Merge pull request #4087 from SJuliez/AS_NoAmmo_Fix

AS conversion: disregard weapons lacking ammo
MegaMek · Jan 5, 2023 · e7bb69e · e7bb69e
2 parents 27cf56b + 0183019
commit e7bb69e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASDamageConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASDamageConverter.java
@@ -54,7 +54,7 @@ public class ASDamageConverter {
     protected int rearLocation;
     protected int turretLocation;
 
-    private final Map<WeaponType, Boolean> ammoForWeapon = new HashMap<>();
+    private final Map<WeaponType, Double> ammoModifier = new HashMap<>();
     protected final boolean hasTargetingComputer;
     protected List<Mounted> weaponsList;
     protected double rawSDamage;
@@ -358,7 +358,7 @@ protected void processEDamage() { }
 
     protected double getDamageMultiplier(Mounted weapon, WeaponType weaponType) {
         // Low ammo count
-        double damageModifier = ammoForWeapon.getOrDefault(weaponType, true) ? 1 : 0.75;
+        double damageModifier = ammoModifier.getOrDefault(weaponType, 1d);
 
         // Oneshot or Fusillade
         if (weaponType.hasFlag(WeaponType.F_ONESHOT) && !(weaponType instanceof CLFussilade)) {
@@ -409,7 +409,14 @@ protected void assembleAmmoCounts() {
                     || weaponType.getAmmoType() == AmmoType.T_AC_ULTRA_THB) {
                 divisor = 2;
             }
-            ammoForWeapon.put(weaponType, ammoCount / weaponCount.get(weaponType) >= 10 * divisor);
+
+            if (ammoCount / weaponCount.get(weaponType) >= 10 * divisor) {
+                ammoModifier.put(weaponType, 1d);
+            } else if (ammoCount > 0) {
+                ammoModifier.put(weaponType, 0.75);
+            } else {
+                ammoModifier.put(weaponType, 0d);
+            }
         }
     }