Simplify NOE, add Evading, reverse Below calc

MegaMek · Jan 10, 2024 · 2959033 · 2959033
1 parent 6d900d3
commit 2959033
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -4925,16 +4925,21 @@ private static ToHitData artilleryDirectToHit(Game game, Entity ae, Targetable t
                 }
 
                 // Ground-to-air attacks against a target flying at NOE
-                if (Compute.isGroundToAir(ae, target) && te.isNOE()) {
+                if (te.isNOE()) {
                     if (te.passedWithin(ae.getPosition(), 1)) {
                         toHit.addModifier(+1, Messages.getString("WeaponAttackAction.TeNoe"));
                     } else {
                         toHit.addModifier(+3, Messages.getString("WeaponAttackAction.TeNoe"));
                     }
                 }
 
-                // Vs Aero, hits from below
-                if ((ae.getAltitude() - target.getAltitude()) > 2) {
+                // 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);
                 }
             }