Added EngineMultiplier, which multiplies with other EngineMultipliers…

…, opposed to EngineFactor, which always worked off the base.
BattletechModders · Mar 3, 2024 · 36e3a07 · 36e3a07
1 parent 7ce1b2d
commit 36e3a07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/source/Features/Engines/Engine.cs b/source/Features/Engines/Engine.cs
@@ -117,7 +117,7 @@ private static int MatchingCount(IEnumerable<MechComponentRef> heatSinks, HeatSi
 
     private float HeatSinkExternalFreeTonnage => HeatSinkExternalFreeCount * HeatSinkDef.Def.Tonnage;
     internal float GyroTonnage => PrecisionUtils.RoundUp(StandardGyroTonnage * WeightFactors.GyroFactor, WeightPrecision);
-    internal float EngineTonnage => PrecisionUtils.RoundUp(StandardEngineTonnage * WeightFactors.EngineFactor, WeightPrecision);
+    internal float EngineTonnage => PrecisionUtils.RoundUp(StandardEngineTonnage * WeightFactors.EngineFactor * WeightFactors.EngineMultiplier, WeightPrecision);
     internal float HeatSinkTonnage => -HeatSinkExternalFreeTonnage;
     internal float TotalTonnage => HeatSinkTonnage + EngineTonnage + GyroTonnage;
 

diff --git a/source/Features/OverrideTonnage/WeightFactors.cs b/source/Features/OverrideTonnage/WeightFactors.cs
@@ -11,13 +11,16 @@ namespace MechEngineer.Features.OverrideTonnage;
 [UsedBy(User.BattleValue)]
 public class WeightFactors : SimpleCustomComponent, IAdjustSlotElement, IAdjustTooltipEquipment, IAdjustTooltipWeapon
 {
+    // TODO rename to BaseMultiplier, all factors are additive and therefore only a factor against the base
     public float ArmorFactor { get; set; } = 1;
     public float StructureFactor { get; set; } = 1;
     public float EngineFactor { get; set; } = 1;
-    //public float EngineFactorFactor { get; set; } = 1; // TODO was problematic, 1. engine, 2. engine factor, 3. engine factor factor
     public float GyroFactor { get; set; } = 1;
     public float ChassisCapacityFactor { get; set; } = 1;
 
+    // Multipliers are multiplied with each other and the base
+    public float EngineMultiplier { get; set; } = 1;
+
     // not factors
     public int ReservedSlots { get; set; } = 0; // TODO move to own feature... SlotsHandler or SizeHandler
     public float ComponentByChassisFactor { get; set; } = 0; // TODO move to something more elaborate (see CustomCapacities / HBS statistics)
@@ -29,10 +32,11 @@ public void Combine(WeightFactors savings)
         ArmorFactor += savings.ArmorFactor - 1;
         StructureFactor += savings.StructureFactor - 1;
         EngineFactor += savings.EngineFactor - 1;
-        //EngineFactorFactor += savings.EngineFactorFactor - 1;
         GyroFactor += savings.GyroFactor - 1;
         ChassisCapacityFactor += savings.ChassisCapacityFactor - 1;
 
+        EngineMultiplier *= savings.EngineMultiplier;
+
         ReservedSlots += savings.ReservedSlots;
         ComponentByChassisFactor += savings.ComponentByChassisFactor;
     }