More hate changes

zone/attack.cpp

@@ -2400,7 +2400,8 @@ bool NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillUseTypes attack
 	return true;
 }
 
-void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, bool bFrenzy, bool iBuffTic) {
+void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/)
+{
 
 	assert(other != nullptr);
 

zone/bot.cpp

@@ -6008,7 +6008,7 @@ void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, SkillUseTypes attack_
 	}
 }
 
-void Bot::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, bool bFrenzy, bool iBuffTic)
+void Bot::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/)
 {
 	Mob::AddToHateList(other, hate, damage, iYellForHelp, bFrenzy, iBuffTic);
 }

zone/bot.h

@@ -208,7 +208,7 @@ public:
 	bool DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, uint16 slot, bool &stopLogic);
 	void SendBotArcheryWearChange(uint8 material_slot, uint32 material, uint32 color);
 	void Camp(bool databaseSave = true);
-	virtual void AddToHateList(Mob* other, int32 hate = 0, int32 damage = 0, bool iYellForHelp = true, bool bFrenzy = false, bool iBuffTic = false);
+	virtual void AddToHateList(Mob* other, uint32 hate = 0, int32 damage = 0, bool iYellForHelp = true, bool bFrenzy = false, bool iBuffTic = false);
 	virtual void SetTarget(Mob* mob);
 	virtual void Zone();
 	std::vector<AISpells_Struct> GetBotSpells() { return AIspells; }

zone/command.cpp

@@ -8656,8 +8656,8 @@ void command_aggrozone(Client *c, const Seperator *sep) {
 	if (!m)
 		return;
 
-	int hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything
+	uint32 hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything
-	entity_list.AggroZone(m,hate);
+	entity_list.AggroZone(m, hate);
 	c->Message(0, "Train to you! Last chance to go invulnerable...");
 }
 

zone/entity.cpp

@@ -2914,7 +2914,7 @@ void EntityList::ClearZoneFeignAggro(Client *targ)
 	}
 }
 
