From f4983f090d4e3f38d3f5db0eca0cac5e1cac1120 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 1 Nov 2015 20:56:03 -0600 Subject: [PATCH] Once again another adjustment to npc to npc aggro check timer [skip cki] --- common/ruletypes.h | 2 ++ zone/mob_ai.cpp | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/ruletypes.h b/common/ruletypes.h index 1b4baa371..456c9f378 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -475,6 +475,8 @@ RULE_BOOL(NPC, ReturnNonQuestNoDropItems, false) // Returns NO DROP items on NPC RULE_INT(NPC, StartEnrageValue, 9) // % HP that an NPC will begin to enrage RULE_BOOL(NPC, LiveLikeEnrage, false) // If set to true then only player controlled pets will enrage RULE_BOOL(NPC, EnableMeritBasedFaction, false) // If set to true, faction will given in the same way as experience (solo/group/raid) +RULE_INT(NPC, NPCToNPCAggroTimerMin, 500) +RULE_INT(NPC, NPCToNPCAggroTimerMax, 6000) RULE_CATEGORY_END() RULE_CATEGORY(Aggro) diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index 06a9fdbfb..0a2219428 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -480,7 +480,7 @@ void Mob::AI_Start(uint32 iMoveDelay) { AI_movement_timer = std::unique_ptr(new Timer(AImovement_duration)); AI_target_check_timer = std::unique_ptr(new Timer(AItarget_check_duration)); AI_feign_remember_timer = std::unique_ptr(new Timer(AIfeignremember_delay)); - AI_scan_area_timer = std::unique_ptr(new Timer(RandomTimer(6000, 18000))); + AI_scan_area_timer = std::unique_ptr(new Timer(RandomTimer(RuleI(NPC, NPCToNPCAggroTimerMin), RuleI(NPC, NPCToNPCAggroTimerMax)))); AI_check_signal_timer = std::unique_ptr(new Timer(AI_check_signal_timer_delay)); #ifdef REVERSE_AGGRO @@ -1364,8 +1364,6 @@ void Mob::AI_Process() { * */ - Log.Out(Logs::General, Logs::Zone_Server, "AI Scan area timer check for :: %s", this->GetCleanName()); - Mob* tmptar = entity_list.AICheckCloseAggro(this, GetAggroRange(), GetAssistRange()); if (tmptar) AddToHateList(tmptar);