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

fix for SE_Ff_Override_Notfocusable

Browse Source 
Fix for SE_Ff_Override_Notfocusable

Logic was not correct. Changed where spell field 'not_focusable' makes check to properly account for this effect.
This commit is contained in:
KayenEQ
2021-07-21 19:40:49 -04:00
parent 7d1904d20f
commit 9712202cbf
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+12 -8
View File
@@ -4434,6 +4434,8 @@ int16 Client::CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id)
{ {
const SPDat_Spell_Struct &spell = spells[spell_id]; const SPDat_Spell_Struct &spell = spells[spell_id];
bool not_focusable = spells[spell_id].not_focusable;
int16 value = 0; int16 value = 0;
int lvlModifier = 100; int lvlModifier = 100;
int spell_level = 0; int spell_level = 0;
@@ -4744,6 +4746,11 @@ int16 Client::CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id)
LimitFailure = true; LimitFailure = true;
break; break;
case SE_Ff_Override_NotFocusable:
if (base1 == 1)
not_focusable = false;
break;
/* These are not applicable to AA's because there is never a 'caster' of the 'buff' with the focus effect. /* These are not applicable to AA's because there is never a 'caster' of the 'buff' with the focus effect.
case SE_Ff_Same_Caster: case SE_Ff_Same_Caster:
@@ -4996,6 +5003,9 @@ int16 Client::CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id)
if (LimitFailure) if (LimitFailure)
return 0; return 0;
if (not_focusable)
return 0;
return (value * lvlModifier / 100); return (value * lvlModifier / 100);
} }
@@ -5011,8 +5021,8 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
if (!IsValidSpell(focus_id) || !IsValidSpell(spell_id)) if (!IsValidSpell(focus_id) || !IsValidSpell(spell_id))
return 0; return 0;
//Check this here also, some focus effects call this directly, bypassing GetFocusEffect function. //No further checks if spell_id no_focusable, unless spell focus_id contains an override limiter.
if (spells[spell_id].not_focusable && !IsEffectInSpell(spell_id, SE_Ff_Override_NotFocusable)) if (spells[spell_id].not_focusable && !IsEffectInSpell(focus_id, SE_Ff_Override_NotFocusable))
return 0; return 0;
const SPDat_Spell_Struct &focus_spell = spells[focus_id]; const SPDat_Spell_Struct &focus_spell = spells[focus_id];
@@ -5766,9 +5776,6 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id)
if (IsBardSong(spell_id) && type != focusFcBaseEffects && type != focusSpellDuration) if (IsBardSong(spell_id) && type != focusFcBaseEffects && type != focusSpellDuration)
return 0; return 0;
if (spells[spell_id].not_focusable && !IsEffectInSpell(spell_id, SE_Ff_Override_NotFocusable))
return 0;
int16 realTotal = 0; int16 realTotal = 0;
int16 realTotal2 = 0; int16 realTotal2 = 0;
int16 realTotal3 = 0; int16 realTotal3 = 0;
@@ -6040,9 +6047,6 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id)
int16 NPC::GetFocusEffect(focusType type, uint16 spell_id) { int16 NPC::GetFocusEffect(focusType type, uint16 spell_id) {
if (spells[spell_id].not_focusable && !IsEffectInSpell(spell_id, SE_Ff_Override_NotFocusable))
return 0;
int16 realTotal = 0; int16 realTotal = 0;
int16 realTotal2 = 0; int16 realTotal2 = 0;
bool rand_effectiveness = false; bool rand_effectiveness = false;