pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-05 07:02:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update to focus SE_BlockNextSpell (#1479)

Browse Source 
Minor code changes to make the focus be checked consistent with how all other focuses are checked. No change in functionality.
This commit is contained in:
KayenEQ 2021-08-01 14:19:42 -04:00 committed by GitHub
parent 38beb804a3
commit 93b0264a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/bonuses.cpp
View File

@ -2750,10 +2750,6 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
break; break;
} }
case SE_BlockNextSpellFocus:
new_bonus->BlockNextSpell = true;
break;
case SE_NegateSpellEffect: case SE_NegateSpellEffect:
new_bonus->NegateEffects = true; new_bonus->NegateEffects = true;
break; break;
@ -3827,8 +3823,7 @@ uint8 Mob::IsFocusEffect(uint16 spell_id,int effect_index, bool AA,uint32 aa_eff
case SE_Fc_Spell_Damage_Pct_IncomingPC: case SE_Fc_Spell_Damage_Pct_IncomingPC:
return focusFcSpellDamagePctIncomingPC; return focusFcSpellDamagePctIncomingPC;
case SE_BlockNextSpellFocus: case SE_BlockNextSpellFocus:
//return focusBlockNextSpell; return focusBlockNextSpell;
return 0; //This is calculated as an actual bonus
case SE_FcTwincast: case SE_FcTwincast:
return focusTwincast; return focusTwincast;
case SE_SympatheticProc: case SE_SympatheticProc:

2
zone/common.h
View File

@ -483,8 +483,6 @@ struct StatBonuses {
int HPPercCap[2]; //Spell effect that limits you to being healed/regening beyond a % of your max int HPPercCap[2]; //Spell effect that limits you to being healed/regening beyond a % of your max
int ManaPercCap[2]; // ^^ 0 = % Cap 1 = Flat Amount Cap int ManaPercCap[2]; // ^^ 0 = % Cap 1 = Flat Amount Cap
int EndPercCap[2]; // ^^ int EndPercCap[2]; // ^^
bool BlockNextSpell; // Indicates whether the client can block a spell or not
//uint16 BlockSpellEffect[EFFECT_COUNT]; // Prevents spells with certain effects from landing on you *no longer used
bool ImmuneToFlee; // Bypass the fleeing flag bool ImmuneToFlee; // Bypass the fleeing flag
uint32 VoiceGraft; // Stores the ID of the mob with which to talk through uint32 VoiceGraft; // Stores the ID of the mob with which to talk through
int32 SpellProcChance; // chance to proc from sympathetic spell effects int32 SpellProcChance; // chance to proc from sympathetic spell effects

2
zone/lua_stat_bonuses.cpp
View File

@ -677,7 +677,7 @@ int Lua_StatBonuses::GetXPRateMod() const {
bool Lua_StatBonuses::GetBlockNextSpell() const { bool Lua_StatBonuses::GetBlockNextSpell() const {
Lua_Safe_Call_Bool(); Lua_Safe_Call_Bool();
return self->BlockNextSpell; //return self->BlockNextSpell; bonus no longer used due to effect being a focus
} }
bool Lua_StatBonuses::GetImmuneToFlee() const { bool Lua_StatBonuses::GetImmuneToFlee() const {

2
zone/mob.h
View File

@ -823,7 +823,7 @@ public:
int GetCriticalChanceBonus(uint16 skill); int GetCriticalChanceBonus(uint16 skill);
int16 GetSkillDmgAmt(uint16 skill); int16 GetSkillDmgAmt(uint16 skill);
bool TryReflectSpell(uint32 spell_id); bool TryReflectSpell(uint32 spell_id);
bool CanBlockSpell() const { return(spellbonuses.BlockNextSpell); } inline bool CanBlockSpell() const { return(spellbonuses.FocusEffects[focusBlockNextSpell]); }
bool DoHPToManaCovert(uint16 mana_cost = 0); bool DoHPToManaCovert(uint16 mana_cost = 0);
int32 ApplySpellEffectiveness(int16 spell_id, int32 value, bool IsBard = false, uint16 caster_id=0); int32 ApplySpellEffectiveness(int16 spell_id, int32 value, bool IsBard = false, uint16 caster_id=0);
int8 GetDecayEffectValue(uint16 spell_id, uint16 spelleffect); int8 GetDecayEffectValue(uint16 spell_id, uint16 spelleffect);