diff --git a/megamek/src/megamek/client/ui/swing/FiringDisplay.java b/megamek/src/megamek/client/ui/swing/FiringDisplay.java index 1eed8b0a66f..c78424ed73c 100644 --- a/megamek/src/megamek/client/ui/swing/FiringDisplay.java +++ b/megamek/src/megamek/client/ui/swing/FiringDisplay.java @@ -1974,7 +1974,7 @@ public void updateTarget() { setFireEnabled(true); } else { boolean natAptGunnery = ce().hasAbility(OptionsConstants.PILOT_APTITUDE_GUNNERY); - clientgui.getUnitDisplay().wPan.setToHit(toHit, true); + clientgui.getUnitDisplay().wPan.setToHit(toHit, natAptGunnery); setFireEnabled(true); } diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java index 79d85ed3c94..3e3b0be4086 100644 --- a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java +++ b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java @@ -874,14 +874,17 @@ public void setToHit(ToHitData toHit, boolean natAptGunnery) { switch (toHit.getValue()) { case TargetRoll.IMPOSSIBLE: case TargetRoll.AUTOMATIC_FAIL: - toHitText.setText(String.format("%sTo Hit: (0%%) %s", BODY, - toHit.getDesc())); + toHitText.setText(String.format("%sTo Hit: (0%%) %s", BODY, toHit.getDesc())); + break; + case TargetRoll.AUTOMATIC_SUCCESS: + toHitText.setText(String.format("%sTo Hit: (100%%) %s", BODY, toHit.getDesc())); break; default: toHitText.setText(String.format("%sTo Hit: %2d (%2.0f%%)%s = %s", BODY, toHit.getValue(), Compute.oddsAbove(toHit.getValue(), natAptGunnery), LOW_CONTRAST_FONT, toHit.getDesc())); break; } + toHitText.setCaretPosition(0); } public void setToHit(String message) {