[Minor] Optimize GeneralUtils::GetWarheadVersusArmor() (#1700)

Author: NetsuNegi

src/Utilities/GeneralUtils.cpp

@@ -8,6 +8,7 @@
 #include <Ext/Techno/Body.h>
 #include <Misc/FlyingStrings.h>
 #include <Utilities/Constructs.h>
+#include "AresHelper.h"
 
 bool GeneralUtils::IsValidString(const char* str)
 {
@@ -70,23 +71,38 @@ const double GeneralUtils::GetRangedRandomOrSingleValue(PartialVector2D<double>
 	return range.X >= range.Y || range.ValueCount < 2 ? range.X : (ScenarioClass::Instance->Random.RandomRanged(min, max) / 100.0);
 }
 
-const double GeneralUtils::GetWarheadVersusArmor(WarheadTypeClass* pWH, Armor ArmorType)
+struct VersesData
 {
-	return double(MapClass::GetTotalDamage(100, pWH, ArmorType, 0)) / 100.0;
+	double Verses;
+	WarheadFlags Flags;
+};
+
+struct DummyTypeExtHere
+{
+	char _[0x24];
+	std::vector<VersesData> Verses;
+};
+
+const double GeneralUtils::GetWarheadVersusArmor(WarheadTypeClass* pWH, Armor armorType)
+{
+	if (!AresHelper::CanUseAres)
+		return pWH->Verses[static_cast<int>(armorType)];
+
+	return reinterpret_cast<DummyTypeExtHere*>(*(uintptr_t*)((char*)pWH + 0x1CC))->Verses[static_cast<int>(armorType)].Verses;
 }
 
 const double GeneralUtils::GetWarheadVersusArmor(WarheadTypeClass* pWH, TechnoClass* pThis, TechnoTypeClass* pType)
 {
 	if (!pType)
 		pType = pThis->GetTechnoType();
 
-	auto ArmorType = pType->Armor;
+	auto armorType = pType->Armor;
 	auto const pShield = TechnoExt::ExtMap.Find(pThis)->Shield.get();
 
 	if (pShield && pShield->IsActive() && !pShield->CanBePenetrated(pWH))
-		ArmorType = pShield->GetArmorType();
+		armorType = pShield->GetArmorType();
 
-	return double(MapClass::GetTotalDamage(100, pWH, ArmorType, 0)) / 100.0;
+	return GeneralUtils::GetWarheadVersusArmor(pWH, armorType);
 }
 
 // Weighted random element choice (weight) - roll for one.

src/Utilities/GeneralUtils.h

@@ -28,7 +28,7 @@ class GeneralUtils
 	static std::vector<CellStruct> AdjacentCellsInRange(unsigned int range);
 	static const int GetRangedRandomOrSingleValue(PartialVector2D<int> range);
 	static const double GetRangedRandomOrSingleValue(PartialVector2D<double> range);
-	static const double GetWarheadVersusArmor(WarheadTypeClass* pWH, Armor ArmorType);
+	static const double GetWarheadVersusArmor(WarheadTypeClass* pWH, Armor armorType);
 	static const double GetWarheadVersusArmor(WarheadTypeClass* pWH, TechnoClass* pThis, TechnoTypeClass* pType = nullptr);
 	static int ChooseOneWeighted(const double dice, const std::vector<int>* weights);
 	static bool HasHealthRatioThresholdChanged(double oldRatio, double newRatio);