show the initial tohit and roll on when trigging an automatic self hi…

…t with wrecking ball
MegaMek · Nov 18, 2023 · 9b95eac · 9b95eac
1 parent acac3e0
commit 9b95eac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/megamek/src/megamek/common/Report.java b/megamek/src/megamek/common/Report.java
@@ -410,7 +410,7 @@ public Report add(TargetRoll targetRoll) {
     }
 
     public Report add(Roll diceRoll) {
-        return addDataWithTooltip(String.valueOf(diceRoll.getReport()), diceRoll.getReport());
+        return addDataWithTooltip(String.valueOf(diceRoll.getIntValue()), diceRoll.getReport());
     }
 
     public Report addDataWithTooltip(Integer data, String tooltip) {

diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -16318,9 +16318,12 @@ private void resolveClubAttack(PhysicalResult pr, int lastEntityId) {
         if ((caa.getClub().getType().hasSubType(MiscType.S_FLAIL)
                 || caa.getClub().getType().hasSubType(MiscType.S_WRECKING_BALL)) && (rollValue == 2)) {
             // miss
-            r = new Report(4035);
+            r = new Report(4025);
             r.subject = ae.getId();
+            r.add(toHit);
+            r.add(pr.roll);
             addReport(r);
+            // setup miss
             ToHitData newToHit = new ToHitData(TargetRoll.AUTOMATIC_SUCCESS, "hit with own flail/wrecking ball");
             pr.damage = ClubAttackAction.getDamageFor(ae, caa.getClub(), false, caa.isZweihandering());
             pr.damage = (pr.damage / 2) + (pr.damage % 2);