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

Fix to SE_ApplyEffect - Will now trigger spell from this effect at correct time.

Browse Source
This commit is contained in:
KayenEQ 2014-09-22 19:42:59 -04:00
parent c160b8716f
commit 1f155690d8
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zone/mob.cpp
View File

@ -3083,26 +3083,6 @@ void Mob::TrySpellTrigger(Mob *target, uint32 spell_id)
} }
} }
void Mob::TryApplyEffect(Mob *target, uint32 spell_id)
{
if(target == nullptr || !IsValidSpell(spell_id))
{
return;
}
for(int i = 0; i < EFFECT_COUNT; i++)
{
if (spells[spell_id].effectid[i] == SE_ApplyEffect)
{
if(MakeRandomInt(0, 100) <= spells[spell_id].base[i])
{
if(target)
SpellFinished(spells[spell_id].base2[i], target, 10, 0, -1, spells[spell_id].ResistDiff);
}
}
}
}
void Mob::TryTriggerOnValueAmount(bool IsHP, bool IsMana, bool IsEndur, bool IsPet) void Mob::TryTriggerOnValueAmount(bool IsHP, bool IsMana, bool IsEndur, bool IsPet)
{ {
/* /*

1
zone/mob.h
View File

@ -580,7 +580,6 @@ public:
void TryTriggerOnCast(uint32 spell_id, bool aa_trigger); void TryTriggerOnCast(uint32 spell_id, bool aa_trigger);
void TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger); void TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger);
void TrySpellTrigger(Mob *target, uint32 spell_id); void TrySpellTrigger(Mob *target, uint32 spell_id);
void TryApplyEffect(Mob *target, uint32 spell_id);
void TryTriggerOnValueAmount(bool IsHP = false, bool IsMana = false, bool IsEndur = false, bool IsPet = false); void TryTriggerOnValueAmount(bool IsHP = false, bool IsMana = false, bool IsEndur = false, bool IsPet = false);
void TryTwincast(Mob *caster, Mob *target, uint32 spell_id); void TryTwincast(Mob *caster, Mob *target, uint32 spell_id);
void TrySympatheticProc(Mob *target, uint32 spell_id); void TrySympatheticProc(Mob *target, uint32 spell_id);

11
zone/spell_effects.cpp
View File

@ -2730,6 +2730,16 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
break; break;
} }
case SE_ApplyEffect: {
if (caster && IsValidSpell(spells[spell_id].base2[i])){
if(MakeRandomInt(0, 100) <= spells[spell_id].base[i])
caster->SpellFinished(spells[spell_id].base2[i], this, 10, 0, -1, spells[spell_id].ResistDiff);
}
break;
}
// Handled Elsewhere // Handled Elsewhere
case SE_ImmuneFleeing: case SE_ImmuneFleeing:
case SE_NegateSpellEffect: case SE_NegateSpellEffect:
@ -2840,7 +2850,6 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
case SE_SkillDamageTaken: case SE_SkillDamageTaken:
case SE_FcSpellVulnerability: case SE_FcSpellVulnerability:
case SE_SpellTrigger: case SE_SpellTrigger:
case SE_ApplyEffect:
case SE_FcTwincast: case SE_FcTwincast:
case SE_DelayDeath: case SE_DelayDeath:
case SE_CastOnFadeEffect: case SE_CastOnFadeEffect:

1
zone/spells.cpp
View File

@ -3648,7 +3648,6 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
} }
TrySpellTrigger(spelltar, spell_id); TrySpellTrigger(spelltar, spell_id);
TryApplyEffect(spelltar, spell_id);
if (IsValidSpell(spells[spell_id].RecourseLink)) if (IsValidSpell(spells[spell_id].RecourseLink))
SpellFinished(spells[spell_id].RecourseLink, this, 10, 0, -1, spells[spells[spell_id].RecourseLink].ResistDiff); SpellFinished(spells[spell_id].RecourseLink, this, 10, 0, -1, spells[spells[spell_id].RecourseLink].ResistDiff);