Skip to content

Fix #8863: Point-blank shot offered no turret rotation, and would not fire #8961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HammerGS wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix #8863: Point-blank shot offered no turret rotation, and would not fire #8961

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d78edf5
Fix #8863: offer turret rotation on a point-blank shot
HammerGS Sep 12, 2026
dc6e1c0
Redraw the unit after a turret or mount rotation
HammerGS Sep 12, 2026
1042be0
Merge remote-tracking branch 'origin/main' into Fix-8863-pointblank-r…
HammerGS Sep 12, 2026
8d94876
Fix the point-blank shot: trigger, crash and stale ranges
HammerGS Sep 12, 2026
866284b
Apply spotless formatting
HammerGS Sep 12, 2026
9052206
Address review: put two javadoc blocks back on their methods
HammerGS Sep 12, 2026
f30326b
Merge branch 'main' into Fix-8863-pointblank-rotate-turret
HammerGS Sep 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion megamek/src/megamek/client/ui/panels/phaseDisplay/PointblankShotDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import megamek.common.compute.Compute;
import megamek.common.compute.ComputeArc;
import megamek.common.enums.AimingMode;
import megamek.common.enums.ChargeLevel;
import megamek.common.enums.GamePhase;
import megamek.common.equipment.AmmoType;
import megamek.common.equipment.Mounted;
Expand All @@ -73,6 +72,7 @@
import megamek.common.options.OptionsConstants;
import megamek.common.rolls.TargetRoll;
import megamek.common.units.Entity;
import megamek.common.units.Tank;
import megamek.common.units.Targetable;
import megamek.common.weapons.Weapon;
import megamek.common.weapons.capitalWeapons.CapitalMissileWeapon;
Expand All @@ -97,6 +97,8 @@ public class PointblankShotDisplay extends FiringDisplay {
*/
public enum FiringCommand implements PhaseCommand {
FIRE_TWIST("fireTwist"),
FIRE_ROTATE_TURRET("fireRotateTurret"),
FIRE_ROTATE_TURRET_2("fireRotateTurret2"),
FIRE_FIRE("fireFire"),
FIRE_SKIP("fireSkip"),
FIRE_MODE("fireMode"),
Expand Down Expand Up @@ -310,6 +312,11 @@ protected ArrayList<MegaMekButton> getButtonList() {
|| cmd == FiringCommand.FIRE_CANCEL) {
continue;
}
// The rear-turret rotate button exists only for dual-turret vehicles, as in the firing phase.
if ((cmd == FiringCommand.FIRE_ROTATE_TURRET_2)
&& !((currentEntity() instanceof Tank tank) && !tank.hasNoDualTurret())) {
continue;
}

buttonList.add(buttons.get(cmd));
i++;
Expand Down Expand Up @@ -358,6 +365,8 @@ public void selectEntity(int en) {
&& currentEntity().getCrew().isActive());

setFlipArmsEnabled(currentEntity().canFlipArms());
// TW p.260 lets a hidden unit torso twist OR rotate its turret before the point-blank shot.
updateRotateTurret();
updateSearchlight();
} else {
logger.error("Tried to select non-existent entity {}", en);
Expand Down Expand Up @@ -859,6 +868,10 @@ public void actionPerformed(ActionEvent ev) {
nextWeapon();
} else if (ev.getActionCommand().equals(FiringCommand.FIRE_TWIST.getCmd())) {
twisting = true;
} else if (ev.getActionCommand().equals(FiringCommand.FIRE_ROTATE_TURRET.getCmd())) {
rotateSelectedMount();
} else if (ev.getActionCommand().equals(FiringCommand.FIRE_ROTATE_TURRET_2.getCmd())) {
rotateRearTurret();
} else if (ev.getActionCommand().equals(FiringCommand.FIRE_MORE.getCmd())) {
currentButtonGroup++;
currentButtonGroup %= numButtonGroups;
Expand Down Expand Up @@ -887,6 +900,24 @@ protected void setTwistEnabled(boolean enabled) {
clientgui.getMenuBar().setEnabled(FiringCommand.FIRE_TWIST.getCmd(), enabled);
}

@Override
protected void setRotateTurretLabel(boolean dualTurretTank) {
buttons.get(FiringCommand.FIRE_ROTATE_TURRET).setText(Messages.getString(
dualTurretTank ? "FiringDisplay.fireRotateTurretFront" : "FiringDisplay.fireRotateTurret"));
}

@Override
protected void setRotateTurretEnabled(boolean enabled) {
buttons.get(FiringCommand.FIRE_ROTATE_TURRET).setEnabled(enabled);
clientgui.getMenuBar().setEnabled(FiringCommand.FIRE_ROTATE_TURRET.getCmd(), enabled);
}

@Override
protected void setRotateRearTurretEnabled(boolean enabled) {
buttons.get(FiringCommand.FIRE_ROTATE_TURRET_2).setEnabled(enabled);
clientgui.getMenuBar().setEnabled(FiringCommand.FIRE_ROTATE_TURRET_2.getCmd(), enabled);
}

@Override
protected void setSkipEnabled(boolean enabled) {
buttons.get(FiringCommand.FIRE_SKIP).setEnabled(enabled);
Expand Down
Loading