Fix veterancy firepower modifier not being factored in multiple places together with crate/AE ones

Author: Starkku

src/Ext/Anim/Hooks.cpp

@@ -119,7 +119,7 @@ DEFINE_HOOK(0x42453E, AnimClass_AI_Damage, 0x6)
 				pOwner = pInvoker->Owner;
 
 			if (pTypeExt->Damage_ApplyFirepowerMult)
-				appliedDamage = static_cast<int>(appliedDamage * pInvoker->FirepowerMultiplier * TechnoExt::ExtMap.Find(pInvoker)->AE.FirepowerMultiplier);
+				appliedDamage = static_cast<int>(appliedDamage * TechnoExt::GetCurrentFirepowerMultiplier(pInvoker));
 		}
 	}
 

src/Ext/Bullet/Hooks.DetonateLogics.cpp

@@ -414,7 +414,7 @@ DEFINE_HOOK(0x469AA4, BulletClass_Logics_Extras, 0x5)
 			int damage = pWeapon->Damage;
 
 			if (pTypeExt->ReturnWeapon_ApplyFirepowerMult)
-				damage = static_cast<int>(damage * pTechno->FirepowerMultiplier * TechnoExt::ExtMap.Find(pTechno)->AE.FirepowerMultiplier);
+				damage = static_cast<int>(damage * TechnoExt::GetCurrentFirepowerMultiplier(pTechno));
 
 			if (BulletClass* pBullet = pWeapon->Projectile->CreateBullet(pTechno, pTechno,
 				damage, pWeapon->Warhead, pWeapon->Speed, pWeapon->Bright))
@@ -611,7 +611,7 @@ DEFINE_HOOK(0x469EC0, BulletClass_Logics_AirburstWeapon, 0x6)
 		int damage = pWeapon->Damage;
 
 		if (pTypeExt->AirburstWeapon_ApplyFirepowerMult && pSource)
-			damage = static_cast<int>(damage * pSource->FirepowerMultiplier * TechnoExt::ExtMap.Find(pSource)->AE.FirepowerMultiplier);
+			damage = static_cast<int>(damage * TechnoExt::GetCurrentFirepowerMultiplier(pSource));
 
 		// Cache all pointer variables before the loop
 		auto const pWH = pWeapon->Warhead;

src/Ext/Bullet/Trajectories/StraightTrajectory.cpp

@@ -168,10 +168,7 @@ void StraightTrajectory::OnUnlimbo(BulletClass* pBullet, CoordStruct* pCoord, Bu
 	if (pFirer)
 	{
 		this->CurrentBurst = pFirer->CurrentBurstIndex;
-		this->FirepowerMult = pFirer->FirepowerMultiplier;
-
-		if (const auto pExt = TechnoExt::ExtMap.TryFind(pFirer))
-			this->FirepowerMult *= pExt->AE.FirepowerMultiplier;
+		this->FirepowerMult = TechnoExt::GetCurrentFirepowerMultiplier(pFirer);
 
 		if (pType->MirrorCoord && pFirer->CurrentBurstIndex % 2 == 1)
 			this->OffsetCoord.Y = -(this->OffsetCoord.Y);

src/Ext/Techno/Body.cpp

@@ -186,6 +186,12 @@ double TechnoExt::GetCurrentSpeedMultiplier(FootClass* pThis)
 		(pThis->HasAbility(Ability::Faster) ? RulesClass::Instance->VeteranSpeed : 1.0);
 }
 
+double TechnoExt::GetCurrentFirepowerMultiplier(TechnoClass* pThis)
+{
+	return pThis->FirepowerMultiplier * TechnoExt::ExtMap.Find(pThis)->AE.FirepowerMultiplier *
+		(pThis->HasAbility(Ability::Firepower) ? RulesClass::Instance->VeteranCombat : 1.0);
+}
+
 CoordStruct TechnoExt::PassengerKickOutLocation(TechnoClass* pThis, FootClass* pPassenger, int maxAttempts = 1)
 {
 	if (!pThis || !pPassenger)

src/Ext/Techno/Body.h

@@ -238,6 +238,7 @@ class TechnoExt
 	static void ObjectKilledBy(TechnoClass* pThis, TechnoClass* pKiller);
 	static void UpdateSharedAmmo(TechnoClass* pThis);
 	static double GetCurrentSpeedMultiplier(FootClass* pThis);
+	static double GetCurrentFirepowerMultiplier(TechnoClass* pThis);
 	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/WarheadType/Detonate.cpp

@@ -497,7 +497,7 @@ void WarheadTypeExt::ExtData::ApplyCrit(HouseClass* pHouse, TechnoClass* pTarget
 	int damage = this->Crit_ExtraDamage.Get();
 
 	if (this->Crit_ExtraDamage_ApplyFirepowerMult && pOwner)
-		damage = static_cast<int>(damage * pOwner->FirepowerMultiplier * TechnoExt::ExtMap.Find(pOwner)->AE.FirepowerMultiplier);
+		damage = static_cast<int>(damage * TechnoExt::GetCurrentFirepowerMultiplier(pOwner));
 
 	if (this->Crit_Warhead)
 	{

src/New/Entity/AttachEffectClass.cpp

@@ -61,7 +61,7 @@ AttachEffectClass::AttachEffectClass(AttachEffectTypeClass* pType, TechnoClass*
 	duration = this->DurationOverride != 0 ? this->DurationOverride : pType->Duration;
 
 	if (pType->Duration_ApplyFirepowerMult && duration > 0 && pInvoker)
-		duration = Math::max(static_cast<int>(duration * pInvoker->FirepowerMultiplier * TechnoExt::ExtMap.Find(pInvoker)->AE.FirepowerMultiplier), 0);
+		duration = Math::max(static_cast<int>(duration * TechnoExt::GetCurrentFirepowerMultiplier(pInvoker)), 0);
 
 	const auto pTechnoExt = TechnoExt::ExtMap.Find(pTechno);
 
@@ -493,7 +493,7 @@ void AttachEffectClass::RefreshDuration(int durationOverride)
 		duration = this->DurationOverride ? this->DurationOverride : pType->Duration;
 
 	if (pType->Duration_ApplyFirepowerMult && duration > 0 && this->Invoker)
-		duration = Math::max(static_cast<int>(duration * this->Invoker->FirepowerMultiplier * TechnoExt::ExtMap.Find(this->Invoker)->AE.FirepowerMultiplier), 0);
+		duration = Math::max(static_cast<int>(duration * TechnoExt::GetCurrentFirepowerMultiplier(this->Invoker)), 0);
 
 	if (pType->Duration_ApplyArmorMultOnTarget && duration > 0) // no need to count its own effect again
 		duration = Math::max(static_cast<int>(duration / this->Techno->ArmorMultiplier / TechnoExt::ExtMap.Find(this->Techno)->AE.ArmorMultiplier), 0);