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 pull request #814 from EQEmu/charm_specialatk

Browse Source 
Added Spells:CharmDisablesSpecialAbilities
This commit is contained in:
Chris Miles
2019-09-01 15:43:15 -05:00
committed by GitHub
parent 898aea80c7 44f85f140c
commit 5c14bc92bd
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.cpp
+5
View File
@@ -209,6 +209,7 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
default_accuracy_rating = npc_type_data->accuracy_rating;
default_avoidance_rating = npc_type_data->avoidance_rating;
default_atk = npc_type_data->ATK;
strn0cpy(default_special_abilities, npc_type_data->special_abilities, 512);
// used for when getting charmed, if 0, doesn't swap
charm_ac = npc_type_data->charm_ac;
@@ -2855,6 +2856,8 @@ void NPC::ModifyStatsOnCharm(bool bRemoved)
base_damage = round((default_max_dmg - default_min_dmg) / 1.9);
min_damage = default_min_dmg - round(base_damage / 10.0);
}
if (RuleB(Spells, CharmDisablesSpecialAbilities))
ProcessSpecialAbilities(default_special_abilities);
} else {
if (charm_ac)
AC = charm_ac;
@@ -2870,6 +2873,8 @@ void NPC::ModifyStatsOnCharm(bool bRemoved)
base_damage = round((charm_max_dmg - charm_min_dmg) / 1.9);
min_damage = charm_min_dmg - round(base_damage / 10.0);
}
if (RuleB(Spells, CharmDisablesSpecialAbilities))
ClearSpecialAbilities();
}
// the rest of the stats aren't cached, so lets just do these two instead of full CalcBonuses()
SetAttackTimer();