merge upstream

zone/mob_ai.cpp

@@ -15,25 +15,25 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+
 #include "../common/debug.h"
-#include <iostream>
-#include <iomanip>
-#include <stdlib.h>
-#include <math.h>
-#include <algorithm>
-#include "npc.h"
-#include "masterentity.h"
-#include "npc_ai.h"
-#include "map.h"
-#include "../common/moremath.h"
-#include "string_ids.h"
-#include "../common/misc_functions.h"
-#include "../common/string_util.h"
-#include "../common/rulesys.h"
 #include "../common/features.h"
+#include "../common/rulesys.h"
+#include "../common/string_util.h"
+
+#include "client.h"
+#include "entity.h"
+#include "map.h"
+#include "mob.h"
+#include "npc.h"
 #include "quest_parser_collection.h"
+#include "string_ids.h"
 #include "water_map.h"
 
+#include <algorithm>
+#include <iostream>
+#include <math.h>
+
 extern EntityList entity_list;
 
 extern Zone *zone;
@@ -1085,7 +1085,7 @@ void Mob::AI_Process() {
 	{
 		// we are prevented from getting here if we are blind and don't have a target in range
 		// from above, so no extra blind checks needed
-		if (IsRooted() || IsBlind())
+		if ((IsRooted() && !GetSpecialAbility(IGNORE_ROOT_AGGRO_RULES)) || IsBlind())
 			SetTarget(hate_list.GetClosest(this));
 		else
 		{
@@ -2730,7 +2730,7 @@ DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) {
         npc_spells_cache[iDBSpellsID]->attack_proc = tmpattack_proc;
         npc_spells_cache[iDBSpellsID]->proc_chance = tmpproc_chance;
         npc_spells_cache[iDBSpellsID]->range_proc = tmprange_proc;
-        npc_spells_cache[iDBSpellsID]->rproc_chance = tmpdproc_chance;
+        npc_spells_cache[iDBSpellsID]->rproc_chance = tmprproc_chance;
         npc_spells_cache[iDBSpellsID]->defensive_proc = tmpdefensive_proc;
         npc_spells_cache[iDBSpellsID]->dproc_chance = tmpdproc_chance;
         npc_spells_cache[iDBSpellsID]->fail_recast = tmppfail_recast;