From 9b95eac38a8ccad49a427232a042d311b90edb08 Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Sat, 18 Nov 2023 12:43:57 -0500 Subject: [PATCH] show the initial tohit and roll on when trigging an automatic self hit with wrecking ball --- megamek/src/megamek/common/Report.java | 2 +- megamek/src/megamek/server/GameManager.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/megamek/src/megamek/common/Report.java b/megamek/src/megamek/common/Report.java index 878d391ce23..2bed428212b 100755 --- 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 index d7b221c296d..eb86c623838 100644 --- 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);