From 7160aa651e439b908f59851e47412fb645db1606 Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Sat, 4 Jun 2022 14:00:21 -0400
Subject: [PATCH] [Cleanup] Cleanup Haste references and Lua API calls for
 unsigned to signed. (#2240)

---
 zone/bonuses.cpp  |  2 +-
 zone/lua_item.cpp | 18 +++++++++---------
 zone/lua_item.h   | 18 +++++++++---------
 zone/merc.cpp     |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp
index 4d212a4f2..55c6491ff 100644
--- a/zone/bonuses.cpp
+++ b/zone/bonuses.cpp
@@ -353,7 +353,7 @@ void Client::AddItemBonuses(const EQ::ItemInstance *inst, StatBonuses *newbon, b
 		}
 
 		// FatherNitwit: New style haste, shields, and regens
-		if (newbon->haste < (int32)item->Haste) {
+		if (newbon->haste < item->Haste) {
 			newbon->haste = item->Haste;
 		}
 		if (item->Regen > 0)
diff --git a/zone/lua_item.cpp b/zone/lua_item.cpp
index f693407d9..57ae9083b 100644
--- a/zone/lua_item.cpp
+++ b/zone/lua_item.cpp
@@ -76,7 +76,7 @@ uint32 Lua_Item::GetIcon() {
 	return self->Icon;
 }
 
-uint32 Lua_Item::GetLoreGroup() {
+int32 Lua_Item::GetLoreGroup() {
 	Lua_Safe_Call_Int();
 	return self->LoreGroup;
 }
@@ -531,42 +531,42 @@ uint32 Lua_Item::GetAugRestrict() {
 	return self->AugRestrict;
 }
 
-uint32 Lua_Item::GetEndur() {
+int32 Lua_Item::GetEndur() {
 	Lua_Safe_Call_Int();
 	return self->Endur;
 }
 
-uint32 Lua_Item::GetDotShielding() {
+int32 Lua_Item::GetDotShielding() {
 	Lua_Safe_Call_Int();
 	return self->DotShielding;
 }
 
-uint32 Lua_Item::GetAttack() {
+int32 Lua_Item::GetAttack() {
 	Lua_Safe_Call_Int();
 	return self->Attack;
 }
 
-uint32 Lua_Item::GetRegen() {
+int32 Lua_Item::GetRegen() {
 	Lua_Safe_Call_Int();
 	return self->Regen;
 }
 
-uint32 Lua_Item::GetManaRegen() {
+int32 Lua_Item::GetManaRegen() {
 	Lua_Safe_Call_Int();
 	return self->ManaRegen;
 }
 
-uint32 Lua_Item::GetEnduranceRegen() {
+int32 Lua_Item::GetEnduranceRegen() {
 	Lua_Safe_Call_Int();
 	return self->EnduranceRegen;
 }
 
-uint32 Lua_Item::GetHaste() {
+int32 Lua_Item::GetHaste() {
 	Lua_Safe_Call_Int();
 	return self->Haste;
 }
 
-uint32 Lua_Item::GetDamageShield() {
+int32 Lua_Item::GetDamageShield() {
 	Lua_Safe_Call_Int();
 	return self->DamageShield;
 }
diff --git a/zone/lua_item.h b/zone/lua_item.h
index 6a55c80b3..ec7e33dac 100644
--- a/zone/lua_item.h
+++ b/zone/lua_item.h
@@ -41,7 +41,7 @@ public:
 	uint32 GetSlots();
 	uint32 GetPrice();
 	uint32 GetIcon();
-	uint32 GetLoreGroup();
+	int32 GetLoreGroup();
 	bool GetLoreFlag();
 	bool GetPendingLoreFlag();
 	bool GetArtifactFlag();
@@ -129,14 +129,14 @@ public:
 	uint32 GetLDoNSold();
 	uint32 GetBaneDmgRaceAmt();
 	uint32 GetAugRestrict();
-	uint32 GetEndur();
-	uint32 GetDotShielding();
-	uint32 GetAttack();
-	uint32 GetRegen();
-	uint32 GetManaRegen();
-	uint32 GetEnduranceRegen();
-	uint32 GetHaste();
-	uint32 GetDamageShield();
+	int32 GetEndur();
+	int32 GetDotShielding();
+	int32 GetAttack();
+	int32 GetRegen();
+	int32 GetManaRegen();
+	int32 GetEnduranceRegen();
+	int32 GetHaste();
+	int32 GetDamageShield();
 	uint32 GetRecastDelay();
 	uint32 GetRecastType();
 	uint32 GetAugDistiller();
diff --git a/zone/merc.cpp b/zone/merc.cpp
index af34e3c2e..c761818d6 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -351,7 +351,7 @@ void Merc::AddItemBonuses(const EQ::ItemData *item, StatBonuses* newbon) {
 	}
 
 	//FatherNitwit: New style haste, shields, and regens
-	if(newbon->haste < (int16)item->Haste) {
+	if(newbon->haste < item->Haste) {
 		newbon->haste = item->Haste;
 	}
 	if(item->Regen > 0)