Merge pull request #6173 from DM0000/ShowPhysicalAttack

Seperated physical modifiers from base and show them in toHit
MegaMek · Nov 4, 2024 · a300c75 · a300c75
2 parents 0540330 + 3b290ad
commit a300c75
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/megamek/src/megamek/common/actions/ChargeAttackAction.java b/megamek/src/megamek/common/actions/ChargeAttackAction.java
@@ -236,6 +236,7 @@ public ToHitData toHit(Game game, Targetable target, Coords src,
         int base = ae.getCrew().getPiloting();
 
         toHit = new ToHitData(base, "base");
+        toHit.addModifier(0, "Charge");
 
         // attacker movement
         toHit.append(Compute.getAttackerMovementModifier(game, ae.getId(), movement));

diff --git a/megamek/src/megamek/common/actions/ClubAttackAction.java b/megamek/src/megamek/common/actions/ClubAttackAction.java
@@ -479,8 +479,8 @@ public static ToHitData toHit(Game game, int attackerId,
 
         // Various versions of physical weapons have different base bonuses and
         // penalties.
-        base += getHitModFor(clubType);
         toHit = new ToHitData(base, "base");
+        toHit.addModifier(getHitModFor(clubType), clubType.getName());
 
         PhysicalAttackAction.setCommonModifiers(toHit, game, ae, target);
 

diff --git a/megamek/src/megamek/common/actions/DfaAttackAction.java b/megamek/src/megamek/common/actions/DfaAttackAction.java
@@ -302,6 +302,7 @@ public static ToHitData toHit(Game game, int attackerId,
         int base = ae.getCrew().getPiloting();
 
         toHit = new ToHitData(base, "base");
+        toHit.addModifier(0, "DFA");
 
         // BMR(r), page 33. +3 modifier for DFA on infantry.
         if (te instanceof Infantry) {

diff --git a/megamek/src/megamek/common/actions/JumpJetAttackAction.java b/megamek/src/megamek/common/actions/JumpJetAttackAction.java
@@ -227,10 +227,11 @@ public static ToHitData toHit(Game game, int attackerId, Targetable target, int
         }
 
         // Set the base BTH
-        int base = ae.getCrew().getPiloting() + 2;
+        int base = ae.getCrew().getPiloting();
 
         // Start the To-Hit
         toHit = new ToHitData(base, "base");
+        toHit.addModifier(+2, "Jump Jet");
 
         setCommonModifiers(toHit, game, ae, target);
 

diff --git a/megamek/src/megamek/common/actions/KickAttackAction.java b/megamek/src/megamek/common/actions/KickAttackAction.java
@@ -244,11 +244,13 @@ public static ToHitData toHit(Game game, int attackerId,
         }
 
         // Set the base BTH
-        int base = ae.getCrew().getPiloting() - 2;
+        int base = ae.getCrew().getPiloting();
 
         // Start the To-Hit
         toHit = new ToHitData(base, "base");
 
+        toHit.addModifier(-2, "Kick");
+
         PhysicalAttackAction.setCommonModifiers(toHit, game, ae, target);
 
         // +3 modifier for kicking infantry in same hex

diff --git a/megamek/src/megamek/common/actions/PunchAttackAction.java b/megamek/src/megamek/common/actions/PunchAttackAction.java
@@ -215,6 +215,8 @@ public static ToHitData toHit(Game game, int attackerId,
 
         toHit = new ToHitData(base, "base");
 
+        toHit.addModifier(0, "Punch");
+
         PhysicalAttackAction.setCommonModifiers(toHit, game, ae, target);
 
         // Prone Meks can only punch vehicles in the same hex.

diff --git a/megamek/src/megamek/common/actions/PushAttackAction.java b/megamek/src/megamek/common/actions/PushAttackAction.java
@@ -246,9 +246,10 @@ public static ToHitData toHit(Game game, int attackerId, Targetable target) {
         }
 
         // Set the base BTH
-        int base = ae.getCrew().getPiloting() - 1;
+        int base = ae.getCrew().getPiloting();
 
         toHit = new ToHitData(base, "base");
+        toHit.addModifier(-1, "Push");
 
         // attacker movement
         toHit.append(Compute.getAttackerMovementModifier(game, attackerId));

diff --git a/megamek/src/megamek/common/actions/TripAttackAction.java b/megamek/src/megamek/common/actions/TripAttackAction.java
@@ -160,10 +160,11 @@ public static ToHitData toHit(Game game, int attackerId, Targetable target) {
         }
 
         // Set the base BTH
-        int base = ae.getCrew().getPiloting() - 1;
+        int base = ae.getCrew().getPiloting();
 
         // Start the To-Hit
         toHit = new ToHitData(base, "base");
+        toHit.addModifier(-1, "Trip");
 
         PhysicalAttackAction.setCommonModifiers(toHit, game, ae, target);