-void EntityList::AggroZone(Mob *who, int hate)
+void EntityList::AggroZone(Mob *who, uint32 hate)
 {
 	auto it = npc_list.begin();
 	while (it != npc_list.end()) {

zone/entity.h

@@ -355,7 +355,7 @@ public:
 	void	ClearAggro(Mob* targ);
 	void	ClearFeignAggro(Mob* targ);
 	void	ClearZoneFeignAggro(Client* targ);
-	void	AggroZone(Mob* who, int hate = 0);
+	void	AggroZone(Mob* who, uint32 hate = 0);
 
 	bool	Fighting(Mob* targ);
 	void	RemoveFromHateLists(Mob* mob, bool settoone = false);

zone/hate_list.cpp

@@ -158,8 +158,11 @@ Mob* HateList::GetClosestEntOnHateList(Mob *hater)
 	return close_entity;
 }
 
-void HateList::AddEntToHateList(Mob *in_entity, int32 in_hate, int32 in_damage, bool in_is_entity_frenzy, bool iAddIfNotExist)
+#include <iostream>
+void HateList::AddEntToHateList(Mob *in_entity, uint32 in_hate, int32 in_damage, bool in_is_entity_frenzy, bool iAddIfNotExist)
 {
+	std::cout << "AddEntToHateList name: " << owner->GetCleanName() << " in_hate " << in_hate << " in_damage " << in_damage << std::endl;
+
 	if (!in_entity) {
 		return;
 	}

zone/hate_list.h

@@ -27,7 +27,7 @@ struct ExtraAttackOptions;
 
 struct struct_HateList {
 	Mob *entity_on_hatelist;
-	uint32 hatelist_damage;
+	int32 hatelist_damage;
 	uint32 stored_hate_amount;
 	bool is_entity_frenzy;
 };
@@ -44,7 +44,7 @@ class HateList
 		Mob *GetEntWithMostHateInRange(Mob *center);
 		Mob* GetEntWithMostHateOnList();
 
-		bool IsEntOnHateList(Mob *);
+		bool IsEntOnHateList(Mob *mob);
 		bool IsHateListEmpty();
 		bool RemoveEntFromHateList(Mob *ent);
 
@@ -53,7 +53,7 @@ class HateList
 
 		uint32 GetEntHateAmount(Mob *in_entity, bool damage = false);
 
-		void AddEntToHateList(Mob *in_entity, int32 in_hate = 0, int32 in_damage = 0, bool in_is_frenzied = false, bool add_to_hate_list_if_not_exist = true);
+		void AddEntToHateList(Mob *in_entity, uint32 in_hate = 0, int32 in_damage = 0, bool in_is_frenzied = false, bool add_to_hate_list_if_not_exist = true);
 		void DoFactionHits(int32 npc_faction_level_id);
 		void IsEntityInFrenzyMode();
 		void PrintHateListToClient(Client *c);

zone/mob.h

@@ -452,7 +452,7 @@ public:
 	static uint32 GetLevelCon(uint8 mylevel, uint8 iOtherLevel);
 	inline uint32 GetLevelCon(uint8 iOtherLevel) const {
 		return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GREEN; }
-	virtual void AddToHateList(Mob* other, int32 hate = 0, int32 damage = 0, bool iYellForHelp = true,
+	virtual void AddToHateList(Mob* other, uint32 hate = 0, int32 damage = 0, bool iYellForHelp = true,
 		bool bFrenzy = false, bool iBuffTic = false);
 	bool RemoveFromHateList(Mob* mob);
 	void SetHateAmountOnEnt(Mob* other, int32 hate = 0, int32 damage = 0) { hate_list.SetHateAmountOnEnt(other,hate,damage);}

zone/special_attacks.cpp

@@ -106,7 +106,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, SkillUseTypes skill, int32 max_damage,
 	if(who->GetInvul() || who->GetSpecialAbility(IMMUNE_MELEE) || who->GetSpecialAbility(IMMUNE_MELEE_EXCEPT_BANE))
 		return; //-5?
 
-	int32 hate = max_damage;
+	uint32 hate = max_damage;
 	if(hate_override > -1)
 		hate = hate_override;
 
@@ -583,7 +583,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime)
 	int32 ndamage = 0;
 	int32 max_hit = 0;
 	int32 min_hit = 0;
-	int32 hate = 0;
+	uint32 hate = 0;
 	int32 primaryweapondamage = 0;
 	int32 backstab_dmg = 0;
 
@@ -889,7 +889,7 @@ void Mob::DoArcheryAttackDmg(Mob* other,  const ItemInst* RangeWeapon, const Ite
 		if (HeadShot_Dmg)
 			HeadShot = true;
 
-		int32 hate = 0;
+		uint32 hate = 0;
 		int32 TotalDmg = 0;
 		int16 WDmg = 0;
 		int16 ADmg = 0;
@@ -2354,7 +2354,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillUseTypes
 		skillinuse = SkillOffense;
 
 	int damage = 0;
-	int32 hate = 0;
+	uint32 hate = 0;
 	int Hand = MainPrimary;
 	if (hate == 0 && weapon_damage > 1) hate = weapon_damage;
 

zone/spell_effects.cpp

@@ -3728,7 +3728,7 @@ void Mob::DoBuffTic(uint16 spell_id, int slot, uint32 ticsremaining, uint8 caste
 			case SE_AddHateOverTimePct:
 			{				
 				if (IsNPC()){
-					int32 new_hate = CastToNPC()->GetHateAmount(caster) * (100 + spell.base[i]) / 100;
+					uint32 new_hate = CastToNPC()->GetHateAmount(caster) * (100 + spell.base[i]) / 100;
 					if (new_hate <= 0)
 						new_hate = 1;
 					

zone/spells.cpp

@@ -3656,7 +3656,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
 								spelltar->AddToHateList(this, aggro);
 					}
 					else{
-						int32 newhate = spelltar->GetHateAmount(this) + aggro;
+						uint32 newhate = spelltar->GetHateAmount(this) + aggro;
 						if (newhate < 1) {
 							spelltar->SetHateAmountOnEnt(this,1);
 						} else {