fix with over damage again

Author: NetsuNegi

src/Ext/Techno/Body.h

@@ -267,7 +267,7 @@ class TechnoExt
 	static void UpdateSharedAmmo(TechnoClass* pThis);
 	static double GetCurrentSpeedMultiplier(FootClass* pThis);
 	static double GetCurrentFirepowerMultiplier(TechnoClass* pThis);
-	static int CalculateArmorMultipliers(TechnoClass* pThis, int damage, WarheadTypeClass* pWarhead);
+	static double CalculateArmorMultipliers(TechnoClass* pThis, WarheadTypeClass* pWarhead);
 	static void DrawSelfHealPips(TechnoClass* pThis, Point2D* pLocation, RectangleStruct* pBounds);
 	static void DrawInsignia(TechnoClass* pThis, Point2D* pLocation, RectangleStruct* pBounds);
 	static void ApplyGainedSelfHeal(TechnoClass* pThis);

src/Ext/Techno/Hooks.cpp

@@ -452,7 +452,7 @@ DEFINE_HOOK(0x4DB218, FootClass_GetMovementSpeed_SpeedMultiplier, 0x6)
 	return 0;
 }
 
-int TechnoExt::CalculateArmorMultipliers(TechnoClass* pThis, int damage, WarheadTypeClass* pWarhead)
+double TechnoExt::CalculateArmorMultipliers(TechnoClass* pThis, WarheadTypeClass* pWarhead)
 {
 	auto const pExt = TechnoExt::ExtMap.Find(pThis);
 	double mult = pExt->AE.ArmorMultiplier;
@@ -476,7 +476,7 @@ int TechnoExt::CalculateArmorMultipliers(TechnoClass* pThis, int damage, Warhead
 		}
 	}
 
-	return static_cast<int>(damage / mult);
+	return mult;
 }
 
 DEFINE_HOOK(0x6FDC87, TechnoClass_AdjustDamage_ArmorMultiplier, 0x6)
@@ -485,7 +485,7 @@ DEFINE_HOOK(0x6FDC87, TechnoClass_AdjustDamage_ArmorMultiplier, 0x6)
 	GET(const int, damage, EAX);
 	GET_STACK(WeaponTypeClass*, pWeapon, STACK_OFFSET(0x18, 0x8));
 
-	R->EAX(TechnoExt::CalculateArmorMultipliers(pTarget, damage, pWeapon->Warhead));
+	R->EAX(static_cast<int>(damage / TechnoExt::CalculateArmorMultipliers(pTarget, pWeapon->Warhead)));
 
 	return 0;
 }
@@ -496,7 +496,7 @@ DEFINE_HOOK(0x701966, TechnoClass_ReceiveDamage_ArmorMultiplier, 0x6)
 	GET(const int, damage, EAX);
 	GET_STACK(WarheadTypeClass*, pWarhead, STACK_OFFSET(0xC4, 0xC));
 
-	R->EAX(TechnoExt::CalculateArmorMultipliers(pThis, damage, pWarhead));
+	R->EAX(static_cast<int>(damage / TechnoExt::CalculateArmorMultipliers(pThis, pWarhead)));
 
 	return 0;
 }

src/New/Entity/ShieldClass.cpp

@@ -210,7 +210,8 @@ int ShieldClass::ReceiveDamage(args_ReceiveDamage* args)
 				if (pTechno->HasAbility(Ability::Stronger))
 					armorMultiplier *= RulesClass::Instance->VeteranArmor;
 
-				nDamage = Math::max(TechnoExt::CalculateArmorMultipliers(pTechno, static_cast<int>(nDamage / armorMultiplier), pWH), 0);
+				armorMultiplier *= TechnoExt::CalculateArmorMultipliers(pTechno, pWH);
+				nDamage = Math::max(static_cast<int>(nDamage / armorMultiplier), 0);
 			}
 
 			nDamage = MapClass::GetTotalDamage(nDamage, pWH, this->GetArmorType(pTechnoType), args->DistanceToEpicenter);