Skip to content

Commit

Permalink
Merge pull request #4922 from kuronekochomusuke/deploymentOptions
Browse files Browse the repository at this point in the history 
add deployment options
  • Loading branch information
@HammerGS
HammerGS authored Dec 21, 2023
2 parents f3fb654 + a1efa21 commit 06b637e
Show file tree
Hide file tree
Showing 22 changed files with 572 additions and 86 deletions.
9 changes: 9 additions & 0 deletions megamek/i18n/megamek/client/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ BoardSelectionDialog.UpdateSize=Update Size
BoardSelectionDialog.Updating=Updating...
BoardSelectionDialog.ViewGameBoard=Preview Game Map... *
BoardSelectionDialog.ViewGameBoardTooltip=Shows a preview of the game's map.<br> * Note: For generated maps and surprise maps the preview is only a sample<br> and will not be the same as the actual map used.
BoardSelectionDialog.ViewGameBoardButton=Refresh Preview

#Game board tooltips
BoardView1.ACTIVATING=ACTIVATING
Expand Down Expand Up @@ -772,6 +773,8 @@ ChatLounge.notDone=Not Done
ChatLounge.PartialRepairs=Partial Repairs
ChatLounge.Player=Player
ChatLounge.Players=Players
ChatLounge.Player0=Player0
ChatLounge.Blind=Blind
ChatLounge.quickView=Unit Quick View
ChatLounge.OverlapDeploy.title=Must choose exclusive deployment zone
ChatLounge.OverlapDeploy.msg=When using double blind, each player needs to have an exclusive deployment zone.
Expand Down Expand Up @@ -1447,6 +1450,12 @@ CustomMechDialog.labDeploymentOffset=Deployment Zone Offset:
CustomMechDialog.labDeploymentOffsetTip=Deployment Zone Offset, in hexes from corresponding map edge
CustomMechDialog.labDeploymentWidth=Deployment Zone Width:
CustomMechDialog.labDeploymentWidthTip=Deployment Zone width, in hexes
CustomMechDialog.labDeploymentAnyNW=Deployment Any NW corner:
CustomMechDialog.labDeploymentAnySE=Deployment Any SE corner:
CustomMechDialog.BtnDeploymentUseRuler=Use ruler coords
CustomMechDialog.BtnDeploymentUseRulerTip=Set the Any NW and SE corners based on the corners of the NW and SE corners the square defined by the map preview ruler
CustomMechDialog.BtnDeploymentApply=Apply
CustomMechDialog.BtnDeploymentApplyTip=Apply player setting
CustomMechDialog.labDeployShutdown=Shutdown
CustomMechDialog.labDeployProne=Prone
CustomMechDialog.labDeployHullDown=Hull Down
Expand Down
4 changes: 4 additions & 0 deletions megamek/i18n/megamek/common/options/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ GameOptionsInfo.option.dumping_from_round.displayableName=first round for ammo d
GameOptionsInfo.option.dumping_from_round.description=Number of the round that has to be at least reached before allowing ammo dumps.
GameOptionsInfo.option.set_arty_player_homeedge.displayableName=Automatically set artillery home edge
GameOptionsInfo.option.set_arty_player_homeedge.description=If checked, all of the players' artillery units will have their home edge set to the deployment edge of the player, NW and NE are North, SW and SE are South. \nUnchecked by default.
GameOptionsInfo.option.set_default_team_1.displayableName=Default non-bot players to team 1, useful in coop games
GameOptionsInfo.option.set_default_team_1.description=When this option is unchecked each player is assigned new team
GameOptionsInfo.option.set_player_deployment_to_player0.displayableName=Non-bot player entities with \"Use Owners*\" deployment set, use Player 0\'s settings, instead of current player\'s settings
GameOptionsInfo.option.set_player_deployment_to_player0.description=When this option is unchecked use the standard player deployments settings
GameOptionsInfo.option.restrict_game_commands.displayableName=Restrict sensitive commands to non-Observers
GameOptionsInfo.option.restrict_game_commands.description=If checked, commands such as /reset and /kick cannot be used by Observers while others are playing. \nUnchecked by default.
GameOptionsInfo.option.disable_local_save.displayableName=Disable local saves when using double blind
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/client/ui/swing/ClientGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ public void windowClosing(WindowEvent e) {

Ruler.color1 = GUIP.getRulerColor1();
Ruler.color2 = GUIP.getRulerColor2();
ruler = new Ruler(frame, client, bv);
ruler = new Ruler(frame, client, bv, client.getGame());
ruler.setLocation(GUIP.getRulerPosX(), GUIP.getRulerPosY());
ruler.setSize(GUIP.getRulerSizeHeight(), GUIP.getRulerSizeWidth());
UIUtil.updateWindowBounds(ruler);
Expand Down Expand Up @@ -680,7 +680,7 @@ private void showOptions() {
}

public void customizePlayer() {
PlayerSettingsDialog psd = new PlayerSettingsDialog(this, client);
PlayerSettingsDialog psd = new PlayerSettingsDialog(this, client, bv);
psd.setVisible(true);
}

Expand Down
51 changes: 51 additions & 0 deletions megamek/src/megamek/client/ui/swing/CustomMechDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ public class CustomMechDialog extends AbstractButtonDialog implements ActionList
private final JFormattedTextField txtDeploymentOffset = new JFormattedTextField(formatterFactory);
private final JFormattedTextField txtDeploymentWidth = new JFormattedTextField(formatterFactory);

private JSpinner spinStartingAnyNWx;
private JSpinner spinStartingAnyNWy;
private JSpinner spinStartingAnySEx;
private JSpinner spinStartingAnySEy;

private final JLabel labDeployShutdown = new JLabel(
Messages.getString("CustomMechDialog.labDeployShutdown"), SwingConstants.RIGHT);
private final JCheckBox chDeployShutdown = new JCheckBox();
Expand Down Expand Up @@ -473,6 +478,17 @@ private void refreshDeployment() {
txtDeploymentOffset.setText(Integer.toString(entity.getStartingOffset(false)));
txtDeploymentWidth.setText(Integer.toString(entity.getStartingWidth(false)));

int bh = clientgui.getClient().getMapSettings().getBoardHeight();
int bw = clientgui.getClient().getMapSettings().getBoardWidth();
int x = Math.min(entity.getStartingAnyNWx(false) + 1, bw);
spinStartingAnyNWx.setValue(x);
int y = Math.min(entity.getStartingAnyNWy(false) + 1, bh);
spinStartingAnyNWy.setValue(y);
x = Math.min(entity.getStartingAnySEx(false) + 1, bw);
spinStartingAnySEy.setValue(x);
y = Math.min(entity.getStartingAnySEy(false) + 1, bh);
spinStartingAnySEy.setValue(y);

boolean enableDeploymentZoneControls = choDeploymentZone.isEnabled() && (choDeploymentZone.getSelectedIndex() > 0);
txtDeploymentOffset.setEnabled(enableDeploymentZoneControls);
txtDeploymentWidth.setEnabled(enableDeploymentZoneControls);
Expand Down Expand Up @@ -881,6 +897,15 @@ protected void okAction() {
entity.setStartingOffset(Integer.parseInt(txtDeploymentOffset.getText()));
entity.setStartingWidth(Integer.parseInt(txtDeploymentWidth.getText()));

int x = Math.min((Integer) spinStartingAnyNWx.getValue(), (Integer) spinStartingAnySEx.getValue());
int y = Math.min((Integer) spinStartingAnyNWy.getValue(), (Integer) spinStartingAnySEy.getValue());
entity.setStartingAnyNWx(x - 1);
entity.setStartingAnyNWy(y - 1);
x = Math.max((Integer) spinStartingAnyNWx.getValue(), (Integer) spinStartingAnySEx.getValue());
y = Math.max((Integer) spinStartingAnyNWy.getValue(), (Integer) spinStartingAnySEy.getValue());
entity.setStartingAnySEx(x - 1);
entity.setStartingAnySEy(y - 1);

// Should the entity begin the game shutdown?
if (chDeployShutdown.isSelected() && gameOptions().booleanOption(OptionsConstants.RPG_BEGIN_SHUTDOWN)) {
entity.performManualShutdown();
Expand Down Expand Up @@ -1200,6 +1225,32 @@ protected Container createCenterPane() {
panDeploy.add(labDeploymentWidth, GBC.std());
panDeploy.add(txtDeploymentWidth, GBC.eol());

int bh = clientgui.getClient().getMapSettings().getBoardHeight();
int bw = clientgui.getClient().getMapSettings().getBoardWidth();

panDeploy.add(new JLabel(Messages.getString("CustomMechDialog.labDeploymentAnyNW")), GBC.std());
int x = Math.min(entity.getStartingAnyNWx(false) + 1, bw);
SpinnerNumberModel mStartingAnyNWx = new SpinnerNumberModel(x, 0,bw, 1);
spinStartingAnyNWx = new JSpinner(mStartingAnyNWx);
spinStartingAnyNWx.setValue(x);
panDeploy.add(spinStartingAnyNWx, GBC.std());
int y = Math.min(entity.getStartingAnyNWy(false) + 1, bh);
SpinnerNumberModel mStartingAnyNWy = new SpinnerNumberModel(y, 0, bh, 1);
spinStartingAnyNWy = new JSpinner(mStartingAnyNWy);
spinStartingAnyNWy.setValue(y);
panDeploy.add(spinStartingAnyNWy, GBC.eol());
panDeploy.add(new JLabel(Messages.getString("CustomMechDialog.labDeploymentAnySE")), GBC.std());
x = Math.min(entity.getStartingAnySEx(false) + 1, bw);
SpinnerNumberModel mStartingAnySEx = new SpinnerNumberModel(x, 0, bw, 1);
spinStartingAnySEx = new JSpinner(mStartingAnySEx);
spinStartingAnySEx.setValue(x);
panDeploy.add(spinStartingAnySEx, GBC.std());
y = Math.min(entity.getStartingAnySEy(false) + 1, bh);
SpinnerNumberModel mStartingAnySEy = new SpinnerNumberModel(y, -0, bh, 1);
spinStartingAnySEy = new JSpinner(mStartingAnySEy);
spinStartingAnySEy.setValue(y);
panDeploy.add(spinStartingAnySEy, GBC.eol());

numFormatter.setMinimum(0);
numFormatter.setCommitsOnValidEdit(true);

Expand Down
28 changes: 15 additions & 13 deletions megamek/src/megamek/client/ui/swing/Ruler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class Ruler extends JDialog implements BoardViewListener, IPreferenceChan
private int distance;
private Client client;
private BoardView bv;
private Game game;
private boolean flip;

private JPanel buttonPanel;
Expand All @@ -69,7 +70,7 @@ public class Ruler extends JDialog implements BoardViewListener, IPreferenceChan
private JCheckBox cboIsMech2 =
new JCheckBox(Messages.getString("Ruler.isMech"));

public Ruler(JFrame f, Client c, BoardView b) {
public Ruler(JFrame f, Client c, BoardView b, Game g) {
super(f, Messages.getString("Ruler.title"), false);
enableEvents(AWTEvent.WINDOW_EVENT_MASK);

Expand All @@ -81,6 +82,7 @@ public Ruler(JFrame f, Client c, BoardView b) {

bv = b;
client = c;
game = g;
b.addBoardViewListener(this);

try {
Expand Down Expand Up @@ -273,7 +275,7 @@ private void addPoint(Coords c) {
int absHeight = Integer.MIN_VALUE;
boolean isMech = false;
boolean entFound = false;
for (Entity ent : client.getGame().getEntitiesVector(c)) {
for (Entity ent : game.getEntitiesVector(c)) {
int trAbsheight = ent.relHeight();
if (trAbsheight > absHeight) {
absHeight = trAbsheight;
Expand Down Expand Up @@ -316,34 +318,34 @@ private void setText() {
// leave at default value
}

if (!client.getGame().getBoard().contains(start) || !client.getGame().getBoard().contains(end)) {
if (!game.getBoard().contains(start) || !game.getBoard().contains(end)) {
return;
}

String toHit1 = "", toHit2 = "";
ToHitData thd;
if (flip) {
thd = LosEffects.calculateLos(client.getGame(),
thd = LosEffects.calculateLos(game,
buildAttackInfo(start, end, h1, h2, cboIsMech1.isSelected(),
cboIsMech2.isSelected())).losModifiers(client.getGame());
cboIsMech2.isSelected())).losModifiers(game);
} else {
thd = LosEffects.calculateLos(client.getGame(),
thd = LosEffects.calculateLos(game,
buildAttackInfo(end, start, h2, h1, cboIsMech2.isSelected(),
cboIsMech1.isSelected())).losModifiers(client.getGame());
cboIsMech1.isSelected())).losModifiers(game);
}
if (thd.getValue() != TargetRoll.IMPOSSIBLE) {
toHit1 = thd.getValue() + " = ";
}
toHit1 += thd.getDesc();

if (flip) {
thd = LosEffects.calculateLos(client.getGame(),
thd = LosEffects.calculateLos(game,
buildAttackInfo(end, start, h2, h1, cboIsMech2.isSelected(),
cboIsMech1.isSelected())).losModifiers(client.getGame());
cboIsMech1.isSelected())).losModifiers(game);
} else {
thd = LosEffects.calculateLos(client.getGame(),
thd = LosEffects.calculateLos(game,
buildAttackInfo(start, end, h1, h2, cboIsMech1.isSelected(),
cboIsMech2.isSelected())).losModifiers(client.getGame());
cboIsMech2.isSelected())).losModifiers(game);
}
if (thd.getValue() != TargetRoll.IMPOSSIBLE) {
toHit2 = thd.getValue() + " = ";
Expand Down Expand Up @@ -377,8 +379,8 @@ private LosEffects.AttackInfo buildAttackInfo(Coords c1, Coords c2, int h1,
ai.targetHeight = h2;
ai.attackerIsMech = attackerIsMech;
ai.targetIsMech = targetIsMech;
ai.attackAbsHeight = client.getGame().getBoard().getHex(c1).floor() + h1;
ai.targetAbsHeight = client.getGame().getBoard().getHex(c2).floor() + h2;
ai.attackAbsHeight = game.getBoard().getHex(c1).floor() + h1;
ai.targetAbsHeight = game.getBoard().getHex(c2).floor() + h2;
return ai;
}

Expand Down
33 changes: 26 additions & 7 deletions megamek/src/megamek/client/ui/swing/boardview/BoardView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,8 @@ public synchronized void paintComponent(Graphics g) {
drawDeployment(g);
}

if (game.getPhase().isSetArtilleryAutohitHexes() && showAllDeployment) {
if ((game.getPhase().isSetArtilleryAutohitHexes() && showAllDeployment)
|| (game.getPhase().isLounge())) {
drawAllDeployment(g);
}

Expand Down Expand Up @@ -1848,20 +1849,30 @@ private void drawAllDeployment(Graphics g) {
int drawWidth = (view.width / (int) (HEX_WC * scale)) + 3;
int drawHeight = (view.height / (int) (HEX_H * scale)) + 3;

List<Player> players = game.getPlayersList();
final GameOptions gOpts = game.getOptions();

if (gOpts.booleanOption(OptionsConstants.BASE_SET_PLAYER_DEPLOYMENT_TO_PLAYER0)) {
players = players.stream().filter(p -> p.isBot() || p.getId() == 0).collect(Collectors.toList());
}

if (game.getPhase().isLounge() && !localPlayer.isGameMaster()
&& (gOpts.booleanOption(OptionsConstants.BASE_BLIND_DROP)
|| gOpts.booleanOption(OptionsConstants.BASE_REAL_BLIND_DROP)) ) {
players = players.stream().filter(p -> !p.isEnemyOf(localPlayer)).collect(Collectors.toList());
}

Board board = game.getBoard();
// loop through the hexes
for (int i = 0; i < drawHeight; i++) {
for (int j = 0; j < drawWidth; j++) {
Coords c = new Coords(j + drawX, i + drawY);
Enumeration<Player> allP = game.getPlayers();
Player cp;
int pCount = 0;
int bThickness = 1 + 10 / game.getNoOfPlayers();
// loop through all players
while (allP.hasMoreElements()) {
cp = allP.nextElement();
if (board.isLegalDeployment(c, cp)) {
Color bC = cp.getColour().getColour();
for (Player player : players) {
if (board.isLegalDeployment(c, player)) {
Color bC = player.getColour().getColour();
drawHexBorder(g, getHexLocation(c), bC, (bThickness + 2) * pCount, bThickness);
pCount++;
}
Expand Down Expand Up @@ -3145,6 +3156,14 @@ public void drawRuler(Coords s, Coords e, Color sc, Color ec) {
repaint();
}

public Coords getRulerStart() {
return rulerStart;
}

public Coords getRulerEnd() {
return rulerEnd;
}

/**
* @return the coords at the specified point
*/
Expand Down
Loading

0 comments on commit 06b637e

Please sign in to comment.