Consolidated indirect mode code.

MegaMek · Nov 4, 2023 · f261dce · f261dce
1 parent 4ee3305
commit f261dce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/megamek/src/megamek/common/EquipmentMode.java b/megamek/src/megamek/common/EquipmentMode.java
@@ -14,6 +14,8 @@
 
 package megamek.common;
 
+import megamek.common.weapons.Weapon;
+
 import java.util.Hashtable;
 import java.util.Objects;
 
@@ -115,4 +117,8 @@ public boolean equals(String modeName) {
     public String toString() {
         return getName();
     }
+
+    public boolean isIndirect() {
+        return name.equals(Weapon.MODE_MISSILE_INDIRECT) || name.equals(Weapon.MODE_INDIRECT_HEAT);
+    }
 }
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -366,8 +366,7 @@ private static ToHitData toHitCalc(Game game, int attackerId, Targetable target,
                         || atype.countsAsFlak()
         );
 
-        boolean isIndirect = (weapon.hasModes() && (weapon.curMode().equals(Weapon.MODE_MISSILE_INDIRECT)
-                ||weapon.curMode().equals(Weapon.MODE_INDIRECT_HEAT)));
+        boolean isIndirect = weapon.hasModes() && (weapon.curMode().isIndirect());
 
         // BMM p. 31, semi-guided indirect missile attacks vs tagged targets ignore terrain modifiers
         boolean semiGuidedIndirectVsTaggedTarget = isIndirect &&

diff --git a/megamek/src/megamek/common/weapons/infantry/InfantryWeapon.java b/megamek/src/megamek/common/weapons/infantry/InfantryWeapon.java
@@ -247,7 +247,7 @@ public int getSupportVeeSlots(Entity entity) {
     @Override
     protected AttackHandler getCorrectHandler(ToHitData toHit, WeaponAttackAction waa, Game game, GameManager manager) {
         Mounted m = game.getEntity(waa.getEntityId()).getEquipment(waa.getWeaponId());
-        if (((null != m) && (m.curMode().equals(Weapon.MODE_FLAMER_HEAT) || m.curMode().equals(Weapon.MODE_INDIRECT_HEAT)
+        if (((null != m) && ((m.hasModes() && m.curMode().isIndirect())
                 || (waa.getEntity(game).isSupportVehicle()
                 && m.getLinked() != null
                 && m.getLinked().getType() != null