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

Changed mana_used to use int32,

Browse Source 
to match int32 mana_cost
This will allow higher mana costs to function
This commit is contained in:
dmcintosh-BCT
2022-07-21 16:49:17 -04:00
parent 20c639c872
commit 5876049cb7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.h
+2 -2
View File
@@ -345,9 +345,9 @@ public:
int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF,
uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, int16 resist_adjust = 0, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, int16 resist_adjust = 0,
uint32 aa_id = 0); uint32 aa_id = 0);
void CastedSpellFinished(uint16 spell_id, uint32 target_id, EQ::spells::CastingSlot slot, uint16 mana_used, void CastedSpellFinished(uint16 spell_id, uint32 target_id, EQ::spells::CastingSlot slot, int mana_used,
uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0); uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0);
bool SpellFinished(uint16 spell_id, Mob *target, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, uint16 mana_used = 0, bool SpellFinished(uint16 spell_id, Mob *target, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int mana_used = 0,
uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false, int level_override = -1, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, bool from_casted_spell = false, uint32 aa_id = 0); uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false, int level_override = -1, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, bool from_casted_spell = false, uint32 aa_id = 0);
void SendBeginCast(uint16 spell_id, uint32 casttime); void SendBeginCast(uint16 spell_id, uint32 casttime);
virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, int reflect_effectiveness = 0, virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, int reflect_effectiveness = 0,
zone/spell_effects.cpp
+1 -1
View File
@@ -7077,7 +7077,7 @@ uint16 Mob::GetSympatheticSpellProcID(uint16 spell_id)
return 0; return 0;
} }
bool Mob::DoHPToManaCovert(uint16 mana_cost) bool Mob::DoHPToManaCovert(int32 mana_cost)
{ {
if (spellbonuses.HPToManaConvert){ if (spellbonuses.HPToManaConvert){
int64 hp_cost = spellbonuses.HPToManaConvert * mana_cost / 100; int64 hp_cost = spellbonuses.HPToManaConvert * mana_cost / 100;
zone/spells.cpp
+2 -2
View File
@@ -1288,7 +1288,7 @@ void Mob::StopCastSpell(int32 spell_id, bool send_spellbar_enable)
// just check timed spell specific things before passing off to SpellFinished // just check timed spell specific things before passing off to SpellFinished
// which figures out proper targets etc // which figures out proper targets etc
void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slot, void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slot,
uint16 mana_used, uint32 inventory_slot, int16 resist_adjust) int32 mana_used, uint32 inventory_slot, int16 resist_adjust)
{ {
if (!IsValidSpell(spell_id)) if (!IsValidSpell(spell_id))
{ {
@@ -2260,7 +2260,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
// only used from CastedSpellFinished, and procs // only used from CastedSpellFinished, and procs
// we can't interrupt in this, or anything called from this! // we can't interrupt in this, or anything called from this!
// if you need to abort the casting, return false // if you need to abort the casting, return false
bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, uint16 mana_used, bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, int32 mana_used,
uint32 inventory_slot, int16 resist_adjust, bool isproc, int level_override, uint32 inventory_slot, int16 resist_adjust, bool isproc, int level_override,
uint32 timer, uint32 timer_duration, bool from_casted_spell, uint32 aa_id) uint32 timer, uint32 timer_duration, bool from_casted_spell, uint32 aa_id)
{ {