Final cleanup/consolidation, fix "Below" usage

MegaMek · Jan 10, 2024 · 3d08146 · 3d08146
1 parent 2959033
commit 3d08146
Showing 1 changed file with 11 additions and 59 deletions.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -4364,10 +4364,13 @@ private static ToHitData compileTerrainAndLosToHitMods(Game game, Entity ae, Tar
         // Add range mods - If the attacker and target are in the same building
         // & hex, range mods don't apply (and will cause the shot to fail)
         // Don't apply this to bomb attacks either, which are going to be at 0 range of necessity
+        // Also don't apply to ADA Missiles (range computed separately)
         if (((los.getThruBldg() == null) || !los.getTargetPosition().equals(ae.getPosition()))
                 && (wtype != null
-                    && (!(wtype.hasFlag(WeaponType.F_ALT_BOMB) || wtype.hasFlag(WeaponType.F_DIVE_BOMB))))
-                && weaponId > WeaponType.WEAPON_NA) {
+                    && (!(wtype.hasFlag(WeaponType.F_ALT_BOMB)
+                        || wtype.hasFlag(WeaponType.F_DIVE_BOMB)
+                        || (atype != null && atype.getMunitionType().contains(AmmoType.Munitions.M_ADA))))
+                && weaponId > WeaponType.WEAPON_NA)) {
             toHit.append(Compute.getRangeMods(game, ae, weaponId, target));
         }
 
@@ -4501,7 +4504,7 @@ private static ToHitData compileTerrainAndLosToHitMods(Game game, Entity ae, Tar
         }
 
         // Ground-to-air attacks always hit from below
-        if (Compute.isGroundToAir(ae, target) && ((ae.getAltitude() - target.getAltitude()) > 2)) {
+        if (Compute.isGroundToAir(ae, target) && ((target.getAltitude() - ae.getAltitude()) > 2)) {
             toHit.setHitTable(ToHitData.HIT_BELOW);
         }
 
@@ -4886,65 +4889,14 @@ private static ToHitData artilleryDirectToHit(Game game, Entity ae, Targetable t
             // Air-Defense Arrow missiles use a simplified to-hit calculation because they:
             // A) are Flak; B) are not Artillery, C) use three ranges (same low-alt hex, 1 hex, 2 hexes)
             // as S/M/L
-            // Per TO:AR 6th printing, p153, other mods are: Flak (-2), AMM, damage, intervening trees/jungle
-            // Per TW p
-            int distance = Compute.effectiveDistance(game, ae, target);
-            toHit = new ToHitData(ae.getCrew().getGunnery(), Messages.getString("WeaponAttackAction.GunSkill"));
-
-            /// Re-apply quirks and SPAs after wiping out toHit
-            // Quirks
-            processAttackerQuirks(toHit, ae, te, weapon);
-
-            // SPAs
-            processAttackerSPAs(toHit, ae, te, weapon, game);
-            processDefenderSPAs(toHit, ae, te, weapon, game);
-
-            // Flak; ADA won't hit the later artillery flak check so add this modifier directly.
-            toHit.addModifier(-2, Messages.getString("WeaponAttackAction.Flak"));
-            // AMM
-            toHit.append(Compute.getAttackerMovementModifier(game, ae.getId()));
-            // LOS
-            toHit.append(losMods);
+            // Per TO:AR 6th printing, p153, ADA Missils should use TW Flak rules rather than TO Artillery Flak rules.
+            // Per TW pg 114, all other mods _should_ be included.
+
             // Special range calc
+            int distance = Compute.effectiveDistance(game, ae, target);
             toHit.addModifier(Compute.getADARangeModifier(distance), Messages.getString("WeaponAttackAction.ADARangeBracket"));
-            // actuator & sensor damage to attacker
-            if (weapon != null) {
-                toHit.append(Compute.getDamageWeaponMods(ae, weapon));
-            }
-            // Vs airborne Aero specifically
-            if (Compute.isGroundToAir(ae, target)) {
-                int side = Compute.targetSideTable(ae.getPosition(), te);
-
-                // +1 if shooting at an aero approaching nose-on
-                if (side == ToHitData.SIDE_FRONT) {
-                    toHit.addModifier(+1, Messages.getString("WeaponAttackAction.AeroNoseAttack"));
-                }
-                // +2 if shooting at the side as it flashes by
-                if ((side == ToHitData.SIDE_LEFT) || (side == ToHitData.SIDE_RIGHT)) {
-                    toHit.addModifier(+2, Messages.getString("WeaponAttackAction.AeroSideAttack"));
-                }
 
-                // Ground-to-air attacks against a target flying at NOE
-                if (te.isNOE()) {
-                    if (te.passedWithin(ae.getPosition(), 1)) {
-                        toHit.addModifier(+1, Messages.getString("WeaponAttackAction.TeNoe"));
-                    } else {
-                        toHit.addModifier(+3, Messages.getString("WeaponAttackAction.TeNoe"));
-                    }
-                }
-
-                // evading bonuses
-                if (te.isEvading()) {
-                    toHit.addModifier(te.getEvasionBonus(), Messages.getString("WeaponAttackAction.TeEvading"));
-                }
-
-                // Vs Aero, hits from below; attacker _should_ always be below target.
-                if ((te.getAltitude() - ae.getAltitude()) > 2) {
-                    toHit.setHitTable(ToHitData.HIT_BELOW);
-                }
-            }
-
-            srt.setSpecialResolution(true);
+            // Return without SRT set so that regular to-hit mods get applied.
             return toHit;
         }
         //If an airborne unit occupies the target hex, standard artillery ammo makes a flak attack against it