external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make name and order of Dev menu items be consistent

Browse Source
This commit is contained in:
drdev
2014-09-19 20:47:27 +00:00
parent 854030e6d4
commit 3b2a992999
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
forge-gui-desktop/src/main/java/forge/screens/match/menus/DevModeMenu.java
View File

@@ -25,16 +25,17 @@ public class DevModeMenu implements ActionListener {
private enum DevMenuItem { private enum DevMenuItem {
GENERATE_MANA("Generate Mana"), GENERATE_MANA("Generate Mana"),
TUTOR_FOR_CARD("Tutor for Card"), TUTOR_FOR_CARD("Tutor for Card"),
ADD_CARD_TO_HAND("Add card to hand"), ADD_CARD_TO_HAND("Add Card to Hand"),
ADD_CARD_TO_PLAY("Add card to play"), ADD_CARD_TO_PLAY("Add Card to Play"),
RIGGED_PLANAR_ROLL("Rigged planar roll"), SET_PLAYER_LIFE("Set Player Life"),
PLANESWALK_TO("Planeswalk to"), WIN_GAME("Win Game"),
PLAY_MANY_LANDS("Play many lands per Turn"),
SETUP_GAME_STATE("Setup Game State"), SETUP_GAME_STATE("Setup Game State"),
PLAY_UNLIMITED_LANDS("Play Unlimited Lands"),
ADD_COUNTER("Add Counter to Permanent"), ADD_COUNTER("Add Counter to Permanent"),
TAP_PERMANENT("Tap Permanent"), TAP_PERMANENT("Tap Permanent"),
UNTAP_PERMANENT("Untap Permanent"), UNTAP_PERMANENT("Untap Permanent"),
SET_PLAYER_LIFE("Set Player Life"), RIGGED_PLANAR_ROLL("Rigged Planar Roll"),
PLANESWALK_TO("Planeswalk to"),
DEV_CORNER("Developer's Corner"); DEV_CORNER("Developer's Corner");
protected String caption; protected String caption;
@@ -61,17 +62,18 @@ public class DevModeMenu implements ActionListener {
menu.add(getMenuItem(DevMenuItem.ADD_CARD_TO_HAND)); menu.add(getMenuItem(DevMenuItem.ADD_CARD_TO_HAND));
menu.add(getMenuItem(DevMenuItem.ADD_CARD_TO_PLAY)); menu.add(getMenuItem(DevMenuItem.ADD_CARD_TO_PLAY));
menu.addSeparator(); menu.addSeparator();
menu.add(getMenuItem(DevMenuItem.RIGGED_PLANAR_ROLL)); menu.add(getMenuItem(DevMenuItem.SET_PLAYER_LIFE));
menu.add(getMenuItem(DevMenuItem.PLANESWALK_TO)); menu.add(getMenuItem(DevMenuItem.WIN_GAME));
menu.addSeparator(); menu.addSeparator();
menu.add(getCheckboxMenuItem(DevMenuItem.PLAY_MANY_LANDS, Singletons.getControl().getGameView().devGetUnlimitedLands()));
menu.add(getMenuItem(DevMenuItem.SETUP_GAME_STATE)); menu.add(getMenuItem(DevMenuItem.SETUP_GAME_STATE));
menu.add(getCheckboxMenuItem(DevMenuItem.PLAY_UNLIMITED_LANDS, Singletons.getControl().getGameView().devGetUnlimitedLands()));
menu.add(getMenuItem(DevMenuItem.ADD_COUNTER)); menu.add(getMenuItem(DevMenuItem.ADD_COUNTER));
menu.addSeparator(); menu.addSeparator();
menu.add(getMenuItem(DevMenuItem.TAP_PERMANENT)); menu.add(getMenuItem(DevMenuItem.TAP_PERMANENT));
menu.add(getMenuItem(DevMenuItem.UNTAP_PERMANENT)); menu.add(getMenuItem(DevMenuItem.UNTAP_PERMANENT));
menu.addSeparator(); menu.addSeparator();
menu.add(getMenuItem(DevMenuItem.SET_PLAYER_LIFE)); menu.add(getMenuItem(DevMenuItem.RIGGED_PLANAR_ROLL));
menu.add(getMenuItem(DevMenuItem.PLANESWALK_TO));
menu.addSeparator(); menu.addSeparator();
menu.add(getMenuItem(DevMenuItem.DEV_CORNER)); menu.add(getMenuItem(DevMenuItem.DEV_CORNER));
return menu; return menu;
@@ -100,15 +102,18 @@ public class DevModeMenu implements ActionListener {
case TUTOR_FOR_CARD: { controller.tutorForCard(); break; } case TUTOR_FOR_CARD: { controller.tutorForCard(); break; }
case ADD_CARD_TO_HAND: { controller.addCardToHand(); break; } case ADD_CARD_TO_HAND: { controller.addCardToHand(); break; }
case ADD_CARD_TO_PLAY: { controller.addCardToBattlefield(); break; } case ADD_CARD_TO_PLAY: { controller.addCardToBattlefield(); break; }
case RIGGED_PLANAR_ROLL:{ controller.riggedPlanerRoll(); break; } case SET_PLAYER_LIFE: { controller.setPlayerLife(); break; }
case PLANESWALK_TO: { controller.planeswalkTo(); break; } case WIN_GAME: { controller.winGame(); break; }
case PLAY_MANY_LANDS: { controller.togglePlayManyLandsPerTurn(); break; }
case SETUP_GAME_STATE: { controller.setupGameState(); break; } case SETUP_GAME_STATE: { controller.setupGameState(); break; }
case PLAY_UNLIMITED_LANDS: { controller.togglePlayManyLandsPerTurn(); break; }
case ADD_COUNTER: { controller.addCounterToPermanent(); break; } case ADD_COUNTER: { controller.addCounterToPermanent(); break; }
case TAP_PERMANENT: { controller.tapPermanent(); break; } case TAP_PERMANENT: { controller.tapPermanent(); break; }
case UNTAP_PERMANENT: { controller.untapPermanent(); break; } case UNTAP_PERMANENT: { controller.untapPermanent(); break; }
case SET_PLAYER_LIFE: { controller.setPlayerLife(); break; } case RIGGED_PLANAR_ROLL:{ controller.riggedPlanerRoll(); break; }
case PLANESWALK_TO: { controller.planeswalkTo(); break; }
case DEV_CORNER: { openDevForumInBrowser(); break; } case DEV_CORNER: { openDevForumInBrowser(); break; }
default:
break;
} }
} }

15
forge-gui-desktop/src/main/java/forge/screens/match/views/VDev.java
View File

@@ -77,8 +77,7 @@ public enum VDev implements IVDoc<CDev> {
//========= Constructor //========= Constructor
private VDev() { private VDev() {
//devLBLs.add(lblRiggedRoll); devLBLs.add(lblRiggedRoll);
// devLBLs.add(lblMilling);
devLBLs.add(lblUnlimitedLands); devLBLs.add(lblUnlimitedLands);
devLBLs.add(lblGenerateMana); devLBLs.add(lblGenerateMana);
devLBLs.add(lblSetupGame); devLBLs.add(lblSetupGame);
@@ -101,14 +100,13 @@ public enum VDev implements IVDoc<CDev> {
viewport.add(this.lblCardToBattlefield, halfConstraints); viewport.add(this.lblCardToBattlefield, halfConstraints);
viewport.add(this.lblSetLife, halfConstraints + ", split 2"); viewport.add(this.lblSetLife, halfConstraints + ", split 2");
viewport.add(this.lblWinGame, halfConstraints); viewport.add(this.lblWinGame, halfConstraints);
viewport.add(this.lblRiggedRoll, halfConstraints + ", split 2");
viewport.add(this.lblWalkTo, halfConstraints);
// viewport.add(this.lblMilling, constraints);
viewport.add(this.lblUnlimitedLands, constraints);
viewport.add(this.lblSetupGame, constraints); viewport.add(this.lblSetupGame, constraints);
viewport.add(this.lblUnlimitedLands, constraints);
viewport.add(this.lblCounterPermanent, constraints); viewport.add(this.lblCounterPermanent, constraints);
viewport.add(this.lblTapPermanent, halfConstraints + ", split 2"); viewport.add(this.lblTapPermanent, halfConstraints + ", split 2");
viewport.add(this.lblUntapPermanent, halfConstraints); viewport.add(this.lblUntapPermanent, halfConstraints);
viewport.add(this.lblRiggedRoll, halfConstraints + ", split 2");
viewport.add(this.lblWalkTo, halfConstraints);
} }
//========= Overridden methods //========= Overridden methods
@@ -164,11 +162,6 @@ public enum VDev implements IVDoc<CDev> {
//========= Retrieval methods //========= Retrieval methods
/** @return {@link forge.gui.match.views.VDev.DevLabel} */
// public DevLabel getLblMilling() {
// return this.lblMilling;
// }
/** @return {@link forge.screens.match.views.VDev.DevLabel} */ /** @return {@link forge.screens.match.views.VDev.DevLabel} */
public DevLabel getLblGenerateMana() { public DevLabel getLblGenerateMana() {
return this.lblGenerateMana; return this.lblGenerateMana;

6
forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java
View File

@@ -33,7 +33,7 @@ public class VDevMenu extends FDropDownMenu {
}); });
} }
})); }));
addItem(new FMenuItem("Add card to hand", new FEventHandler() { addItem(new FMenuItem("Add Card to Hand", new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { ThreadUtil.invokeInGameThread(new Runnable() {
@@ -44,7 +44,7 @@ public class VDevMenu extends FDropDownMenu {
}); });
} }
})); }));
addItem(new FMenuItem("Add card to play", new FEventHandler() { addItem(new FMenuItem("Add Card to Play", new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { ThreadUtil.invokeInGameThread(new Runnable() {
@@ -130,7 +130,7 @@ public class VDevMenu extends FDropDownMenu {
}); });
} }
})); }));
addItem(new FMenuItem("Rigged planar roll", new FEventHandler() { addItem(new FMenuItem("Rigged Planar Roll", new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { ThreadUtil.invokeInGameThread(new Runnable() {