pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-06 00:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

converted spell id's to integers and made the internal representation 322-bit

Browse Source
This commit is contained in:
dannuic 2026-04-26 23:53:57 -06:00
parent 05cb1921e8
commit 5de441fa20
134 changed files with 1644 additions and 1645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/eq_packet_structs.h
View File

@ -128,7 +128,7 @@ struct LDoNTrapTemplate
{
uint32 id;
LDoNChestTypes type;
uint32 spell_id;
int32 spell_id;
uint16 skill;
uint8 locked;
};
@ -422,7 +422,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lower reuse
};
@ -471,7 +471,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
/*16*/ int32 slot; // -1 normal, otherwise clear ETA and GCD
@ -489,14 +489,14 @@ struct BeginCast_Struct
{
// len = 8
/*000*/ uint16 caster_id;
/*002*/ uint16 spell_id;
/*002*/ int16 spell_id;
/*004*/ uint32 cast_time; // in miliseconds
};
struct CastSpell_Struct
{
uint32 slot;
uint32 spell_id;
int32 spell_id;
uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast
uint32 target_id;
uint32 cs_unknown1;
@ -544,7 +544,7 @@ struct SpellBuff_Struct
/*001*/ uint8 level;
/*002*/ uint8 bard_modifier;
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking? -- OSX client calls this "activated"
/*004*/ uint32 spellid;
/*004*/ int32 spellid;
/*008*/ int32 duration;
/*012*/ uint32 counters; // single book keeping value (counters, rune/vie)
/*016*/ uint32 player_id; // caster ID, pretty sure just zone ID
@ -574,7 +574,7 @@ struct BuffRemoveRequest_Struct
struct PetBuff_Struct {
/*000*/ uint32 petid;
/*004*/ uint32 spellid[PET_BUFF_COUNT];
/*004*/ int32 spellid[PET_BUFF_COUNT];
/*124*/ int32 ticsremaining[PET_BUFF_COUNT];
/*244*/ uint32 buffcount;
};
@ -875,7 +875,7 @@ struct BindStruct {
struct SuspendedMinion_Struct
{
/*000*/ uint16 SpellID;
/*000*/ int16 SpellID;
/*002*/ uint32 HP;
/*006*/ uint32 Mana;
/*010*/ SpellBuff_Struct Buffs[BUFF_COUNT];
@ -1010,7 +1010,7 @@ struct PlayerProfile_Struct
/*2505*/ uint8 unknown2541[47]; // ?
/*2552*/ uint8 languages[MAX_PP_LANGUAGE];
/*2580*/ uint8 unknown2616[4];
/*2584*/ uint32 spell_book[EQ::spells::SPELLBOOK_SIZE];
/*2584*/ int32 spell_book[EQ::spells::SPELLBOOK_SIZE];
/*4504*/ uint8 unknown4540[128]; // Was [428] all 0xff
/*4632*/ uint32 mem_spells[EQ::spells::SPELL_GEM_COUNT];
/*4668*/ uint8 unknown4704[32]; //
@ -1344,7 +1344,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells, skill
/* 05 */ uint16 spellid;
/* 05 */ int16 spellid;
/* 07 */ uint32 damage;
/* 11 */ float force;
/* 15 */ float hit_heading; // see above notes in Action_Struct
@ -1377,7 +1377,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 bindzoneid;
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 attack_skill;
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2983,7 +2983,7 @@ struct Resurrect_Struct {
/*024*/ char your_name[64];
/*088*/ uint32 unknown088;
/*092*/ char rezzer_name[64];
/*156*/ uint32 spellid;
/*156*/ int32 spellid;
/*160*/ char corpse_name[64];
/*224*/ uint32 action;
/* 228 */
@ -2991,7 +2991,7 @@ struct Resurrect_Struct {
struct Translocate_Struct {
/*000*/ uint32 ZoneID;
/*004*/ uint32 SpellID;
/*004*/ int32 SpellID;
/*008*/ uint32 unknown008; //Heading ?
/*012*/ char Caster[64];
/*076*/ float y;
@ -3008,7 +3008,7 @@ struct PendingTranslocate_Struct
float x;
float y;
float z;
uint32 spell_id;
int32 spell_id;
};
struct Sacrifice_Struct {
@ -4875,7 +4875,7 @@ struct MarkNPC_Struct
};
struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT];
/*000*/ int32 spell_id[BUFF_COUNT];
/*100*/ int32 tics_remaining[BUFF_COUNT];
};
@ -5144,7 +5144,7 @@ struct SendAA_Struct {
/*0040*/ uint32 prereq_skill; //is < 0, abs() is category #
/*0044*/ uint32 prereq_minpoints; //min points in the prereq
/*0048*/ uint32 type;
/*0052*/ uint32 spellid;
/*0052*/ int32 spellid;
/*0056*/ uint32 spell_type;
/*0060*/ uint32 spell_refresh;
/*0064*/ uint16 classes;
@ -5645,7 +5645,7 @@ struct HideCorpse_Struct
struct BuffIconEntry_Struct
{
uint32 buff_slot;
uint32 spell_id;
int32 spell_id;
int32 tics_remaining;
uint32 num_hits;
char caster[64];

4
common/events/player_events.h
View File

@ -960,7 +960,7 @@ namespace PlayerEvent {
struct ResurrectAcceptEvent {
std::string resurrecter_name;
std::string spell_name;
uint32 spell_id;
int32 spell_id;
// cereal
template <class Archive>
@ -1058,7 +1058,7 @@ namespace PlayerEvent {
uint32 killer_id;
std::string killer_name;
int64 damage;
uint32 spell_id;
int32 spell_id;
std::string spell_name;
int skill_id;
std::string skill_name;

2
common/links.cpp
View File

@ -11,7 +11,7 @@ void Links::FormatItemLink(char* Buffer, size_t BufferSize, const EQ::ItemInstan
// TODO: Reverse 0x14064B220 to get definition of this function
}
void Links::FormatSpellLink(char* Buffer, size_t BufferSize, uint32_t SpellID,
void Links::FormatSpellLink(char* Buffer, size_t BufferSize, int32_t SpellID,
const char* spellNameOverride)
{
snprintf(Buffer, BufferSize, "%c%d3^%d^0^'%s%c", ITEM_TAG_CHAR, ETAG_SPELL, SpellID,

2
common/links.h
View File

@ -49,7 +49,7 @@ void FormatItemLink(char* Buffer, size_t BufferSize, const EQ::ItemInstance* ite
// Create a spell link for the given spell, with optional spell name override. Spells on items often have
// spell name overrides that changes the display name of the spell.
void FormatSpellLink(char* Buffer, size_t BufferSize, uint32_t SpellID,
void FormatSpellLink(char* Buffer, size_t BufferSize, int32_t SpellID,
const char* spellNameOverride = nullptr);
// Format text into a clickable dialog link. The keyword is the text that will be displayed in the chat window,

6
common/patches/rof.cpp
View File

@ -466,7 +466,7 @@ namespace RoF
for (int i = 0; i < emu->count; ++i)
{
__packet->WriteUInt32(emu->type == 0 ? ServerToRoFBuffSlot(emu->entries[i].buff_slot) : emu->entries[i].buff_slot);
__packet->WriteUInt32(emu->entries[i].spell_id);
__packet->WriteSInt32 (emu->entries[i].spell_id);
__packet->WriteUInt32(emu->entries[i].tics_remaining);
__packet->WriteUInt32(emu->entries[i].num_hits); // Unknown
__packet->WriteString(emu->entries[i].caster);
@ -1879,7 +1879,7 @@ namespace RoF
if (emu->spellid[i])
{
__packet->WriteUInt32(i);
__packet->WriteUInt32(emu->spellid[i]);
__packet->WriteSInt32 (emu->spellid[i]);
__packet->WriteUInt32(emu->ticsremaining[i]);
__packet->WriteUInt32(0); // numhits
__packet->WriteString("");
@ -2179,7 +2179,7 @@ namespace RoF
outapp->WriteUInt32(emu->buffs[r].counters);
outapp->WriteUInt32(emu->buffs[r].duration);
outapp->WriteUInt8(emu->buffs[r].level);
outapp->WriteUInt32(emu->buffs[r].spellid);
outapp->WriteSInt32 (emu->buffs[r].spellid);
outapp->WriteUInt8(effect_type); // Only ever seen 2
outapp->WriteUInt32(emu->buffs[r].num_hits);
outapp->WriteUInt32(0);

6
common/patches/rof2.cpp
View File

@ -724,7 +724,7 @@ namespace RoF2
for (int i = 0; i < emu->count; ++i)
{
__packet->WriteUInt32(emu->type == 0 ? ServerToRoF2BuffSlot(emu->entries[i].buff_slot) : emu->entries[i].buff_slot);
__packet->WriteUInt32(emu->entries[i].spell_id);
__packet->WriteSInt32 (emu->entries[i].spell_id);
__packet->WriteUInt32(emu->entries[i].tics_remaining);
__packet->WriteUInt32(emu->entries[i].num_hits); // Unknown
__packet->WriteString(emu->entries[i].caster);
@ -2485,7 +2485,7 @@ namespace RoF2
if (emu->spellid[i])
{
__packet->WriteUInt32(i);
__packet->WriteUInt32(emu->spellid[i]);
__packet->WriteSInt32 (emu->spellid[i]);
__packet->WriteUInt32(emu->ticsremaining[i]);
__packet->WriteUInt32(0); // num hits
__packet->WriteString("");
@ -2786,7 +2786,7 @@ namespace RoF2
outapp->WriteUInt32(emu->buffs[r].counters);
outapp->WriteUInt32(emu->buffs[r].duration);
outapp->WriteUInt8(emu->buffs[r].level);
outapp->WriteUInt32(emu->buffs[r].spellid);
outapp->WriteSInt32 (emu->buffs[r].spellid);
outapp->WriteUInt8(effect_type); // Only ever seen 2
outapp->WriteUInt32(emu->buffs[r].num_hits);
outapp->WriteUInt32(0);

22
common/patches/rof2_structs.h
View File

@ -668,7 +668,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lowers reuse
};
@ -705,7 +705,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
/*16*/ int32 slot; // -1 for normal usage slot for when we want silent interrupt? I think it does timer stuff or something. Linked Spell Reuse interrupt uses it
@ -719,7 +719,7 @@ struct SwapSpell_Struct
struct BeginCast_Struct
{
/*000*/ uint32 spell_id;
/*000*/ int32 spell_id;
/*004*/ uint16 caster_id;
/*006*/ uint32 cast_time; // in miliseconds
/*010*/
@ -728,7 +728,7 @@ struct BeginCast_Struct
struct CastSpell_Struct
{
/*00*/ uint32 slot;
/*04*/ uint32 spell_id;
/*04*/ int32 spell_id;
/*08*/ InventorySlot_Struct inventory_slot; // slot for clicky item, Seen unknown of 131 = normal cast
/*20*/ uint32 target_id;
/*24*/ uint32 cs_unknown[2];
@ -760,7 +760,7 @@ struct SpellBuff_Struct
/*002*/ uint8 unknown002; //pretty sure padding now
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
/*004*/ float bard_modifier;
/*008*/ uint32 spellid;
/*008*/ int32 spellid;
/*012*/ uint32 duration;
/*016*/ uint32 player_id; // caster ID, pretty sure just zone ID
/*020*/ uint32 num_hits;
@ -791,7 +791,7 @@ struct BuffRemoveRequest_Struct
// not in use
struct BuffIconEntry_Struct {
/*000*/ uint32 buff_slot;
/*004*/ uint32 spell_id;
/*004*/ int32 spell_id;
/*008*/ uint32 tics_remaining;
/*012*/ uint32 num_hits;
// char name[0]; caster name is also here sometimes
@ -1513,7 +1513,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells
/* 05 */ uint32 spellid;
/* 05 */ int32 spellid;
/* 09 */ int32 damage;
/* 13 */ float force; // cd cc cc 3d
/* 17 */ float hit_heading; // see above notes in Action_Struct
@ -1549,7 +1549,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 attack_skill; // was type
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 bindzoneid; //bindzoneid?
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2658,7 +2658,7 @@ struct GroupFollow_Struct { // Live Follow Struct
};
struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT];
/*000*/ int32 spell_id[BUFF_COUNT];
/*168*/ int32 tics_remaining[BUFF_COUNT];
};
@ -3077,7 +3077,7 @@ struct Resurrect_Struct
/*024*/ char your_name[64];
/*088*/ uint32 unknown088;
/*092*/ char rezzer_name[64];
/*156*/ uint32 spellid;
/*156*/ int32 spellid;
/*160*/ char corpse_name[64];
/*224*/ uint32 action;
/*228*/ uint32 unknown228;
@ -4581,7 +4581,7 @@ struct SendAA_Struct {
/*0045*/ uint32 prereq_minpoints_count; // mutliple prereqs at least 1, even no prereqs
/*0049*/ uint32 prereq_minpoints; //min points in the prereq
/*0053*/ uint32 type;
/*0057*/ uint32 spellid;
/*0057*/ int32 spellid;
/*0061*/ uint32 unknown057; // Introduced during HoT - Seen 1 - Maybe account status or enable/disable AA?
/*0065*/ uint32 spell_type;
/*0069*/ uint32 spell_refresh;

22
common/patches/rof_structs.h
View File

@ -614,7 +614,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lowers reuse
};
@ -651,7 +651,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
/*16*/ int32 slot; // -1 for normal usage slot for when we want silent interrupt? I think it does timer stuff or something. Linked Spell Reuse interrupt uses it
@ -665,7 +665,7 @@ struct SwapSpell_Struct
struct BeginCast_Struct
{
/*000*/ uint32 spell_id;
/*000*/ int32 spell_id;
/*004*/ uint16 caster_id;
/*006*/ uint32 cast_time; // in miliseconds
/*010*/
@ -674,7 +674,7 @@ struct BeginCast_Struct
struct CastSpell_Struct
{
/*00*/ uint32 slot;
/*04*/ uint32 spell_id;
/*04*/ int32 spell_id;
/*08*/ InventorySlot_Struct inventory_slot; // slot for clicky item, Seen unknown of 131 = normal cast
/*20*/ uint32 target_id;
/*24*/ uint32 cs_unknown[2];
@ -706,7 +706,7 @@ struct SpellBuff_Struct
/*002*/ uint8 unknown002; //pretty sure padding now
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
/*004*/ float bard_modifier;
/*008*/ uint32 spellid;
/*008*/ int32 spellid;
/*012*/ uint32 duration;
/*016*/ uint32 player_id; // caster ID, pretty sure just zone ID
/*020*/ uint32 num_hits;
@ -737,7 +737,7 @@ struct BuffRemoveRequest_Struct
// not in use
struct BuffIconEntry_Struct {
/*000*/ uint32 buff_slot;
/*004*/ uint32 spell_id;
/*004*/ int32 spell_id;
/*008*/ uint32 tics_remaining;
/*012*/ uint32 num_hits;
// char name[0]; caster name is also here sometimes
@ -1500,7 +1500,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells
/* 05 */ uint32 spellid;
/* 05 */ int32 spellid;
/* 09 */ int32 damage;
/* 13 */ float force; // cd cc cc 3d
/* 17 */ float hit_heading; // see above notes in Action_Struct
@ -1536,7 +1536,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 attack_skill; // was type
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 bindzoneid; //bindzoneid?
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2603,7 +2603,7 @@ struct GroupFollow_Struct { // Live Follow Struct
};
struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT];
/*000*/ int32 spell_id[BUFF_COUNT];
/*168*/ int32 tics_remaining[BUFF_COUNT];
};
@ -3013,7 +3013,7 @@ struct Resurrect_Struct
/*024*/ char your_name[64];
/*088*/ uint32 unknown088;
/*092*/ char rezzer_name[64];
/*156*/ uint32 spellid;
/*156*/ int32 spellid;
/*160*/ char corpse_name[64];
/*224*/ uint32 action;
/*228*/ uint32 unknown228;
@ -4333,7 +4333,7 @@ struct SendAA_Struct {
/*0045*/ uint32 prereq_minpoints_count; // mutliple prereqs at least 1, even no prereqs
/*0049*/ uint32 prereq_minpoints; //min points in the prereq
/*0053*/ uint32 type;
/*0057*/ uint32 spellid;
/*0057*/ int32 spellid;
/*0061*/ uint32 unknown057; // Introduced during HoT - Seen 1 - Maybe account status or enable/disable AA?
/*0065*/ uint32 spell_type;
/*0069*/ uint32 spell_refresh;

18
common/patches/sod_structs.h
View File

@ -480,7 +480,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lowers reuse
};
@ -517,7 +517,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
/*16*/ int32 slot; // -1 for normal usage slot for when we want silent interrupt? I think it does timer stuff or something. Linked Spell Reuse interrupt uses it
@ -535,14 +535,14 @@ struct BeginCast_Struct
{
// len = 8
/*004*/ uint16 caster_id;
/*006*/ uint16 spell_id;
/*006*/ int16 spell_id;
/*016*/ uint32 cast_time; // in miliseconds
};
struct CastSpell_Struct
{
uint32 slot;
uint32 spell_id;
int32 spell_id;
uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast
uint32 target_id;
uint8 cs_unknown[4];
@ -571,7 +571,7 @@ struct SpellBuff_Struct
/*001*/ uint8 level; // Seen 1 for no buff
/*002*/ uint8 bard_modifier;
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
/*004*/ uint32 spellid;
/*004*/ int32 spellid;
/*008*/ uint32 duration;
/*012*/ uint32 counters;
/*016*/ uint32 unknown016;
@ -1266,7 +1266,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells
/* 05 */ uint16 spellid;
/* 05 */ int16 spellid;
/* 07 */ int32 damage;
/* 11 */ float force; // cd cc cc 3d
/* 15 */ float hit_heading; // see above notes in Action_Struct
@ -1301,7 +1301,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 attack_skill; // was type
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 bindzoneid; //bindzoneid?
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2534,7 +2534,7 @@ struct Resurrect_Struct {
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
uint32 spellid;
int32 spellid;
char corpse_name[64];
uint32 action;
/* 228 */
@ -3787,7 +3787,7 @@ struct SendAA_Struct {
/*0037*/ uint32 prereq_skill; //is < 0, abs() is category #
/*0041*/ uint32 prereq_minpoints; //min points in the prereq
/*0045*/ uint32 type;
/*0049*/ uint32 spellid;
/*0049*/ int32 spellid;
/*0053*/ uint32 spell_type;
/*0057*/ uint32 spell_refresh;
/*0061*/ uint32 classes;

18
common/patches/sof_structs.h
View File

@ -480,7 +480,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lowers reuse
};
@ -517,7 +517,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
/*16*/ int32 slot; // -1 for normal usage slot for when we want silent interrupt? I think it does timer stuff or something. Linked Spell Reuse interrupt uses it
@ -535,14 +535,14 @@ struct BeginCast_Struct
{
// len = 8
/*004*/ uint16 caster_id;
/*006*/ uint16 spell_id;
/*006*/ int16 spell_id;
/*016*/ uint32 cast_time; // in miliseconds
};
struct CastSpell_Struct
{
uint32 slot;
uint32 spell_id;
int32 spell_id;
uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast
uint32 target_id;
uint8 cs_unknown[4];
@ -571,7 +571,7 @@ struct SpellBuff_Struct
/*001*/ uint8 level; // Seen 1 for no buff
/*002*/ uint8 bard_modifier;
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
/*004*/ uint32 spellid;
/*004*/ int32 spellid;
/*008*/ uint32 duration;
/*012*/ uint32 counters;
/*016*/ uint32 unknown016;
@ -1266,7 +1266,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells
/* 05 */ uint16 spellid;
/* 05 */ int16 spellid;
/* 07 */ int32 damage;
/* 11 */ float force; // cd cc cc 3d
/* 15 */ float hit_heading; // see above notes in Action_Struct
@ -1301,7 +1301,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 attack_skill; // was type
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 bindzoneid; //bindzoneid?
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2504,7 +2504,7 @@ struct Resurrect_Struct {
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
uint32 spellid;
int32 spellid;
char corpse_name[64];
uint32 action;
/* 228 */
@ -3711,7 +3711,7 @@ struct SendAA_Struct {
/*0037*/ uint32 prereq_skill; //is < 0, abs() is category #
/*0041*/ uint32 prereq_minpoints; //min points in the prereq
/*0045*/ uint32 type;
/*0049*/ uint32 spellid;
/*0049*/ int32 spellid;
/*0053*/ uint32 spell_type;
/*0057*/ uint32 spell_refresh;
/*0061*/ uint32 classes;

18
common/patches/titanium_structs.h
View File

@ -406,7 +406,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lowers reuse
};
@ -442,7 +442,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
};
@ -459,14 +459,14 @@ struct BeginCast_Struct
{
// len = 8
/*000*/ uint16 caster_id;
/*002*/ uint16 spell_id;
/*002*/ int16 spell_id;
/*004*/ uint32 cast_time; // in miliseconds
};
struct CastSpell_Struct
{
uint32 slot;
uint32 spell_id;
int32 spell_id;
uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast
uint32 target_id;
uint8 cs_unknown[4];
@ -495,7 +495,7 @@ struct SpellBuff_Struct
/*001*/ uint8 level;
/*002*/ uint8 bard_modifier;
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
/*004*/ uint32 spellid;
/*004*/ int32 spellid;
/*008*/ int32 duration;
/*012*/ uint32 counters; // single book keeping value (counters, rune/vie)
/*016*/ uint32 player_id; // caster ID, pretty sure just zone ID
@ -1142,7 +1142,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells, skill
/* 05 */ uint16 spellid;
/* 05 */ int16 spellid;
/* 07 */ uint32 damage;
/* 11 */ float force;
/* 15 */ float hit_heading; // see above notes in Action_Struct
@ -1177,7 +1177,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 attack_skill; // was type
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 bindzoneid; //bindzoneid?
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2233,7 +2233,7 @@ struct Resurrect_Struct {
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
uint32 spellid;
int32 spellid;
char corpse_name[64];
uint32 action;
/* 228 */
@ -3247,7 +3247,7 @@ struct SendAA_Struct {
/*0040*/ uint32 prereq_skill; //is < 0, abs() is category #
/*0044*/ uint32 prereq_minpoints; //min points in the prereq
/*0048*/ uint32 type;
/*0052*/ uint32 spellid;
/*0052*/ int32 spellid;
/*0056*/ uint32 spell_type;
/*0060*/ uint32 spell_refresh;
/*0064*/ uint32 classes;

14
common/patches/tob_structs.h
View File

@ -627,7 +627,7 @@ namespace TOB {
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; //not read by client
/*012*/ uint32 unknown1; //not read by client
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 attack_skill;
/*024*/ uint64 damage;
/*032*/ uint32 unknown2; //not read by client
@ -672,7 +672,7 @@ namespace TOB {
struct BeginCast_Struct
{
/*000*/ uint32 spell_id;
/*000*/ int32 spell_id;
/*004*/ uint16 caster_id;
/*006*/ uint32 cast_time; // in miliseconds
/*010*/ uint32 unknown0a; // I think this is caster effective level but im not sure. live always sends 0. The client uses this for the spell link
@ -682,7 +682,7 @@ namespace TOB {
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // -1 refreshes book, 0 scribe to book, 2 end mem, 1 start mem, 3 unmem, 4 set activated item keyring -- client will send back 2 if a 0 operation updated a memorized spell of the same group + subgroup
uint32 reduction; // lower reuse (only used if scribing is 4)
};
@ -702,7 +702,7 @@ namespace TOB {
struct CastSpell_Struct
{
/*00*/ uint32 slot;
/*04*/ uint32 spell_id;
/*04*/ int32 spell_id;
/*08*/ CastSpellInventorySlot_Struct inventory_slot;
/*18*/ uint32 target_id;
/*22*/ uint32 spell_crc;
@ -732,7 +732,7 @@ namespace TOB {
/*000*/ EQAffectSlot_Struct slots[6];
/*096*/ EqGuid caster_id;
/*104*/ uint32 flags;
/*108*/ uint32 spell_id;
/*108*/ int32 spell_id;
/*112*/ uint32 duration;
/*116*/ uint32 initial_duration;
/*120*/ uint32 hit_count;
@ -762,7 +762,7 @@ namespace TOB {
{
uint32 new_mana;
uint32 stamina; // endurance
uint32 spell_id;
int32 spell_id;
uint32 keepcasting;
int32 slot; // gem slot
};
@ -775,7 +775,7 @@ namespace TOB {
{
uint16 target;
uint16 source;
uint32 spell_id;
int32 spell_id;
//4 leaves a buff
uint32 effect_type;
uint32 effective_casting_level;

2
common/patches/uf.cpp
View File

@ -473,7 +473,7 @@ namespace UF
for (int i = 0; i < emu->count; ++i)
{
__packet->WriteUInt32(emu->type == 0 ? ServerToUFBuffSlot(emu->entries[i].buff_slot) : emu->entries[i].buff_slot);
__packet->WriteUInt32(emu->entries[i].spell_id);
__packet->WriteSInt32 (emu->entries[i].spell_id);
__packet->WriteUInt32(emu->entries[i].tics_remaining);
__packet->WriteUInt32(emu->entries[i].num_hits);
__packet->WriteString(emu->entries[i].caster);

22
common/patches/uf_structs.h
View File

@ -480,7 +480,7 @@ struct NewZone_Struct {
*/
struct MemorizeSpell_Struct {
uint32 slot; // Spot in the spell book/memorized slot
uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
int32 spell_id; // Spell id (200 or c8 is minor healing, etc)
uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
uint32 reduction; // lowers reuse
};
@ -517,7 +517,7 @@ struct ManaChange_Struct
{
/*00*/ uint32 new_mana; // New Mana AMount
/*04*/ uint32 stamina;
/*08*/ uint32 spell_id;
/*08*/ int32 spell_id;
/*12*/ uint8 keepcasting; // won't stop the cast. Change mana while casting?
/*13*/ uint8 padding[3]; // client doesn't read it, garbage data seems like
/*16*/ int32 slot; // -1 for normal usage slot for when we want silent interrupt? I think it does timer stuff or something. Linked Spell Reuse interrupt uses it
@ -535,14 +535,14 @@ struct BeginCast_Struct
{
// len = 8
/*004*/ uint16 caster_id;
/*006*/ uint16 spell_id;
/*006*/ int16 spell_id;
/*016*/ uint32 cast_time; // in miliseconds
};
struct CastSpell_Struct
{
uint32 slot;
uint32 spell_id;
int32 spell_id;
uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast
uint32 target_id;
uint32 cs_unknown1;
@ -575,7 +575,7 @@ struct SpellBuff_Struct
/*002*/ uint8 unknown002; //pretty sure padding now
/*003*/ uint8 unknown003; // MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
/*004*/ float bard_modifier;
/*008*/ uint32 spellid;
/*008*/ int32 spellid;
/*012*/ uint32 duration;
/*016*/ uint32 num_hits;
/*020*/ uint32 player_id; // caster ID, pretty sure just zone ID
@ -595,7 +595,7 @@ struct SpellBuffPacket_Struct {
#if 0
struct BuffIconEntry_Struct {
/*000*/ uint32 buff_slot;
/*004*/ uint32 spell_id;
/*004*/ int32 spell_id;
/*008*/ uint32 tics_remaining;
/*012*/ uint32 num_hits;
// char name[0]; caster name is also here sometimes
@ -1306,7 +1306,7 @@ struct CombatDamage_Struct
/* 00 */ uint16 target;
/* 02 */ uint16 source;
/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells
/* 05 */ uint16 spellid;
/* 05 */ int16 spellid;
/* 07 */ int32 damage;
/* 11 */ float force; // cd cc cc 3d
/* 15 */ float hit_heading; // see above notes in Action_Struct
@ -1342,7 +1342,7 @@ struct Death_Struct
/*004*/ uint32 killer_id;
/*008*/ uint32 corpseid; // was corpseid
/*012*/ uint32 attack_skill; // was type
/*016*/ uint32 spell_id;
/*016*/ int32 spell_id;
/*020*/ uint32 bindzoneid; //bindzoneid?
/*024*/ uint32 damage;
/*028*/ uint32 unknown028;
@ -2194,7 +2194,7 @@ struct GroupFollow_Struct { // Underfoot Follow Struct
};
struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT];
/*000*/ int32 spell_id[BUFF_COUNT];
/*120*/ int32 tics_remaining[BUFF_COUNT];
};
@ -2610,7 +2610,7 @@ struct Resurrect_Struct {
char your_name[64];
uint32 unknown88;
char rezzer_name[64];
uint32 spellid;
int32 spellid;
char corpse_name[64];
uint32 action;
/* 228 */
@ -3896,7 +3896,7 @@ struct SendAA_Struct {
/*0037*/ uint32 prereq_skill; //is < 0, abs() is category #
/*0041*/ uint32 prereq_minpoints; //min points in the prereq
/*0045*/ uint32 type;
/*0049*/ uint32 spellid;
/*0049*/ int32 spellid;
/*0053*/ uint32 spell_type;
/*0057*/ uint32 spell_refresh;
/*0061*/ uint32 classes;

2
common/repositories/base/base_blocked_spells_repository.h
View File

@ -37,7 +37,7 @@ class BaseBlockedSpellsRepository {
public:
struct BlockedSpells {
int32_t id;
uint32_t spellid;
int32_t spellid;
int8_t type;
int32_t zoneid;
float x;

2
common/repositories/base/base_bot_blocked_buffs_repository.h
View File

@ -37,7 +37,7 @@ class BaseBotBlockedBuffsRepository {
public:
struct BotBlockedBuffs {
uint32_t bot_id;
uint32_t spell_id;
int32_t spell_id;
uint8_t blocked;
uint8_t blocked_pet;
};

2
common/repositories/base/base_bot_buffs_repository.h
View File

@ -38,7 +38,7 @@ public:
struct BotBuffs {
uint32_t buffs_index;
uint32_t bot_id;
uint32_t spell_id;
int32_t spell_id;
uint8_t caster_level;
uint32_t duration_formula;
uint32_t tics_remaining;

2
common/repositories/base/base_bot_pet_buffs_repository.h
View File

@ -38,7 +38,7 @@ public:
struct BotPetBuffs {
uint32_t pet_buffs_index;
uint32_t pets_index;
uint32_t spell_id;
int32_t spell_id;
uint32_t caster_level;
uint32_t duration;
};

2
common/repositories/base/base_bot_pets_repository.h
View File

@ -37,7 +37,7 @@ class BaseBotPetsRepository {
public:
struct BotPets {
uint32_t pets_index;
uint32_t spell_id;
int32_t spell_id;
uint32_t bot_id;
std::string name;
int32_t mana;

2
common/repositories/base/base_bot_spell_settings_repository.h
View File

@ -38,7 +38,7 @@ public:
struct BotSpellSettings {
uint32_t id;
int32_t bot_id;
int16_t spell_id;
int32_t spell_id;
int16_t priority;
int16_t min_hp;
int16_t max_hp;

2
common/repositories/base/base_bot_spells_entries_repository.h
View File

@ -38,7 +38,7 @@ public:
struct BotSpellsEntries {
uint32_t id;
int32_t npc_spells_id;
uint16_t spell_id;
int32_t spell_id;
uint32_t type;
uint8_t minlevel;
uint8_t maxlevel;

2
common/repositories/base/base_bot_timers_repository.h
View File

@ -42,7 +42,7 @@ public:
uint32_t recast_time;
uint8_t is_spell;
uint8_t is_disc;
uint32_t spell_id;
int32_t spell_id;
uint8_t is_item;
uint32_t item_id;
};

2
common/repositories/base/base_character_buffs_repository.h
View File

@ -38,7 +38,7 @@ public:
struct CharacterBuffs {
uint32_t character_id;
uint8_t slot_id;
uint16_t spell_id;
int32_t spell_id;
uint8_t caster_level;
std::string caster_name;
int32_t ticsremaining;

2
common/repositories/base/base_character_memmed_spells_repository.h
View File

@ -38,7 +38,7 @@ public:
struct CharacterMemmedSpells {
uint32_t id;
uint16_t slot_id;
uint16_t spell_id;
int32_t spell_id;
};
static std::string PrimaryKey()

2
common/repositories/base/base_character_spells_repository.h
View File

@ -38,7 +38,7 @@ public:
struct CharacterSpells {
uint32_t id;
uint16_t slot_id;
uint16_t spell_id;
int32_t spell_id;
};
static std::string PrimaryKey()

2
common/repositories/base/base_damageshieldtypes_repository.h
View File

@ -36,7 +36,7 @@
class BaseDamageshieldtypesRepository {
public:
struct Damageshieldtypes {
uint32_t spellid;
int32_t spellid;
uint8_t type;
};

2
common/repositories/base/base_ldon_trap_templates_repository.h
View File

@ -38,7 +38,7 @@ public:
struct LdonTrapTemplates {
uint32_t id;
uint8_t type;
uint16_t spell_id;
int32_t spell_id;
uint16_t skill;
uint8_t locked;
};

2
common/repositories/base/base_merc_buffs_repository.h
View File

@ -38,7 +38,7 @@ public:
struct MercBuffs {
uint32_t MercBuffId;
uint32_t MercId;
uint32_t SpellId;
int32_t SpellId;
uint32_t CasterLevel;
uint32_t DurationFormula;
int32_t TicsRemaining;

2
common/repositories/base/base_merc_spell_list_entries_repository.h
View File

@ -39,7 +39,7 @@ public:
struct MercSpellListEntries {
uint32_t merc_spell_list_entry_id;
uint32_t merc_spell_list_id;
uint32_t spell_id;
int32_t spell_id;
uint32_t spell_type;
uint8_t stance_id;
uint8_t minlevel;

2
common/repositories/base/base_npc_spells_entries_repository.h
View File

@ -38,7 +38,7 @@ public:
struct NpcSpellsEntries {
uint32_t id;
int32_t npc_spells_id;
uint16_t spellid;
int32_t spellid;
uint32_t type;
uint8_t minlevel;
uint8_t maxlevel;

2
common/repositories/base/base_spell_buckets_repository.h
View File

@ -36,7 +36,7 @@
class BaseSpellBucketsRepository {
public:
struct SpellBuckets {
uint32_t spell_id;
int32_t spell_id;
std::string bucket_name;
std::string bucket_value;
uint8_t bucket_comparison;

4
common/servertalk.h
View File

@ -1425,7 +1425,7 @@ struct CZSpell_Struct {
uint8 update_type; // 0 - Character, 1 - Group, 2 - Raid, 3 - Guild, 4 - Expedition, 5 - Character Name
uint8 update_subtype; // 0 - Cast Spell, 1 - Remove Spell
int update_identifier; // Character ID, Group ID, Raid ID, Guild ID, or Expedition ID based on update type, 0 for Character Name
uint32 spell_id;
int32 spell_id;
char client_name[64]; // Only used by Character Name Type, else empty
};
@ -1498,7 +1498,7 @@ struct WWSignal_Struct {
struct WWSpell_Struct {
uint8 update_type; // 0 - Cast Spell, 1 - Remove Spell
uint32 spell_id;
int32 spell_id;
uint8 min_status;
uint8 max_status;
};

296
common/spdat.cpp
View File

File diff suppressed because it is too large Load Diff

305
common/spdat.h
View File

@ -21,9 +21,8 @@
#include "common/item_data.h"
#include "common/skills.h"
#define SPELL_UNKNOWN 0xFFFF
#define POISON_PROC 0xFFFE
#define SPELLBOOK_UNKNOWN 0xFFFFFFFF //player profile spells are 32 bit
#define SPELL_UNKNOWN -1
#define POISON_PROC -2
//some spell IDs which will prolly change, but are needed
#define SPELL_COMPLETE_HEAL 13
@ -914,10 +913,10 @@ bool BotSpellTypeRequiresTarget(uint16 spell_type);
bool BotSpellTypeRequiresAEChecks(uint16 spell_type);
bool IsCommandedBotSpellType(uint16 spell_type);
bool IsPullingBotSpellType(uint16 spell_type);
uint16 GetCorrectBotSpellType(uint16 spell_type, uint16 spell_id);
uint16 GetCorrectBotSpellType(uint16 spell_type, int32 spell_id);
uint16 GetPetBotSpellType(uint16 spell_type);
bool IsBotBuffSpellType(uint16 spell_type);
bool BotRequiresLoSToCast(uint16 spell_type, uint16 spell_id);
bool BotRequiresLoSToCast(uint16 spell_type, int32 spell_id);
// These should not be used to determine spell category..
// They are a graphical affects (effects?) index only
@ -1762,157 +1761,157 @@ struct SPDat_Spell_Struct
extern const SPDat_Spell_Struct* spells;
extern int32 SPDAT_RECORDS;
bool IsTargetableAESpell(uint16 spell_id);
bool IsSacrificeSpell(uint16 spell_id);
bool IsLifetapSpell(uint16 spell_id);
bool IsMesmerizeSpell(uint16 spell_id);
bool SpellBreaksMez(uint16 spell_id);
bool IsStunSpell(uint16 spell_id);
bool IsSlowSpell(uint16 spell_id);
bool IsHasteSpell(uint16 spell_id);
bool IsHarmonySpell(uint16 spell_id);
bool IsPercentalHealSpell(uint16 spell_id);
bool IsGroupOnlySpell(uint16 spell_id);
bool IsBeneficialSpell(uint16 spell_id);
bool IsDetrimentalSpell(uint16 spell_id);
bool IsInvisibleSpell(uint16 spell_id);
bool IsInvulnerabilitySpell(uint16 spell_id);
bool IsCompleteHealDurationSpell(uint16 spell_id);
bool IsPoisonCounterSpell(uint16 spell_id);
bool IsDiseaseCounterSpell(uint16 spell_id);
bool IsSummonItemSpell(uint16 spell_id);
bool IsSummonSkeletonSpell(uint16 spell_id);
bool IsSummonPetSpell(uint16 spell_id);
bool IsSummonPCSpell(uint16 spell_id);
bool IsPetSpell(uint16 spell_id);
bool IsCharmSpell(uint16 spell_id);
bool IsResurrectionSicknessSpell(uint16 spell_id);
bool IsBlindSpell(uint16 spell_id);
bool IsHealthSpell(uint16 spell_id);
bool IsCastTimeReductionSpell(uint16 spell_id);
bool IsIncreaseDurationSpell(uint16 spell_id);
bool IsManaCostReductionSpell(uint16 spell_id);
bool IsIncreaseRangeSpell(uint16 spell_id);
bool IsImprovedHealingSpell(uint16 spell_id);
bool IsImprovedDamageSpell(uint16 spell_id);
bool IsAEDurationSpell(uint16 spell_id);
bool IsPureNukeSpell(uint16 spell_id);
bool IsAENukeSpell(uint16 spell_id);
bool IsPBAENukeSpell(uint16 spell_id);
bool IsAERainNukeSpell(uint16 spell_id);
bool IsAnyNukeOrStunSpell(uint16 spell_id);
bool IsAnyAESpell(uint16 spell_id);
bool IsAESpell(uint16 spell_id);
bool IsPBAESpell(uint16 spell_id);
bool IsAERainSpell(uint16 spell_id);
bool IsPartialResistableSpell(uint16 spell_id);
bool IsResistableSpell(uint16 spell_id);
bool IsGroupSpell(uint16 spell_id);
bool IsTGBCompatibleSpell(uint16 spell_id);
bool IsBardSong(uint16 spell_id);
bool IsEffectInSpell(uint16 spell_id, int effect_id);
uint16 GetSpellTriggerSpellID(uint16 spell_id, int effect_id);
bool IsBlankSpellEffect(uint16 spell_id, int effect_index);
bool IsValidSpell(uint32 spell_id);
bool IsSummonSpell(uint16 spell_id);
bool IsDamageSpell(uint16 spell_id);
bool IsAnyDamageSpell(uint16 spell_id);
bool IsDamageOverTimeSpell(uint16 spell_i);
bool IsFearSpell(uint16 spell_id);
bool IsCureSpell(uint16 spell_id);
bool IsHarmTouchSpell(uint16 spell_id);
int GetSpellEffectIndex(uint16 spell_id, int effect_id);
uint8 GetSpellMinimumLevel(uint16 spell_id);
uint8 GetSpellLevel(uint16 spell_id, uint8 class_id);
bool IsTargetableAESpell(int32 spell_id);
bool IsSacrificeSpell(int32 spell_id);
bool IsLifetapSpell(int32 spell_id);
bool IsMesmerizeSpell(int32 spell_id);
bool SpellBreaksMez(int32 spell_id);
bool IsStunSpell(int32 spell_id);
bool IsSlowSpell(int32 spell_id);
bool IsHasteSpell(int32 spell_id);
bool IsHarmonySpell(int32 spell_id);
bool IsPercentalHealSpell(int32 spell_id);
bool IsGroupOnlySpell(int32 spell_id);
bool IsBeneficialSpell(int32 spell_id);
bool IsDetrimentalSpell(int32 spell_id);
bool IsInvisibleSpell(int32 spell_id);
bool IsInvulnerabilitySpell(int32 spell_id);
bool IsCompleteHealDurationSpell(int32 spell_id);
bool IsPoisonCounterSpell(int32 spell_id);
bool IsDiseaseCounterSpell(int32 spell_id);
bool IsSummonItemSpell(int32 spell_id);
bool IsSummonSkeletonSpell(int32 spell_id);
bool IsSummonPetSpell(int32 spell_id);
bool IsSummonPCSpell(int32 spell_id);
bool IsPetSpell(int32 spell_id);
bool IsCharmSpell(int32 spell_id);
bool IsResurrectionSicknessSpell(int32 spell_id);
bool IsBlindSpell(int32 spell_id);
bool IsHealthSpell(int32 spell_id);
bool IsCastTimeReductionSpell(int32 spell_id);
bool IsIncreaseDurationSpell(int32 spell_id);
bool IsManaCostReductionSpell(int32 spell_id);
bool IsIncreaseRangeSpell(int32 spell_id);
bool IsImprovedHealingSpell(int32 spell_id);
bool IsImprovedDamageSpell(int32 spell_id);
bool IsAEDurationSpell(int32 spell_id);
bool IsPureNukeSpell(int32 spell_id);
bool IsAENukeSpell(int32 spell_id);
bool IsPBAENukeSpell(int32 spell_id);
bool IsAERainNukeSpell(int32 spell_id);
bool IsAnyNukeOrStunSpell(int32 spell_id);
bool IsAnyAESpell(int32 spell_id);
bool IsAESpell(int32 spell_id);
bool IsPBAESpell(int32 spell_id);
bool IsAERainSpell(int32 spell_id);
bool IsPartialResistableSpell(int32 spell_id);
bool IsResistableSpell(int32 spell_id);
bool IsGroupSpell(int32 spell_id);
bool IsTGBCompatibleSpell(int32 spell_id);
bool IsBardSong(int32 spell_id);
bool IsEffectInSpell(int32 spell_id, int effect_id);
int32 GetSpellTriggerSpellID(int32 spell_id, int effect_id);
bool IsBlankSpellEffect(int32 spell_id, int effect_index);
bool IsValidSpell(int32 spell_id);
bool IsSummonSpell(int32 spell_id);
bool IsDamageSpell(int32 spell_id);
bool IsAnyDamageSpell(int32 spell_id);
bool IsDamageOverTimeSpell(int32 spell_id);
bool IsFearSpell(int32 spell_id);
bool IsCureSpell(int32 spell_id);
bool IsHarmTouchSpell(int32 spell_id);
int GetSpellEffectIndex(int32 spell_id, int effect_id);
uint8 GetSpellMinimumLevel(int32 spell_id);
uint8 GetSpellLevel(int32 spell_id, uint8 class_id);
int CalcBuffDuration_formula(int level, int formula, int duration);
int32 CalculatePoisonCounters(uint16 spell_id);
int32 CalculateDiseaseCounters(uint16 spell_id);
int32 CalculateCurseCounters(uint16 spell_id);
int32 CalculateCorruptionCounters(uint16 spell_id);
int32 CalculateCounters(uint16 spell_id);
bool IsDisciplineBuff(uint16 spell_id);
bool IsDiscipline(uint16 spell_id);
bool IsCombatSkill(uint16 spell_id);
bool IsResurrectionEffects(uint16 spell_id);
int8 GetSpellResurrectionSicknessCheck(uint16 spell_id_one, uint16 spell_id_two);
bool IsRuneSpell(uint16 spell_id);
bool IsMagicRuneSpell(uint16 spell_id);
bool IsManaTapSpell(uint16 spell_id);
bool IsAllianceSpell(uint16 spell_id);
bool IsDeathSaveSpell(uint16 spell_id);
bool IsFullDeathSaveSpell(uint16 spell_id);
bool IsPartialDeathSaveSpell(uint16 spell_id);
bool IsShadowStepSpell(uint16 spell_id);
bool IsSuccorSpell(uint16 spell_id);
bool IsTeleportSpell(uint16 spell_id);
bool IsTranslocateSpell(uint16 spell_id);
bool IsGateSpell(uint16 spell_id);
bool IsIllusionSpell(uint16 spell_id);
bool IsLDoNObjectSpell(uint16 spell_id);
int GetSpellResistType(uint16 spell_id);
int GetSpellTargetType(uint16 spell_id);
bool IsHealOverTimeSpell(uint16 spell_id);
bool IsCompleteHealSpell(uint16 spell_id);
bool IsFastHealSpell(uint16 spell_id);
bool IsVeryFastHealSpell(uint16 spell_id);
bool IsRegularSingleTargetHealSpell(uint16 spell_id);
bool IsRegularPetHealSpell(uint16 spell_id);
bool IsRegularGroupHealSpell(uint16 spell_id);
bool IsGroupCompleteHealSpell(uint16 spell_id);
bool IsGroupHealOverTimeSpell(uint16 spell_id);
bool IsAnyHealSpell(uint16 spell_id);
bool IsAnyBuffSpell(uint16 spell_id);
bool IsDispelSpell(uint16 spell_id);
bool IsEscapeSpell(uint16 spell_id);
bool IsDebuffSpell(uint16 spell_id);
bool IsHateReduxSpell(uint16 spell_id);
bool IsResistDebuffSpell(uint16 spell_id);
bool IsSelfConversionSpell(uint16 spell_id);
bool IsBuffSpell(uint16 spell_id);
bool IsPersistDeathSpell(uint16 spell_id);
bool IsSuspendableSpell(uint16 spell_id);
bool IsCastOnFadeDurationSpell(uint16 spell_id);
bool IsDistanceModifierSpell(uint16 spell_id);
int GetSpellPartialMeleeRuneReduction(uint16 spell_id);
int GetSpellPartialMagicRuneReduction(uint16 spell_id);
int GetSpellPartialMeleeRuneAmount(uint16 spell_id);
int GetSpellPartialMagicRuneAmount(uint16 spell_id);
bool IsNoDetrimentalSpellAggroSpell(uint16 spell_id);
bool IsStackableDOT(uint16 spell_id);
int32 CalculatePoisonCounters(int32 spell_id);
int32 CalculateDiseaseCounters(int32 spell_id);
int32 CalculateCurseCounters(int32 spell_id);
int32 CalculateCorruptionCounters(int32 spell_id);
int32 CalculateCounters(int32 spell_id);
bool IsDisciplineBuff(int32 spell_id);
bool IsDiscipline(int32 spell_id);
bool IsCombatSkill(int32 spell_id);
bool IsResurrectionEffects(int32 spell_id);
int8 GetSpellResurrectionSicknessCheck(int32 spell_id_one, int32 spell_id_two);
bool IsRuneSpell(int32 spell_id);
bool IsMagicRuneSpell(int32 spell_id);
bool IsManaTapSpell(int32 spell_id);
bool IsAllianceSpell(int32 spell_id);
bool IsDeathSaveSpell(int32 spell_id);
bool IsFullDeathSaveSpell(int32 spell_id);
bool IsPartialDeathSaveSpell(int32 spell_id);
bool IsShadowStepSpell(int32 spell_id);
bool IsSuccorSpell(int32 spell_id);
bool IsTeleportSpell(int32 spell_id);
bool IsTranslocateSpell(int32 spell_id);
bool IsGateSpell(int32 spell_id);
bool IsIllusionSpell(int32 spell_id);
bool IsLDoNObjectSpell(int32 spell_id);
int GetSpellResistType(int32 spell_id);
int GetSpellTargetType(int32 spell_id);
bool IsHealOverTimeSpell(int32 spell_id);
bool IsCompleteHealSpell(int32 spell_id);
bool IsFastHealSpell(int32 spell_id);
bool IsVeryFastHealSpell(int32 spell_id);
bool IsRegularSingleTargetHealSpell(int32 spell_id);
bool IsRegularPetHealSpell(int32 spell_id);
bool IsRegularGroupHealSpell(int32 spell_id);
bool IsGroupCompleteHealSpell(int32 spell_id);
bool IsGroupHealOverTimeSpell(int32 spell_id);
bool IsAnyHealSpell(int32 spell_id);
bool IsAnyBuffSpell(int32 spell_id);
bool IsDispelSpell(int32 spell_id);
bool IsEscapeSpell(int32 spell_id);
bool IsDebuffSpell(int32 spell_id);
bool IsHateReduxSpell(int32 spell_id);
bool IsResistDebuffSpell(int32 spell_id);
bool IsSelfConversionSpell(int32 spell_id);
bool IsBuffSpell(int32 spell_id);
bool IsPersistDeathSpell(int32 spell_id);
bool IsSuspendableSpell(int32 spell_id);
bool IsCastOnFadeDurationSpell(int32 spell_id);
bool IsDistanceModifierSpell(int32 spell_id);
int GetSpellPartialMeleeRuneReduction(int32 spell_id);
int GetSpellPartialMagicRuneReduction(int32 spell_id);
int GetSpellPartialMeleeRuneAmount(int32 spell_id);
int GetSpellPartialMagicRuneAmount(int32 spell_id);
bool IsNoDetrimentalSpellAggroSpell(int32 spell_id);
bool IsStackableDOT(int32 spell_id);
bool IsBardOnlyStackEffect(int effect_id);
bool IsCastWhileInvisibleSpell(uint16 spell_id);
bool IsCastWhileInvisibleSpell(int32 spell_id);
bool IsEffectIgnoredInStacking(int effect_id);
bool IsFocusLimit(int effect_id);
bool IsTargetRequiredForSpell(uint16 spell_id);
bool IsVirusSpell(uint16 spell_id);
int GetSpellViralMinimumSpreadTime(uint16 spell_id);
int GetSpellViralMaximumSpreadTime(uint16 spell_id);
int GetSpellViralSpreadRange(uint16 spell_id);
bool IsInstrumentModifierAppliedToSpellEffect(uint16 spell_id, int effect_id);
bool IsPulsingBardSong(uint16 spell_id);
int GetSpellProcLimitTimer(uint16 spell_id, int proc_type);
bool IsCastNotStandingSpell(uint16 spell_id);
int GetSpellEffectDescriptionNumber(uint16 spell_id);
DmgShieldType GetDamageShieldType(uint16 spell_id, int damage_shield_type = 0);
bool IsRestAllowedSpell(uint16 spell_id);
int GetSpellNimbusEffect(uint16 spell_id);
int GetSpellFuriousBash(uint16 spell_id);
bool IsShortDurationBuff(uint16 spell_id);
bool IsSpellUsableInThisZoneType(uint16 spell_id, uint8 zone_type);
const char *GetSpellName(uint16 spell_id);
int GetSpellStatValue(uint16 spell_id, const char* stat_identifier, uint8 slot = 0);
bool IsCastRestrictedSpell(uint16 spell_id);
bool IsAegolismSpell(uint16 spell_id);
bool AegolismStackingIsSymbolSpell(uint16 spell_id);
bool AegolismStackingIsArmorClassSpell(uint16 spell_id);
int8 SpellEffectsCount(uint16 spell_id);
bool IsLichSpell(uint16 spell_id);
bool IsInstantHealSpell(uint32 spell_id);
bool IsResurrectSpell(uint16 spell_id);
bool IsTargetRequiredForSpell(int32 spell_id);
bool IsVirusSpell(int32 spell_id);
int GetSpellViralMinimumSpreadTime(int32 spell_id);
int GetSpellViralMaximumSpreadTime(int32 spell_id);
int GetSpellViralSpreadRange(int32 spell_id);
bool IsInstrumentModifierAppliedToSpellEffect(int32 spell_id, int effect_id);
bool IsPulsingBardSong(int32 spell_id);
int GetSpellProcLimitTimer(int32 spell_id, int proc_type);
bool IsCastNotStandingSpell(int32 spell_id);
int GetSpellEffectDescriptionNumber(int32 spell_id);
DmgShieldType GetDamageShieldType(int32 spell_id, int damage_shield_type = 0);
bool IsRestAllowedSpell(int32 spell_id);
int GetSpellNimbusEffect(int32 spell_id);
int GetSpellFuriousBash(int32 spell_id);
bool IsShortDurationBuff(int32 spell_id);
bool IsSpellUsableInThisZoneType(int32 spell_id, uint8 zone_type);
const char *GetSpellName(int32 spell_id);
int GetSpellStatValue(int32 spell_id, const char* stat_identifier, uint8 slot = 0);
bool IsCastRestrictedSpell(int32 spell_id);
bool IsAegolismSpell(int32 spell_id);
bool AegolismStackingIsSymbolSpell(int32 spell_id);
bool AegolismStackingIsArmorClassSpell(int32 spell_id);
int8 SpellEffectsCount(int32 spell_id);
bool IsLichSpell(int32 spell_id);
bool IsInstantHealSpell(int32 spell_id);
bool IsResurrectSpell(int32 spell_id);
bool RequiresStackCheck(uint16 spell_type);
bool IsResistanceBuffSpell(uint16 spell_id);
bool IsResistanceOnlySpell(uint16 spell_id);
bool IsDamageShieldOnlySpell(uint16 spell_id);
bool IsDamageShieldAndResistSpell(uint16 spell_id);
bool IsHateSpell(uint16 spell_id);
bool IsResistanceBuffSpell(int32 spell_id);
bool IsResistanceOnlySpell(int32 spell_id);
bool IsDamageShieldOnlySpell(int32 spell_id);
bool IsDamageShieldAndResistSpell(int32 spell_id);
bool IsHateSpell(int32 spell_id);
bool IsDisciplineTome(const EQ::ItemData* item);

4
common/spdat_bot.cpp
View File

@ -432,7 +432,7 @@ bool IsPullingBotSpellType(uint16 spell_type) {
return false;
}
uint16 GetCorrectBotSpellType(uint16 spell_type, uint16 spell_id) {
uint16 GetCorrectBotSpellType(uint16 spell_type, int32 spell_id) {
if (!IsValidSpell(spell_id)) {
return UINT16_MAX;
}
@ -504,7 +504,7 @@ bool IsBotBuffSpellType(uint16 spell_type) {
return false;
}
bool BotRequiresLoSToCast(uint16 spell_type, uint16 spell_id) {
bool BotRequiresLoSToCast(uint16 spell_type, int32 spell_id) {
if (!BotSpellTypeRequiresTarget(spell_type)) {
return false;
}

4
zone/aa.cpp
View File

@ -45,7 +45,7 @@
extern WorldServer worldserver;
extern QueryServ* QServ;
void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg, uint16 *eye_id) {
void Mob::TemporaryPets(int32 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg, uint16 *eye_id) {
//It might not be a bad idea to put these into the database, eventually..
@ -288,7 +288,7 @@ void Mob::TypesTemporaryPets(uint32 typesid, Mob *targ, const char *name_overrid
delete made_npc;
}
void Mob::WakeTheDead(uint16 spell_id, Corpse *corpse_to_use, Mob *tar, uint32 duration) {
void Mob::WakeTheDead(int32 spell_id, Corpse *corpse_to_use, Mob *tar, uint32 duration) {
/*
SPA 299 Wake The Dead, 'animateDead' should be temp pet, always spawns 1 pet from corpse, max value is duration

6
zone/aggro.cpp
View File

@ -1348,7 +1348,7 @@ bool Mob::CheckPositioningLosFN(Mob* other, float x, float y, float z) {
}
//offensive spell aggro
int32 Mob::CheckAggroAmount(uint16 spell_id, Mob *target, bool is_proc)
int32 Mob::CheckAggroAmount(int32 spell_id, Mob *target, bool is_proc)
{
if (IsNoDetrimentalSpellAggroSpell(spell_id)) {
return 0;
@ -1536,7 +1536,7 @@ int32 Mob::CheckAggroAmount(uint16 spell_id, Mob *target, bool is_proc)
}
//healing and buffing aggro
int32 Mob::CheckHealAggroAmount(uint16 spell_id, Mob *target, uint32 heal_possible)
int32 Mob::CheckHealAggroAmount(int32 spell_id, Mob *target, uint32 heal_possible)
{
int32 AggroAmount = 0;
auto target_level = target ? target->GetLevel() : 1;
@ -1662,7 +1662,7 @@ bool Mob::IsOnFeignMemory(Mob *attacker) const
return feign_memory_list.find(attacker->GetID()) != feign_memory_list.end();
}
bool Mob::PassCharismaCheck(Mob* caster, uint16 spell_id) {
bool Mob::PassCharismaCheck(Mob* caster, int32 spell_id) {
/*
Charm formula is correct based on over 50 hours of personal live parsing - Kayen

26
zone/attack.cpp
View File

@ -1774,7 +1774,7 @@ bool Mob::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
}
}
void Client::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special)
void Client::Damage(Mob* other, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special)
{
if (dead || IsCorpse())
return;
@ -1811,7 +1811,7 @@ void Client::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::Skill
}
}
bool Client::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
bool Client::Death(Mob* killer_mob, int64 damage, int32 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
{
if (!ClientFinishedLoading() || dead) {
return false;
@ -2430,7 +2430,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
return has_hit;
}
void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
void NPC::Damage(Mob* other, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
if (spell_id == 0)
spell_id = SPELL_UNKNOWN;
@ -2467,7 +2467,7 @@ void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillTyp
CommonDamage(other, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic, special);
}
bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
bool NPC::Death(Mob* killer_mob, int64 damage, int32 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
{
LogCombat(
"Fatal blow dealt by [{}] with [{}] damage, spell [{}], skill [{}]",
@ -3051,7 +3051,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
return true;
}
void Mob::AddToHateList(Mob* other, int64 hate /*= 0*/, int64 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/, uint16 spell_id, bool pet_command)
void Mob::AddToHateList(Mob* other, int64 hate /*= 0*/, int64 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/, int32 spell_id, bool pet_command)
{
if (!other)
return;
@ -3312,7 +3312,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) {
int DS = 0;
int rev_ds = 0;
uint16 spellid = 0;
int32 spellid = 0;
if (!spell_ds)
{
@ -3388,7 +3388,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) {
//Reverse DS
//this is basically a DS, but the spell is on the attacker, not the attackee
//if we've gotten to this point, we know we know "attacker" hit "this" (us) for damage & we aren't invulnerable
uint16 rev_ds_spell_id = SPELL_UNKNOWN;
int32 rev_ds_spell_id = SPELL_UNKNOWN;
if (IsValidSpell(spellbonuses.ReverseDamageShieldSpellID)) {
rev_ds_spell_id = spellbonuses.ReverseDamageShieldSpellID;
@ -3676,7 +3676,7 @@ int64 Mob::ReduceDamage(int64 damage)
return(damage);
}
int64 Mob::AffectMagicalDamage(int64 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker)
int64 Mob::AffectMagicalDamage(int64 damage, int32 spell_id, const bool iBuffTic, Mob* attacker)
{
if (damage <= 0)
return damage;
@ -4020,7 +4020,7 @@ bool Mob::CheckDoubleAttack()
return zone->random.Int(1, 500) <= chance;
}
void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, const EQ::skills::SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks special) {
void Mob::CommonDamage(Mob* attacker, int64 &damage, const int32 spell_id, const EQ::skills::SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks special) {
#ifdef LUA_EQEMU
int64 lua_ret = 0;
bool ignore_default = false;
@ -4776,7 +4776,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
}
}
void Mob::HealDamage(uint64 amount, Mob* caster, uint16 spell_id)
void Mob::HealDamage(uint64 amount, Mob* caster, int32 spell_id)
{
#ifdef LUA_EQEMU
uint64 lua_ret = 0;
@ -5266,7 +5266,7 @@ void Mob::TrySpellProc(const EQ::ItemInstance *inst, const EQ::ItemData *weapon,
if (poison_slot > -1) {
bool one_shot = !RuleB(Combat, UseExtendedPoisonProcs);
float chance = (one_shot) ? 100.0f : ProcChance * (static_cast<float>(SpellProcs[poison_slot].chance) / 100.0f);
uint16 spell_id = SpellProcs[poison_slot].spellID;
int32 spell_id = SpellProcs[poison_slot].spellID;
if (zone->random.Roll(chance)) {
LogCombat("Poison proc [{}] procing spell [{}] ([{}] percent chance)", poison_slot, spell_id, chance);
@ -5986,8 +5986,8 @@ void Mob::TrySkillProc(Mob *on, EQ::skills::SkillType skill, uint16 ReuseTime, b
*/
bool CanProc = true;
uint16 base_spell_id = 0;
uint16 proc_spell_id = 0;
int32 base_spell_id = 0;
int32 proc_spell_id = 0;
float ProcMod = 0;
float chance = 0;

4
zone/aura.cpp
View File

@ -871,7 +871,7 @@ void Aura::Depop(bool skip_strip)
p_depop = true;
}
void Mob::MakeAura(uint16 spell_id)
void Mob::MakeAura(int32 spell_id)
{
// TODO: verify room in AuraMgr
if (!IsValidSpell(spell_id)) {
@ -944,7 +944,7 @@ void Mob::MakeAura(uint16 spell_id)
}
}
bool ZoneDatabase::GetAuraEntry(uint16 spell_id, AuraRecord& r)
bool ZoneDatabase::GetAuraEntry(int32 spell_id, AuraRecord& r)
{
const auto& l = AurasRepository::GetWhere(
*this,

2
zone/beacon.cpp
View File

@ -148,7 +148,7 @@ bool Beacon::Process()
return true;
}
void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_adjust)
void Beacon::AELocationSpell(Mob *caster, int32 cast_spell_id, int16 in_resist_adjust)
{
if (!IsValidSpell(cast_spell_id) || !caster) {
return;

8
zone/beacon.h
View File

@ -32,8 +32,8 @@ public:
~Beacon();
//abstract virtual function implementations requird by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
virtual bool HasRaid() { return false; }
virtual bool HasGroup() { return false; }
virtual Raid* GetRaid() { return 0; }
@ -44,13 +44,13 @@ public:
bool IsBeacon() const { return true; }
bool Process();
virtual void Depop(bool not_used = true) { remove_me = true; }
void AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_adjust);
void AELocationSpell(Mob *caster, int32 cast_spell_id, int16 in_resist_adjust);
protected:
Timer remove_timer;
bool remove_me;
uint16 spell_id;
int32 spell_id;
int16 resist_adjust;
int spell_iterations;
Timer spell_timer;

6
zone/bonuses.cpp
View File

@ -1851,7 +1851,7 @@ void Mob::CalcSpellBonuses(StatBonuses* newbon)
newbon->ManaRegen = 0; // Bards do not get mana regen from spells.
}
void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId,
void Mob::ApplySpellsBonuses(int32 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId,
uint8 WornType, int32 ticsremaining, int buffslot, int instrument_mod,
bool IsAISpellEffect, uint16 effect_id, int32 se_base, int32 se_limit, int32 se_max)
{
@ -4108,7 +4108,7 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) {
return changed;
}
uint8 Mob::IsFocusEffect(uint16 spell_id,int effect_index, bool AA,uint32 aa_effect)
uint8 Mob::IsFocusEffect(int32 spell_id,int effect_index, bool AA,uint32 aa_effect)
{
uint16 effect = 0;
@ -4212,7 +4212,7 @@ uint8 Mob::IsFocusEffect(uint16 spell_id,int effect_index, bool AA,uint32 aa_eff
return 0;
}
void Mob::NegateSpellEffectBonuses(uint16 spell_id)
void Mob::NegateSpellEffectBonuses(int32 spell_id)
{
if (!IsValidSpell(spell_id))
return;

110
zone/bot.cpp
View File

@ -509,7 +509,7 @@ void Bot::SetBotID(uint32 botID) {
npctype_id = botID;
}
void Bot::SetBotSpellID(uint32 newSpellID) {
void Bot::SetBotSpellID(int32 newSpellID) {
npc_spells_id = newSpellID;
}
@ -1542,7 +1542,7 @@ bool Bot::LoadPet()
if (!pet_index)
return true;
uint32 saved_pet_spell_id = 0;
int32 saved_pet_spell_id = 0;
database.botdb.LoadPetSpellID(GetBotID(), saved_pet_spell_id);
if (!IsValidSpell(saved_pet_spell_id)) {
@ -1554,7 +1554,7 @@ bool Bot::LoadPet()
std::string pet_name;
uint32 pet_mana = 0;
uint32 pet_hp = 0;
uint32 pet_spell_id = 0;
int32 pet_spell_id = 0;
if (!database.botdb.LoadPetStats(GetBotID(), pet_name, pet_mana, pet_hp, pet_spell_id)) {
return false;
@ -2321,7 +2321,7 @@ void Bot::AI_Process()
}
if (!at_combat_range && RuleB(Bots, UseSpellPulling)) {
uint16 pull_spell_id = RuleI(Bots, PullSpellID);
int32 pull_spell_id = RuleI(Bots, PullSpellID);
if (IsValidSpell(pull_spell_id) && tar_distance <= spells[pull_spell_id].range) {
at_combat_range = true;
@ -2363,7 +2363,7 @@ void Bot::AI_Process()
}
if (RuleB(Bots, UseSpellPulling)) {
uint16 pull_spell_id = RuleI(Bots, PullSpellID);
int32 pull_spell_id = RuleI(Bots, PullSpellID);
if (IsValidSpell(pull_spell_id) && tar_distance <= spells[pull_spell_id].range) {
StopMoving(CalculateHeadingToTarget(tar->GetX(), tar->GetY()));
@ -4920,7 +4920,7 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
}
}
bool Bot::Death(Mob *killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
bool Bot::Death(Mob *killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
{
if (!NPC::Death(killer_mob, damage, spell_id, attack_skill)) {
return false;
@ -4966,7 +4966,7 @@ bool Bot::Death(Mob *killer_mob, int64 damage, uint16 spell_id, EQ::skills::Skil
return true;
}
void Bot::Damage(Mob *from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
void Bot::Damage(Mob *from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
if (!from) {
return;
}
@ -5598,7 +5598,7 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) {
classattack_timer.Start(reuse / HasteModifier);
}
void Bot::MakePet(uint16 spell_id, const char* pettype, const char *petname) {
void Bot::MakePet(int32 spell_id, const char* pettype, const char *petname) {
Mob::MakePet(spell_id, pettype, petname);
}
@ -5800,7 +5800,7 @@ void Bot::SetAttackTimer() {
}
}
int32 Bot::GetActSpellDuration(uint16 spell_id, int32 duration) {
int32 Bot::GetActSpellDuration(int32 spell_id, int32 duration) {
int increase = 100;
increase += GetFocusEffect(focusSpellDuration, spell_id);
int64 tic_inc = 0;
@ -5832,7 +5832,7 @@ int32 Bot::GetActSpellDuration(uint16 spell_id, int32 duration) {
return (((duration * increase) / 100) + tic_inc);
}
float Bot::GetAOERange(uint16 spell_id) {
float Bot::GetAOERange(int32 spell_id) {
float range;
range = spells[spell_id].aoe_range;
if (range == 0)
@ -5849,7 +5849,7 @@ float Bot::GetAOERange(uint16 spell_id) {
return range;
}
bool Bot::SpellEffect(Mob* caster, uint16 spell_id, float partial) {
bool Bot::SpellEffect(Mob* caster, int32 spell_id, float partial) {
bool Result = false;
Result = Mob::SpellEffect(caster, spell_id, partial);
if (IsGrouped()) {
@ -5871,7 +5871,7 @@ void Bot::DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster) {
}
bool Bot::CastSpell(
uint16 spell_id,
int32 spell_id,
uint16 target_id,
EQ::spells::CastingSlot slot,
int32 cast_time,
@ -5951,7 +5951,7 @@ bool Bot::CastSpell(
}
bool Bot::SpellOnTarget(
uint16 spell_id,
int32 spell_id,
Mob *spelltar,
int reflect_effectiveness,
bool use_resist_adjust,
@ -5988,7 +5988,7 @@ bool Bot::SpellOnTarget(
return false;
}
bool Bot::IsImmuneToSpell(uint16 spell_id, Mob *caster) {
bool Bot::IsImmuneToSpell(int32 spell_id, Mob *caster) {
bool Result = false;
if (!caster)
return false;
@ -6018,7 +6018,7 @@ bool Bot::IsImmuneToSpell(uint16 spell_id, Mob *caster) {
return Result;
}
bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot) {
bool Bot::DetermineSpellTargets(int32 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot) {
bool Result = false;
SpellTargetType target_type = spells[spell_id].target_type;
@ -6034,7 +6034,7 @@ bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
return Result;
}
bool Bot::DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 aa_id) {
bool Bot::DoCastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 aa_id) {
bool Result = false;
if (GetClass() == Class::Bard)
cast_time = 0;
@ -6158,7 +6158,7 @@ void Bot::GenerateSpecialAttacks() {
SetSpecialAbility(SpecialAbility::TripleAttack, 1);
}
bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
bool Bot::DoFinishedSpellSingleTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
if (
spellTarget &&
@ -6252,7 +6252,7 @@ bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spe
return true;
}
bool Bot::DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
bool Bot::DoFinishedSpellGroupTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
bool isMainGroupMGB = false;
if (isMainGroupMGB && (GetClass() != Class::Bard)) {
@ -7688,7 +7688,7 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) {
return;
}
uint8 Bot::GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, uint16 spell_id, float range) {
uint8 Bot::GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, int32 spell_id, float range) {
if (!TargetValidation(tar)) {
return 0;
}
@ -7871,7 +7871,7 @@ bool Bot::GetNeedsHateRedux(Mob *tar) {
return false;
}
bool Bot::HasOrMayGetAggro(bool sit_aggro, uint32 spell_id) {
bool Bot::HasOrMayGetAggro(bool sit_aggro, int32 spell_id) {
if (
!GetTarget() ||
!GetTarget()->GetHateTop()
@ -7950,7 +7950,7 @@ void Bot::RaidGroupSay(const char* msg, ...) {
}
}
bool Bot::UseDiscipline(uint32 spell_id, uint32 target) {
bool Bot::UseDiscipline(int32 spell_id, uint32 target) {
if (!IsValidSpell(spell_id)) {
RaidGroupSay("Not a valid spell.");
return false;
@ -8270,7 +8270,7 @@ void Bot::SetBotEnforceSpellSetting(bool enforceSpellSettings)
AI_AddBotSpells(GetBotSpellID());
}
bool Bot::AddBotSpellSetting(uint16 spell_id, BotSpellSetting* bs)
bool Bot::AddBotSpellSetting(int32 spell_id, BotSpellSetting* bs)
{
if (!IsValidSpell(spell_id) || !bs) {
return false;
@ -8300,7 +8300,7 @@ bool Bot::AddBotSpellSetting(uint16 spell_id, BotSpellSetting* bs)
return true;
}
bool Bot::DeleteBotSpellSetting(uint16 spell_id)
bool Bot::DeleteBotSpellSetting(int32 spell_id)
{
if (!IsValidSpell(spell_id)) {
return false;
@ -8323,7 +8323,7 @@ bool Bot::DeleteBotSpellSetting(uint16 spell_id)
return true;
}
BotSpellSetting* Bot::GetBotSpellSetting(uint16 spell_id)
BotSpellSetting* Bot::GetBotSpellSetting(int32 spell_id)
{
if (!IsValidSpell(spell_id) || !bot_spell_settings.count(spell_id)) {
return nullptr;
@ -8464,7 +8464,7 @@ void Bot::LoadBotSpellSettings()
}
}
bool Bot::UpdateBotSpellSetting(uint16 spell_id, BotSpellSetting* bs)
bool Bot::UpdateBotSpellSetting(int32 spell_id, BotSpellSetting* bs)
{
if (!IsValidSpell(spell_id) || !bs) {
return false;
@ -8669,7 +8669,7 @@ int32 Bot::GetRawItemAC()
return Total;
}
void Bot::SendSpellAnim(uint16 target_id, uint16 spell_id)
void Bot::SendSpellAnim(uint16 target_id, int32 spell_id)
{
if (!target_id || !IsValidSpell(spell_id)) {
return;
@ -8866,7 +8866,7 @@ void Bot::AddBotStartingItems(uint16 race_id, uint8 class_id)
}
}
void Bot::SetSpellRecastTimer(uint16 spell_id, int32 recast_delay) {
void Bot::SetSpellRecastTimer(int32 spell_id, int32 recast_delay) {
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set spell recast timer.");
return;
@ -8911,7 +8911,7 @@ void Bot::SetSpellRecastTimer(uint16 spell_id, int32 recast_delay) {
}
}
uint32 Bot::GetSpellRecastTimer(uint16 spell_id)
uint32 Bot::GetSpellRecastTimer(int32 spell_id)
{
uint32 result = 0;
@ -8944,7 +8944,7 @@ uint32 Bot::GetSpellRecastTimer(uint16 spell_id)
return result;
}
uint32 Bot::GetSpellRecastRemainingTime(uint16 spell_id)
uint32 Bot::GetSpellRecastRemainingTime(int32 spell_id)
{
uint32 result = 0;
@ -8955,7 +8955,7 @@ uint32 Bot::GetSpellRecastRemainingTime(uint16 spell_id)
return result;
}
bool Bot::CheckSpellRecastTimer(uint16 spell_id)
bool Bot::CheckSpellRecastTimer(int32 spell_id)
{
ClearExpiredTimers();
@ -8971,7 +8971,7 @@ bool Bot::CheckSpellRecastTimer(uint16 spell_id)
return false;
}
void Bot::SetDisciplineReuseTimer(uint16 spell_id, int32 reuse_timer)
void Bot::SetDisciplineReuseTimer(int32 spell_id, int32 reuse_timer)
{
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set discipline reuse timer.");
@ -9017,7 +9017,7 @@ void Bot::SetDisciplineReuseTimer(uint16 spell_id, int32 reuse_timer)
}
}
uint32 Bot::GetDisciplineReuseTimer(uint16 spell_id)
uint32 Bot::GetDisciplineReuseTimer(int32 spell_id)
{
uint32 result = 0;
@ -9045,7 +9045,7 @@ uint32 Bot::GetDisciplineReuseTimer(uint16 spell_id)
return result;
}
uint32 Bot::GetDisciplineReuseRemainingTime(uint16 spell_id) {
uint32 Bot::GetDisciplineReuseRemainingTime(int32 spell_id) {
uint32 result = 0;
if (GetDisciplineReuseTimer(spell_id) > Timer::GetCurrentTime()) {
@ -9055,7 +9055,7 @@ uint32 Bot::GetDisciplineReuseRemainingTime(uint16 spell_id) {
return result;
}
bool Bot::CheckDisciplineReuseTimer(uint16 spell_id)
bool Bot::CheckDisciplineReuseTimer(int32 spell_id)
{
ClearExpiredTimers();
@ -9189,7 +9189,7 @@ uint32 Bot::GetItemReuseRemainingTime(uint32 item_id)
return result;
}
uint32 Bot::CalcSpellRecastTimer(uint16 spell_id)
uint32 Bot::CalcSpellRecastTimer(int32 spell_id)
{
uint32 result = 0;
@ -9206,7 +9206,7 @@ uint32 Bot::CalcSpellRecastTimer(uint16 spell_id)
return result;
}
void Bot::ClearDisciplineReuseTimer(uint16 spell_id)
void Bot::ClearDisciplineReuseTimer(int32 spell_id)
{
if (spell_id && !IsValidSpell(spell_id)) {
OwnerMessage(
@ -9283,7 +9283,7 @@ void Bot::ClearItemReuseTimer(uint32 item_id)
ClearExpiredTimers();
}
void Bot::ClearSpellRecastTimer(uint16 spell_id)
void Bot::ClearSpellRecastTimer(int32 spell_id)
{
if (spell_id && !IsValidSpell(spell_id)) {
OwnerMessage(
@ -9546,7 +9546,7 @@ bool Bot::PrecastChecks(Mob* tar, uint16 spell_type) {
return true;
}
bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool prechecks, bool ae_check) {
bool Bot::CastChecks(int32 spell_id, Mob* tar, uint16 spell_type, bool prechecks, bool ae_check) {
if (prechecks) {
if (!tar || tar->GetAppearance() == eaDead || tar->GetHP() < 0) {
LogBotSpellChecksDetail("{} says, 'Cancelling cast due to CastChecks !tar.'", GetCleanName());
@ -9866,7 +9866,7 @@ bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool precheck
return true;
}
bool Bot::CanCastSpellType(uint16 spell_type, uint16 spell_id, Mob* tar) {
bool Bot::CanCastSpellType(uint16 spell_type, int32 spell_id, Mob* tar) {
if (!spell_id || !tar) {
LogBotSpellChecksDetail("{} says, 'Cancelling cast of {} on {} due to failsafe checks.'", GetCleanName(), (spell_id ? GetSpellName(spell_id) : (spell_type ? GetSpellTypeNameByID(spell_type) : "Unknown")), (tar ? tar->GetCleanName() : "Unknown"));
return false;
@ -10081,7 +10081,7 @@ bool Bot::CanCastSpellType(uint16 spell_type, uint16 spell_id, Mob* tar) {
return true;
}
bool Bot::BotHasEnoughMana(uint16 spell_id) {
bool Bot::BotHasEnoughMana(int32 spell_id) {
if (!IsValidSpell(spell_id)) {
return false;
}
@ -10095,7 +10095,7 @@ bool Bot::BotHasEnoughMana(uint16 spell_id) {
return true;
}
bool Bot::IsTargetAlreadyReceivingSpell(Mob* tar, uint16 spell_id) {
bool Bot::IsTargetAlreadyReceivingSpell(Mob* tar, int32 spell_id) {
if (!tar || !spell_id) {
return true;
}
@ -10126,7 +10126,7 @@ bool Bot::IsTargetAlreadyReceivingSpell(Mob* tar, uint16 spell_id) {
return false;
}
bool Bot::DoResistCheck(Mob* tar, uint16 spell_id, int32 resist_limit) {
bool Bot::DoResistCheck(Mob* tar, int32 spell_id, int32 resist_limit) {
if (!tar || spell_id == 0) {
return false;
@ -10173,7 +10173,7 @@ bool Bot::DoResistCheck(Mob* tar, uint16 spell_id, int32 resist_limit) {
return true;
}
bool Bot::DoResistCheckBySpellType(Mob* tar, uint16 spell_id, uint16 spell_type) {
bool Bot::DoResistCheckBySpellType(Mob* tar, int32 spell_id, uint16 spell_type) {
if (!tar || !IsValidSpell(spell_id)) {
return false;
}
@ -10185,7 +10185,7 @@ bool Bot::DoResistCheckBySpellType(Mob* tar, uint16 spell_id, uint16 spell_type)
return DoResistCheck(tar, spell_id, GetSpellTypeResistLimit(spell_type));
}
bool Bot::IsValidTargetType(uint16 spell_id, int target_type, uint8 body_type) {
bool Bot::IsValidTargetType(int32 spell_id, int target_type, uint8 body_type) {
if (!spell_id) {
return false;
}
@ -10294,7 +10294,7 @@ bool Bot::IsMobEngagedByAnyone(Mob* tar) {
return false;
}
bool Bot::IsValidMezTarget(Mob* owner, Mob* npc, uint16 spell_id) {
bool Bot::IsValidMezTarget(Mob* owner, Mob* npc, int32 spell_id) {
if (npc->GetSpecialAbility(SpecialAbility::MesmerizeImmunity)) {
return false;
}
@ -11326,7 +11326,7 @@ bool Bot::AttemptAICastSpell(uint16 spell_type, Mob* tar) {
return result;
}
bool Bot::AttemptAACastSpell(Mob* tar, uint16 spell_id, AA::Rank* rank) {
bool Bot::AttemptAACastSpell(Mob* tar, int32 spell_id, AA::Rank* rank) {
if (!IsValidSpell(spell_id)) {
return false;
}
@ -11431,7 +11431,7 @@ bool Bot::AttemptAACastSpell(Mob* tar, uint16 spell_id, AA::Rank* rank) {
return true;
}
bool Bot::AttemptForcedCastSpell(Mob* tar, uint16 spell_id, bool is_disc) {
bool Bot::AttemptForcedCastSpell(Mob* tar, int32 spell_id, bool is_disc) {
if (!IsValidSpell(spell_id)) {
return false;
}
@ -11636,7 +11636,7 @@ bool Bot::IsValidBotSpellType(uint16 spell_type) {
);
}
bool Bot::IsValidSpellTypeBySpellID(uint16 spell_type, uint16 spell_id) {
bool Bot::IsValidSpellTypeBySpellID(uint16 spell_type, int32 spell_id) {
if (IsAEBotSpellType(spell_type) && !IsAnyAESpell(spell_id)) {
return false;
}
@ -12249,7 +12249,7 @@ bool Bot::HasRequiredLoSForPositioning(Mob* tar) {
return true;
}
bool Bot::HasValidAETarget(Bot* caster, uint16 spell_id, uint16 spell_type, Mob* tar) {
bool Bot::HasValidAETarget(Bot* caster, int32 spell_id, uint16 spell_type, Mob* tar) {
int spell_range = caster->GetActSpellRange(spell_id, spells[spell_id].range);
int spell_ae_range = caster->GetAOERange(spell_id);
int target_count = 0;
@ -12474,7 +12474,7 @@ bool Bot::ValidStateCheck(Mob* other, bool same_raid_group) {
return true;
}
bool Bot::IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, uint16 spell_id) {
bool Bot::IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, int32 spell_id) {
if (sub_type == UINT16_MAX) {
return true;
}
@ -12586,8 +12586,8 @@ bool Bot::IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, uint16 spe
return false;
}
uint16 Bot::GetSpellByAA(int id, AA::Rank*& rank) {
uint16 spell_id = 0;
int32 Bot::GetSpellByAA(int id, AA::Rank*& rank) {
int32 spell_id = 0;
std::pair<AA::Ability*, AA::Rank*> aa_ability = std::make_pair(nullptr, nullptr);
AA::Ability* ability = zone->GetAlternateAdvancementAbility(id);
@ -12612,7 +12612,7 @@ uint16 Bot::GetSpellByAA(int id, AA::Rank*& rank) {
return spell_id;
}
void Bot::SetBotBlockedBuff(uint16 spell_id, bool block)
void Bot::SetBotBlockedBuff(int32 spell_id, bool block)
{
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set blocked buff.");
@ -12659,7 +12659,7 @@ bool Bot::IsBlockedBuff(int32 spell_id)
return result;
}
void Bot::SetBotBlockedPetBuff(uint16 spell_id, bool block)
void Bot::SetBotBlockedPetBuff(int32 spell_id, bool block)
{
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set blocked pet buff.");
@ -13319,7 +13319,7 @@ uint8 Bot::GetUltimateSpellTypeMaxThreshold(uint16 spell_type, Mob* tar) {
return GetSpellTypeMaxThreshold(spell_type);
}
bool Bot::IsImmuneToBotSpell(uint16 spell_id, Mob* caster) {
bool Bot::IsImmuneToBotSpell(int32 spell_id, Mob* caster) {
int effect_index;
if (!caster) {

120
zone/bot.h
View File

@ -270,8 +270,8 @@ public:
Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double totalPlayTime, uint32 lastZoneId, NPCType *npcTypeData);
//abstract virtual override function implementations requird by base abstract class
bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) override;
void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1,
bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) override;
void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1,
bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) override;
bool HasRaid() final { return GetRaid() != nullptr; }
@ -320,7 +320,7 @@ public:
void DoClassAttacks(Mob *target, bool IsRiposte=false);
void CalcBonuses() override;
void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr) override;
void MakePet(int32 spell_id, const char* pettype, const char *petname = nullptr) override;
FACTION_VALUE GetReverseFactionCon(Mob* iOther) override;
inline bool IsPet() override { return false; }
bool IsNPC() const override { return false; }
@ -331,8 +331,8 @@ public:
void SetAttackTimer() override;
uint64 GetClassHPFactor();
int64 CalcMaxHP() override;
bool DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
bool DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
bool DoFinishedSpellSingleTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
bool DoFinishedSpellGroupTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
void Camp(bool save_to_database = true);
void SetTarget(Mob* mob) override;
void Zone();
@ -361,11 +361,11 @@ public:
bool GetReturningFlag() const { return m_returning_flag; }
bool GetIsUsingItemClick() { return is_using_item_click; }
void SetIsUsingItemClick(bool flag = true) { is_using_item_click = flag; }
bool UseDiscipline(uint32 spell_id, uint32 target);
uint8 GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, uint16 spell_id, float range);
bool UseDiscipline(int32 spell_id, uint32 target);
uint8 GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, int32 spell_id, float range);
bool GetNeedsCured(Mob *tar);
bool GetNeedsHateRedux(Mob *tar);
bool HasOrMayGetAggro(bool SitAggro, uint32 spell_id = 0);
bool HasOrMayGetAggro(bool SitAggro, int32 spell_id = 0);
void SetDefaultBotStance();
void SetSurname(std::string_view bot_surname);
void SetTitle(std::string_view bot_title);
@ -428,10 +428,10 @@ public:
EQ::ItemInstance* GetClickItem(uint16 slot_id);
void DoItemClick(const EQ::ItemData* inst, uint16 slot_id);
bool AI_AddBotSpells(uint32 bot_spell_id);
bool AI_AddBotSpells(int32 bot_spell_id);
void AddSpellToBotList(
int16 iPriority,
uint16 iSpellID,
int32 iSpellID,
uint32 iType,
int16 iManaCost,
int32 iRecastDelay,
@ -447,7 +447,7 @@ public:
void AddSpellToBotEnforceList(
int16 iPriority,
uint16 iSpellID,
int32 iSpellID,
uint32 iType,
int16 iManaCost,
int32 iRecastDelay,
@ -466,8 +466,8 @@ public:
// AI Methods
bool AICastSpell(Mob* tar, uint8 chance, uint16 spell_type, uint16 sub_target_type = UINT16_MAX, uint16 sub_type = UINT16_MAX);
bool AttemptAICastSpell(uint16 spell_type, Mob* tar = nullptr);
bool AttemptAACastSpell(Mob* tar, uint16 spell_id, AA::Rank* rank);
bool AttemptForcedCastSpell(Mob* tar, uint16 spell_id, bool is_disc = false);
bool AttemptAACastSpell(Mob* tar, int32 spell_id, AA::Rank* rank);
bool AttemptForcedCastSpell(Mob* tar, int32 spell_id, bool is_disc = false);
bool AttemptCloseBeneficialSpells(uint16 spell_type);
bool AI_EngagedCastCheck() override;
bool AI_PursueCastCheck() override;
@ -483,7 +483,7 @@ public:
void SetGuardMode();
void SetHoldMode();
bool IsValidSpellRange(uint16 spell_id, Mob* tar);
bool IsValidSpellRange(int32 spell_id, Mob* tar);
// Bot AI Methods
void AI_Bot_Init();
@ -495,14 +495,14 @@ public:
// Mob Spell Virtual Override Methods
void SpellProcess() override;
int32 GetActSpellDuration(uint16 spell_id, int32 duration) override;
float GetAOERange(uint16 spell_id) override;
virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100);
int32 GetActSpellDuration(int32 spell_id, int32 duration) override;
float GetAOERange(int32 spell_id) override;
virtual bool SpellEffect(Mob* caster, int32 spell_id, float partial = 100);
void DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster = nullptr) override;
virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0,
virtual bool CastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0,
uint32 item_slot = 0xFFFFFFFF, int16 *resist_adjust = nullptr, uint32 aa_id = 0);
bool SpellOnTarget(
uint16 spell_id,
int32 spell_id,
Mob* spelltar,
int reflect_effectiveness = 0,
bool use_resist_adjust = false,
@ -512,11 +512,11 @@ public:
int duration_override = 0,
bool disable_buff_overwrite = false
) final;
bool IsImmuneToSpell(uint16 spell_id, Mob *caster) override;
virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot);
virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1,
bool IsImmuneToSpell(int32 spell_id, Mob *caster) override;
virtual bool DetermineSpellTargets(int32 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot);
virtual bool DoCastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1,
uint32* oSpellWillFinish = nullptr, uint32 item_slot = 0xFFFFFFFF, uint32 aa_id = 0);
inline int64 GetFocusEffect(focusType type, uint16 spell_id, Mob *caster = nullptr, bool from_buff_tic = false) override
inline int64 GetFocusEffect(focusType type, int32 spell_id, Mob *caster = nullptr, bool from_buff_tic = false) override
{ return Mob::GetFocusEffect(type, spell_id, caster, from_buff_tic); }
inline bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) override
@ -536,21 +536,21 @@ public:
// Targeting
std::vector<Mob*> GatherSpellTargets(bool entireRaid = false, Mob* target = nullptr, bool no_clients = false, bool no_bots = false);
bool HasValidAETarget(Bot* caster, uint16 spell_id, uint16 spell_type, Mob* tar);
bool HasValidAETarget(Bot* caster, int32 spell_id, uint16 spell_type, Mob* tar);
void SetHasLoS(bool has_los) { _hasLoS = has_los; }
bool HasLoS() const { return _hasLoS; }
bool IsValidMezTarget(Mob* owner, Mob* npc, uint16 spell_id);
bool IsValidMezTarget(Mob* owner, Mob* npc, int32 spell_id);
// Cast checks
bool PrecastChecks(Mob* tar, uint16 spell_type);
bool CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool prechecks = false, bool ae_check = false);
bool IsImmuneToBotSpell(uint16 spell_id, Mob* caster);
bool CanCastSpellType(uint16 spell_type, uint16 spell_id, Mob* tar);
bool BotHasEnoughMana(uint16 spell_id);
bool IsTargetAlreadyReceivingSpell(Mob* tar, uint16 spell_id);
bool DoResistCheck(Mob* target, uint16 spell_id, int32 resist_limit);
bool DoResistCheckBySpellType(Mob* tar, uint16 spell_id, uint16 spell_type);
bool IsValidTargetType(uint16 spell_id, int target_type, uint8 body_type);
bool CastChecks(int32 spell_id, Mob* tar, uint16 spell_type, bool prechecks = false, bool ae_check = false);
bool IsImmuneToBotSpell(int32 spell_id, Mob* caster);
bool CanCastSpellType(uint16 spell_type, int32 spell_id, Mob* tar);
bool BotHasEnoughMana(int32 spell_id);
bool IsTargetAlreadyReceivingSpell(Mob* tar, int32 spell_id);
bool DoResistCheck(Mob* target, int32 spell_id, int32 resist_limit);
bool DoResistCheckBySpellType(Mob* tar, int32 spell_id, uint16 spell_type);
bool IsValidTargetType(int32 spell_id, int target_type, uint8 body_type);
// Spell checks
static bool IsValidBotSpellType(uint16 spell_type);
@ -598,8 +598,8 @@ public:
void ClearBotBlockedBuffs() { bot_blocked_buffs.clear(); }
bool IsBlockedBuff(int32 spell_id) override;
bool IsBlockedPetBuff(int32 spell_id) override;
void SetBotBlockedBuff(uint16 spell_id, bool block);
void SetBotBlockedPetBuff(uint16 spell_id, bool block);
void SetBotBlockedBuff(int32 spell_id, bool block);
void SetBotBlockedPetBuff(int32 spell_id, bool block);
std::vector<BotBlockedBuffs> GetBotBlockedBuffs() { return bot_blocked_buffs; }
void SetBotBlockedBuffs(std::vector<BotBlockedBuffs> blocked_buffs) { bot_blocked_buffs = blocked_buffs; }
@ -665,16 +665,16 @@ public:
// Spell lists
std::list<BotSpellTypeOrder> GetSpellTypesPrioritized(uint8 priority_type);
static uint16 GetParentSpellType(uint16 spell_type);
static bool IsValidSpellTypeBySpellID(uint16 spell_type, uint16 spell_id);
static bool IsValidSpellTypeBySpellID(uint16 spell_type, int32 spell_id);
inline uint16 GetCastedSpellType() const { return _castedSpellType; }
void SetCastedSpellType(uint16 spell_type);
bool IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, uint16 spell_id);
bool IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, int32 spell_id);
static bool IsValidBotSpellCategory(uint8 setting_type);
static std::string GetBotSpellCategoryName(uint8 setting_type);
static std::string GetBotSpellCategoryShortName(uint8 setting_type);
static uint16 GetBotSpellCategoryIDByShortName(std::string setting_string);
void AssignBotSpellsToTypes(std::vector<BotSpells>& AIBot_spells, std::unordered_map<uint16, std::vector<BotSpells_wIndex>>& AIBot_spells_by_type);
uint16 GetSpellByAA(int id, AA::Rank*& rank);
int32 GetSpellByAA(int id, AA::Rank*& rank);
// Spell Type
static uint16 GetSpellTypeIDByShortName(std::string spellType_string);
@ -745,7 +745,7 @@ public:
static BotSpell GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal);
static BotSpell GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal);
static Mob* GetFirstIncomingMobToMez(Bot* caster, uint16 spell_id, uint16 spell_type, bool AE);
static Mob* GetFirstIncomingMobToMez(Bot* caster, int32 spell_id, uint16 spell_type, bool AE);
static BotSpell GetBestBotSpellForMez(Bot* caster, uint16 spell_type = BotSpellTypes::Mez);
static BotSpell GetBestBotMagicianPetSpell(Bot* caster, uint16 spell_type = BotSpellTypes::Pet);
static std::string GetBotMagicianPetType(Bot* caster);
@ -778,7 +778,7 @@ public:
// "GET" Class Methods
uint32 GetBotID() const { return _botID; }
uint32 GetBotOwnerCharacterID() const { return _botOwnerCharacterID; }
uint32 GetBotSpellID() const { return npc_spells_id; }
int32 GetBotSpellID() const { return npc_spells_id; }
Mob* GetBotOwner() { return this->_botOwner; }
uint32 GetBotRangedValue();
EQ::ItemInstance* GetBotItem(uint16 slot_id);
@ -889,8 +889,8 @@ public:
inline const InspectMessage_Struct& GetInspectMessage() const { return _botInspectMessage; }
// "Quest API" Methods
bool HasBotSpellEntry(uint16 spell_id);
bool CanUseBotSpell(uint16 spell_id);
bool HasBotSpellEntry(int32 spell_id);
bool CanUseBotSpell(int32 spell_id);
void ApplySpell(int spell_id, int duration = 0, int level = -1, ApplySpellType apply_type = ApplySpellType::Solo, bool allow_pets = false, bool is_raid_group_only = true);
void BreakInvis();
void Escape();
@ -899,11 +899,11 @@ public:
int32 GetItemIDAt(int16 slot_id);
int32 GetAugmentIDAt(int16 slot_id, uint8 augslot);
int32 GetRawItemAC();
void SendSpellAnim(uint16 targetid, uint16 spell_id);
void SendSpellAnim(uint16 targetid, int32 spell_id);
void SetSpellDuration(int spell_id, int duration = 0, int level = -1, ApplySpellType apply_type = ApplySpellType::Solo, bool allow_pets = false, bool is_raid_group_only = true);
// "SET" Class Methods
void SetBotSpellID(uint32 newSpellID);
void SetBotSpellID(int32 newSpellID);
void SetSpawnStatus(bool spawnStatus) { _spawnStatus = spawnStatus; }
void SetPetChooserID(uint8 id) { _petChooserID = id; }
void SetBotRangedSetting(bool value) { _botRangedSetting = value; }
@ -911,21 +911,21 @@ public:
void SetBotOwner(Mob* botOwner) { this->_botOwner = botOwner; }
void SetRangerAutoWeaponSelect(bool enable) { GetClass() == Class::Ranger ? _rangerAutoWeaponSelect = enable : _rangerAutoWeaponSelect = false; }
void SetBotStance(uint8 stance_id) { _botStance = Stance::IsValid(stance_id) ? stance_id : Stance::Passive; }
uint32 GetSpellRecastTimer(uint16 spell_id = 0);
bool CheckSpellRecastTimer(uint16 spell_id = 0);
uint32 GetSpellRecastRemainingTime(uint16 spell_id = 0);
void SetSpellRecastTimer(uint16 spell_id, int32 recast_delay = 0);
uint32 CalcSpellRecastTimer(uint16 spell_id);
uint32 GetDisciplineReuseTimer(uint16 spell_id = 0);
bool CheckDisciplineReuseTimer(uint16 spell_id = 0);
uint32 GetDisciplineReuseRemainingTime(uint16 spell_id = 0);
void SetDisciplineReuseTimer(uint16 spell_id, int32 reuse_timer = 0);
uint32 GetSpellRecastTimer(int32 spell_id = 0);
bool CheckSpellRecastTimer(int32 spell_id = 0);
uint32 GetSpellRecastRemainingTime(int32 spell_id = 0);
void SetSpellRecastTimer(int32 spell_id, int32 recast_delay = 0);
uint32 CalcSpellRecastTimer(int32 spell_id);
uint32 GetDisciplineReuseTimer(int32 spell_id = 0);
bool CheckDisciplineReuseTimer(int32 spell_id = 0);
uint32 GetDisciplineReuseRemainingTime(int32 spell_id = 0);
void SetDisciplineReuseTimer(int32 spell_id, int32 reuse_timer = 0);
uint32 GetItemReuseTimer(uint32 item_id = 0);
bool CheckItemReuseTimer(uint32 item_id = 0);
void SetItemReuseTimer(uint32 item_id, uint32 reuse_timer = 0);
void ClearDisciplineReuseTimer(uint16 spell_id = 0);
void ClearDisciplineReuseTimer(int32 spell_id = 0);
void ClearItemReuseTimer(uint32 item_id = 0);
void ClearSpellRecastTimer(uint16 spell_id = 0);
void ClearSpellRecastTimer(int32 spell_id = 0);
uint32 GetItemReuseRemainingTime(uint32 item_id = 0);
void ClearExpiredTimers();
void SetBeardColor(uint8 value) { beardcolor = value; }
@ -947,12 +947,12 @@ public:
std::string GetHPString(int8 min_hp, int8 max_hp);
bool AddBotSpellSetting(uint16 spell_id, BotSpellSetting* bs);
bool DeleteBotSpellSetting(uint16 spell_id);
BotSpellSetting* GetBotSpellSetting(uint16 spell_id);
bool AddBotSpellSetting(int32 spell_id, BotSpellSetting* bs);
bool DeleteBotSpellSetting(int32 spell_id);
BotSpellSetting* GetBotSpellSetting(int32 spell_id);
void ListBotSpellSettings();
void LoadBotSpellSettings();
bool UpdateBotSpellSetting(uint16 spell_id, BotSpellSetting* bs);
bool UpdateBotSpellSetting(int32 spell_id, BotSpellSetting* bs);
void SetBotEnforceSpellSetting(bool enforceSpellSettings);
bool GetBotEnforceSpellSetting() { return _enforceSpellSettings; }
@ -1257,4 +1257,4 @@ private:
int32 CalcItemATKCap() final;
};
bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 spell_id);
bool IsSpellInBotList(DBbotspells_Struct* spell_list, int32 spell_id);

4
zone/bot_commands/bot_blocked_buffs.cpp
View File

@ -87,7 +87,7 @@ void bot_command_blocked_buffs(Client* c, const Seperator* sep)
bool remove = false;
bool list = false;
bool wipe = false;
uint16 spell_id;
int32 spell_id;
if (!arg1.compare("add")) {
if (!sep->IsNumber(2) || !IsValidSpell(atoi(sep->arg[2])) || !IsBeneficialSpell(atoi(sep->arg[2]))) {
@ -325,7 +325,7 @@ void bot_command_blocked_pet_buffs(Client* c, const Seperator* sep)
bool remove = false;
bool list = false;
bool wipe = false;
uint16 spell_id;
int32 spell_id;
if (!arg1.compare("add")) {
if (!sep->IsNumber(2) || !IsValidSpell(atoi(sep->arg[2])) || !IsBeneficialSpell(atoi(sep->arg[2]))) {

4
zone/bot_commands/bot_cast.cpp
View File

@ -177,7 +177,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
bool aa_type = false;
int aa_id = 0;
bool by_spell_id = false;
uint16 chosen_spell_id = UINT16_MAX;
int32 chosen_spell_id = -1;
if (!arg1.compare("aa") || !arg1.compare("harmtouch") || !arg1.compare("layonhands")) {
if (!RuleB(Bots, AllowCastAAs)) {
@ -536,7 +536,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
AA::Rank* temp_rank = nullptr;
AA::Rank*& rank = temp_rank;
uint16 spell_id = bot_iter->GetSpellByAA(aa_id, rank);
int32 spell_id = bot_iter->GetSpellByAA(aa_id, rank);
if (!IsValidSpell(spell_id)) {
continue;

2
zone/bot_commands/bot_discipline.cpp
View File

@ -85,7 +85,7 @@ void bot_command_discipline(Client* c, const Seperator* sep)
bool aggressive = false;
bool defensive = false;
Mob* tar = c->GetTarget();
uint16 spell_id = UINT16_MAX;
int32 spell_id = -1;
if (!arg1.compare("aggressive")) {
aggressive = true;

8
zone/bot_database.cpp
View File

@ -1252,7 +1252,7 @@ bool BotDatabase::LoadPetIndex(const uint32 bot_id, uint32& pet_index)
return true;
}
bool BotDatabase::LoadPetSpellID(const uint32 bot_id, uint32& pet_spell_id)
bool BotDatabase::LoadPetSpellID(const uint32 bot_id, int32& pet_spell_id)
{
if (!bot_id) {
return false;
@ -1277,7 +1277,7 @@ bool BotDatabase::LoadPetSpellID(const uint32 bot_id, uint32& pet_spell_id)
return true;
}
bool BotDatabase::LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, uint32& pet_spell_id)
bool BotDatabase::LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, int32& pet_spell_id)
{
if (!bot_id) {
return false;
@ -1315,7 +1315,7 @@ bool BotDatabase::LoadPetStats(const uint32 bot_id, std::string& pet_name, uint3
return true;
}
bool BotDatabase::SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const uint32 pet_spell_id)
bool BotDatabase::SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const int32 pet_spell_id)
{
if (!bot_id || pet_name.empty() || !pet_spell_id || pet_spell_id > SPDAT_RECORDS) {
return false;
@ -2572,7 +2572,7 @@ bool BotDatabase::DeleteBotBlockedBuffs(const uint32 bot_id)
void BotDatabase::CheckBotSpells() {
auto spell_list = BotSpellsEntriesRepository::All(content_db);
uint16 spell_id;
int32 spell_id;
SPDat_Spell_Struct spell;
for (const auto& s : spell_list) {

6
zone/bot_database.h
View File

@ -90,10 +90,10 @@ public:
/* Bot pet functions */
bool LoadPetIndex(const uint32 bot_id, uint32& pet_index);
bool LoadPetSpellID(const uint32 bot_id, uint32& pet_spell_id);
bool LoadPetSpellID(const uint32 bot_id, int32& pet_spell_id);
bool LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, uint32& pet_spell_id);
bool SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const uint32 pet_spell_id);
bool LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, int32& pet_spell_id);
bool SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const int32 pet_spell_id);
bool DeletePetStats(const uint32 bot_id);
bool LoadPetBuffs(const uint32 bot_id, SpellBuff_Struct* pet_buffs);

10
zone/bot_structs.h
View File

@ -33,7 +33,7 @@ struct BotsAvailableList {
};
struct BotSpell {
uint16 SpellId;
int32 SpellId;
int SpellIndex;
int16 ManaCost;
};
@ -64,7 +64,7 @@ struct BotSpellSetting {
struct BotSpells {
uint32 type; // 0 = never, must be one (and only one) of the defined values
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next
int32 recast_delay;
@ -82,7 +82,7 @@ struct BotSpells {
struct BotSpells_wIndex {
uint32 index; //index of AIBot_spells
uint32 type; // 0 = never, must be one (and only one) of the defined values
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next
int32 recast_delay;
@ -103,7 +103,7 @@ struct BotTimer {
uint32 recast_time;
bool is_spell;
bool is_disc;
uint16 spell_id;
int32 spell_id;
bool is_item;
uint32 item_id;
};
@ -138,7 +138,7 @@ struct BotSpellTypeOrder {
struct BotBlockedBuffs {
uint32_t bot_id;
uint32_t spell_id;
int32_t spell_id;
uint8_t blocked;
uint8_t blocked_pet;
};

24
zone/botspellsai.cpp
View File

@ -1335,7 +1335,7 @@ BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_ty
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
if (IsRegularGroupHealSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId;
int32 spell_id = bot_spell_list_itr->SpellId;
if (caster->TargetValidation(tar) && !caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
target_count = caster->GetNumberNeedingHealedInGroup(tar, spell_type, spell_id, caster->GetAOERange(spell_id));
@ -1373,7 +1373,7 @@ BotSpell Bot::GetBestBotSpellForGroupHealOverTime(Bot* caster, Mob* tar, uint16
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
if (IsGroupHealOverTimeSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId;
int32 spell_id = bot_spell_list_itr->SpellId;
if (caster->TargetValidation(tar) && !caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
target_count = caster->GetNumberNeedingHealedInGroup(tar, spell_type, spell_id, caster->GetAOERange(spell_id));
@ -1411,7 +1411,7 @@ BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
if (IsGroupCompleteHealSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId;
int32 spell_id = bot_spell_list_itr->SpellId;
if (caster->TargetValidation(tar) && !caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
target_count = caster->GetNumberNeedingHealedInGroup(tar, spell_type, spell_id, caster->GetAOERange(spell_id));
@ -1459,7 +1459,7 @@ BotSpell Bot::GetBestBotSpellForMez(Bot* caster, uint16 spell_type) {
return result;
}
Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, uint16 spell_id, uint16 spell_type, bool AE) {
Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, int32 spell_id, uint16 spell_type, bool AE) {
Mob* result = nullptr;
if (caster && caster->GetOwner()) {
@ -2184,7 +2184,7 @@ uint8 Bot::GetChanceToCastBySpellType(uint16 spell_type)
return RuleI(Bots, PercentChanceToCastOtherType);
}
bool Bot::AI_AddBotSpells(uint32 bot_spell_id) {
bool Bot::AI_AddBotSpells(int32 bot_spell_id) {
// ok, this function should load the list, and the parent list then shove them into the struct and sort
npc_spells_id = bot_spell_id;
AIBot_spells.clear();
@ -2486,7 +2486,7 @@ bool Bot::AI_AddBotSpells(uint32 bot_spell_id) {
return true;
}
bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 iSpellID) {
bool IsSpellInBotList(DBbotspells_Struct* spell_list, int32 iSpellID) {
auto it = std::find_if (
spell_list->entries.begin(),
spell_list->entries.end(),
@ -2498,7 +2498,7 @@ bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 iSpellID) {
return it != spell_list->entries.end();
}
DBbotspells_Struct* ZoneDatabase::GetBotSpells(uint32 bot_spell_id)
DBbotspells_Struct* ZoneDatabase::GetBotSpells(int32 bot_spell_id)
{
if (!bot_spell_id) {
return nullptr;
@ -2591,7 +2591,7 @@ DBbotspells_Struct* ZoneDatabase::GetBotSpells(uint32 bot_spell_id)
// adds a spell to the list, taking into account priority and resorting list as needed.
void Bot::AddSpellToBotList(
int16 in_priority,
uint16 in_spell_id,
int32 in_spell_id,
uint32 in_type,
int16 in_mana_cost,
int32 in_recast_delay,
@ -2637,7 +2637,7 @@ void Bot::AddSpellToBotList(
// adds spells to the list ^spells that are returned if ^enforce is enabled
void Bot::AddSpellToBotEnforceList(
int16 iPriority,
uint16 iSpellID,
int32 iSpellID,
uint32 iType,
int16 iManaCost,
int32 iRecastDelay,
@ -2703,7 +2703,7 @@ void Bot::AI_Bot_Event_SpellCastFinished(bool iCastSucceeded, uint16 slot) {
}
}
bool Bot::HasBotSpellEntry(uint16 spell_id) {
bool Bot::HasBotSpellEntry(int32 spell_id) {
auto* spell_list = content_db.GetBotSpells(GetBotSpellID());
if (!spell_list) {
@ -2720,7 +2720,7 @@ bool Bot::HasBotSpellEntry(uint16 spell_id) {
return false;
}
bool Bot::CanUseBotSpell(uint16 spell_id) {
bool Bot::CanUseBotSpell(int32 spell_id) {
if (AIBot_spells.empty()) {
return false;
}
@ -2744,7 +2744,7 @@ bool Bot::CanUseBotSpell(uint16 spell_id) {
return false;
}
bool Bot::IsValidSpellRange(uint16 spell_id, Mob* tar) {
bool Bot::IsValidSpellRange(int32 spell_id, Mob* tar) {
if (!IsValidSpell(spell_id) || !tar) {
return false;
}

12
zone/client.cpp
View File

@ -3344,7 +3344,7 @@ void Client::GMKill() {
safe_delete(outapp);
}
void Client::MemorizeSpell(uint32 slot, uint32 spell_id, uint32 scribing, uint32 reduction){
void Client::MemorizeSpell(uint32 slot, int32 spell_id, uint32 scribing, uint32 reduction){
if (
!EQ::ValueWithin(
slot,
@ -4393,7 +4393,7 @@ void Client::Sacrifice(Mob *caster)
}
}
void Client::SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID) {
void Client::SendOPTranslocateConfirm(Mob *Caster, int32 SpellID) {
if(!Caster || PendingTranslocate)
return;
@ -6362,7 +6362,7 @@ void Client::SuspendMinion(int value)
}
else
{
uint16 SpellID = CurrentPet->GetPetSpellID();
int32 SpellID = CurrentPet->GetPetSpellID();
if(SpellID)
{
@ -7103,7 +7103,7 @@ void Client::ConsentCorpses(std::string consent_name, bool deny)
}
}
void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration)
void Client::Doppelganger(int32 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration)
{
if(!target || !IsValidSpell(spell_id) || GetID() == target->GetID())
return;
@ -10714,7 +10714,7 @@ void Client::Fling(float value, float target_x, float target_y, float target_z,
std::vector<int> Client::GetLearnableDisciplines(uint8 min_level, uint8 max_level) {
std::vector<int> learnable_disciplines;
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
for (int32 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool learnable = true;
if (!IsValidSpell(spell_id)) {
continue;
@ -10785,7 +10785,7 @@ std::vector<int> Client::GetScribeableSpells(uint8 min_level, uint8 max_level) {
std::vector<int> scribeable_spells;
std::unordered_map<uint32, std::vector<uint16>> spell_group_cache = LoadSpellGroupCache(min_level, max_level);
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
for (int32 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool scribeable = true;
if (!IsValidSpell(spell_id)) {
continue;

56
zone/client.h
View File

@ -277,8 +277,8 @@ public:
bool GotoPlayerRaid(const std::string& player_name);
//abstract virtual function implementations required by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool HasRaid() { return (GetRaid() ? true : false); }
virtual bool HasGroup() { return (GetGroup() ? true : false); }
virtual Raid* GetRaid() { return entity_list.GetRaidByClient(this); }
@ -678,7 +678,7 @@ public:
inline virtual int32 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath + 11; }
virtual bool CheckFizzle(uint16 spell_id);
virtual bool CheckFizzle(int32 spell_id);
virtual int GetCurrentBuffSlots() const;
virtual int GetCurrentSongSlots() const;
virtual int GetCurrentDiscSlots() const { return 1; }
@ -928,8 +928,8 @@ public:
bool CanHaveSkill(EQ::skills::SkillType skill_id) const;
void SetSkill(EQ::skills::SkillType skill_num, uint16 value);
void AddSkill(EQ::skills::SkillType skillid, uint16 value);
void CheckSpecializeIncrease(uint16 spell_id);
void CheckSongSkillIncrease(uint16 spell_id);
void CheckSpecializeIncrease(int32 spell_id);
void CheckSongSkillIncrease(int32 spell_id);
bool CheckIncreaseSkill(EQ::skills::SkillType skillid, Mob *against_who, int chancemodi = 0);
void CheckLanguageSkillIncrease(uint8 language_id, uint8 teacher_skill);
void SetLanguageSkill(uint8 language_id, uint8 language_skill);
@ -955,13 +955,13 @@ public:
inline void SetDuelTarget(uint32 set_id) { duel_target = set_id; }
inline void SetDueling(bool duel) { duelaccepted = duel; }
// use this one instead
void MemSpell(uint16 spell_id, int slot, bool update_client = true);
void MemSpell(int32 spell_id, int slot, bool update_client = true);
void UnmemSpell(int slot, bool update_client = true);
void UnmemSpellBySpellID(int32 spell_id);
void UnmemSpellAll(bool update_client = true);
int FindEmptyMemSlot();
uint16 FindMemmedSpellBySlot(int slot);
int FindMemmedSpellBySpellID(uint16 spell_id);
int FindMemmedSpellBySpellID(int32 spell_id);
int MemmedCount();
std::vector<int> GetLearnableDisciplines(uint8 min_level = 1, uint8 max_level = 0);
std::vector<int> GetLearnedDisciplines();
@ -969,7 +969,7 @@ public:
std::vector<int> GetScribeableSpells(uint8 min_level = 1, uint8 max_level = 0);
std::vector<int> GetScribedSpells();
// defer save used when bulk saving
void ScribeSpell(uint16 spell_id, int slot, bool update_client = true, bool defer_save = false);
void ScribeSpell(int32 spell_id, int slot, bool update_client = true, bool defer_save = false);
void SaveSpells();
void SaveDisciplines();
@ -985,12 +985,12 @@ public:
// defer save used when bulk saving
void UnscribeSpell(int slot, bool update_client = true, bool defer_save = false);
void UnscribeSpellAll(bool update_client = true);
void UnscribeSpellBySpellID(uint16 spell_id, bool update_client = true);
void UnscribeSpellBySpellID(int32 spell_id, bool update_client = true);
void UntrainDisc(int slot, bool update_client = true, bool defer_save = false);
void UntrainDiscAll(bool update_client = true);
void UntrainDiscBySpellID(uint16 spell_id, bool update_client = true);
bool SpellGlobalCheck(uint16 spell_id, uint32 char_id);
bool SpellBucketCheck(uint16 spell_id, uint32 char_id);
void UntrainDiscBySpellID(int32 spell_id, bool update_client = true);
bool SpellGlobalCheck(int32 spell_id, uint32 char_id);
bool SpellBucketCheck(int32 spell_id, uint32 char_id);
uint8 GetCharMaxLevelFromQGlobal();
uint8 GetCharMaxLevelFromBucket();
@ -1013,7 +1013,7 @@ public:
inline bool AutoConsentRaidEnabled() const { return m_pp.raidAutoconsent != 0; }
inline bool AutoConsentGuildEnabled() const { return m_pp.guildAutoconsent != 0; }
void SummonHorse(uint16 spell_id);
void SummonHorse(int32 spell_id);
void SetHorseId(uint16 horseid_in);
inline void SetControlledMobId(uint16 mob_id_in) { controlled_mob_id = mob_id_in; }
uint16 GetControlledMobId() const{ return controlled_mob_id; }
@ -1111,7 +1111,7 @@ public:
inline uint32 GetAAPercent() const { return m_epp.perAA; }
void SetAATitle(std::string title);
void SetTitleSuffix(std::string suffix);
void MemorizeSpell(uint32 slot, uint32 spell_id, uint32 scribing, uint32 reduction = 0);
void MemorizeSpell(uint32 slot, int32 spell_id, uint32 scribing, uint32 reduction = 0);
int GetAAEXPPercentage();
int GetEXPPercentage();
@ -1243,15 +1243,15 @@ public:
void ResetDisciplineTimer(uint32 timer_id);
void SendDisciplineUpdate();
void SendDisciplineTimer(uint32 timer_id, uint32 duration);
bool UseDiscipline(uint32 spell_id, uint32 target);
bool HasDisciplineLearned(uint16 spell_id);
bool UseDiscipline(int32 spell_id, uint32 target);
bool HasDisciplineLearned(int32 spell_id);
void SetLinkedSpellReuseTimer(uint32 timer_id, uint32 duration);
bool IsLinkedSpellReuseTimerReady(uint32 timer_id);
void ResetCastbarCooldownBySlot(int slot);
void ResetAllCastbarCooldowns();
void ResetCastbarCooldownBySpellID(uint32 spell_id);
void ResetCastbarCooldownBySpellID(int32 spell_id);
bool CheckTitle(int title_set);
void EnableTitle(int title_set, bool insert = true);
@ -1275,13 +1275,13 @@ public:
void ProcessInspectRequest(Client* requestee, Client* requester);
bool ClientFinishedLoading() { return (conn_state == ClientConnectFinished); }
int FindSpellBookSlotBySpellID(uint16 spellid);
uint32 GetSpellIDByBookSlot(int book_slot);
int FindSpellBookSlotBySpellID(int32 spellid);
int32 GetSpellIDByBookSlot(int book_slot);
int GetNextAvailableSpellBookSlot(int starting_slot = 0);
int GetNextAvailableDisciplineSlot(int starting_slot = 0);
inline uint32 GetSpellByBookSlot(int book_slot) { return m_pp.spell_book[book_slot]; }
inline int32 GetSpellByBookSlot(int book_slot) { return m_pp.spell_book[book_slot]; }
inline bool HasSpellScribed(int spellid) { return FindSpellBookSlotBySpellID(spellid) != -1; }
uint32 GetHighestScribedSpellinSpellGroup(uint32 spell_group);
int32 GetHighestScribedSpellinSpellGroup(uint32 spell_group);
std::unordered_map<uint32, std::vector<uint16>> LoadSpellGroupCache(uint8 min_level, uint8 max_level);
uint16 GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill);
void SendPopupToClient(const char *Title, const char *Text, uint32 PopupID = 0, uint32 Buttons = 0, uint32 Duration = 0);
@ -1292,7 +1292,7 @@ public:
bool PendingSacrifice;
uint16 sacrifice_caster_id;
PendingTranslocate_Struct PendingTranslocateData;
void SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID);
void SendOPTranslocateConfirm(Mob *Caster, int32 SpellID);
// Help Window
std::string SendBotCommandHelpWindow(const BotCommandHelpParams& params);
@ -1665,7 +1665,7 @@ public:
}
void SuspendMinion(int value);
void Doppelganger(uint16 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration);
void Doppelganger(int32 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration);
void NotifyNewTitlesAvailable();
void Signal(int signal_id);
void SendPayload(int payload_id, std::string payload_value = std::string());
@ -1698,7 +1698,7 @@ public:
bool RemoveRespawnOption(std::string option_name);
bool RemoveRespawnOption(uint8 position);
void ClearRespawnOptions() { respawn_options.clear(); }
void SetPendingRezzData(int XP, uint32 DBID, uint16 SpellID, const char *CorpseName) { PendingRezzXP = XP; PendingRezzDBID = DBID; PendingRezzSpellID = SpellID; PendingRezzCorpseName = CorpseName; }
void SetPendingRezzData(int XP, uint32 DBID, int32 SpellID, const char *CorpseName) { PendingRezzXP = XP; PendingRezzDBID = DBID; PendingRezzSpellID = SpellID; PendingRezzCorpseName = CorpseName; }
bool IsRezzPending() { return PendingRezzSpellID > 0; }
void ClearHover();
inline bool IsBlockedBuff(int32 SpellID) { return PlayerBlockedBuffs.find(SpellID) != PlayerBlockedBuffs.end(); }
@ -1798,7 +1798,7 @@ public:
void SendWebLink(const char* website);
void SendMarqueeMessage(uint32 type, std::string message, uint32 duration = 3000);
void SendMarqueeMessage(uint32 type, uint32 priority, uint32 fade_in, uint32 fade_out, uint32 duration, std::string message);
void SendSpellAnim(uint16 targetid, uint16 spell_id);
void SendSpellAnim(uint16 targetid, int32 spell_id);
void DuplicateLoreMessage(uint32 ItemID);
void GarbleMessage(char *, uint8);
@ -1956,7 +1956,7 @@ public:
protected:
friend class Mob;
void CalcEdibleBonuses(StatBonuses* newbon);
void MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message = true);
void MakeBuffFadePacket(int32 spell_id, int slot_id, bool send_message = true);
bool client_data_loaded;
@ -1989,7 +1989,7 @@ private:
eqFilterMode ClientFilters[_FilterCount];
int32 HandlePacket(const EQApplicationPacket *app);
void OPTGB(const EQApplicationPacket *app);
void OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z);
void OPRezzAnswer(uint32 Action, int32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z);
void OPMemorizeSpell(const EQApplicationPacket *app);
void OPMoveCoin(const EQApplicationPacket* app);
void MoveItemCharges(EQ::ItemInstance &from, int16 to_slot, uint8 type);
@ -2309,7 +2309,7 @@ private:
bool PendingGuildInvitation;
int PendingRezzXP;
uint32 PendingRezzDBID;
uint16 PendingRezzSpellID; // Only used for resurrect while hovering.
int32 PendingRezzSpellID; // Only used for resurrect while hovering.
std::string PendingRezzCorpseName; // Only used for resurrect while hovering.
std::set<uint32> PlayerBlockedBuffs;

2
zone/client_mods.cpp
View File

@ -1441,7 +1441,7 @@ int32 Client::CalcATK()
return (ATK);
}
uint32 Mob::GetInstrumentMod(uint16 spell_id)
uint32 Mob::GetInstrumentMod(int32 spell_id)
{
if (GetClass() != Class::Bard || spells[spell_id].is_discipline || spell_id == SPELL_AMPLIFICATION) {
//Other classes can get a base effects mod using SPA 413

14
zone/client_packet.cpp
View File

@ -1560,7 +1560,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
m_pp.buffs[i].num_hits = buffs[i].hit_number;
}
else {
m_pp.buffs[i].spellid = SPELLBOOK_UNKNOWN;
m_pp.buffs[i].spellid = SPELL_UNKNOWN;
m_pp.buffs[i].bard_modifier = 10;
m_pp.buffs[i].effect_type = 0;
m_pp.buffs[i].player_id = 0;
@ -4228,7 +4228,7 @@ void Client::Handle_OP_BuffRemoveRequest(const EQApplicationPacket *app)
if (brrs->SlotID > (uint32)m->GetMaxTotalSlots())
return;
uint16 SpellID = m->GetSpellIDFromSlot(brrs->SlotID);
int32 SpellID = m->GetSpellIDFromSlot(brrs->SlotID);
if (SpellID && (GetGM() || ((IsBeneficialSpell(SpellID) || IsEffectInSpell(SpellID, SpellEffect::BindSight)) && !spells[SpellID].no_remove))) {
m->BuffFadeBySlot(brrs->SlotID, true);
@ -4419,9 +4419,9 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
if (inst && inst->IsClassCommon())
{
const EQ::ItemData* item = inst->GetItem();
if (item->Click.Effect != (uint32)castspell->spell_id)
if (item->Click.Effect != castspell->spell_id)
{
std::string message = fmt::format("OP_CastSpell with item, tried to cast a different spell than what was on item - item spell id [{}] attempted [{}]", item->Click.Effect, (uint32)castspell->spell_id);
std::string message = fmt::format("OP_CastSpell with item, tried to cast a different spell than what was on item - item spell id [{}] attempted [{}]", item->Click.Effect, castspell->spell_id);
RecordPlayerEventLog(PlayerEvent::POSSIBLE_HACK, PlayerEvent::PossibleHackEvent{.message = message});
InterruptSpell(castspell->spell_id); //CHEATER!!
return;
@ -5841,8 +5841,8 @@ void Client::Handle_OP_DeleteSpell(const EQApplicationPacket *app)
if (dss->spell_slot < 0 || dss->spell_slot >= EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize)
return;
if (m_pp.spell_book[dss->spell_slot] != SPELLBOOK_UNKNOWN) {
m_pp.spell_book[dss->spell_slot] = SPELLBOOK_UNKNOWN;
if (m_pp.spell_book[dss->spell_slot] != SPELL_UNKNOWN) {
m_pp.spell_book[dss->spell_slot] = SPELL_UNKNOWN;
database.DeleteCharacterSpell(CharacterID(), dss->spell_slot);
dss->success = 1;
}
@ -15843,7 +15843,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
}
if (its->Complete == 1) {
uint32 spell_id = PendingTranslocateData.spell_id;
int32 spell_id = PendingTranslocateData.spell_id;
bool in_translocate_zone = (
zone->GetZoneID() == PendingTranslocateData.zone_id &&
zone->GetInstanceID() == PendingTranslocateData.instance_id

6
zone/client_process.cpp
View File

@ -1033,7 +1033,7 @@ uint8 Client::WithCustomer(uint16 NewCustomer){
return 0;
}
void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z)
void Client::OPRezzAnswer(uint32 Action, int32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z)
{
if(PendingRezzXP < 0) {
// pendingrezexp is set to -1 if we are not expecting an OP_RezzAnswer
@ -1048,7 +1048,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
// corpse is in has shutdown since the rez spell was cast.
database.MarkCorpseAsResurrected(PendingRezzDBID);
LogSpells("Player [{}] got a [{}] Rezz spellid [{}] in zone[{}] instance id [{}]",
name, (uint16)spells[SpellID].base_value[0],
name, spells[SpellID].base_value[0],
SpellID, ZoneID, InstanceID);
const bool use_old_resurrection = (
@ -1061,7 +1061,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
)
);
const uint16 resurrection_sickness_spell_id = (
const int32 resurrection_sickness_spell_id = (
use_old_resurrection ?
RuleI(Character, OldResurrectionSicknessSpellID) :
RuleI(Character, ResurrectionSicknessSpellID)

8
zone/common.h
View File

@ -334,13 +334,13 @@ struct StatBonuses {
int32 Corrup;
int32 CorrupCapMod;
int32 HeroicCorrup;
uint16 DamageShieldSpellID;
int32 DamageShieldSpellID;
int DamageShield; // this is damage done to mobs that attack this
DmgShieldType DamageShieldType;
int SpellDamageShield;
int SpellShield;
int ReverseDamageShield; // this is damage done to the mob when it attacks
uint16 ReverseDamageShieldSpellID;
int32 ReverseDamageShieldSpellID;
DmgShieldType ReverseDamageShieldType;
int movementspeed;
int32 haste;
@ -641,7 +641,7 @@ namespace SBIndex {
constexpr uint16 POSITION_FRONT = 1; // SPA 503-506
constexpr uint16 PET_RAMPAGE_CHANCE = 0; // SPA 464,465
constexpr uint16 PET_RAMPAGE_DMG_MOD = 1; // SPA 465,465
constexpr uint16 SKILLATK_PROC_SPELL_ID = 0; // SPA 288
constexpr int32 SKILLATK_PROC_SPELL_ID = 0; // SPA 288
constexpr uint16 SKILLATK_PROC_CHANCE = 1; // SPA 288
constexpr uint16 SKILLATK_PROC_SKILL = 2; // SPA 288
constexpr uint16 SLAYUNDEAD_DMG_MOD = 0; // SPA 219
@ -660,7 +660,7 @@ namespace SBIndex {
constexpr uint16 REFLECT_RESISTANCE_MOD = 1; // SPA 158
constexpr uint16 REFLECT_DMG_EFFECTIVENESS = 2; // SPA 158
constexpr uint16 COMBAT_PROC_ORIGIN_ID = 0; // SPA
constexpr uint16 COMBAT_PROC_SPELL_ID = 1; // SPA
constexpr int32 COMBAT_PROC_SPELL_ID = 1; // SPA
constexpr uint16 COMBAT_PROC_RATE_MOD = 2; // SPA
constexpr uint16 COMBAT_PROC_REUSE_TIMER = 3; // SPA
constexpr uint16 SHIELD_TARGET_MITIGATION_PERCENT = 0; // SPA 463

2
zone/corpse.cpp
View File

@ -2304,7 +2304,7 @@ void Corpse::CheckIsOwnerOnline()
}
}
void Corpse::CastRezz(uint16 spell_id, Mob *caster)
void Corpse::CastRezz(int32 spell_id, Mob *caster)
{
LogSpells(
"spell_id [{}] IsRezzed() [{}], rez_experience [{}], rez_timer enabled [{}]",

6
zone/corpse.h
View File

@ -83,7 +83,7 @@ public:
virtual bool Death(
Mob *killer_mob,
int64 damage,
uint16 spell_id,
int32 spell_id,
EQ::skills::SkillType attack_skill,
KilledByTypes killed_by = KilledByTypes::Killed_NPC,
bool is_buff_tic = false
@ -92,7 +92,7 @@ public:
virtual void Damage(
Mob *from,
int64 damage,
uint16 spell_id,
int32 spell_id,
EQ::skills::SkillType attack_skill,
bool avoidable = true,
int8 buffslot = -1,
@ -205,7 +205,7 @@ public:
/* Corpse: Resurrection */
bool IsRezzed() { return m_rez; }
void IsRezzed(bool in_rez) { m_rez = in_rez; }
void CastRezz(uint16 spell_id, Mob *caster);
void CastRezz(int32 spell_id, Mob *caster);
void CompleteResurrection(bool timer_expired = false);
bool IsRezzable() { return m_is_rezzable; }
void SetRezTimer(bool initial_timer = false);

24
zone/effects.cpp
View File

@ -27,7 +27,7 @@
#include "zone/worldserver.h"
#include "zone/zonedb.h"
float Mob::GetActSpellRange(uint16 spell_id, float range)
float Mob::GetActSpellRange(int32 spell_id, float range)
{
float extrange = 100;
@ -36,7 +36,7 @@ float Mob::GetActSpellRange(uint16 spell_id, float range)
return (range * extrange) / 100;
}
int64 Mob::GetActSpellDamage(uint16 spell_id, int64 value, Mob* target) {
int64 Mob::GetActSpellDamage(int32 spell_id, int64 value, Mob* target) {
if (spells[spell_id].target_type == ST_Self) {
return value;
}
@ -202,7 +202,7 @@ int64 Mob::GetActSpellDamage(uint16 spell_id, int64 value, Mob* target) {
return value;
}
int64 Mob::GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness) {
int64 Mob::GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness) {
/*
Reflected spells use the spells base damage before any modifiers or formulas applied.
That value can then be modifier by the reflect spells 'max' value, defined here as effectiveness
@ -237,7 +237,7 @@ int64 Mob::GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiv
return value;
}
int64 Mob::GetActDoTDamage(uint16 spell_id, int64 value, Mob* target, bool from_buff_tic) {
int64 Mob::GetActDoTDamage(int32 spell_id, int64 value, Mob* target, bool from_buff_tic) {
if (target == nullptr)
return value;
@ -362,7 +362,7 @@ int64 Mob::GetActDoTDamage(uint16 spell_id, int64 value, Mob* target, bool from_
return value;
}
int64 Mob::GetExtraSpellAmt(uint16 spell_id, int64 extra_spell_amt, int64 base_spell_dmg)
int64 Mob::GetExtraSpellAmt(int32 spell_id, int64 extra_spell_amt, int64 base_spell_dmg)
{
if (RuleB(Spells, FlatItemExtraSpellAmt)) {
@ -401,7 +401,7 @@ int64 Mob::GetExtraSpellAmt(uint16 spell_id, int64 extra_spell_amt, int64 base_s
return extra_spell_amt;
}
int64 Mob::GetActSpellHealing(uint16 spell_id, int64 value, Mob* target, bool from_buff_tic) {
int64 Mob::GetActSpellHealing(int32 spell_id, int64 value, Mob* target, bool from_buff_tic) {
if (target == nullptr && IsBot()) {
target = this;
}
@ -557,7 +557,7 @@ int64 Mob::GetActSpellHealing(uint16 spell_id, int64 value, Mob* target, bool fr
}
int32 Mob::GetActSpellCost(uint16 spell_id, int32 cost)
int32 Mob::GetActSpellCost(int32 spell_id, int32 cost)
{
//FrenziedDevastation doubles mana cost of all DD spells
int16 FrenziedDevastation = itembonuses.FrenziedDevastation + spellbonuses.FrenziedDevastation + aabonuses.FrenziedDevastation;
@ -606,7 +606,7 @@ int32 Mob::GetActSpellCost(uint16 spell_id, int32 cost)
return cost;
}
int32 Mob::GetActSpellDuration(uint16 spell_id, int32 duration)
int32 Mob::GetActSpellDuration(int32 spell_id, int32 duration)
{
// focuses don't affect discipline duration (Except War Cries)
if (
@ -849,7 +849,7 @@ void Client::SendDisciplineUpdate() {
QueuePacket(&app);
}
bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
bool Client::UseDiscipline(int32 spell_id, uint32 target) {
// Dont let client waste a reuse timer if they can't use the disc
if ((IsStunned() && !IsCastNotStandingSpell(spell_id))||
IsFeared() ||
@ -1001,7 +1001,7 @@ void Client::ResetAllDisciplineTimers() {
}
}
bool Client::HasDisciplineLearned(uint16 spell_id) {
bool Client::HasDisciplineLearned(int32 spell_id) {
bool has_learned = false;
for (auto index = 0; index < MAX_PP_DISCIPLINES; ++index) {
if (GetPP().disciplines.values[index] == spell_id) {
@ -1063,7 +1063,7 @@ void EntityList::AETaunt(Client* taunter, float range, int bonus_hate)
void EntityList::AESpell(
Mob* caster_mob,
Mob* center_mob,
uint16 spell_id,
int32 spell_id,
bool affect_caster,
int16 resist_adjust,
int* max_targets,
@ -1250,7 +1250,7 @@ void EntityList::AESpell(
void EntityList::MassGroupBuff(
Mob* caster,
Mob* center,
uint16 spell_id,
int32 spell_id,
bool affect_caster
)
{

12
zone/embparser.cpp
View File

@ -527,7 +527,7 @@ int PerlembParser::EventSpell(
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
@ -606,7 +606,7 @@ bool PerlembParser::GlobalPlayerHasQuestSub(QuestEventID event_id)
return perl->SubExists("qst_global_player", QuestEventSubroutines[event_id]);
}
bool PerlembParser::SpellHasQuestSub(uint32 spell_id, QuestEventID event_id)
bool PerlembParser::SpellHasQuestSub(int32 spell_id, QuestEventID event_id)
{
if (!perl || event_id >= _LargestEventID) {
return false;
@ -786,7 +786,7 @@ void PerlembParser::LoadItemScript(std::string filename, EQ::ItemInstance* inst)
item_quest_status_[inst->GetID()] = questLoaded;
}
void PerlembParser::LoadSpellScript(std::string filename, uint32 spell_id)
void PerlembParser::LoadSpellScript(std::string filename, int32 spell_id)
{
if (!perl) {
return;
@ -986,7 +986,7 @@ void PerlembParser::ExportVar(const char* prefix, const char* variable_name, con
int PerlembParser::SendCommands(
const char* prefix,
const char* event_id,
uint32 object_id,
int32 object_id, // TODO: unused parameter? spell_id in header, object_id here
Mob* other,
Mob* mob,
EQ::ItemInstance* inst,
@ -1917,8 +1917,8 @@ void PerlembParser::ExportEventVariables(
case EVENT_SPELL_BLOCKED: {
Seperator sep(data);
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[1]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[1]);
ExportVar(package_name.c_str(), "blocking_spell_id", blocking_spell_id);
ExportVar(package_name.c_str(), "cast_spell_id", cast_spell_id);

8
zone/embparser.h
View File

@ -111,7 +111,7 @@ public:
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
@ -173,7 +173,7 @@ public:
virtual bool HasGlobalQuestSub(QuestEventID event_id);
virtual bool PlayerHasQuestSub(QuestEventID event_id);
virtual bool GlobalPlayerHasQuestSub(QuestEventID event_id);
virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID event_id);
virtual bool SpellHasQuestSub(int32 spell_id, QuestEventID event_id);
virtual bool ItemHasQuestSub(EQ::ItemInstance* inst, QuestEventID event_id);
virtual bool BotHasQuestSub(QuestEventID event_id);
virtual bool GlobalBotHasQuestSub(QuestEventID event_id);
@ -187,7 +187,7 @@ public:
virtual void LoadPlayerScript(std::string filename);
virtual void LoadGlobalPlayerScript(std::string filename);
virtual void LoadItemScript(std::string filename, EQ::ItemInstance* inst);
virtual void LoadSpellScript(std::string filename, uint32 spell_id);
virtual void LoadSpellScript(std::string filename, int32 spell_id);
virtual void LoadBotScript(std::string filename);
virtual void LoadGlobalBotScript(std::string filename);
virtual void LoadMercScript(std::string filename);
@ -228,7 +228,7 @@ private:
int SendCommands(
const char* prefix,
const char* event,
uint32 spell_id,
int32 spell_id,
Mob* other,
Mob* mob,
EQ::ItemInstance* inst,

302
zone/embparser_api.cpp
View File

@ -312,12 +312,12 @@ int Perl__getinventoryslotid(std::string identifier)
return result;
}
void Perl__castspell(uint16 spell_id, uint16 target_id)
void Perl__castspell(int32 spell_id, uint16 target_id)
{
quest_manager.castspell(spell_id, target_id);
}
void Perl__selfcast(uint16 spell_id)
void Perl__selfcast(int32 spell_id)
{
quest_manager.selfcast(spell_id);
}
@ -542,12 +542,12 @@ std::string Perl__getracename(uint16 race_id)
return quest_manager.getracename(race_id);
}
std::string Perl__getspellname(uint32 spell_id)
std::string Perl__getspellname(int32 spell_id)
{
return quest_manager.getspellname(spell_id);
}
uint8 Perl__get_spell_level(uint16 spell_id, uint8 class_id)
uint8 Perl__get_spell_level(int32 spell_id, uint8 class_id)
{
const auto spell_level = GetSpellLevel(spell_id, class_id);
return spell_level > RuleI(Character, MaxLevel) ? UINT8_MAX : spell_level;
@ -1736,437 +1736,437 @@ bool Perl__IsRunning()
return quest_manager.IsRunning();
}
bool Perl__IsEffectInSpell(uint16 spell_id, int effect_id)
bool Perl__IsEffectInSpell(int32 spell_id, int effect_id)
{
return IsEffectInSpell(spell_id, effect_id);
}
bool Perl__IsBeneficialSpell(uint16 spell_id)
bool Perl__IsBeneficialSpell(int32 spell_id)
{
return IsBeneficialSpell(spell_id);
}
bool Perl__IsDetrimentalSpell(uint16 spell_id)
bool Perl__IsDetrimentalSpell(int32 spell_id)
{
return IsDetrimentalSpell(spell_id);
}
bool Perl__IsTargetableAESpell(uint16 spell_id)
bool Perl__IsTargetableAESpell(int32 spell_id)
{
return IsTargetableAESpell(spell_id);
}
bool Perl__IsSacrificeSpell(uint16 spell_id)
bool Perl__IsSacrificeSpell(int32 spell_id)
{
return IsSacrificeSpell(spell_id);
}
bool Perl__IsLifetapSpell(uint16 spell_id)
bool Perl__IsLifetapSpell(int32 spell_id)
{
return IsLifetapSpell(spell_id);
}
bool Perl__IsMesmerizeSpell(uint16 spell_id)
bool Perl__IsMesmerizeSpell(int32 spell_id)
{
return IsMesmerizeSpell(spell_id);
}
bool Perl__IsStunSpell(uint16 spell_id)
bool Perl__IsStunSpell(int32 spell_id)
{
return IsStunSpell(spell_id);
}
bool Perl__IsSummonSpell(uint16 spell_id)
bool Perl__IsSummonSpell(int32 spell_id)
{
return IsSummonSpell(spell_id);
}
bool Perl__IsDamageSpell(uint16 spell_id)
bool Perl__IsDamageSpell(int32 spell_id)
{
return IsDamageSpell(spell_id);
}
bool Perl__IsFearSpell(uint16 spell_id)
bool Perl__IsFearSpell(int32 spell_id)
{
return IsFearSpell(spell_id);
}
bool Perl__IsCureSpell(uint16 spell_id)
bool Perl__IsCureSpell(int32 spell_id)
{
return IsCureSpell(spell_id);
}
bool Perl__IsHasteSpell(uint16 spell_id)
bool Perl__IsHasteSpell(int32 spell_id)
{
return IsHasteSpell(spell_id);
}
bool Perl__IsHarmonySpell(uint16 spell_id)
bool Perl__IsHarmonySpell(int32 spell_id)
{
return IsHarmonySpell(spell_id);
}
bool Perl__IsPercentalHealSpell(uint16 spell_id)
bool Perl__IsPercentalHealSpell(int32 spell_id)
{
return IsPercentalHealSpell(spell_id);
}
bool Perl__IsGroupOnlySpell(uint16 spell_id)
bool Perl__IsGroupOnlySpell(int32 spell_id)
{
return IsGroupOnlySpell(spell_id);
}
bool Perl__IsInvisibleSpell(uint16 spell_id)
bool Perl__IsInvisibleSpell(int32 spell_id)
{
return IsInvisibleSpell(spell_id);
}
bool Perl__IsInvulnerabilitySpell(uint16 spell_id)
bool Perl__IsInvulnerabilitySpell(int32 spell_id)
{
return IsInvulnerabilitySpell(spell_id);
}
bool Perl__IsCompleteHealDurationSpell(uint16 spell_id)
bool Perl__IsCompleteHealDurationSpell(int32 spell_id)
{
return IsCompleteHealDurationSpell(spell_id);
}
bool Perl__IsPoisonCounterSpell(uint16 spell_id)
bool Perl__IsPoisonCounterSpell(int32 spell_id)
{
return IsPoisonCounterSpell(spell_id);
}
bool Perl__IsDiseaseCounterSpell(uint16 spell_id)
bool Perl__IsDiseaseCounterSpell(int32 spell_id)
{
return IsDiseaseCounterSpell(spell_id);
}
bool Perl__IsSummonItemSpell(uint16 spell_id)
bool Perl__IsSummonItemSpell(int32 spell_id)
{
return IsSummonItemSpell(spell_id);
}
bool Perl__IsSummonSkeletonSpell(uint16 spell_id)
bool Perl__IsSummonSkeletonSpell(int32 spell_id)
{
return IsSummonSkeletonSpell(spell_id);
}
bool Perl__IsSummonPetSpell(uint16 spell_id)
bool Perl__IsSummonPetSpell(int32 spell_id)
{
return IsSummonPetSpell(spell_id);
}
bool Perl__IsPetSpell(uint16 spell_id)
bool Perl__IsPetSpell(int32 spell_id)
{
return IsPetSpell(spell_id);
}
bool Perl__IsSummonPCSpell(uint16 spell_id)
bool Perl__IsSummonPCSpell(int32 spell_id)
{
return IsSummonPCSpell(spell_id);
}
bool Perl__IsCharmSpell(uint16 spell_id)
bool Perl__IsCharmSpell(int32 spell_id)
{
return IsCharmSpell(spell_id);
}
bool Perl__IsBlindSpell(uint16 spell_id)
bool Perl__IsBlindSpell(int32 spell_id)
{
return IsBlindSpell(spell_id);
}
bool Perl__IsHealthSpell(uint16 spell_id)
bool Perl__IsHealthSpell(int32 spell_id)
{
return IsHealthSpell(spell_id);
}
bool Perl__IsCastTimeReductionSpell(uint16 spell_id)
bool Perl__IsCastTimeReductionSpell(int32 spell_id)
{
return IsCastTimeReductionSpell(spell_id);
}
bool Perl__IsIncreaseDurationSpell(uint16 spell_id)
bool Perl__IsIncreaseDurationSpell(int32 spell_id)
{
return IsIncreaseDurationSpell(spell_id);
}
bool Perl__IsManaCostReductionSpell(uint16 spell_id)
bool Perl__IsManaCostReductionSpell(int32 spell_id)
{
return IsManaCostReductionSpell(spell_id);
}
bool Perl__IsIncreaseRangeSpell(uint16 spell_id)
bool Perl__IsIncreaseRangeSpell(int32 spell_id)
{
return IsIncreaseRangeSpell(spell_id);
}
bool Perl__IsImprovedHealingSpell(uint16 spell_id)
bool Perl__IsImprovedHealingSpell(int32 spell_id)
{
return IsImprovedHealingSpell(spell_id);
}
bool Perl__IsImprovedDamageSpell(uint16 spell_id)
bool Perl__IsImprovedDamageSpell(int32 spell_id)
{
return IsImprovedDamageSpell(spell_id);
}
bool Perl__IsAEDurationSpell(uint16 spell_id)
bool Perl__IsAEDurationSpell(int32 spell_id)
{
return IsAEDurationSpell(spell_id);
}
bool Perl__IsPureNukeSpell(uint16 spell_id)
bool Perl__IsPureNukeSpell(int32 spell_id)
{
return IsPureNukeSpell(spell_id);
}
bool Perl__IsAENukeSpell(uint16 spell_id)
bool Perl__IsAENukeSpell(int32 spell_id)
{
return IsAENukeSpell(spell_id);
}
bool Perl__IsPBAENukeSpell(uint16 spell_id)
bool Perl__IsPBAENukeSpell(int32 spell_id)
{
return IsPBAENukeSpell(spell_id);
}
bool Perl__IsAERainNukeSpell(uint16 spell_id)
bool Perl__IsAERainNukeSpell(int32 spell_id)
{
return IsAERainNukeSpell(spell_id);
}
bool Perl__IsPartialResistableSpell(uint16 spell_id)
bool Perl__IsPartialResistableSpell(int32 spell_id)
{
return IsPartialResistableSpell(spell_id);
}
bool Perl__IsResistableSpell(uint16 spell_id)
bool Perl__IsResistableSpell(int32 spell_id)
{
return IsResistableSpell(spell_id);
}
bool Perl__IsGroupSpell(uint16 spell_id)
bool Perl__IsGroupSpell(int32 spell_id)
{
return IsGroupSpell(spell_id);
}
bool Perl__IsTGBCompatibleSpell(uint16 spell_id)
bool Perl__IsTGBCompatibleSpell(int32 spell_id)
{
return IsTGBCompatibleSpell(spell_id);
}
bool Perl__IsBardSong(uint16 spell_id)
bool Perl__IsBardSong(int32 spell_id)
{
return IsBardSong(spell_id);
}
bool Perl__IsPulsingBardSong(uint16 spell_id)
bool Perl__IsPulsingBardSong(int32 spell_id)
{
return IsPulsingBardSong(spell_id);
}
bool Perl__IsDisciplineBuff(uint16 spell_id)
bool Perl__IsDisciplineBuff(int32 spell_id)
{
return IsDisciplineBuff(spell_id);
}
bool Perl__IsDiscipline(uint16 spell_id)
bool Perl__IsDiscipline(int32 spell_id)
{
return IsDiscipline(spell_id);
}
bool Perl__IsCombatSkill(uint16 spell_id)
bool Perl__IsCombatSkill(int32 spell_id)
{
return IsCombatSkill(spell_id);
}
bool Perl__IsResurrectionEffects(uint16 spell_id)
bool Perl__IsResurrectionEffects(int32 spell_id)
{
return IsResurrectionEffects(spell_id);
}
bool Perl__IsRuneSpell(uint16 spell_id)
bool Perl__IsRuneSpell(int32 spell_id)
{
return IsRuneSpell(spell_id);
}
bool Perl__IsMagicRuneSpell(uint16 spell_id)
bool Perl__IsMagicRuneSpell(int32 spell_id)
{
return IsMagicRuneSpell(spell_id);
}
bool Perl__IsManaTapSpell(uint16 spell_id)
bool Perl__IsManaTapSpell(int32 spell_id)
{
return IsManaTapSpell(spell_id);
}
bool Perl__IsAllianceSpell(uint16 spell_id)
bool Perl__IsAllianceSpell(int32 spell_id)
{
return IsAllianceSpell(spell_id);
}
bool Perl__IsDeathSaveSpell(uint16 spell_id)
bool Perl__IsDeathSaveSpell(int32 spell_id)
{
return IsDeathSaveSpell(spell_id);
}
bool Perl__IsPartialDeathSaveSpell(uint16 spell_id)
bool Perl__IsPartialDeathSaveSpell(int32 spell_id)
{
return IsPartialDeathSaveSpell(spell_id);
}
bool Perl__IsFullDeathSaveSpell(uint16 spell_id)
bool Perl__IsFullDeathSaveSpell(int32 spell_id)
{
return IsFullDeathSaveSpell(spell_id);
}
bool Perl__IsShadowStepSpell(uint16 spell_id)
bool Perl__IsShadowStepSpell(int32 spell_id)
{
return IsShadowStepSpell(spell_id);
}
bool Perl__IsSuccorSpell(uint16 spell_id)
bool Perl__IsSuccorSpell(int32 spell_id)
{
return IsSuccorSpell(spell_id);
}
bool Perl__IsTeleportSpell(uint16 spell_id)
bool Perl__IsTeleportSpell(int32 spell_id)
{
return IsTeleportSpell(spell_id);
}
bool Perl__IsTranslocateSpell(uint16 spell_id)
bool Perl__IsTranslocateSpell(int32 spell_id)
{
return IsTranslocateSpell(spell_id);
}
bool Perl__IsGateSpell(uint16 spell_id)
bool Perl__IsGateSpell(int32 spell_id)
{
return IsGateSpell(spell_id);
}
bool Perl__IsIllusionSpell(uint16 spell_id)
bool Perl__IsIllusionSpell(int32 spell_id)
{
return IsIllusionSpell(spell_id);
}
bool Perl__IsLDoNObjectSpell(uint16 spell_id)
bool Perl__IsLDoNObjectSpell(int32 spell_id)
{
return IsLDoNObjectSpell(spell_id);
}
bool Perl__IsHealOverTimeSpell(uint16 spell_id)
bool Perl__IsHealOverTimeSpell(int32 spell_id)
{
return IsHealOverTimeSpell(spell_id);
}
bool Perl__IsCompleteHealSpell(uint16 spell_id)
bool Perl__IsCompleteHealSpell(int32 spell_id)
{
return IsCompleteHealSpell(spell_id);
}
bool Perl__IsFastHealSpell(uint16 spell_id)
bool Perl__IsFastHealSpell(int32 spell_id)
{
return IsFastHealSpell(spell_id);
}
bool Perl__IsVeryFastHealSpell(uint16 spell_id)
bool Perl__IsVeryFastHealSpell(int32 spell_id)
{
return IsVeryFastHealSpell(spell_id);
}
bool Perl__IsRegularSingleTargetHealSpell(uint16 spell_id)
bool Perl__IsRegularSingleTargetHealSpell(int32 spell_id)
{
return IsRegularSingleTargetHealSpell(spell_id);
}
bool Perl__IsRegularGroupHealSpell(uint16 spell_id)
bool Perl__IsRegularGroupHealSpell(int32 spell_id)
{
return IsRegularGroupHealSpell(spell_id);
}
bool Perl__IsGroupCompleteHealSpell(uint16 spell_id)
bool Perl__IsGroupCompleteHealSpell(int32 spell_id)
{
return IsGroupCompleteHealSpell(spell_id);
}
bool Perl__IsGroupHealOverTimeSpell(uint16 spell_id)
bool Perl__IsGroupHealOverTimeSpell(int32 spell_id)
{
return IsGroupHealOverTimeSpell(spell_id);
}
bool Perl__IsDebuffSpell(uint16 spell_id)
bool Perl__IsDebuffSpell(int32 spell_id)
{
return IsDebuffSpell(spell_id);
}
bool Perl__IsResistDebuffSpell(uint16 spell_id)
bool Perl__IsResistDebuffSpell(int32 spell_id)
{
return IsResistDebuffSpell(spell_id);
}
bool Perl__IsSelfConversionSpell(uint16 spell_id)
bool Perl__IsSelfConversionSpell(int32 spell_id)
{
return IsSelfConversionSpell(spell_id);
}
bool Perl__IsBuffSpell(uint16 spell_id)
bool Perl__IsBuffSpell(int32 spell_id)
{
return IsBuffSpell(spell_id);
}
bool Perl__IsPersistDeathSpell(uint16 spell_id)
bool Perl__IsPersistDeathSpell(int32 spell_id)
{
return IsPersistDeathSpell(spell_id);
}
bool Perl__IsSuspendableSpell(uint16 spell_id)
bool Perl__IsSuspendableSpell(int32 spell_id)
{
return IsSuspendableSpell(spell_id);
}
bool Perl__IsCastOnFadeDurationSpell(uint16 spell_id)
bool Perl__IsCastOnFadeDurationSpell(int32 spell_id)
{
return IsCastOnFadeDurationSpell(spell_id);
}
bool Perl__IsDistanceModifierSpell(uint16 spell_id)
bool Perl__IsDistanceModifierSpell(int32 spell_id)
{
return IsDistanceModifierSpell(spell_id);
}
bool Perl__IsRestAllowedSpell(uint16 spell_id)
bool Perl__IsRestAllowedSpell(int32 spell_id)
{
return IsRestAllowedSpell(spell_id);
}
bool Perl__IsNoDetrimentalSpellAggroSpell(uint16 spell_id)
bool Perl__IsNoDetrimentalSpellAggroSpell(int32 spell_id)
{
return IsNoDetrimentalSpellAggroSpell(spell_id);
}
bool Perl__IsStackableDOT(uint16 spell_id)
bool Perl__IsStackableDOT(int32 spell_id)
{
return IsStackableDOT(spell_id);
}
bool Perl__IsShortDurationBuff(uint16 spell_id)
bool Perl__IsShortDurationBuff(int32 spell_id)
{
return IsShortDurationBuff(spell_id);
}
bool Perl__IsTargetRequiredForSpell(uint16 spell_id)
bool Perl__IsTargetRequiredForSpell(int32 spell_id)
{
return IsTargetRequiredForSpell(spell_id);
}
bool Perl__IsVirusSpell(uint16 spell_id)
bool Perl__IsVirusSpell(int32 spell_id)
{
return IsVirusSpell(spell_id);
}
bool Perl__IsValidSpell(uint16 spell_id)
bool Perl__IsValidSpell(int32 spell_id)
{
return IsValidSpell(spell_id);
}
@ -2186,147 +2186,147 @@ bool Perl__IsBardOnlyStackEffect(int effect_id)
return IsBardOnlyStackEffect(effect_id);
}
bool Perl__IsCastWhileInvisibleSpell(uint16 spell_id)
bool Perl__IsCastWhileInvisibleSpell(int32 spell_id)
{
return IsCastWhileInvisibleSpell(spell_id);
}
bool Perl__IsCastRestrictedSpell(uint16 spell_id)
bool Perl__IsCastRestrictedSpell(int32 spell_id)
{
return IsCastRestrictedSpell(spell_id);
}
bool Perl__IsCastNotStandingSpell(uint16 spell_id)
bool Perl__IsCastNotStandingSpell(int32 spell_id)
{
return IsCastNotStandingSpell(spell_id);
}
bool Perl__IsInstrumentModifierAppliedToSpellEffect(uint16 spell_id, int effect_id)
bool Perl__IsInstrumentModifierAppliedToSpellEffect(int32 spell_id, int effect_id)
{
return IsInstrumentModifierAppliedToSpellEffect(spell_id, effect_id);
}
bool Perl__IsBlankSpellEffect(uint16 spell_id, int effect_index)
bool Perl__IsBlankSpellEffect(int32 spell_id, int effect_index)
{
return IsBlankSpellEffect(spell_id, effect_index);
}
uint16 Perl__GetSpellTriggerSpellID(uint16 spell_id, int effect_id)
int32 Perl__GetSpellTriggerSpellID(int32 spell_id, int effect_id)
{
return GetSpellTriggerSpellID(spell_id, effect_id);
}
uint8 Perl__GetSpellMinimumLevel(uint16 spell_id)
uint8 Perl__GetSpellMinimumLevel(int32 spell_id)
{
return GetSpellMinimumLevel(spell_id);
}
int Perl__GetSpellResistType(uint16 spell_id)
int Perl__GetSpellResistType(int32 spell_id)
{
return GetSpellResistType(spell_id);
}
int Perl__GetSpellTargetType(uint16 spell_id)
int Perl__GetSpellTargetType(int32 spell_id)
{
return GetSpellTargetType(spell_id);
}
int Perl__GetSpellPartialMeleeRuneReduction(uint16 spell_id)
int Perl__GetSpellPartialMeleeRuneReduction(int32 spell_id)
{
return GetSpellPartialMeleeRuneReduction(spell_id);
}
int Perl__GetSpellPartialMagicRuneReduction(uint16 spell_id)
int Perl__GetSpellPartialMagicRuneReduction(int32 spell_id)
{
return GetSpellPartialMagicRuneReduction(spell_id);
}
int Perl__GetSpellPartialMeleeRuneAmount(uint16 spell_id)
int Perl__GetSpellPartialMeleeRuneAmount(int32 spell_id)
{
return GetSpellPartialMeleeRuneAmount(spell_id);
}
int Perl__GetSpellPartialMagicRuneAmount(uint16 spell_id)
int Perl__GetSpellPartialMagicRuneAmount(int32 spell_id)
{
return GetSpellPartialMagicRuneAmount(spell_id);
}
int Perl__GetSpellViralMinimumSpreadTime(uint16 spell_id)
int Perl__GetSpellViralMinimumSpreadTime(int32 spell_id)
{
return GetSpellViralMinimumSpreadTime(spell_id);
}
int Perl__GetSpellViralMaximumSpreadTime(uint16 spell_id)
int Perl__GetSpellViralMaximumSpreadTime(int32 spell_id)
{
return GetSpellViralMaximumSpreadTime(spell_id);
}
int Perl__GetSpellViralSpreadRange(uint16 spell_id)
int Perl__GetSpellViralSpreadRange(int32 spell_id)
{
return GetSpellViralSpreadRange(spell_id);
}
int Perl__GetSpellProcLimitTimer(uint16 spell_id, int proc_type)
int Perl__GetSpellProcLimitTimer(int32 spell_id, int proc_type)
{
return GetSpellProcLimitTimer(spell_id, proc_type);
}
int Perl__GetSpellEffectDescriptionNumber(uint16 spell_id)
int Perl__GetSpellEffectDescriptionNumber(int32 spell_id)
{
return GetSpellEffectDescriptionNumber(spell_id);
}
int Perl__GetSpellFuriousBash(uint16 spell_id)
int Perl__GetSpellFuriousBash(int32 spell_id)
{
return GetSpellFuriousBash(spell_id);
}
bool Perl__IsSpellUsableInThisZoneType(uint16 spell_id)
bool Perl__IsSpellUsableInThisZoneType(int32 spell_id)
{
return IsSpellUsableInThisZoneType(spell_id, zone->GetZoneType());
}
bool Perl__IsSpellUsableInThisZoneType(uint16 spell_id, uint8 zone_type)
bool Perl__IsSpellUsableInThisZoneType(int32 spell_id, uint8 zone_type)
{
return IsSpellUsableInThisZoneType(spell_id, zone_type);
}
int Perl__GetSpellEffectIndex(uint16 spell_id, int effect_id)
int Perl__GetSpellEffectIndex(int32 spell_id, int effect_id)
{
return GetSpellEffectIndex(spell_id, effect_id);
}
int Perl__CalculatePoisonCounters(uint16 spell_id)
int Perl__CalculatePoisonCounters(int32 spell_id)
{
return CalculatePoisonCounters(spell_id);
}
int Perl__CalculateDiseaseCounters(uint16 spell_id)
int Perl__CalculateDiseaseCounters(int32 spell_id)
{
return CalculateDiseaseCounters(spell_id);
}
int Perl__CalculateCurseCounters(uint16 spell_id)
int Perl__CalculateCurseCounters(int32 spell_id)
{
return CalculateCurseCounters(spell_id);
}
int Perl__CalculateCorruptionCounters(uint16 spell_id)
int Perl__CalculateCorruptionCounters(int32 spell_id)
{
return CalculateCorruptionCounters(spell_id);
}
int Perl__CalculateCounters(uint16 spell_id)
int Perl__CalculateCounters(int32 spell_id)
{
return CalculateCounters(spell_id);
}
int8 Perl__GetSpellResurrectionSicknessCheck(uint16 spell_id_one, uint16 spell_id_two)
int8 Perl__GetSpellResurrectionSicknessCheck(int32 spell_id_one, int32 spell_id_two)
{
return GetSpellResurrectionSicknessCheck(spell_id_one, spell_id_two);
}
int Perl__GetSpellNimbusEffect(uint16 spell_id)
int Perl__GetSpellNimbusEffect(int32 spell_id)
{
return GetSpellNimbusEffect(spell_id);
}
@ -3049,12 +3049,12 @@ const int Perl__getitemstat(uint32 item_id, std::string identifier)
return quest_manager.getitemstat(item_id, identifier);
}
int Perl__getspellstat(uint32 spell_id, std::string stat_identifier)
int Perl__getspellstat(int32 spell_id, std::string stat_identifier)
{
return quest_manager.getspellstat(spell_id, stat_identifier);
}
int Perl__getspellstat(uint32 spell_id, std::string stat_identifier, uint8 slot)
int Perl__getspellstat(int32 spell_id, std::string stat_identifier, uint8 slot)
{
return quest_manager.getspellstat(spell_id, stat_identifier, slot);
}
@ -3246,32 +3246,32 @@ void Perl__crosszoneassigntaskbyclientname(const char* client_name, uint32 task_
quest_manager.CrossZoneTaskUpdate(CZUpdateType_ClientName, CZTaskUpdateSubtype_AssignTask, update_identifier, task_id, task_subidentifier, update_count, enforce_level_requirement, client_name);
}
void Perl__crosszonecastspellbycharid(int character_id, uint32 spell_id)
void Perl__crosszonecastspellbycharid(int character_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Character, CZSpellUpdateSubtype_Cast, character_id, spell_id);
}
void Perl__crosszonecastspellbygroupid(int group_id, uint32 spell_id)
void Perl__crosszonecastspellbygroupid(int group_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Group, CZSpellUpdateSubtype_Cast, group_id, spell_id);
}
void Perl__crosszonecastspellbyraidid(int raid_id, uint32 spell_id)
void Perl__crosszonecastspellbyraidid(int raid_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Raid, CZSpellUpdateSubtype_Cast, raid_id, spell_id);
}
void Perl__crosszonecastspellbyguildid(int guild_id, uint32 spell_id)
void Perl__crosszonecastspellbyguildid(int guild_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Guild, CZSpellUpdateSubtype_Cast, guild_id, spell_id);
}
void Perl__crosszonecastspellbyexpeditionid(uint32 expedition_id, uint32 spell_id)
void Perl__crosszonecastspellbyexpeditionid(uint32 expedition_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Expedition, CZSpellUpdateSubtype_Cast, expedition_id, spell_id);
}
void Perl__crosszonecastspellbyclientname(const char* client_name, uint32 spell_id)
void Perl__crosszonecastspellbyclientname(const char* client_name, int32 spell_id)
{
int update_identifier = 0;
quest_manager.CrossZoneSpell(CZUpdateType_ClientName, CZSpellUpdateSubtype_Cast, update_identifier, spell_id, client_name);
@ -4037,32 +4037,32 @@ void Perl__crosszoneremoveldonwinbyclientname(const char* client_name, uint32 th
quest_manager.CrossZoneLDoNUpdate(CZUpdateType_ClientName, CZLDoNUpdateSubtype_RemoveWin, update_identifier, theme_id, points, client_name);
}
void Perl__crosszoneremovespellbycharid(int character_id, uint32 spell_id)
void Perl__crosszoneremovespellbycharid(int character_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Character, CZSpellUpdateSubtype_Remove, character_id, spell_id);
}
void Perl__crosszoneremovespellbygroupid(int group_id, uint32 spell_id)
void Perl__crosszoneremovespellbygroupid(int group_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Group, CZSpellUpdateSubtype_Remove, group_id, spell_id);
}
void Perl__crosszoneremovespellbyraidid(int raid_id, uint32 spell_id)
void Perl__crosszoneremovespellbyraidid(int raid_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Raid, CZSpellUpdateSubtype_Remove, raid_id, spell_id);
}
void Perl__crosszoneremovespellbyguildid(int guild_id, uint32 spell_id)
void Perl__crosszoneremovespellbyguildid(int guild_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Guild, CZSpellUpdateSubtype_Remove, guild_id, spell_id);
}
void Perl__crosszoneremovespellbyexpeditionid(uint32 expedition_id, uint32 spell_id)
void Perl__crosszoneremovespellbyexpeditionid(uint32 expedition_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Expedition, CZSpellUpdateSubtype_Remove, expedition_id, spell_id);
}
void Perl__crosszoneremovespellbyclientname(const char* client_name, uint32 spell_id)
void Perl__crosszoneremovespellbyclientname(const char* client_name, int32 spell_id)
{
int update_identifier = 0;
quest_manager.CrossZoneSpell(CZUpdateType_ClientName, CZSpellUpdateSubtype_Remove, update_identifier, spell_id, client_name);
@ -4394,17 +4394,17 @@ void Perl__worldwideassigntask(uint32 task_id, bool enforce_level_requirement, u
quest_manager.WorldWideTaskUpdate(WWTaskUpdateType_AssignTask, task_id, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
void Perl__worldwidecastspell(uint32 spell_id)
void Perl__worldwidecastspell(int32 spell_id)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Cast, spell_id);
}
void Perl__worldwidecastspell(uint32 spell_id, uint8 min_status)
void Perl__worldwidecastspell(int32 spell_id, uint8 min_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Cast, spell_id, min_status);
}
void Perl__worldwidecastspell(uint32 spell_id, uint8 min_status, uint8 max_status)
void Perl__worldwidecastspell(int32 spell_id, uint8 min_status, uint8 max_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Cast, spell_id, min_status, max_status);
}
@ -4586,17 +4586,17 @@ void Perl__worldwideremoveldonwin(uint32 theme_id, uint8 min_status, uint8 max_s
quest_manager.WorldWideLDoNUpdate(CZLDoNUpdateSubtype_RemoveWin, theme_id, points, min_status, max_status);
}
void Perl__worldwideremovespell(uint32 spell_id)
void Perl__worldwideremovespell(int32 spell_id)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Remove, spell_id);
}
void Perl__worldwideremovespell(uint32 spell_id, uint8 min_status)
void Perl__worldwideremovespell(int32 spell_id, uint8 min_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Remove, spell_id, min_status);
}
void Perl__worldwideremovespell(uint32 spell_id, uint8 min_status, uint8 max_status)
void Perl__worldwideremovespell(int32 spell_id, uint8 min_status, uint8 max_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Remove, spell_id, min_status, max_status);
}
@ -4723,7 +4723,7 @@ uint32_t Perl__countspawnednpcs(perl::array npc_id_array)
return entity_list.CountSpawnedNPCs(npc_ids);
}
SPDat_Spell_Struct* Perl__getspell(uint32 spell_id)
SPDat_Spell_Struct* Perl__getspell(int32 spell_id)
{
// should be safe, it's read only in perl (could also use proxy lika lua)
return const_cast<SPDat_Spell_Struct*>(quest_manager.getspell(spell_id));
@ -6320,8 +6320,8 @@ void perl_register_quest()
package.add("IsShadowStepSpell", &Perl__IsShadowStepSpell);
package.add("IsShortDurationBuff", &Perl__IsShortDurationBuff);
package.add("IsSnowing", &Perl__IsSnowing);
package.add("IsSpellUsableInThisZoneType", (bool(*)(uint16))&Perl__IsSpellUsableInThisZoneType);
package.add("IsSpellUsableInThisZoneType", (bool(*)(uint16, uint8))&Perl__IsSpellUsableInThisZoneType);
package.add("IsSpellUsableInThisZoneType", (bool(*)(int32))&Perl__IsSpellUsableInThisZoneType);
package.add("IsSpellUsableInThisZoneType", (bool(*)(int32, uint8))&Perl__IsSpellUsableInThisZoneType);
package.add("IsStackableDOT", &Perl__IsStackableDOT);
package.add("IsStunSpell", &Perl__IsStunSpell);
package.add("IsSuccorSpell", &Perl__IsSuccorSpell);
@ -6585,9 +6585,9 @@ void perl_register_quest()
package.add("worldwideassigntask", (void(*)(uint32, bool))&Perl__worldwideassigntask);
package.add("worldwideassigntask", (void(*)(uint32, bool, uint8))&Perl__worldwideassigntask);
package.add("worldwideassigntask", (void(*)(uint32, bool, uint8, uint8))&Perl__worldwideassigntask);
package.add("worldwidecastspell", (void(*)(uint32))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(uint32, uint8))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(uint32, uint8, uint8 max_status))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(int32))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(int32, uint8))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(int32, uint8, uint8 max_status))&Perl__worldwidecastspell);
package.add("worldwidedialoguewindow", (void(*)(const char*))&Perl__worldwidedialoguewindow);
package.add("worldwidedialoguewindow", (void(*)(const char*, uint8))&Perl__worldwidedialoguewindow);
package.add("worldwidedialoguewindow", (void(*)(const char*, uint8, uint8))&Perl__worldwidedialoguewindow);
@ -6618,9 +6618,9 @@ void perl_register_quest()
package.add("worldwideremoveldonwin", (void(*)(uint32))&Perl__worldwideremoveldonwin);
package.add("worldwideremoveldonwin", (void(*)(uint32, uint8))&Perl__worldwideremoveldonwin);
package.add("worldwideremoveldonwin", (void(*)(uint32, uint8, uint8))&Perl__worldwideremoveldonwin);
package.add("worldwideremovespell", (void(*)(uint32))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(uint32, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(uint32, uint8, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(int32))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(int32, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(int32, uint8, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovetask", (void(*)(uint32))&Perl__worldwideremovetask);
package.add("worldwideremovetask", (void(*)(uint32, uint8))&Perl__worldwideremovetask);
package.add("worldwideremovetask", (void(*)(uint32, uint8, uint8))&Perl__worldwideremovetask);
@ -6753,8 +6753,8 @@ void perl_register_quest()
package.add("getspell", &Perl__getspell);
package.add("getspellname", &Perl__getspellname);
package.add("get_spell_level", &Perl__get_spell_level);
package.add("getspellstat", (int(*)(uint32, std::string))&Perl__getspellstat);
package.add("getspellstat", (int(*)(uint32, std::string, uint8))&Perl__getspellstat);
package.add("getspellstat", (int(*)(int32, std::string))&Perl__getspellstat);
package.add("getspellstat", (int(*)(int32, std::string, uint8))&Perl__getspellstat);
package.add("getskillname", &Perl__getskillname);
package.add("get_timers", &Perl__get_timers);
package.add("getlevel", &Perl__getlevel);

4
zone/encounter.h
View File

@ -32,8 +32,8 @@ public:
~Encounter();
//abstract virtual function implementations required by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) override {
return false;

4
zone/entity.h
View File

@ -445,13 +445,13 @@ public:
void AESpell(
Mob* caster,
Mob* center,
uint16 spell_id,
int32 spell_id,
bool affect_caster = true,
int16 resist_adjust = 0,
int* max_targets = nullptr,
bool is_scripted = false
);
void MassGroupBuff(Mob* caster, Mob* center, uint16 spell_id, bool affect_caster = true);
void MassGroupBuff(Mob* caster, Mob* center, int32 spell_id, bool affect_caster = true);
//trap stuff
Mob* GetTrapTrigger(Trap* trap);

2
zone/gm_commands/castspell.cpp
View File

@ -38,7 +38,7 @@ void command_castspell(Client *c, const Seperator *sep)
t = c->GetTarget();
}
const uint16 spell_id = Strings::ToUnsignedInt(sep->arg[1]);
const int32 spell_id = Strings::ToInt(sep->arg[1]);
if (spell_id >= SPDAT_RECORDS) {
c->Message(Chat::White, "Invalid Spell ID.");

8
zone/gm_commands/npccast.cpp
View File

@ -27,7 +27,7 @@ void command_npccast(Client *c, const Seperator *sep)
auto target = c->GetTarget()->CastToNPC();
if (!sep->IsNumber(1) && sep->arg[1] && sep->IsNumber(2)) {
std::string entity_name = sep->arg[1] ? sep->arg[1] : 0;
auto spell_id = sep->arg[2] ? Strings::ToUnsignedInt(sep->arg[2]) : 0;
int32 spell_id = sep->arg[2] ? Strings::ToInt(sep->arg[2]) : 0;
auto spell_target = entity_list.GetMob(entity_name.c_str());
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
@ -35,7 +35,7 @@ void command_npccast(Client *c, const Seperator *sep)
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
@ -63,7 +63,7 @@ void command_npccast(Client *c, const Seperator *sep)
}
} else if (sep->IsNumber(1) && sep->IsNumber(2)) {
uint16 entity_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[1]));
auto spell_id = Strings::ToUnsignedInt(sep->arg[2]);
int32 spell_id = Strings::ToInt(sep->arg[2]);
auto spell_target = entity_list.GetMob(entity_id);
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
@ -71,7 +71,7 @@ void command_npccast(Client *c, const Seperator *sep)
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()

2
zone/gm_commands/unscribespell.cpp
View File

@ -31,7 +31,7 @@ void command_unscribespell(Client *c, const Seperator *sep)
t = c->GetTarget()->CastToClient();
}
const uint16 spell_id = EQ::Clamp(Strings::ToInt(sep->arg[1]), 0, 65535);
const int32 spell_id = Strings::ToInt(sep->arg[1]);
if (!IsValidSpell(spell_id)) {
c->Message(

2
zone/gm_commands/untraindisc.cpp
View File

@ -31,7 +31,7 @@ void command_untraindisc(Client *c, const Seperator *sep)
target = c->GetTarget()->CastToClient();
}
uint16 spell_id = EQ::Clamp(Strings::ToInt(sep->arg[1]), 0, 65535);
int32 spell_id = Strings::ToInt(sep->arg[1]);
if (!IsValidSpell(spell_id)) {
c->Message(

2
zone/groups.cpp
View File

@ -810,7 +810,7 @@ bool Group::DelMember(Mob* oldmember, bool ignoresender)
return true;
}
void Group::CastGroupSpell(Mob* caster, uint16 spell_id) {
void Group::CastGroupSpell(Mob* caster, int32 spell_id) {
uint32 z;
float range, distance;

2
zone/groups.h
View File

@ -77,7 +77,7 @@ public:
bool IsGroupMember(const char* name);
bool Process();
void SendGroupJoinOOZ(Mob* NewMember);
void CastGroupSpell(Mob* caster,uint16 spellid);
void CastGroupSpell(Mob* caster,int32 spellid);
void SplitExp(ExpSource exp_source, const uint64 exp, Mob* other);
void GroupMessage(Mob* sender,uint8 language,uint8 lang_skill,const char* message);
void GroupMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);

2
zone/hate_list.cpp
View File

@ -800,7 +800,7 @@ int HateList::AreaRampage(Mob *caster, Mob *target, int count, ExtraAttackOption
return hit_count;
}
void HateList::SpellCast(Mob *caster, uint32 spell_id, float range, Mob* ae_center)
void HateList::SpellCast(Mob *caster, int32 spell_id, float range, Mob* ae_center)
{
if (!caster)
return;

2
zone/hate_list.h
View File

@ -92,7 +92,7 @@ public:
void PrintHateListToClient(Client *c);
void SetHateAmountOnEnt(Mob *other, int64 in_hate, uint64 in_damage);
void SetHateOwner(Mob *new_hate_owner) { hate_owner = new_hate_owner; }
void SpellCast(Mob *caster, uint32 spell_id, float range, Mob *ae_center = nullptr);
void SpellCast(Mob *caster, int32 spell_id, float range, Mob *ae_center = nullptr);
void WipeHateList(bool npc_only = false);
void RemoveStaleEntries(int time_ms, float dist);

10
zone/horse.cpp
View File

@ -30,7 +30,7 @@ std::map<uint16, const NPCType *> Horse::horse_types;
Horse::Horse(
Client *c,
uint16 spell_id,
int32 spell_id,
const glm::vec4& position
) : NPC(
GetHorseType(spell_id),
@ -52,12 +52,12 @@ void Horse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* m) {
ns->spawn.runspeed = NPCTypedata->runspeed;
}
bool Horse::IsHorseSpell(uint16 spell_id)
bool Horse::IsHorseSpell(int32 spell_id)
{
return GetHorseType(spell_id);
}
const NPCType *Horse::GetHorseType(uint16 spell_id)
const NPCType *Horse::GetHorseType(int32 spell_id)
{
if (horse_types.count(spell_id)) {
return horse_types[spell_id];
@ -70,7 +70,7 @@ const NPCType *Horse::GetHorseType(uint16 spell_id)
return n;
}
const NPCType *Horse::BuildHorseType(uint16 spell_id)
const NPCType *Horse::BuildHorseType(int32 spell_id)
{
const auto& l = HorsesRepository::GetWhere(
content_db,
@ -119,7 +119,7 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id)
return n;
}
void Client::SummonHorse(uint16 spell_id)
void Client::SummonHorse(int32 spell_id)
{
if (GetHorseId()) {
MessageString(Chat::Red, ALREADY_ON_A_MOUNT);

8
zone/horse.h
View File

@ -29,15 +29,15 @@ struct NewSpawn_Struct;
class Horse : public NPC {
public:
Horse(Client* c, uint16 spell_id, const glm::vec4& position);
Horse(Client* c, int32 spell_id, const glm::vec4& position);
virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* m);
static bool IsHorseSpell(uint16 spell_id);
static bool IsHorseSpell(int32 spell_id);
protected:
Client* owner;
static std::map<uint16, const NPCType*> horse_types;
static const NPCType* GetHorseType(uint16 spell_id);
static const NPCType* BuildHorseType(uint16 spell_id);
static const NPCType* GetHorseType(int32 spell_id);
static const NPCType* BuildHorseType(int32 spell_id);
};

36
zone/lua_bot.cpp
View File

@ -143,7 +143,7 @@ void Lua_Bot::ReloadBotSpellSettings() {
self->LoadBotSpellSettings();
}
bool Lua_Bot::HasBotSpellEntry(uint16 spellid) {
bool Lua_Bot::HasBotSpellEntry(int32 spellid) {
Lua_Safe_Call_Bool();
return self->HasBotSpellEntry(spellid);
}
@ -407,7 +407,7 @@ void Lua_Bot::ClearDisciplineReuseTimer() {
return self->ClearDisciplineReuseTimer();
}
void Lua_Bot::ClearDisciplineReuseTimer(uint16 spell_id) {
void Lua_Bot::ClearDisciplineReuseTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->ClearDisciplineReuseTimer(spell_id);
}
@ -427,7 +427,7 @@ void Lua_Bot::ClearSpellRecastTimer() {
return self->ClearSpellRecastTimer();
}
void Lua_Bot::ClearSpellRecastTimer(uint16 spell_id) {
void Lua_Bot::ClearSpellRecastTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->ClearSpellRecastTimer(spell_id);
}
@ -437,7 +437,7 @@ uint32 Lua_Bot::GetDisciplineReuseTimer() {
return self->GetDisciplineReuseRemainingTime();
}
uint32 Lua_Bot::GetDisciplineReuseTimer(uint16 spell_id) {
uint32 Lua_Bot::GetDisciplineReuseTimer(int32 spell_id) {
Lua_Safe_Call_Int();
return self->GetDisciplineReuseRemainingTime(spell_id);
}
@ -457,17 +457,17 @@ uint32 Lua_Bot::GetSpellRecastTimer() {
return self->GetSpellRecastRemainingTime();
}
uint32 Lua_Bot::GetSpellRecastTimer(uint16 spell_id) {
uint32 Lua_Bot::GetSpellRecastTimer(int32 spell_id) {
Lua_Safe_Call_Int();
return self->GetSpellRecastRemainingTime(spell_id);
}
void Lua_Bot::SetDisciplineReuseTimer(uint16 spell_id) {
void Lua_Bot::SetDisciplineReuseTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->SetDisciplineReuseTimer(spell_id);
}
void Lua_Bot::SetDisciplineReuseTimer(uint16 spell_id, uint32 reuse_timer) {
void Lua_Bot::SetDisciplineReuseTimer(int32 spell_id, uint32 reuse_timer) {
Lua_Safe_Call_Void();
return self->SetDisciplineReuseTimer(spell_id, reuse_timer);
}
@ -482,12 +482,12 @@ void Lua_Bot::SetItemReuseTimer(uint32 item_id, uint32 reuse_timer) {
return self->SetItemReuseTimer(item_id, reuse_timer);
}
void Lua_Bot::SetSpellRecastTimer(uint16 spell_id) {
void Lua_Bot::SetSpellRecastTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->SetSpellRecastTimer(spell_id);
}
void Lua_Bot::SetSpellRecastTimer(uint16 spell_id, uint32 recast_delay) {
void Lua_Bot::SetSpellRecastTimer(int32 spell_id, uint32 recast_delay) {
Lua_Safe_Call_Void();
return self->SetSpellRecastTimer(spell_id, recast_delay);
}
@ -560,7 +560,7 @@ Lua_ItemInst Lua_Bot::GetItemAt(int16 slot_id) // @categories Inventory and Item
return Lua_ItemInst(self->GetInv().GetItem(slot_id));
}
void Lua_Bot::SendSpellAnim(uint16 target_id, uint16 spell_id)
void Lua_Bot::SendSpellAnim(uint16 target_id, int32 spell_id)
{
Lua_Safe_Call_Void();
self->SendSpellAnim(target_id, spell_id);
@ -715,11 +715,11 @@ luabind::scope lua_register_bot() {
.def("Camp", (void(Lua_Bot::*)(void))&Lua_Bot::Camp)
.def("Camp", (void(Lua_Bot::*)(bool))&Lua_Bot::Camp)
.def("ClearDisciplineReuseTimer", (void(Lua_Bot::*)())&Lua_Bot::ClearDisciplineReuseTimer)
.def("ClearDisciplineReuseTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::ClearDisciplineReuseTimer)
.def("ClearDisciplineReuseTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::ClearDisciplineReuseTimer)
.def("ClearItemReuseTimer", (void(Lua_Bot::*)())&Lua_Bot::ClearItemReuseTimer)
.def("ClearItemReuseTimer", (void(Lua_Bot::*)(uint32))&Lua_Bot::ClearItemReuseTimer)
.def("ClearSpellRecastTimer", (void(Lua_Bot::*)())&Lua_Bot::ClearSpellRecastTimer)
.def("ClearSpellRecastTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::ClearSpellRecastTimer)
.def("ClearSpellRecastTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::ClearSpellRecastTimer)
.def("CountAugmentEquippedByID", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountAugmentEquippedByID)
.def("CountBotItem", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountBotItem)
.def("CountItemEquippedByID", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountItemEquippedByID)
@ -746,7 +746,7 @@ luabind::scope lua_register_bot() {
.def("GetBotItem", (Lua_ItemInst(Lua_Bot::*)(uint16))&Lua_Bot::GetBotItem)
.def("GetBotItemIDBySlot", (uint32(Lua_Bot::*)(uint16))&Lua_Bot::GetBotItemIDBySlot)
.def("GetDisciplineReuseTimer", (uint32(Lua_Bot::*)())&Lua_Bot::GetDisciplineReuseTimer)
.def("GetDisciplineReuseTimer", (uint32(Lua_Bot::*)(uint16))&Lua_Bot::GetDisciplineReuseTimer)
.def("GetDisciplineReuseTimer", (uint32(Lua_Bot::*)(int32))&Lua_Bot::GetDisciplineReuseTimer)
.def("GetBucket", (std::string(Lua_Bot::*)(std::string))&Lua_Bot::GetBucket)
.def("GetBucketExpires", (std::string(Lua_Bot::*)(std::string))&Lua_Bot::GetBucketExpires)
.def("GetBucketRemaining", (std::string(Lua_Bot::*)(std::string))&Lua_Bot::GetBucketRemaining)
@ -764,7 +764,7 @@ luabind::scope lua_register_bot() {
.def("GetRawItemAC", (int(Lua_Bot::*)(void))&Lua_Bot::GetRawItemAC)
.def("GetSpellDamage", (int(Lua_Bot::*)(void))&Lua_Bot::GetSpellDamage)
.def("GetSpellRecastTimer", (uint32(Lua_Bot::*)())&Lua_Bot::GetSpellRecastTimer)
.def("GetSpellRecastTimer", (uint32(Lua_Bot::*)(uint16))&Lua_Bot::GetSpellRecastTimer)
.def("GetSpellRecastTimer", (uint32(Lua_Bot::*)(int32))&Lua_Bot::GetSpellRecastTimer)
.def("HasAugmentEquippedByID", (bool(Lua_Bot::*)(uint32))&Lua_Bot::HasAugmentEquippedByID)
.def("HasBotItem", (int16(Lua_Bot::*)(uint32))&Lua_Bot::HasBotItem)
.def("HasBotSpellEntry", (bool(Lua_Bot::*)(uint16))&Lua_Bot::HasBotSpellEntry)
@ -782,8 +782,8 @@ luabind::scope lua_register_bot() {
.def("SetBucket", (void(Lua_Bot::*)(std::string,std::string))&Lua_Bot::SetBucket)
.def("SetBucket", (void(Lua_Bot::*)(std::string,std::string,std::string))&Lua_Bot::SetBucket)
.def("SetExpansionBitmask", (void(Lua_Bot::*)(int))&Lua_Bot::SetExpansionBitmask)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(uint16, uint32))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(int32, uint32))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetItemReuseTimer", (void(Lua_Bot::*)(uint32))&Lua_Bot::SetItemReuseTimer)
.def("SetItemReuseTimer", (void(Lua_Bot::*)(uint32, uint32))&Lua_Bot::SetItemReuseTimer)
.def("SetSpellDuration", (void(Lua_Bot::*)(int))&Lua_Bot::SetSpellDuration)
@ -799,8 +799,8 @@ luabind::scope lua_register_bot() {
.def("SetSpellDurationRaid", (void(Lua_Bot::*)(int,int,int))&Lua_Bot::SetSpellDurationRaid)
.def("SetSpellDurationRaid", (void(Lua_Bot::*)(int,int,int,bool))&Lua_Bot::SetSpellDurationRaid)
.def("SetSpellDurationRaid", (void(Lua_Bot::*)(int,int,int,bool,bool))&Lua_Bot::SetSpellDurationRaid)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::SetSpellRecastTimer)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(uint16, uint32))&Lua_Bot::SetSpellRecastTimer)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::SetSpellRecastTimer)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(int32, uint32))&Lua_Bot::SetSpellRecastTimer)
.def("SendPayload", (void(Lua_Bot::*)(int))&Lua_Bot::SendPayload)
.def("SendPayload", (void(Lua_Bot::*)(int,std::string))&Lua_Bot::SendPayload)
.def("Signal", (void(Lua_Bot::*)(int))&Lua_Bot::Signal)

20
zone/lua_bot.h
View File

@ -70,7 +70,7 @@ public:
void RemoveBotItem(uint32 item_id);
void SetExpansionBitmask(int expansion_bitmask);
void Signal(int signal_id);
bool HasBotSpellEntry(uint16 spellid);
bool HasBotSpellEntry(int32 spellid);
void SendPayload(int payload_id);
void SendPayload(int payload_id, std::string payload_value);
uint32 GetBotID();
@ -82,7 +82,7 @@ public:
luabind::object GetAugmentIDsBySlotID(lua_State* L, int16 slot_id) const;
Lua_ItemInst GetItemAt(int16 slot_id);
int GetItemIDAt(int16 slot_id);
void SendSpellAnim(uint16 target_id, uint16 spell_id);
void SendSpellAnim(uint16 target_id, int32 spell_id);
std::string GetClassAbbreviation();
std::string GetRaceAbbreviation();
void DeleteBucket(std::string bucket_name);
@ -125,23 +125,23 @@ public:
void SetSpellDurationRaid(int spell_id, int duration, int level, bool allow_pets, bool is_raid_group_only);
void ClearDisciplineReuseTimer();
void ClearDisciplineReuseTimer(uint16 spell_id);
void ClearDisciplineReuseTimer(int32 spell_id);
void ClearItemReuseTimer();
void ClearItemReuseTimer(uint32 item_id);
void ClearSpellRecastTimer();
void ClearSpellRecastTimer(uint16 spell_id);
void ClearSpellRecastTimer(int32 spell_id);
uint32 GetDisciplineReuseTimer();
uint32 GetDisciplineReuseTimer(uint16 spell_id);
uint32 GetDisciplineReuseTimer(int32 spell_id);
uint32 GetItemReuseTimer();
uint32 GetItemReuseTimer(uint32 item_id);
uint32 GetSpellRecastTimer();
uint32 GetSpellRecastTimer(uint16 spell_id);
void SetDisciplineReuseTimer(uint16 spell_id);
void SetDisciplineReuseTimer(uint16 spell_id, uint32 reuse_timer);
uint32 GetSpellRecastTimer(int32 spell_id);
void SetDisciplineReuseTimer(int32 spell_id);
void SetDisciplineReuseTimer(int32 spell_id, uint32 reuse_timer);
void SetItemReuseTimer(uint32 item_id);
void SetItemReuseTimer(uint32 item_id, uint32 reuse_timer);
void SetSpellRecastTimer(uint16 spell_id);
void SetSpellRecastTimer(uint16 spell_id, uint32 reuse_timer);
void SetSpellRecastTimer(int32 spell_id);
void SetSpellRecastTimer(int32 spell_id, uint32 reuse_timer);
uint32 CountAugmentEquippedByID(uint32 item_id);
uint32 CountItemEquippedByID(uint32 item_id);

2
zone/lua_buff.cpp
View File

@ -107,7 +107,7 @@ int16 Lua_Buff::GetRootBreakChance()
return self->RootBreakChance;
}
uint16 Lua_Buff::GetSpellID()
int32 Lua_Buff::GetSpellID()
{
Lua_Safe_Call_Int();
return self->spellid;

2
zone/lua_buff.h
View File

@ -56,7 +56,7 @@ public:
uint32 GetMeleeRune();
uint32 GetNumberOfHits();
int16 GetRootBreakChance();
uint16 GetSpellID();
int32 GetSpellID();
int GetTicsRemaining();
int GetVirusSpreadTime();
bool IsCasterClient();

30
zone/lua_client.cpp
View File

@ -647,7 +647,7 @@ uint16 Lua_Client::FindMemmedSpellBySlot(int slot) {
return self->FindMemmedSpellBySlot(slot);
}
int Lua_Client::FindMemmedSpellBySpellID(uint16 spell_id) {
int Lua_Client::FindMemmedSpellBySpellID(int32 spell_id) {
Lua_Safe_Call_Int();
return self->FindMemmedSpellBySpellID(spell_id);
}
@ -1083,7 +1083,7 @@ bool Lua_Client::UseDiscipline(int spell_id, int target_id) {
return self->UseDiscipline(spell_id, target_id);
}
bool Lua_Client::HasDisciplineLearned(uint16 spell_id) {
bool Lua_Client::HasDisciplineLearned(int32 spell_id) {
Lua_Safe_Call_Bool();
return self->HasDisciplineLearned(spell_id);
}
@ -1377,7 +1377,7 @@ int Lua_Client::GetNextAvailableSpellBookSlot() {
return self->GetNextAvailableSpellBookSlot();
}
uint32 Lua_Client::GetSpellIDByBookSlot(int slot_id) {
int32 Lua_Client::GetSpellIDByBookSlot(int slot_id) {
Lua_Safe_Call_Int();
return self->GetSpellIDByBookSlot(slot_id);
}
@ -2320,12 +2320,12 @@ int16 Lua_Client::GetGMStatus() {
return self->Admin();
}
void Lua_Client::UntrainDiscBySpellID(uint16 spell_id) {
void Lua_Client::UntrainDiscBySpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->UntrainDiscBySpellID(spell_id);
}
void Lua_Client::UntrainDiscBySpellID(uint16 spell_id, bool update_client) {
void Lua_Client::UntrainDiscBySpellID(int32 spell_id, bool update_client) {
Lua_Safe_Call_Void();
self->UntrainDiscBySpellID(spell_id, update_client);
}
@ -2422,17 +2422,17 @@ void Lua_Client::ResetAllCastbarCooldowns() {
self->ResetAllCastbarCooldowns();
}
void Lua_Client::ResetCastbarCooldownBySpellID(uint32 spell_id) {
void Lua_Client::ResetCastbarCooldownBySpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->ResetCastbarCooldownBySpellID(spell_id);
}
void Lua_Client::UnscribeSpellBySpellID(uint16 spell_id) {
void Lua_Client::UnscribeSpellBySpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->UnscribeSpellBySpellID(spell_id);
}
void Lua_Client::UnscribeSpellBySpellID(uint16 spell_id, bool update_client) {
void Lua_Client::UnscribeSpellBySpellID(int32 spell_id, bool update_client) {
Lua_Safe_Call_Void();
self->UnscribeSpellBySpellID(spell_id, update_client);
}
@ -3760,7 +3760,7 @@ luabind::scope lua_register_client() {
.def("FilteredMessage", &Lua_Client::FilteredMessage)
.def("FindEmptyMemSlot", (int(Lua_Client::*)(void))&Lua_Client::FindEmptyMemSlot)
.def("FindMemmedSpellBySlot", (uint16(Lua_Client::*)(int))&Lua_Client::FindMemmedSpellBySlot)
.def("FindMemmedSpellBySpellID", (int(Lua_Client::*)(uint16))&Lua_Client::FindMemmedSpellBySpellID)
.def("FindMemmedSpellBySpellID", (int(Lua_Client::*)(int32 ))&Lua_Client::FindMemmedSpellBySpellID)
.def("FindSpellBookSlotBySpellID", (int(Lua_Client::*)(int))&Lua_Client::FindSpellBookSlotBySpellID)
.def("Fling", (void(Lua_Client::*)(float,float,float))&Lua_Client::Fling)
.def("Fling", (void(Lua_Client::*)(float,float,float,bool))&Lua_Client::Fling)
@ -3914,7 +3914,7 @@ luabind::scope lua_register_client() {
.def("GetSkillPoints", (int(Lua_Client::*)(void))&Lua_Client::GetSkillPoints)
.def("GetSkillTrainLevel", (uint8(Lua_Client::*)(int))&Lua_Client::GetSkillTrainLevel)
.def("GetSpellDamage", (int(Lua_Client::*)(void))&Lua_Client::GetSpellDamage)
.def("GetSpellIDByBookSlot", (uint32(Lua_Client::*)(int))&Lua_Client::GetSpellIDByBookSlot)
.def("GetSpellIDByBookSlot", (int32 (Lua_Client::*)(int))&Lua_Client::GetSpellIDByBookSlot)
.def("GetSpentAA", (int(Lua_Client::*)(void))&Lua_Client::GetSpentAA)
.def("GetStartZone", (int(Lua_Client::*)(void))&Lua_Client::GetStartZone)
.def("GetTargetRingX", (float(Lua_Client::*)(void))&Lua_Client::GetTargetRingX)
@ -4065,7 +4065,7 @@ luabind::scope lua_register_client() {
.def("ResetAllCastbarCooldowns", (void(Lua_Client::*)(void))&Lua_Client::ResetAllCastbarCooldowns)
.def("ResetAlternateAdvancementRank", &Lua_Client::ResetAlternateAdvancementRank)
.def("ResetCastbarCooldownBySlot", (void(Lua_Client::*)(int))&Lua_Client::ResetCastbarCooldownBySlot)
.def("ResetCastbarCooldownBySpellID", (void(Lua_Client::*)(uint32))&Lua_Client::ResetCastbarCooldownBySpellID)
.def("ResetCastbarCooldownBySpellID", (void(Lua_Client::*)(int32 ))&Lua_Client::ResetCastbarCooldownBySpellID)
.def("ResetDisciplineTimer", (void(Lua_Client::*)(uint32))&Lua_Client::ResetDisciplineTimer)
.def("ResetItemCooldown", (void(Lua_Client::*)(uint32))&Lua_Client::ResetItemCooldown)
.def("ResetLeadershipAA", (void(Lua_Client::*)(void))&Lua_Client::ResetLeadershipAA)
@ -4229,14 +4229,14 @@ luabind::scope lua_register_client() {
.def("UnscribeSpell", (void(Lua_Client::*)(int,bool))&Lua_Client::UnscribeSpell)
.def("UnscribeSpellAll", (void(Lua_Client::*)(bool))&Lua_Client::UnscribeSpellAll)
.def("UnscribeSpellAll", (void(Lua_Client::*)(void))&Lua_Client::UnscribeSpellAll)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(uint16))&Lua_Client::UnscribeSpellBySpellID)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(uint16,bool))&Lua_Client::UnscribeSpellBySpellID)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(int32 ))&Lua_Client::UnscribeSpellBySpellID)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(int32 ,bool))&Lua_Client::UnscribeSpellBySpellID)
.def("UntrainDisc", (void(Lua_Client::*)(int))&Lua_Client::UntrainDisc)
.def("UntrainDisc", (void(Lua_Client::*)(int,bool))&Lua_Client::UntrainDisc)
.def("UntrainDiscAll", (void(Lua_Client::*)(bool))&Lua_Client::UntrainDiscAll)
.def("UntrainDiscAll", (void(Lua_Client::*)(void))&Lua_Client::UntrainDiscAll)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(uint16))&Lua_Client::UntrainDiscBySpellID)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(uint16,bool))&Lua_Client::UntrainDiscBySpellID)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(int32 ))&Lua_Client::UntrainDiscBySpellID)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(int32 ,bool))&Lua_Client::UntrainDiscBySpellID)
.def("UpdateAdmin", (void(Lua_Client::*)(void))&Lua_Client::UpdateAdmin)
.def("UpdateAdmin", (void(Lua_Client::*)(bool))&Lua_Client::UpdateAdmin)
.def("UpdateGroupAAs", (void(Lua_Client::*)(int,uint32))&Lua_Client::UpdateGroupAAs)

16
zone/lua_client.h
View File

@ -214,7 +214,7 @@ public:
void UnmemSpellAll(bool update_client);
int FindEmptyMemSlot();
uint16 FindMemmedSpellBySlot(int slot);
int FindMemmedSpellBySpellID(uint16 spell_id);
int FindMemmedSpellBySpellID(int32 spell_id);
int MemmedCount();
luabind::object GetLearnableDisciplines(lua_State* L);
luabind::object GetLearnableDisciplines(lua_State* L, uint8 min_level);
@ -232,16 +232,16 @@ public:
void UnscribeSpell(int slot, bool update_client);
void UnscribeSpellAll();
void UnscribeSpellAll(bool update_client);
void UnscribeSpellBySpellID(uint16 spell_id);
void UnscribeSpellBySpellID(uint16 spell_id, bool update_client);
void UnscribeSpellBySpellID(int32 spell_id);
void UnscribeSpellBySpellID(int32 spell_id, bool update_client);
void TrainDisc(int itemid);
uint16 LearnDisciplines(uint8 min_level, uint8 max_level);
void TrainDiscBySpellID(int32 spell_id);
int GetDiscSlotBySpellID(int32 spell_id);
void UntrainDisc(int slot);
void UntrainDisc(int slot, bool update_client);
void UntrainDiscBySpellID(uint16 spell_id);
void UntrainDiscBySpellID(uint16 spell_id, bool update_client);
void UntrainDiscBySpellID(int32 spell_id);
void UntrainDiscBySpellID(int32 spell_id, bool update_client);
void UntrainDiscAll();
void UntrainDiscAll(bool update_client);
bool IsStanding();
@ -294,10 +294,10 @@ public:
void ResetDisciplineTimer(uint32 timer_id);
void ResetCastbarCooldownBySlot(int slot);
void ResetAllCastbarCooldowns();
void ResetCastbarCooldownBySpellID(uint32 spell_id);
void ResetCastbarCooldownBySpellID(int32 spell_id);
void ResetAllDisciplineTimers();
bool UseDiscipline(int spell_id, int target_id);
bool HasDisciplineLearned(uint16 spell_id);
bool HasDisciplineLearned(int32 spell_id);
int GetCharacterFactionLevel(int faction_id);
void ClearZoneFlag(uint32 zone_id);
bool HasZoneFlag(uint32 zone_id);
@ -369,7 +369,7 @@ public:
int GetNextAvailableSpellBookSlot(int start);
int GetNextAvailableDisciplineSlot();
int GetNextAvailableDisciplineSlot(int starting_slot);
uint32 GetSpellIDByBookSlot(int book_slot);
int32 GetSpellIDByBookSlot(int book_slot);
int FindSpellBookSlotBySpellID(int spell_id);
void UpdateTaskActivity(int task, int activity, int count);
void AssignTask(int task_id);

24
zone/lua_entity_list.cpp
View File

@ -729,25 +729,25 @@ void Lua_EntityList::AreaAttack(Lua_Mob attacker, float distance, int16 slot_id,
self->AEAttack(attacker, distance, slot_id, count, is_from_spell, attack_rounds);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id, affect_caster);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id, affect_caster, resist_adjust);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id, affect_caster, resist_adjust, &max_targets);
@ -771,13 +771,13 @@ void Lua_EntityList::AreaTaunt(Lua_Client caster, float range, int bonus_hate)
self->AETaunt(caster, range, bonus_hate);
}
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id)
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
self->MassGroupBuff(caster, center, spell_id);
}
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
self->MassGroupBuff(caster, center, spell_id, affect_caster);
@ -853,10 +853,10 @@ luabind::scope lua_register_entity_list() {
.def("AreaAttack", (void(Lua_EntityList::*)(Lua_Mob, float, int16, int))&Lua_EntityList::AreaAttack)
.def("AreaAttack", (void(Lua_EntityList::*)(Lua_Mob, float, int16, int, bool))&Lua_EntityList::AreaAttack)
.def("AreaAttack", (void(Lua_EntityList::*)(Lua_Mob, float, int16, int, bool, int))&Lua_EntityList::AreaAttack)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool, int16))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool, int16, int))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool, int16))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool, int16, int))&Lua_EntityList::AreaSpell)
.def("AreaTaunt", (void(Lua_EntityList::*)(Lua_Client))&Lua_EntityList::AreaTaunt)
.def("AreaTaunt", (void(Lua_EntityList::*)(Lua_Client, float))&Lua_EntityList::AreaTaunt)
.def("AreaTaunt", (void(Lua_EntityList::*)(Lua_Client, float, int))&Lua_EntityList::AreaTaunt)
@ -936,8 +936,8 @@ luabind::scope lua_register_entity_list() {
.def("Marquee", (void(Lua_EntityList::*)(uint32, std::string))&Lua_EntityList::Marquee)
.def("Marquee", (void(Lua_EntityList::*)(uint32, std::string, uint32))&Lua_EntityList::Marquee)
.def("Marquee", (void(Lua_EntityList::*)(uint32, uint32, uint32, uint32, uint32, std::string))&Lua_EntityList::Marquee)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16))&Lua_EntityList::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool))&Lua_EntityList::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32))&Lua_EntityList::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool))&Lua_EntityList::MassGroupBuff)
.def("Message", (void(Lua_EntityList::*)(uint32, uint32, const char*))&Lua_EntityList::Message)
.def("MessageClose", (void(Lua_EntityList::*)(Lua_Mob, bool, float, uint32, const char*))&Lua_EntityList::MessageClose)
.def("MessageGroup", (void(Lua_EntityList::*)(Lua_Mob, bool, uint32, const char*))&Lua_EntityList::MessageGroup)

12
zone/lua_entity_list.h
View File

@ -165,15 +165,15 @@ public:
void AreaAttack(Lua_Mob attacker, float distance, int16 slot_id, int count);
void AreaAttack(Lua_Mob attacker, float distance, int16 slot_id, int count, bool is_from_spell);
void AreaAttack(Lua_Mob attacker, float distance, int16 slot_id, int count, bool is_from_spell, int attack_rounds);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void AreaTaunt(Lua_Client caster);
void AreaTaunt(Lua_Client caster, float range);
void AreaTaunt(Lua_Client caster, float range, int bonus_hate);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster);
Lua_NPC_List GetNPCsByIDs(luabind::adl::object npc_ids);
Lua_NPC_List GetNPCsByExcludedIDs(luabind::adl::object npc_ids);
};

302
zone/lua_general.cpp
View File

@ -445,7 +445,7 @@ std::string lua_get_race_name(uint32 race_id) {
return quest_manager.getracename(race_id);
}
std::string lua_get_spell_name(uint32 spell_id) {
std::string lua_get_spell_name(int32 spell_id) {
return quest_manager.getspellname(spell_id);
}
@ -2055,11 +2055,11 @@ const int lua_get_item_stat(uint32 item_id, std::string identifier) {
return quest_manager.getitemstat(item_id, identifier);
}
int lua_get_spell_stat(uint32 spell_id, std::string stat_identifier) {
int lua_get_spell_stat(int32 spell_id, std::string stat_identifier) {
return quest_manager.getspellstat(spell_id, stat_identifier);
}
int lua_get_spell_stat(uint32 spell_id, std::string stat_identifier, uint8 slot) {
int lua_get_spell_stat(int32 spell_id, std::string stat_identifier, uint8 slot) {
return quest_manager.getspellstat(spell_id, stat_identifier, slot);
}
@ -2280,37 +2280,37 @@ void lua_cross_zone_assign_task_by_client_name(const char* client_name, uint32 t
quest_manager.CrossZoneTaskUpdate(update_type, update_subtype, update_identifier, task_id, task_subidentifier, update_count, enforce_level_requirement, client_name);
}
void lua_cross_zone_cast_spell_by_char_id(int character_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_char_id(int character_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Character;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, character_id, spell_id);
}
void lua_cross_zone_cast_spell_by_group_id(int group_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_group_id(int group_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Group;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, group_id, spell_id);
}
void lua_cross_zone_cast_spell_by_raid_id(int raid_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_raid_id(int raid_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Raid;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, raid_id, spell_id);
}
void lua_cross_zone_cast_spell_by_guild_id(int guild_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_guild_id(int guild_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Guild;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, guild_id, spell_id);
}
void lua_cross_zone_cast_spell_by_expedition_id(uint32 expedition_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_expedition_id(uint32 expedition_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Expedition;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, expedition_id, spell_id);
}
void lua_cross_zone_cast_spell_by_client_name(const char* client_name, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_client_name(const char* client_name, int32 spell_id) {
uint8 update_type = CZUpdateType_ClientName;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
int update_identifier = 0;
@ -3071,37 +3071,37 @@ void lua_cross_zone_remove_ldon_win_by_client_name(const char* client_name, uint
quest_manager.CrossZoneLDoNUpdate(update_type, update_subtype, update_identifier, theme_id, points, client_name);
}
void lua_cross_zone_remove_spell_by_char_id(int character_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_char_id(int character_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Character;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, character_id, spell_id);
}
void lua_cross_zone_remove_spell_by_group_id(int group_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_group_id(int group_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Group;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, group_id, spell_id);
}
void lua_cross_zone_remove_spell_by_raid_id(int raid_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_raid_id(int raid_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Raid;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, raid_id, spell_id);
}
void lua_cross_zone_remove_spell_by_guild_id(int guild_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_guild_id(int guild_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Guild;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, guild_id, spell_id);
}
void lua_cross_zone_remove_spell_by_expedition_id(uint32 expedition_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_expedition_id(uint32 expedition_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Expedition;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, expedition_id, spell_id);
}
void lua_cross_zone_remove_spell_by_client_name(const char* client_name, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_client_name(const char* client_name, int32 spell_id) {
uint8 update_type = CZUpdateType_ClientName;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
int update_identifier = 0;
@ -3446,17 +3446,17 @@ void lua_world_wide_assign_task(uint32 task_id, bool enforce_level_requirement,
quest_manager.WorldWideTaskUpdate(update_type, task_id, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
void lua_world_wide_cast_spell(uint32 spell_id) {
void lua_world_wide_cast_spell(int32 spell_id) {
uint8 update_type = WWSpellUpdateType_Cast;
quest_manager.WorldWideSpell(update_type, spell_id);
}
void lua_world_wide_cast_spell(uint32 spell_id, uint8 min_status) {
void lua_world_wide_cast_spell(int32 spell_id, uint8 min_status) {
uint8 update_type = WWSpellUpdateType_Cast;
quest_manager.WorldWideSpell(update_type, spell_id, min_status);
}
void lua_world_wide_cast_spell(uint32 spell_id, uint8 min_status, uint8 max_status) {
void lua_world_wide_cast_spell(int32 spell_id, uint8 min_status, uint8 max_status) {
uint8 update_type = WWSpellUpdateType_Cast;
quest_manager.WorldWideSpell(update_type, spell_id, min_status, max_status);
}
@ -3629,17 +3629,17 @@ void lua_world_wide_remove_ldon_win(uint32 theme_id, uint8 min_status, uint8 max
quest_manager.WorldWideLDoNUpdate(update_type, theme_id, points, min_status, max_status);
}
void lua_world_wide_remove_spell(uint32 spell_id) {
void lua_world_wide_remove_spell(int32 spell_id) {
uint8 update_type = WWSpellUpdateType_Remove;
quest_manager.WorldWideSpell(update_type, spell_id);
}
void lua_world_wide_remove_spell(uint32 spell_id, uint8 min_status) {
void lua_world_wide_remove_spell(int32 spell_id, uint8 min_status) {
uint8 update_type = WWSpellUpdateType_Remove;
quest_manager.WorldWideSpell(update_type, spell_id, min_status);
}
void lua_world_wide_remove_spell(uint32 spell_id, uint8 min_status, uint8 max_status) {
void lua_world_wide_remove_spell(int32 spell_id, uint8 min_status, uint8 max_status) {
uint8 update_type = WWSpellUpdateType_Remove;
quest_manager.WorldWideSpell(update_type, spell_id, min_status, max_status);
}
@ -3806,7 +3806,7 @@ uint32 lua_count_spawned_npcs(luabind::adl::object table) {
return entity_list.CountSpawnedNPCs(npc_ids);
}
Lua_Spell lua_get_spell(uint32 spell_id) {
Lua_Spell lua_get_spell(int32 spell_id) {
return Lua_Spell(spell_id);
}
@ -4801,443 +4801,443 @@ void lua_send_channel_message(Lua_Client from, const char* to, uint8 channel_num
quest_manager.SendChannelMessage(from, to, channel_number, guild_id, language_id, language_skill, message);
}
uint8 lua_get_spell_level(uint16 spell_id, uint8 class_id)
uint8 lua_get_spell_level(int32 spell_id, uint8 class_id)
{
const auto spell_level = GetSpellLevel(spell_id, class_id);
return spell_level > RuleI(Character, MaxLevel) ? UINT8_MAX : spell_level;
}
bool lua_is_effect_in_spell(uint16 spell_id, int effect_id)
bool lua_is_effect_in_spell(int32 spell_id, int effect_id)
{
return IsEffectInSpell(spell_id, effect_id);
}
bool lua_is_beneficial_spell(uint16 spell_id)
bool lua_is_beneficial_spell(int32 spell_id)
{
return IsBeneficialSpell(spell_id);
}
bool lua_is_detrimental_spell(uint16 spell_id)
bool lua_is_detrimental_spell(int32 spell_id)
{
return IsDetrimentalSpell(spell_id);
}
bool lua_is_targetable_ae_spell(uint16 spell_id)
bool lua_is_targetable_ae_spell(int32 spell_id)
{
return IsTargetableAESpell(spell_id);
}
bool lua_is_sacrifice_spell(uint16 spell_id)
bool lua_is_sacrifice_spell(int32 spell_id)
{
return IsSacrificeSpell(spell_id);
}
bool lua_is_lifetap_spell(uint16 spell_id)
bool lua_is_lifetap_spell(int32 spell_id)
{
return IsLifetapSpell(spell_id);
}
bool lua_is_mesmerize_spell(uint16 spell_id)
bool lua_is_mesmerize_spell(int32 spell_id)
{
return IsMesmerizeSpell(spell_id);
}
bool lua_is_stun_spell(uint16 spell_id)
bool lua_is_stun_spell(int32 spell_id)
{
return IsStunSpell(spell_id);
}
bool lua_is_summon_spell(uint16 spell_id)
bool lua_is_summon_spell(int32 spell_id)
{
return IsSummonSpell(spell_id);
}
bool lua_is_damage_spell(uint16 spell_id)
bool lua_is_damage_spell(int32 spell_id)
{
return IsDamageSpell(spell_id);
}
bool lua_is_fear_spell(uint16 spell_id)
bool lua_is_fear_spell(int32 spell_id)
{
return IsFearSpell(spell_id);
}
bool lua_is_cure_spell(uint16 spell_id)
bool lua_is_cure_spell(int32 spell_id)
{
return IsCureSpell(spell_id);
}
bool lua_is_haste_spell(uint16 spell_id)
bool lua_is_haste_spell(int32 spell_id)
{
return IsHasteSpell(spell_id);
}
bool lua_is_harmony_spell(uint16 spell_id)
bool lua_is_harmony_spell(int32 spell_id)
{
return IsHarmonySpell(spell_id);
}
bool lua_is_percental_heal_spell(uint16 spell_id)
bool lua_is_percental_heal_spell(int32 spell_id)
{
return IsPercentalHealSpell(spell_id);
}
bool lua_is_group_only_spell(uint16 spell_id)
bool lua_is_group_only_spell(int32 spell_id)
{
return IsGroupOnlySpell(spell_id);
}
bool lua_is_invisible_spell(uint16 spell_id)
bool lua_is_invisible_spell(int32 spell_id)
{
return IsInvisibleSpell(spell_id);
}
bool lua_is_invulnerability_spell(uint16 spell_id)
bool lua_is_invulnerability_spell(int32 spell_id)
{
return IsInvulnerabilitySpell(spell_id);
}
bool lua_is_complete_heal_duration_spell(uint16 spell_id)
bool lua_is_complete_heal_duration_spell(int32 spell_id)
{
return IsCompleteHealDurationSpell(spell_id);
}
bool lua_is_poison_counter_spell(uint16 spell_id)
bool lua_is_poison_counter_spell(int32 spell_id)
{
return IsPoisonCounterSpell(spell_id);
}
bool lua_is_disease_counter_spell(uint16 spell_id)
bool lua_is_disease_counter_spell(int32 spell_id)
{
return IsDiseaseCounterSpell(spell_id);
}
bool lua_is_summon_item_spell(uint16 spell_id)
bool lua_is_summon_item_spell(int32 spell_id)
{
return IsSummonItemSpell(spell_id);
}
bool lua_is_summon_skeleton_spell(uint16 spell_id)
bool lua_is_summon_skeleton_spell(int32 spell_id)
{
return IsSummonSkeletonSpell(spell_id);
}
bool lua_is_summon_pet_spell(uint16 spell_id)
bool lua_is_summon_pet_spell(int32 spell_id)
{
return IsSummonPetSpell(spell_id);
}
bool lua_is_pet_spell(uint16 spell_id)
bool lua_is_pet_spell(int32 spell_id)
{
return IsPetSpell(spell_id);
}
bool lua_is_summon_pc_spell(uint16 spell_id)
bool lua_is_summon_pc_spell(int32 spell_id)
{
return IsSummonPCSpell(spell_id);
}
bool lua_is_charm_spell(uint16 spell_id)
bool lua_is_charm_spell(int32 spell_id)
{
return IsCharmSpell(spell_id);
}
bool lua_is_blind_spell(uint16 spell_id)
bool lua_is_blind_spell(int32 spell_id)
{
return IsBlindSpell(spell_id);
}
bool lua_is_health_spell(uint16 spell_id)
bool lua_is_health_spell(int32 spell_id)
{
return IsHealthSpell(spell_id);
}
bool lua_is_cast_time_reduction_spell(uint16 spell_id)
bool lua_is_cast_time_reduction_spell(int32 spell_id)
{
return IsCastTimeReductionSpell(spell_id);
}
bool lua_is_increase_duration_spell(uint16 spell_id)
bool lua_is_increase_duration_spell(int32 spell_id)
{
return IsIncreaseDurationSpell(spell_id);
}
bool lua_is_mana_cost_reduction_spell(uint16 spell_id)
bool lua_is_mana_cost_reduction_spell(int32 spell_id)
{
return IsManaCostReductionSpell(spell_id);
}
bool lua_is_increase_range_spell(uint16 spell_id)
bool lua_is_increase_range_spell(int32 spell_id)
{
return IsIncreaseRangeSpell(spell_id);
}
bool lua_is_improved_healing_spell(uint16 spell_id)
bool lua_is_improved_healing_spell(int32 spell_id)
{
return IsImprovedHealingSpell(spell_id);
}
bool lua_is_improved_damage_spell(uint16 spell_id)
bool lua_is_improved_damage_spell(int32 spell_id)
{
return IsImprovedDamageSpell(spell_id);
}
bool lua_is_ae_duration_spell(uint16 spell_id)
bool lua_is_ae_duration_spell(int32 spell_id)
{
return IsAEDurationSpell(spell_id);
}
bool lua_is_pure_nuke_spell(uint16 spell_id)
bool lua_is_pure_nuke_spell(int32 spell_id)
{
return IsPureNukeSpell(spell_id);
}
bool lua_is_ae_nuke_spell(uint16 spell_id)
bool lua_is_ae_nuke_spell(int32 spell_id)
{
return IsAENukeSpell(spell_id);
}
bool lua_is_pbae_nuke_spell(uint16 spell_id)
bool lua_is_pbae_nuke_spell(int32 spell_id)
{
return IsPBAENukeSpell(spell_id);
}
bool lua_is_ae_rain_nuke_spell(uint16 spell_id)
bool lua_is_ae_rain_nuke_spell(int32 spell_id)
{
return IsAERainNukeSpell(spell_id);
}
bool lua_is_partial_resistable_spell(uint16 spell_id)
bool lua_is_partial_resistable_spell(int32 spell_id)
{
return IsPartialResistableSpell(spell_id);
}
bool lua_is_resistable_spell(uint16 spell_id)
bool lua_is_resistable_spell(int32 spell_id)
{
return IsResistableSpell(spell_id);
}
bool lua_is_group_spell(uint16 spell_id)
bool lua_is_group_spell(int32 spell_id)
{
return IsGroupSpell(spell_id);
}
bool lua_is_tgb_compatible_spell(uint16 spell_id)
bool lua_is_tgb_compatible_spell(int32 spell_id)
{
return IsTGBCompatibleSpell(spell_id);
}
bool lua_is_bard_song(uint16 spell_id)
bool lua_is_bard_song(int32 spell_id)
{
return IsBardSong(spell_id);
}
bool lua_is_pulsing_bard_song(uint16 spell_id)
bool lua_is_pulsing_bard_song(int32 spell_id)
{
return IsPulsingBardSong(spell_id);
}
bool lua_is_discipline_buff(uint16 spell_id)
bool lua_is_discipline_buff(int32 spell_id)
{
return IsDisciplineBuff(spell_id);
}
bool lua_is_discipline(uint16 spell_id)
bool lua_is_discipline(int32 spell_id)
{
return IsDiscipline(spell_id);
}
bool lua_is_combat_skill(uint16 spell_id)
bool lua_is_combat_skill(int32 spell_id)
{
return IsCombatSkill(spell_id);
}
bool lua_is_resurrection_effects(uint16 spell_id)
bool lua_is_resurrection_effects(int32 spell_id)
{
return IsResurrectionEffects(spell_id);
}
bool lua_is_rune_spell(uint16 spell_id)
bool lua_is_rune_spell(int32 spell_id)
{
return IsRuneSpell(spell_id);
}
bool lua_is_magic_rune_spell(uint16 spell_id)
bool lua_is_magic_rune_spell(int32 spell_id)
{
return IsMagicRuneSpell(spell_id);
}
bool lua_is_mana_tap_spell(uint16 spell_id)
bool lua_is_mana_tap_spell(int32 spell_id)
{
return IsManaTapSpell(spell_id);
}
bool lua_is_alliance_spell(uint16 spell_id)
bool lua_is_alliance_spell(int32 spell_id)
{
return IsAllianceSpell(spell_id);
}
bool lua_is_death_save_spell(uint16 spell_id)
bool lua_is_death_save_spell(int32 spell_id)
{
return IsDeathSaveSpell(spell_id);
}
bool lua_is_partial_death_save_spell(uint16 spell_id)
bool lua_is_partial_death_save_spell(int32 spell_id)
{
return IsPartialDeathSaveSpell(spell_id);
}
bool lua_is_full_death_save_spell(uint16 spell_id)
bool lua_is_full_death_save_spell(int32 spell_id)
{
return IsFullDeathSaveSpell(spell_id);
}
bool lua_is_shadow_step_spell(uint16 spell_id)
bool lua_is_shadow_step_spell(int32 spell_id)
{
return IsShadowStepSpell(spell_id);
}
bool lua_is_succor_spell(uint16 spell_id)
bool lua_is_succor_spell(int32 spell_id)
{
return IsSuccorSpell(spell_id);
}
bool lua_is_teleport_spell(uint16 spell_id)
bool lua_is_teleport_spell(int32 spell_id)
{
return IsTeleportSpell(spell_id);
}
bool lua_is_translocate_spell(uint16 spell_id)
bool lua_is_translocate_spell(int32 spell_id)
{
return IsTranslocateSpell(spell_id);
}
bool lua_is_gate_spell(uint16 spell_id)
bool lua_is_gate_spell(int32 spell_id)
{
return IsGateSpell(spell_id);
}
bool lua_is_illusion_spell(uint16 spell_id)
bool lua_is_illusion_spell(int32 spell_id)
{
return IsIllusionSpell(spell_id);
}
bool lua_is_ldon_object_spell(uint16 spell_id)
bool lua_is_ldon_object_spell(int32 spell_id)
{
return IsLDoNObjectSpell(spell_id);
}
bool lua_is_heal_over_time_spell(uint16 spell_id)
bool lua_is_heal_over_time_spell(int32 spell_id)
{
return IsHealOverTimeSpell(spell_id);
}
bool lua_is_complete_heal_spell(uint16 spell_id)
bool lua_is_complete_heal_spell(int32 spell_id)
{
return IsCompleteHealSpell(spell_id);
}
bool lua_is_fast_heal_spell(uint16 spell_id)
bool lua_is_fast_heal_spell(int32 spell_id)
{
return IsFastHealSpell(spell_id);
}
bool lua_is_very_fast_heal_spell(uint16 spell_id)
bool lua_is_very_fast_heal_spell(int32 spell_id)
{
return IsVeryFastHealSpell(spell_id);
}
bool lua_is_regular_single_target_heal_spell(uint16 spell_id)
bool lua_is_regular_single_target_heal_spell(int32 spell_id)
{
return IsRegularSingleTargetHealSpell(spell_id);
}
bool lua_is_regular_group_heal_spell(uint16 spell_id)
bool lua_is_regular_group_heal_spell(int32 spell_id)
{
return IsRegularGroupHealSpell(spell_id);
}
bool lua_is_group_complete_heal_spell(uint16 spell_id)
bool lua_is_group_complete_heal_spell(int32 spell_id)
{
return IsGroupCompleteHealSpell(spell_id);
}
bool lua_is_group_heal_over_time_spell(uint16 spell_id)
bool lua_is_group_heal_over_time_spell(int32 spell_id)
{
return IsGroupHealOverTimeSpell(spell_id);
}
bool lua_is_debuff_spell(uint16 spell_id)
bool lua_is_debuff_spell(int32 spell_id)
{
return IsDebuffSpell(spell_id);
}
bool lua_is_resist_debuff_spell(uint16 spell_id)
bool lua_is_resist_debuff_spell(int32 spell_id)
{
return IsResistDebuffSpell(spell_id);
}
bool lua_is_self_conversion_spell(uint16 spell_id)
bool lua_is_self_conversion_spell(int32 spell_id)
{
return IsSelfConversionSpell(spell_id);
}
bool lua_is_buff_spell(uint16 spell_id)
bool lua_is_buff_spell(int32 spell_id)
{
return IsBuffSpell(spell_id);
}
bool lua_is_persist_death_spell(uint16 spell_id)
bool lua_is_persist_death_spell(int32 spell_id)
{
return IsPersistDeathSpell(spell_id);
}
bool lua_is_suspendable_spell(uint16 spell_id)
bool lua_is_suspendable_spell(int32 spell_id)
{
return IsSuspendableSpell(spell_id);
}
bool lua_is_cast_on_fade_duration_spell(uint16 spell_id)
bool lua_is_cast_on_fade_duration_spell(int32 spell_id)
{
return IsCastOnFadeDurationSpell(spell_id);
}
bool lua_is_distance_modifier_spell(uint16 spell_id)
bool lua_is_distance_modifier_spell(int32 spell_id)
{
return IsDistanceModifierSpell(spell_id);
}
bool lua_is_rest_allowed_spell(uint16 spell_id)
bool lua_is_rest_allowed_spell(int32 spell_id)
{
return IsRestAllowedSpell(spell_id);
}
bool lua_is_no_detrimental_spell_aggro_spell(uint16 spell_id)
bool lua_is_no_detrimental_spell_aggro_spell(int32 spell_id)
{
return IsNoDetrimentalSpellAggroSpell(spell_id);
}
bool lua_is_stackable_dot(uint16 spell_id)
bool lua_is_stackable_dot(int32 spell_id)
{
return IsStackableDOT(spell_id);
}
bool lua_is_short_duration_buff(uint16 spell_id)
bool lua_is_short_duration_buff(int32 spell_id)
{
return IsShortDurationBuff(spell_id);
}
bool lua_is_target_required_for_spell(uint16 spell_id)
bool lua_is_target_required_for_spell(int32 spell_id)
{
return IsTargetRequiredForSpell(spell_id);
}
bool lua_is_virus_spell(uint16 spell_id)
bool lua_is_virus_spell(int32 spell_id)
{
return IsVirusSpell(spell_id);
}
bool lua_is_valid_spell(uint16 spell_id)
bool lua_is_valid_spell(int32 spell_id)
{
return IsValidSpell(spell_id);
}
@ -5257,147 +5257,147 @@ bool lua_is_bard_only_stack_effect(int effect_id)
return IsBardOnlyStackEffect(effect_id);
}
bool lua_is_cast_while_invisible_spell(uint16 spell_id)
bool lua_is_cast_while_invisible_spell(int32 spell_id)
{
return IsCastWhileInvisibleSpell(spell_id);
}
bool lua_is_cast_restricted_spell(uint16 spell_id)
bool lua_is_cast_restricted_spell(int32 spell_id)
{
return IsCastRestrictedSpell(spell_id);
}
bool lua_is_cast_not_standing_spell(uint16 spell_id)
bool lua_is_cast_not_standing_spell(int32 spell_id)
{
return IsCastNotStandingSpell(spell_id);
}
bool lua_is_instrument_modifier_applied_to_spell_effect(uint16 spell_id, int effect_id)
bool lua_is_instrument_modifier_applied_to_spell_effect(int32 spell_id, int effect_id)
{
return IsInstrumentModifierAppliedToSpellEffect(spell_id, effect_id);
}
bool lua_is_blank_spell_effect(uint16 spell_id, int effect_index)
bool lua_is_blank_spell_effect(int32 spell_id, int effect_index)
{
return IsBlankSpellEffect(spell_id, effect_index);
}
uint16 lua_get_spell_trigger_spell_id(uint16 spell_id, int effect_id)
int32 lua_get_spell_trigger_spell_id(int32 spell_id, int effect_id)
{
return GetSpellTriggerSpellID(spell_id, effect_id);
}
uint8 lua_get_spell_minimum_level(uint16 spell_id)
uint8 lua_get_spell_minimum_level(int32 spell_id)
{
return GetSpellMinimumLevel(spell_id);
}
int lua_get_spell_resist_type(uint16 spell_id)
int lua_get_spell_resist_type(int32 spell_id)
{
return GetSpellResistType(spell_id);
}
int lua_get_spell_target_type(uint16 spell_id)
int lua_get_spell_target_type(int32 spell_id)
{
return GetSpellTargetType(spell_id);
}
int lua_get_spell_partial_melee_rune_reduction(uint16 spell_id)
int lua_get_spell_partial_melee_rune_reduction(int32 spell_id)
{
return GetSpellPartialMeleeRuneReduction(spell_id);
}
int lua_get_spell_partial_magic_rune_reduction(uint16 spell_id)
int lua_get_spell_partial_magic_rune_reduction(int32 spell_id)
{
return GetSpellPartialMagicRuneReduction(spell_id);
}
int lua_get_spell_partial_melee_rune_amount(uint16 spell_id)
int lua_get_spell_partial_melee_rune_amount(int32 spell_id)
{
return GetSpellPartialMeleeRuneAmount(spell_id);
}
int lua_get_spell_partial_magic_rune_amount(uint16 spell_id)
int lua_get_spell_partial_magic_rune_amount(int32 spell_id)
{
return GetSpellPartialMagicRuneAmount(spell_id);
}
int lua_get_spell_viral_minimum_spread_time(uint16 spell_id)
int lua_get_spell_viral_minimum_spread_time(int32 spell_id)
{
return GetSpellViralMinimumSpreadTime(spell_id);
}
int lua_get_spell_viral_maximum_spread_time(uint16 spell_id)
int lua_get_spell_viral_maximum_spread_time(int32 spell_id)
{
return GetSpellViralMaximumSpreadTime(spell_id);
}
int lua_get_spell_viral_spread_range(uint16 spell_id)
int lua_get_spell_viral_spread_range(int32 spell_id)
{
return GetSpellViralSpreadRange(spell_id);
}
int lua_get_spell_proc_limit_timer(uint16 spell_id, int proc_type)
int lua_get_spell_proc_limit_timer(int32 spell_id, int proc_type)
{
return GetSpellProcLimitTimer(spell_id, proc_type);
}
int lua_get_spell_effect_description_number(uint16 spell_id)
int lua_get_spell_effect_description_number(int32 spell_id)
{
return GetSpellEffectDescriptionNumber(spell_id);
}
int lua_get_spell_furious_bash(uint16 spell_id)
int lua_get_spell_furious_bash(int32 spell_id)
{
return GetSpellFuriousBash(spell_id);
}
bool lua_is_spell_usable_in_this_zone_type(uint16 spell_id)
bool lua_is_spell_usable_in_this_zone_type(int32 spell_id)
{
return IsSpellUsableInThisZoneType(spell_id, zone->GetZoneType());
}
bool lua_is_spell_usable_in_this_zone_type(uint16 spell_id, uint8 zone_type)
bool lua_is_spell_usable_in_this_zone_type(int32 spell_id, uint8 zone_type)
{
return IsSpellUsableInThisZoneType(spell_id, zone_type);
}
int lua_get_spell_effect_index(uint16 spell_id, int effect_id)
int lua_get_spell_effect_index(int32 spell_id, int effect_id)
{
return GetSpellEffectIndex(spell_id, effect_id);
}
int lua_calculate_poison_counters(uint16 spell_id)
int lua_calculate_poison_counters(int32 spell_id)
{
return CalculatePoisonCounters(spell_id);
}
int lua_calculate_disease_counters(uint16 spell_id)
int lua_calculate_disease_counters(int32 spell_id)
{
return CalculateDiseaseCounters(spell_id);
}
int lua_calculate_curse_counters(uint16 spell_id)
int lua_calculate_curse_counters(int32 spell_id)
{
return CalculateCurseCounters(spell_id);
}
int lua_calculate_corruption_counters(uint16 spell_id)
int lua_calculate_corruption_counters(int32 spell_id)
{
return CalculateCorruptionCounters(spell_id);
}
int lua_calculate_counters(uint16 spell_id)
int lua_calculate_counters(int32 spell_id)
{
return CalculateCounters(spell_id);
}
int8 lua_get_spell_resurrection_sickness_check(uint16 spell_id_one, uint16 spell_id_two)
int8 lua_get_spell_resurrection_sickness_check(int32 spell_id_one, int32 spell_id_two)
{
return GetSpellResurrectionSicknessCheck(spell_id_one, spell_id_two);
}
int lua_get_spell_nimbus_effect(uint16 spell_id)
int lua_get_spell_nimbus_effect(int32 spell_id)
{
return GetSpellNimbusEffect(spell_id);
}
@ -5425,12 +5425,12 @@ std::string lua_convert_money_to_string(luabind::adl::object table)
return Strings::Money(platinum, gold, silver, copper);
}
void lua_cast_spell(uint16 spell_id, uint16 target_id)
void lua_cast_spell(int32 spell_id, uint16 target_id)
{
quest_manager.castspell(spell_id, target_id);
}
void lua_self_cast(uint16 spell_id)
void lua_self_cast(int32 spell_id)
{
quest_manager.selfcast(spell_id);
}
@ -6208,8 +6208,8 @@ luabind::scope lua_register_general() {
luabind::def("rename", &lua_rename),
luabind::def("get_data_remaining", &lua_get_data_remaining),
luabind::def("get_item_stat", &lua_get_item_stat),
luabind::def("get_spell_stat", (int(*)(uint32,std::string))&lua_get_spell_stat),
luabind::def("get_spell_stat", (int(*)(uint32,std::string,uint8))&lua_get_spell_stat),
luabind::def("get_spell_stat", (int(*)(int32,std::string))&lua_get_spell_stat),
luabind::def("get_spell_stat", (int(*)(int32,std::string,uint8))&lua_get_spell_stat),
luabind::def("is_npc_spawned", &lua_is_npc_spawned),
luabind::def("count_spawned_npcs", &lua_count_spawned_npcs),
luabind::def("get_spell", &lua_get_spell),
@ -6504,8 +6504,8 @@ luabind::scope lua_register_general() {
luabind::def("get_spell_proc_limit_timer", &lua_get_spell_proc_limit_timer),
luabind::def("get_spell_effect_description_number", &lua_get_spell_effect_description_number),
luabind::def("get_spell_furious_bash", &lua_get_spell_furious_bash),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(uint16))&lua_is_spell_usable_in_this_zone_type),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(uint16,uint8))&lua_is_spell_usable_in_this_zone_type),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(int32))&lua_is_spell_usable_in_this_zone_type),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(int32,uint8))&lua_is_spell_usable_in_this_zone_type),
luabind::def("get_spell_effect_index", &lua_get_spell_effect_index),
luabind::def("calculate_poison_counters", &lua_calculate_poison_counters),
luabind::def("calculate_disease_counters", &lua_calculate_disease_counters),
@ -6727,9 +6727,9 @@ luabind::scope lua_register_general() {
luabind::def("world_wide_assign_task", (void(*)(uint32,bool))&lua_world_wide_assign_task),
luabind::def("world_wide_assign_task", (void(*)(uint32,bool,uint8))&lua_world_wide_assign_task),
luabind::def("world_wide_assign_task", (void(*)(uint32,bool,uint8,uint8))&lua_world_wide_assign_task),
luabind::def("world_wide_cast_spell", (void(*)(uint32))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(uint32,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(uint32,uint8,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(int32))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(int32,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(int32,uint8,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_dialogue_window", (void(*)(const char*))&lua_world_wide_dialogue_window),
luabind::def("world_wide_dialogue_window", (void(*)(const char*,uint8))&lua_world_wide_dialogue_window),
luabind::def("world_wide_dialogue_window", (void(*)(const char*,uint8,uint8))&lua_world_wide_dialogue_window),
@ -6760,9 +6760,9 @@ luabind::scope lua_register_general() {
luabind::def("world_wide_remove_ldon_win", (void(*)(uint32))&lua_world_wide_remove_ldon_win),
luabind::def("world_wide_remove_ldon_win", (void(*)(uint32,uint8))&lua_world_wide_remove_ldon_win),
luabind::def("world_wide_remove_ldon_win", (void(*)(uint32,uint8,uint8))&lua_world_wide_remove_ldon_win),
luabind::def("world_wide_remove_spell", (void(*)(uint32))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(uint32,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(uint32,uint8,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(int32))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(int32,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(int32,uint8,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_task", (void(*)(uint32))&lua_world_wide_remove_task),
luabind::def("world_wide_remove_task", (void(*)(uint32,uint8))&lua_world_wide_remove_task),
luabind::def("world_wide_remove_task", (void(*)(uint32,uint8,uint8))&lua_world_wide_remove_task),

2
zone/lua_merc.cpp
View File

@ -203,7 +203,7 @@ bool Lua_Merc::Suspend()
return self->Suspend();
}
bool Lua_Merc::UseDiscipline(uint16 spell_id, uint16 target_id)
bool Lua_Merc::UseDiscipline(int32 spell_id, uint16 target_id)
{
Lua_Safe_Call_Bool();
return self->UseDiscipline(spell_id, target_id);

2
zone/lua_merc.h
View File

@ -73,7 +73,7 @@ public:
void Sit();
void Stand();
bool Suspend();
bool UseDiscipline(uint16 spell_id, uint16 target_id);
bool UseDiscipline(int32 spell_id, uint16 target_id);
};
#endif // LUA_EQEMU

72
zone/lua_mob.cpp
View File

@ -334,12 +334,12 @@ void Lua_Mob::SetInvisible(int state) {
self->SetInvisible(state);
}
bool Lua_Mob::FindBuff(uint16 spell_id) {
bool Lua_Mob::FindBuff(int32 spell_id) {
Lua_Safe_Call_Bool();
return self->FindBuff(spell_id);
}
bool Lua_Mob::FindBuff(uint16 spell_id, uint16 caster_id) {
bool Lua_Mob::FindBuff(int32 spell_id, uint16 caster_id) {
Lua_Safe_Call_Bool();
return self->FindBuff(spell_id, caster_id);
}
@ -2397,7 +2397,7 @@ int Lua_Mob::GetOrigBodyType()
return (int)self->GetOrigBodyType();
}
void Lua_Mob::CheckNumHitsRemaining(int type, int32 buff_slot, uint16 spell_id)
void Lua_Mob::CheckNumHitsRemaining(int type, int32 buff_slot, int32 spell_id)
{
Lua_Safe_Call_Void();
self->CheckNumHitsRemaining((NumHit)type, buff_slot, spell_id);
@ -3010,62 +3010,62 @@ float Lua_Mob::GetDefaultRaceSize(int race_id, int gender_id) {
return self->GetDefaultRaceSize(race_id, gender_id);
}
float Lua_Mob::GetActSpellRange(uint16 spell_id, float range) {
float Lua_Mob::GetActSpellRange(int32 spell_id, float range) {
Lua_Safe_Call_Real();
return self->GetActSpellRange(spell_id, range);
}
int64 Lua_Mob::GetActSpellDamage(uint16 spell_id, int64 value) {
int64 Lua_Mob::GetActSpellDamage(int32 spell_id, int64 value) {
Lua_Safe_Call_Int();
return self->GetActSpellDamage(spell_id, value);
}
int64 Lua_Mob::GetActSpellDamage(uint16 spell_id, int64 value, Lua_Mob target) {
int64 Lua_Mob::GetActSpellDamage(int32 spell_id, int64 value, Lua_Mob target) {
Lua_Safe_Call_Int();
return self->GetActSpellDamage(spell_id, value, target);
}
int64 Lua_Mob::GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target) {
int64 Lua_Mob::GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target) {
Lua_Safe_Call_Int();
return self->GetActDoTDamage(spell_id, value, target);
}
int64 Lua_Mob::GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
int64 Lua_Mob::GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
Lua_Safe_Call_Int();
return self->GetActDoTDamage(spell_id, value, target, from_buff_tic);
}
int64 Lua_Mob::GetActSpellHealing(uint16 spell_id, int64 value) {
int64 Lua_Mob::GetActSpellHealing(int32 spell_id, int64 value) {
Lua_Safe_Call_Int();
return self->GetActSpellHealing(spell_id, value);
}
int64 Lua_Mob::GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target) {
int64 Lua_Mob::GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target) {
Lua_Safe_Call_Int();
return self->GetActSpellHealing(spell_id, value, target);
}
int64 Lua_Mob::GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
int64 Lua_Mob::GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
Lua_Safe_Call_Int();
return self->GetActSpellHealing(spell_id, value, target, from_buff_tic);
}
int Lua_Mob::GetActSpellCost(uint16 spell_id, int cost) {
int Lua_Mob::GetActSpellCost(int32 spell_id, int cost) {
Lua_Safe_Call_Int();
return self->GetActSpellCost(spell_id, cost);
}
int Lua_Mob::GetActSpellDuration(uint16 spell_id, int duration) {
int Lua_Mob::GetActSpellDuration(int32 spell_id, int duration) {
Lua_Safe_Call_Int();
return self->GetActSpellDuration(spell_id, duration);
}
int Lua_Mob::GetActSpellCasttime(uint16 spell_id, uint32 cast_time) {
int Lua_Mob::GetActSpellCasttime(int32 spell_id, uint32 cast_time) {
Lua_Safe_Call_Int();
return self->GetActSpellCasttime(spell_id, cast_time);
}
int64 Lua_Mob::GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness) {
int64 Lua_Mob::GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness) {
Lua_Safe_Call_Int();
return self->GetActReflectedSpellDamage(spell_id, value, effectiveness);
}
@ -3434,37 +3434,37 @@ void Lua_Mob::AreaAttack(float distance, int16 slot_id, int count, bool is_from_
entity_list.AEAttack(self, distance, slot_id, count, is_from_spell, attack_rounds);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id, affect_caster);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id, affect_caster, resist_adjust);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id, affect_caster, resist_adjust, &max_targets);
}
void Lua_Mob::MassGroupBuff(Lua_Mob center, uint16 spell_id)
void Lua_Mob::MassGroupBuff(Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
entity_list.MassGroupBuff(self, center, spell_id);
}
void Lua_Mob::MassGroupBuff(Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_Mob::MassGroupBuff(Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
entity_list.MassGroupBuff(self, center, spell_id, affect_caster);
@ -3566,10 +3566,10 @@ luabind::scope lua_register_mob() {
.def("AreaAttack", (void(Lua_Mob::*)(float, int16, int))&Lua_Mob::AreaAttack)
.def("AreaAttack", (void(Lua_Mob::*)(float, int16, int, bool))&Lua_Mob::AreaAttack)
.def("AreaAttack", (void(Lua_Mob::*)(float, int16, int, bool, int))&Lua_Mob::AreaAttack)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16, bool))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16, bool, int16))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16, bool, int16, int))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32, bool))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32, bool, int16))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32, bool, int16, int))&Lua_Mob::AreaSpell)
.def("Attack", (bool(Lua_Mob::*)(Lua_Mob))&Lua_Mob::Attack)
.def("Attack", (bool(Lua_Mob::*)(Lua_Mob,int))&Lua_Mob::Attack)
.def("Attack", (bool(Lua_Mob::*)(Lua_Mob,int,bool))&Lua_Mob::Attack)
@ -3721,8 +3721,8 @@ luabind::scope lua_register_mob() {
.def("Emote", &Lua_Mob::Emote)
.def("EntityVariableExists", &Lua_Mob::EntityVariableExists)
.def("FaceTarget", (void(Lua_Mob::*)(Lua_Mob))&Lua_Mob::FaceTarget)
.def("FindBuff", (bool(Lua_Mob::*)(uint16))&Lua_Mob::FindBuff)
.def("FindBuff", (bool(Lua_Mob::*)(uint16,uint16))&Lua_Mob::FindBuff)
.def("FindBuff", (bool(Lua_Mob::*)(int32))&Lua_Mob::FindBuff)
.def("FindBuff", (bool(Lua_Mob::*)(int32,uint16))&Lua_Mob::FindBuff)
.def("FindBuffBySlot", (uint16(Lua_Mob::*)(int))&Lua_Mob::FindBuffBySlot)
.def("FindGroundZ", (double(Lua_Mob::*)(double,double))&Lua_Mob::FindGroundZ)
.def("FindGroundZ", (double(Lua_Mob::*)(double,double,double))&Lua_Mob::FindGroundZ)
@ -3739,17 +3739,17 @@ luabind::scope lua_register_mob() {
.def("GetAC", &Lua_Mob::GetAC)
.def("GetAGI", &Lua_Mob::GetAGI)
.def("GetATK", &Lua_Mob::GetATK)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob))&Lua_Mob::GetActDoTDamage)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob,bool))&Lua_Mob::GetActDoTDamage)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(int32,int64,Lua_Mob))&Lua_Mob::GetActDoTDamage)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(int32,int64,Lua_Mob,bool))&Lua_Mob::GetActDoTDamage)
.def("GetActReflectedSpellDamage", &Lua_Mob::GetActReflectedSpellDamage)
.def("GetActSpellCasttime", &Lua_Mob::GetActSpellCasttime)
.def("GetActSpellCost", &Lua_Mob::GetActSpellCost)
.def("GetActSpellDuration", &Lua_Mob::GetActSpellDuration)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(uint16,int64))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(uint16,int64))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob,bool))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(int32,int64))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(int32,int64,Lua_Mob))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(int32,int64))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(int32,int64,Lua_Mob))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(int32,int64,Lua_Mob,bool))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellRange", &Lua_Mob::GetActSpellRange)
.def("GetAggroRange", (float(Lua_Mob::*)(void))&Lua_Mob::GetAggroRange)
.def("GetAllowBeneficial", (bool(Lua_Mob::*)(void))&Lua_Mob::GetAllowBeneficial)
@ -3996,8 +3996,8 @@ luabind::scope lua_register_mob() {
.def("IsWarriorClass", &Lua_Mob::IsWarriorClass)
.def("IsWisdomCasterClass", &Lua_Mob::IsWisdomCasterClass)
.def("Kill", (void(Lua_Mob::*)(void))&Lua_Mob::Kill)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, uint16))&Lua_Mob::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, uint16, bool))&Lua_Mob::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, int32))&Lua_Mob::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, int32, bool))&Lua_Mob::MassGroupBuff)
.def("Mesmerize", (void(Lua_Mob::*)(void))&Lua_Mob::Mesmerize)
.def("Message", &Lua_Mob::Message)
.def("MessageString", &Lua_Mob::MessageString)

42
zone/lua_mob.h
View File

@ -109,8 +109,8 @@ public:
uint8 GetInvisibleUndeadLevel();
void SetSeeInvisibleLevel(uint8 invisible_level);
void SetSeeInvisibleUndeadLevel(uint8 invisible_level);
bool FindBuff(uint16 spell_id);
bool FindBuff(uint16 spell_id, uint16 caster_id);
bool FindBuff(int32 spell_id);
bool FindBuff(int32 spell_id, uint16 caster_id);
uint16 FindBuffBySlot(int slot);
uint32 BuffCount();
uint32 BuffCount(bool is_beneficial);
@ -491,7 +491,7 @@ public:
bool TryFinishingBlow(Lua_Mob defender, int64 &damage);
int GetBodyType();
int GetOrigBodyType();
void CheckNumHitsRemaining(int type, int32 buff_slot, uint16 spell_id);
void CheckNumHitsRemaining(int type, int32 buff_slot, int32 spell_id);
void DeleteBucket(std::string bucket_name);
std::string GetBucket(std::string bucket_name);
std::string GetBucketExpires(std::string bucket_name);
@ -552,18 +552,18 @@ public:
float GetDefaultRaceSize();
float GetDefaultRaceSize(int race_id);
float GetDefaultRaceSize(int race_id, int gender_id);
int64 GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target);
int64 GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
int64 GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness);
int GetActSpellCasttime(uint16 spell_id, uint32 cast_time);
int GetActSpellCost(uint16 spell_id, int cost);
int64 GetActSpellDamage(uint16 spell_id, int64 value);
int64 GetActSpellDamage(uint16 spell_id, int64 value, Lua_Mob target);
int GetActSpellDuration(uint16 spell_id, int duration);
int64 GetActSpellHealing(uint16 spell_id, int64 value);
int64 GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target);
int64 GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
float GetActSpellRange(uint16 spell_id, float range);
int64 GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target);
int64 GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
int64 GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness);
int GetActSpellCasttime(int32 spell_id, uint32 cast_time);
int GetActSpellCost(int32 spell_id, int cost);
int64 GetActSpellDamage(int32 spell_id, int64 value);
int64 GetActSpellDamage(int32 spell_id, int64 value, Lua_Mob target);
int GetActSpellDuration(int32 spell_id, int duration);
int64 GetActSpellHealing(int32 spell_id, int64 value);
int64 GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target);
int64 GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
float GetActSpellRange(int32 spell_id, float range);
uint32 GetRemainingTimeMS(const char* timer_name);
uint32 GetTimerDurationMS(const char* timer_name);
bool HasTimer(const char* timer_name);
@ -619,12 +619,12 @@ public:
void AreaAttack(float distance, int16 slot_id, int count);
void AreaAttack(float distance, int16 slot_id, int count, bool is_from_spell);
void AreaAttack(float distance, int16 slot_id, int count, bool is_from_spell, int attack_rounds);
void AreaSpell(Lua_Mob center, uint16 spell_id);
void AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void MassGroupBuff(Lua_Mob center, uint16 spell_id);
void MassGroupBuff(Lua_Mob center, uint16 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob center, int32 spell_id);
void AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void MassGroupBuff(Lua_Mob center, int32 spell_id);
void MassGroupBuff(Lua_Mob center, int32 spell_id, bool affect_caster);
void BuffFadeBeneficial();
void BuffFadeDetrimental();
void BuffFadeDetrimentalByCaster(Lua_Mob caster);

8
zone/lua_mod.cpp
View File

@ -810,7 +810,7 @@ void LuaMod::GetExperienceForKill(Client *self, Mob *against, uint64 &returnValu
}
}
void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &return_value, bool &ignore_default)
void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, int32 spell_id, bool &return_value, bool &ignore_default)
{
int start = lua_gettop(L);
@ -862,7 +862,7 @@ void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &retu
}
}
void LuaMod::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault)
void LuaMod::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault)
{
int start = lua_gettop(L);
int64 retval = 0;
@ -989,7 +989,7 @@ void LuaMod::RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug,
}
void LuaMod::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default)
void LuaMod::CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default)
{
int start = lua_gettop(L);
@ -1048,7 +1048,7 @@ void LuaMod::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id
}
void LuaMod::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, uint64 &return_value, bool &ignore_default)
void LuaMod::HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, uint64 &return_value, bool &ignore_default)
{
int start = lua_gettop(L);

8
zone/lua_mod.h
View File

@ -44,13 +44,13 @@ public:
void TryCriticalHit(Mob *self, Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *opts, bool &ignoreDefault);
void GetRequiredAAExperience(Client *self, uint32 &returnValue, bool &ignoreDefault);
void GetEXPForLevel(Client *self, uint16 level, uint32 &returnValue, bool &ignoreDefault);
void IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &return_value, bool &ignore_default);
void IsImmuneToSpell(Mob *self, Mob* caster, int32 spell_id, bool &return_value, bool &ignore_default);
void GetExperienceForKill(Client *self, Mob *against, uint64 &returnValue, bool &ignoreDefault);
void CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault);
void CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault);
void UpdatePersonalFaction(Mob *self, int32 npc_value, int32 faction_id, int32 current_value, int32 temp, int32 this_faction_min, int32 this_faction_max, int32 &return_value, bool &ignore_default);
void RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug, bool &ignore_default);
void CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default);
void HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, uint64 &return_value, bool &ignore_default);
void CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default);
void HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, uint64 &return_value, bool &ignore_default);
void SetEXP(Mob *self, ExpSource exp_source, uint64 current_exp, uint64 set_exp, bool is_rezz_exp, uint64 &return_value, bool &ignore_default);
void SetAAEXP(Mob *self, ExpSource exp_source, uint64 current_aa_exp, uint64 set_aa_exp, bool is_rezz_exp, uint64 &return_value, bool &ignore_default);
private:

8
zone/lua_npc.cpp
View File

@ -736,12 +736,12 @@ void Lua_NPC::SetLDoNTrapType(uint8 trap_type) {
self->SetLDoNTrapType(trap_type);
}
uint16 Lua_NPC::GetLDoNTrapSpellID() {
int32 Lua_NPC::GetLDoNTrapSpellID() {
Lua_Safe_Call_Int();
return self->GetLDoNTrapSpellID();
}
void Lua_NPC::SetLDoNTrapSpellID(uint16 spell_id) {
void Lua_NPC::SetLDoNTrapSpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->SetLDoNTrapSpellID(spell_id);
}
@ -1035,7 +1035,7 @@ luabind::scope lua_register_npc() {
.def("GetMinDMG", (uint32(Lua_NPC::*)(void))&Lua_NPC::GetMinDMG)
.def("GetLDoNLockedSkill", (uint16(Lua_NPC::*)(void))&Lua_NPC::GetLDoNLockedSkill)
.def("GetLDoNTrapType", (uint8(Lua_NPC::*)(void))&Lua_NPC::GetLDoNTrapType)
.def("GetLDoNTrapSpellID", (uint16(Lua_NPC::*)(void))&Lua_NPC::GetLDoNTrapSpellID)
.def("GetLDoNTrapSpellID", (int32 (Lua_NPC::*)(void))&Lua_NPC::GetLDoNTrapSpellID)
.def("GetNPCAggro", (bool(Lua_NPC::*)(void))&Lua_NPC::GetNPCAggro)
.def("GetNPCFactionID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCFactionID)
.def("GetNPCHate", (int64(Lua_NPC::*)(Lua_Mob))&Lua_NPC::GetNPCHate)
@ -1119,7 +1119,7 @@ luabind::scope lua_register_npc() {
.def("SetLDoNLockedSkill", (void(Lua_NPC::*)(uint16))&Lua_NPC::SetLDoNLockedSkill)
.def("SetLDoNTrapped", (void(Lua_NPC::*)(bool))&Lua_NPC::SetLDoNTrapped)
.def("SetLDoNTrapDetected", (void(Lua_NPC::*)(bool))&Lua_NPC::SetLDoNTrapDetected)
.def("SetLDoNTrapSpellID", (void(Lua_NPC::*)(uint16))&Lua_NPC::SetLDoNTrapSpellID)
.def("SetLDoNTrapSpellID", (void(Lua_NPC::*)(int32 ))&Lua_NPC::SetLDoNTrapSpellID)
.def("SetLDoNTrapType", (void(Lua_NPC::*)(uint8))&Lua_NPC::SetLDoNTrapType)
.def("SetNPCAggro", (void(Lua_NPC::*)(bool))&Lua_NPC::SetNPCAggro)
.def("SetNPCFactionID", (void(Lua_NPC::*)(int))&Lua_NPC::SetNPCFactionID)

4
zone/lua_npc.h
View File

@ -183,8 +183,8 @@ public:
void SetLDoNTrapped(bool is_trapped);
uint8 GetLDoNTrapType();
void SetLDoNTrapType(uint8 trap_type);
uint16 GetLDoNTrapSpellID();
void SetLDoNTrapSpellID(uint16 spell_id);
int32 GetLDoNTrapSpellID();
void SetLDoNTrapSpellID(int32 spell_id);
bool IsLDoNLocked();
void SetLDoNLocked(bool is_locked);
uint16 GetLDoNLockedSkill();

18
zone/lua_parser.cpp
View File

@ -757,7 +757,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
return 0;
}
int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
@ -773,7 +773,7 @@ int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spe
return _EventSpell(package_name, evt, mob, client, spell_id, data, extra_data, extra_pointers);
}
int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers, luabind::adl::object *l_func) {
const char *sub_name = LuaEvents[evt];
@ -959,7 +959,7 @@ bool LuaParser::GlobalPlayerHasQuestSub(QuestEventID evt) {
return HasFunction(subname, "global_player");
}
bool LuaParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) {
bool LuaParser::SpellHasQuestSub(int32 spell_id, QuestEventID evt) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
return false;
@ -1026,7 +1026,7 @@ void LuaParser::LoadItemScript(std::string filename, EQ::ItemInstance *item) {
LoadScript(filename, package_name);
}
void LuaParser::LoadSpellScript(std::string filename, uint32 spell_id) {
void LuaParser::LoadSpellScript(std::string filename, int32 spell_id) {
std::string package_name = "spell_" + std::to_string(spell_id);
LoadScript(filename, package_name);
@ -1533,7 +1533,7 @@ int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInsta
return ret;
}
int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
@ -1675,7 +1675,7 @@ uint64 LuaParser::GetExperienceForKill(Client *self, Mob *against, bool &ignoreD
}
int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default)
int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default)
{
int64 retval = 0;
for (auto &mod : mods_) {
@ -1684,7 +1684,7 @@ int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spel
return retval;
}
uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, bool &ignore_default)
uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, bool &ignore_default)
{
uint64 retval = 0;
for (auto &mod : mods_) {
@ -1693,7 +1693,7 @@ uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_
return retval;
}
bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, uint16 spell_id, bool &ignore_default)
bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, int32 spell_id, bool &ignore_default)
{
bool retval = false;
for (auto &mod : mods_) {
@ -1702,7 +1702,7 @@ bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, uint16 spell_id, bool &i
return retval;
}
int64 LuaParser::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, bool &ignoreDefault)
int64 LuaParser::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, bool &ignoreDefault)
{
int64 retval = 0;
for (auto &mod : mods_) {

18
zone/lua_parser.h
View File

@ -97,7 +97,7 @@ public:
QuestEventID evt,
Mob* mob,
Client *client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -160,7 +160,7 @@ public:
virtual bool HasGlobalQuestSub(QuestEventID evt);
virtual bool PlayerHasQuestSub(QuestEventID evt);
virtual bool GlobalPlayerHasQuestSub(QuestEventID evt);
virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID evt);
virtual bool SpellHasQuestSub(int32 spell_id, QuestEventID evt);
virtual bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt);
virtual bool EncounterHasQuestSub(std::string encounter_name, QuestEventID evt);
virtual bool HasEncounterSub(const std::string& package_name, QuestEventID evt);
@ -176,7 +176,7 @@ public:
virtual void LoadPlayerScript(std::string filename);
virtual void LoadGlobalPlayerScript(std::string filename);
virtual void LoadItemScript(std::string filename, EQ::ItemInstance *item);
virtual void LoadSpellScript(std::string filename, uint32 spell_id);
virtual void LoadSpellScript(std::string filename, int32 spell_id);
virtual void LoadEncounterScript(std::string filename, std::string encounter_name);
virtual void LoadBotScript(std::string filename);
virtual void LoadGlobalBotScript(std::string filename);
@ -220,7 +220,7 @@ public:
QuestEventID evt,
Mob* mob,
Client *client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -266,14 +266,14 @@ public:
uint32 GetRequiredAAExperience(Client *self, bool &ignoreDefault);
uint32 GetEXPForLevel(Client *self, uint16 level, bool &ignoreDefault);
uint64 GetExperienceForKill(Client *self, Mob *against, bool &ignoreDefault);
int64 CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, bool &ignoreDefault);
int64 CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, bool &ignoreDefault);
int32 UpdatePersonalFaction(Mob *self, int32 npc_value, int32 faction_id, int32 current_value, int32 temp, int32 this_faction_min, int32 this_faction_max, bool &ignore_default);
void RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug, bool &ignore_default);
int64 CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default);
uint64 HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, bool &ignore_default);
int64 CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default);
uint64 HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, bool &ignore_default);
uint64 SetEXP(Mob *self, ExpSource exp_source, uint64 current_exp, uint64 set_exp, bool is_rezz_exp, bool &ignore_default);
uint64 SetAAEXP(Mob *self, ExpSource exp_source, uint64 current_aa_exp, uint64 set_aa_exp, bool is_rezz_exp, bool &ignore_default);
bool IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &ignore_default);
bool IsImmuneToSpell(Mob *self, Mob* caster, int32 spell_id, bool &ignore_default);
private:
LuaParser();
LuaParser(const LuaParser&);
@ -314,7 +314,7 @@ private:
QuestEventID evt,
Mob* mob,
Client *client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers,

30
zone/lua_parser_events.cpp
View File

@ -327,7 +327,7 @@ void handle_npc_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
@ -384,7 +384,7 @@ void handle_npc_cast(
) {
Seperator sep(data.c_str());
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell(IsValidSpell(spell_id) ? &spells[spell_id] : nullptr);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
l_spell_o.push(L);
@ -669,14 +669,14 @@ void handle_npc_spell_blocked(
lua_pushinteger(L, Strings::ToUnsignedInt(sep.arg[1]));
lua_setfield(L, -2, "cast_spell_id");
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_one(IsValidSpell(blocking_spell_id) ? &spells[blocking_spell_id] : nullptr);
luabind::adl::object l_spell_one_o = luabind::adl::object(L, l_spell_one);
l_spell_one_o.push(L);
lua_setfield(L, -2, "blocking_spell");
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_two(IsValidSpell(cast_spell_id) ? &spells[cast_spell_id] : nullptr);
luabind::adl::object l_spell_two_o = luabind::adl::object(L, l_spell_two);
@ -758,7 +758,7 @@ void handle_player_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
@ -1784,14 +1784,14 @@ void handle_player_spell_blocked(
lua_pushinteger(L, Strings::ToUnsignedInt(sep.arg[1]));
lua_setfield(L, -2, "cast_spell_id");
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_one(IsValidSpell(blocking_spell_id) ? &spells[blocking_spell_id] : nullptr);
luabind::adl::object l_spell_one_o = luabind::adl::object(L, l_spell_one);
l_spell_one_o.push(L);
lua_setfield(L, -2, "blocking_spell");
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_two(IsValidSpell(cast_spell_id) ? &spells[cast_spell_id] : nullptr);
luabind::adl::object l_spell_two_o = luabind::adl::object(L, l_spell_two);
@ -2083,7 +2083,7 @@ void handle_spell_event(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -2132,7 +2132,7 @@ void handle_translocate_finish(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -2184,7 +2184,7 @@ void handle_spell_null(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -2460,7 +2460,7 @@ void handle_bot_cast(
) {
Seperator sep(data.c_str());
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell(IsValidSpell(spell_id) ? &spells[spell_id] : nullptr);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
l_spell_o.push(L);
@ -2524,7 +2524,7 @@ void handle_bot_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
@ -2907,14 +2907,14 @@ void handle_bot_spell_blocked(
lua_pushinteger(L, Strings::ToUnsignedInt(sep.arg[1]));
lua_setfield(L, -2, "cast_spell_id");
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_one(IsValidSpell(blocking_spell_id) ? &spells[blocking_spell_id] : nullptr);
luabind::adl::object l_spell_one_o = luabind::adl::object(L, l_spell_one);
l_spell_one_o.push(L);
lua_setfield(L, -2, "blocking_spell");
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_two(IsValidSpell(cast_spell_id) ? &spells[cast_spell_id] : nullptr);
luabind::adl::object l_spell_two_o = luabind::adl::object(L, l_spell_two);
@ -2993,7 +2993,7 @@ void handle_zone_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);

8
zone/lua_parser_events.h
View File

@ -43,7 +43,7 @@ namespace EQ
typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, std::string, uint32, std::vector<std::any>*);
typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, std::string, uint32, std::vector<std::any>*);
typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQ::ItemInstance*, Mob*, std::string, uint32, std::vector<std::any>*);
typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, Mob*, Client*, uint32, std::string, uint32, std::vector<std::any>*);
typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, Mob*, Client*, int32, std::string, uint32, std::vector<std::any>*);
typedef void(*EncounterArgumentHandler)(QuestInterface*, lua_State*, Encounter* encounter, std::string, uint32, std::vector<std::any>*);
typedef void(*BotArgumentHandler)(QuestInterface*, lua_State*, Bot*, Mob*, std::string, uint32, std::vector<std::any>*);
typedef void(*MercArgumentHandler)(QuestInterface*, lua_State*, Merc*, Mob*, std::string, uint32, std::vector<std::any>*);
@ -1060,7 +1060,7 @@ void handle_spell_event(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -1071,7 +1071,7 @@ void handle_translocate_finish(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@ -1082,7 +1082,7 @@ void handle_spell_null(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers

4
zone/lua_stat_bonuses.cpp
View File

@ -269,7 +269,7 @@ int32 Lua_StatBonuses::GetHeroicCorrup() const {
return self->HeroicCorrup;
}
uint16 Lua_StatBonuses::GetDamageShieldSpellID() const {
int32 Lua_StatBonuses::GetDamageShieldSpellID() const {
Lua_Safe_Call_Int();
return self->DamageShieldSpellID;
}
@ -299,7 +299,7 @@ int Lua_StatBonuses::GetReverseDamageShield() const {
return self->ReverseDamageShield;
}
uint16 Lua_StatBonuses::GetReverseDamageShieldSpellID() const {
int32 Lua_StatBonuses::GetReverseDamageShieldSpellID() const {
Lua_Safe_Call_Int();
return self->ReverseDamageShieldSpellID;
}

4
zone/lua_stat_bonuses.h
View File

@ -91,13 +91,13 @@ public:
int32 GetCorrup() const;
int32 GetCorrupCapMod() const;
int32 GetHeroicCorrup() const;
uint16 GetDamageShieldSpellID() const;
int32 GetDamageShieldSpellID() const;
int GetDamageShield() const;
int GetDamageShieldType() const;
int GetSpellDamageShield() const;
int GetSpellShield() const;
int GetReverseDamageShield() const;
uint16 GetReverseDamageShieldSpellID() const;
int32 GetReverseDamageShieldSpellID() const;
int GetReverseDamageShieldType() const;
int Getmovementspeed() const;
int32 Gethaste() const;

2
zone/lua_zone.cpp
View File

@ -624,7 +624,7 @@ bool Lua_Zone::IsSpecialBindLocation(float x, float y, float z, float heading)
return self->IsSpecialBindLocation(glm::vec4(x, y, z, heading));
}
bool Lua_Zone::IsSpellBlocked(uint32 spell_id, float x, float y, float z)
bool Lua_Zone::IsSpellBlocked(int32 spell_id, float x, float y, float z)
{
Lua_Safe_Call_Bool();
return self->IsSpellBlocked(spell_id, glm::vec3(x, y, z));

2
zone/lua_zone.h
View File

@ -144,7 +144,7 @@ public:
bool IsRaining();
bool IsSnowing();
bool IsSpecialBindLocation(float x, float y, float z, float heading);
bool IsSpellBlocked(uint32 spell_id, float x, float y, float z);
bool IsSpellBlocked(int32 spell_id, float x, float y, float z);
bool IsStaticZone();
bool IsUCSServerAvailable();
bool IsWaterZone(float z);

Some files were not shown because too many files have changed in this diff Show More