From 8df6e7e26be8d4154d93fde71bd2d00cff84023d Mon Sep 17 00:00:00 2001 From: KayenEQ Date: Mon, 8 Dec 2014 18:44:37 -0500 Subject: [PATCH 1/2] ADD FD check before adding projectile generated hate. --- zone/special_attacks.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 928353149..d5b6aef6d 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -979,7 +979,9 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Ite if (HeadShot) entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, FATAL_BOW_SHOT, GetName()); - other->AddToHateList(this, hate, 0, false); + if (IsClient() && !CastToClient()->GetFeigned()) + other->AddToHateList(this, hate, 0, false); + other->Damage(this, TotalDmg, SPELL_UNKNOWN, SkillArchery); //Skill Proc Success @@ -1513,7 +1515,9 @@ void Mob::DoThrowingAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Ite else TotalDmg = -5; - other->AddToHateList(this, 2*WDmg, 0, false); + if (IsClient() && !CastToClient()->GetFeigned()) + other->AddToHateList(this, 2*WDmg, 0, false); + other->Damage(this, TotalDmg, SPELL_UNKNOWN, SkillThrowing); if (TotalDmg > 0 && HasSkillProcSuccess() && other && !other->HasDied()){ From ba2aefc5729bacdd900993243f8d0a39317d3a43 Mon Sep 17 00:00:00 2001 From: KayenEQ Date: Mon, 8 Dec 2014 18:55:23 -0500 Subject: [PATCH 2/2] NPC Focus Effects Optional Rules SQL --- utils/sql/git/optional/2014_12_8_NPC_FocusEffectRules.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 utils/sql/git/optional/2014_12_8_NPC_FocusEffectRules.sql diff --git a/utils/sql/git/optional/2014_12_8_NPC_FocusEffectRules.sql b/utils/sql/git/optional/2014_12_8_NPC_FocusEffectRules.sql new file mode 100644 index 000000000..7cbbb36b1 --- /dev/null +++ b/utils/sql/git/optional/2014_12_8_NPC_FocusEffectRules.sql @@ -0,0 +1,2 @@ +INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:NPC_UseFocusFromSpells', 'true', 'Allow npcs to use most spell buff derived focus effects.'); +INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:NPC_UseFocusFromItems', 'false', 'Allow npcs to use most item derived focus effects.');