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

Merge branch 'master' into shieldability

Browse Source
This commit is contained in:
KayenEQ
2021-08-10 16:12:03 -04:00
committed by GitHub
parent 66c7d77245 416fadd554
commit 24c4d6da97
13 changed files with 692 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+20 -1
View File
@@ -2959,7 +2959,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
int shld_target_mitigation = spells[spell_id].base2[i] ? spells[spell_id].base2[i] : 50;
int shlder_mitigation = spells[spell_id].max[i] ? spells[spell_id].base2[i] : 50;
ShieldAbility(petowner->GetID(), 25, shield_duration, shld_target_mitigation, shlder_mitigation);
break;
}
case SE_Weapon_Stance: {
if (IsClient()) {
CastToClient()->ApplyWeaponsStance();
}
break;
}
@@ -3218,6 +3223,8 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
case SE_Critical_Melee_Damage_Mod_Max:
case SE_Melee_Damage_Position_Mod:
case SE_Damage_Taken_Position_Mod:
case SE_Melee_Damage_Position_Amt:
case SE_Damage_Taken_Position_Amt:
case SE_DS_Mitigation_Amount:
case SE_DS_Mitigation_Percentage:
case SE_Double_Backstab_Front:
@@ -3242,6 +3249,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
case SE_AddExtraAttackPct_1h_Primary:
case SE_AddExtraAttackPct_1h_Secondary:
case SE_Skill_Base_Damage_Mod:
case SE_Buy_AA_Rank:
{
break;
@@ -4372,6 +4380,17 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
}
}
case SE_Weapon_Stance:
{
/*
If we click off the spell buff (or fades naturally) giving us
Weapon Stance effects it should remove all associated buff.
*/
if (weaponstance.spellbonus_buff_spell_id) {
BuffFadeBySpellID(weaponstance.spellbonus_buff_spell_id);
}
weaponstance.spellbonus_enabled = false;
}
}
}
@@ -6598,7 +6617,7 @@ bool Mob::TryDivineSave()
}
}
SpellOnTarget(4789, this); //Touch of the Divine=4789, an Invulnerability/HoT/Purify effect
SpellOnTarget(SPELL_TOUCH_OF_THE_DIVINE, this); //Touch of the Divine=4789, an Invulnerability/HoT/Purify effect
SendHPUpdate();
return true;
}