pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Spells:CharmDisablesSpecialAbilities

Browse Source
This commit is contained in:
Xackery Xtal 2019-01-21 20:29:12 -08:00
parent 7857bc45fb
commit 44f85f140c
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -365,6 +365,7 @@ RULE_INT(Spells, CharismaEffectiveness, 10) // Deterimes how much resist modific
RULE_INT(Spells, CharismaEffectivenessCap, 255) // Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod. RULE_INT(Spells, CharismaEffectivenessCap, 255) // Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod.
RULE_BOOL(Spells, CharismaCharmDuration, false) // Allow CHA resist mod to extend charm duration. RULE_BOOL(Spells, CharismaCharmDuration, false) // Allow CHA resist mod to extend charm duration.
RULE_INT(Spells, CharmBreakCheckChance, 25) //Determines chance for a charm break check to occur each buff tick. RULE_INT(Spells, CharmBreakCheckChance, 25) //Determines chance for a charm break check to occur each buff tick.
RULE_BOOL(Spells, CharmDisablesSpecialAbilities, false) //When charm is cast on an NPC, strip their special abilities
RULE_INT(Spells, MaxCastTimeReduction, 50) //Max percent your spell cast time can be reduced by spell haste RULE_INT(Spells, MaxCastTimeReduction, 50) //Max percent your spell cast time can be reduced by spell haste
RULE_INT(Spells, RootBreakFromSpells, 55) //Chance for root to break when cast on. RULE_INT(Spells, RootBreakFromSpells, 55) //Chance for root to break when cast on.
RULE_INT(Spells, DeathSaveCharismaMod, 3) //Determines how much charisma effects chance of death save firing. RULE_INT(Spells, DeathSaveCharismaMod, 3) //Determines how much charisma effects chance of death save firing.

5
zone/npc.cpp
View File

@ -208,6 +208,7 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
default_accuracy_rating = npc_type_data->accuracy_rating; default_accuracy_rating = npc_type_data->accuracy_rating;
default_avoidance_rating = npc_type_data->avoidance_rating; default_avoidance_rating = npc_type_data->avoidance_rating;
default_atk = npc_type_data->ATK; 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 // used for when getting charmed, if 0, doesn't swap
charm_ac = npc_type_data->charm_ac; charm_ac = npc_type_data->charm_ac;
@ -2840,6 +2841,8 @@ void NPC::ModifyStatsOnCharm(bool bRemoved)
base_damage = round((default_max_dmg - default_min_dmg) / 1.9); base_damage = round((default_max_dmg - default_min_dmg) / 1.9);
min_damage = default_min_dmg - round(base_damage / 10.0); min_damage = default_min_dmg - round(base_damage / 10.0);
} }
if (RuleB(Spells, CharmDisablesSpecialAbilities))
ProcessSpecialAbilities(default_special_abilities);
} else { } else {
if (charm_ac) if (charm_ac)
AC = charm_ac; AC = charm_ac;
@ -2855,6 +2858,8 @@ void NPC::ModifyStatsOnCharm(bool bRemoved)
base_damage = round((charm_max_dmg - charm_min_dmg) / 1.9); base_damage = round((charm_max_dmg - charm_min_dmg) / 1.9);
min_damage = charm_min_dmg - round(base_damage / 10.0); 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() // the rest of the stats aren't cached, so lets just do these two instead of full CalcBonuses()
SetAttackTimer(); SetAttackTimer();

1
zone/npc.h
View File

@ -538,6 +538,7 @@ protected:
int default_accuracy_rating; int default_accuracy_rating;
int default_avoidance_rating; int default_avoidance_rating;
int default_atk; int default_atk;
char default_special_abilities[512];
// when charmed, switch to these // when charmed, switch to these
int charm_ac; int charm_ac;