mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 18:58:00 +00:00
Renamed Commander Gauntlet to more accurate QUICK Commander Gauntlet
This commit is contained in:
committed by
Chris H
parent
25ba06d530
commit
a9df4ea424
@@ -68,7 +68,7 @@ public enum EDocID {
|
|||||||
HOME_GAUNTLETBUILD (VSubmenuGauntletBuild.SINGLETON_INSTANCE),
|
HOME_GAUNTLETBUILD (VSubmenuGauntletBuild.SINGLETON_INSTANCE),
|
||||||
HOME_GAUNTLETLOAD (VSubmenuGauntletLoad.SINGLETON_INSTANCE),
|
HOME_GAUNTLETLOAD (VSubmenuGauntletLoad.SINGLETON_INSTANCE),
|
||||||
HOME_GAUNTLETQUICK (VSubmenuGauntletQuick.SINGLETON_INSTANCE),
|
HOME_GAUNTLETQUICK (VSubmenuGauntletQuick.SINGLETON_INSTANCE),
|
||||||
HOME_GAUNTLETCOMMANDER (VSubmenuGauntletCommander.SINGLETON_INSTANCE),
|
HOME_GAUNTLETCOMMANDER (VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE),
|
||||||
HOME_GAUNTLETCONTESTS (VSubmenuGauntletContests.SINGLETON_INSTANCE),
|
HOME_GAUNTLETCONTESTS (VSubmenuGauntletContests.SINGLETON_INSTANCE),
|
||||||
HOME_PREFERENCES (VSubmenuPreferences.SINGLETON_INSTANCE),
|
HOME_PREFERENCES (VSubmenuPreferences.SINGLETON_INSTANCE),
|
||||||
HOME_ACHIEVEMENTS (VSubmenuAchievements.SINGLETON_INSTANCE),
|
HOME_ACHIEVEMENTS (VSubmenuAchievements.SINGLETON_INSTANCE),
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import forge.item.PaperCard;
|
|||||||
import forge.screens.deckeditor.menus.DeckFileMenu;
|
import forge.screens.deckeditor.menus.DeckFileMenu;
|
||||||
import forge.screens.deckeditor.views.VCurrentDeck;
|
import forge.screens.deckeditor.views.VCurrentDeck;
|
||||||
import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
|
import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
|
||||||
import forge.screens.home.gauntlet.VSubmenuGauntletCommander;
|
import forge.screens.home.gauntlet.VSubmenuGauntletCommanderQuick;
|
||||||
import forge.screens.home.gauntlet.VSubmenuGauntletContests;
|
import forge.screens.home.gauntlet.VSubmenuGauntletContests;
|
||||||
import forge.screens.home.gauntlet.VSubmenuGauntletQuick;
|
import forge.screens.home.gauntlet.VSubmenuGauntletQuick;
|
||||||
import forge.screens.home.sanctioned.VSubmenuConstructed;
|
import forge.screens.home.sanctioned.VSubmenuConstructed;
|
||||||
@@ -358,7 +358,7 @@ public class DeckController<T extends DeckBase> {
|
|||||||
VSubmenuGauntletBuild.SINGLETON_INSTANCE.updateDeckPanel();
|
VSubmenuGauntletBuild.SINGLETON_INSTANCE.updateDeckPanel();
|
||||||
VSubmenuGauntletQuick.SINGLETON_INSTANCE.updateDeckPanel();
|
VSubmenuGauntletQuick.SINGLETON_INSTANCE.updateDeckPanel();
|
||||||
VSubmenuGauntletContests.SINGLETON_INSTANCE.updateDeckPanel();
|
VSubmenuGauntletContests.SINGLETON_INSTANCE.updateDeckPanel();
|
||||||
VSubmenuGauntletCommander.SINGLETON_INSTANCE.updateDeckPanel();
|
VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE.updateDeckPanel();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ public enum VHomeUI implements IVTopLevelUI {
|
|||||||
allSubmenus.add(VSubmenuGauntletBuild.SINGLETON_INSTANCE);
|
allSubmenus.add(VSubmenuGauntletBuild.SINGLETON_INSTANCE);
|
||||||
allSubmenus.add(VSubmenuGauntletLoad.SINGLETON_INSTANCE);
|
allSubmenus.add(VSubmenuGauntletLoad.SINGLETON_INSTANCE);
|
||||||
allSubmenus.add(VSubmenuGauntletContests.SINGLETON_INSTANCE);
|
allSubmenus.add(VSubmenuGauntletContests.SINGLETON_INSTANCE);
|
||||||
allSubmenus.add(VSubmenuGauntletCommander.SINGLETON_INSTANCE);
|
allSubmenus.add(VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE);
|
||||||
|
|
||||||
allSubmenus.add(VSubmenuPuzzleSolve.SINGLETON_INSTANCE);
|
allSubmenus.add(VSubmenuPuzzleSolve.SINGLETON_INSTANCE);
|
||||||
allSubmenus.add(VSubmenuPuzzleCreate.SINGLETON_INSTANCE);
|
allSubmenus.add(VSubmenuPuzzleCreate.SINGLETON_INSTANCE);
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ import forge.player.GamePlayerUtil;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public enum CSubmenuGauntletCommander implements ICDoc {
|
public enum CSubmenuGauntletCommanderQuick implements ICDoc {
|
||||||
/** */
|
/** */
|
||||||
SINGLETON_INSTANCE;
|
SINGLETON_INSTANCE;
|
||||||
|
|
||||||
private final ActionListener actStartGame = arg0 -> startGame();
|
private final ActionListener actStartGame = arg0 -> startGame();
|
||||||
|
|
||||||
private final VSubmenuGauntletCommander view = VSubmenuGauntletCommander.SINGLETON_INSTANCE;
|
private final VSubmenuGauntletCommanderQuick view = VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE;
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see forge.gui.home.ICSubmenu#initialize()
|
* @see forge.gui.home.ICSubmenu#initialize()
|
||||||
@@ -31,18 +31,18 @@ import net.miginfocom.swing.MigLayout;
|
|||||||
* <br><br><i>(V at beginning of class name denotes a view class.)</i>
|
* <br><br><i>(V at beginning of class name denotes a view class.)</i>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public enum VSubmenuGauntletCommander implements IVSubmenu<CSubmenuGauntletCommander> {
|
public enum VSubmenuGauntletCommanderQuick implements IVSubmenu<CSubmenuGauntletCommanderQuick> {
|
||||||
/** */
|
/** */
|
||||||
SINGLETON_INSTANCE;
|
SINGLETON_INSTANCE;
|
||||||
final Localizer localizer = Localizer.getInstance();
|
final Localizer localizer = Localizer.getInstance();
|
||||||
// Fields used with interface IVDoc
|
// Fields used with interface IVDoc
|
||||||
private DragCell parentCell;
|
private DragCell parentCell;
|
||||||
private final DragTab tab = new DragTab(localizer.getMessage("lblCommanderGauntlet"));
|
private final DragTab tab = new DragTab(localizer.getMessage("lblQuickCommanderGauntlet"));
|
||||||
|
|
||||||
// Other fields
|
// Other fields
|
||||||
private final FPanel pnlOptions = new FPanel(new MigLayout("insets 0, gap 0, wrap"));
|
private final FPanel pnlOptions = new FPanel(new MigLayout("insets 0, gap 0, wrap"));
|
||||||
private final FLabel lblTitle = new FLabel.Builder()
|
private final FLabel lblTitle = new FLabel.Builder()
|
||||||
.text(localizer.getMessage("lblCommanderGauntletBuilder")).fontAlign(SwingConstants.CENTER)
|
.text(localizer.getMessage("lblQuickCommanderGauntletBuilder")).fontAlign(SwingConstants.CENTER)
|
||||||
.opaque(true).fontSize(16).build();
|
.opaque(true).fontSize(16).build();
|
||||||
|
|
||||||
private final FLabel lblDecklist = new FLabel.Builder()
|
private final FLabel lblDecklist = new FLabel.Builder()
|
||||||
@@ -71,7 +71,7 @@ public enum VSubmenuGauntletCommander implements IVSubmenu<CSubmenuGauntletComma
|
|||||||
|
|
||||||
private final StartButton btnStart = new StartButton();
|
private final StartButton btnStart = new StartButton();
|
||||||
|
|
||||||
VSubmenuGauntletCommander() {
|
VSubmenuGauntletCommanderQuick() {
|
||||||
lblTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
|
lblTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
|
||||||
|
|
||||||
boxRandomCommanderDecks.setSelected(true);
|
boxRandomCommanderDecks.setSelected(true);
|
||||||
@@ -115,7 +115,7 @@ public enum VSubmenuGauntletCommander implements IVSubmenu<CSubmenuGauntletComma
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String getMenuTitle() {
|
public String getMenuTitle() {
|
||||||
return localizer.getMessage("lblCommanderGauntlet");
|
return localizer.getMessage("lblQuickCommanderGauntlet");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
@@ -199,8 +199,8 @@ public enum VSubmenuGauntletCommander implements IVSubmenu<CSubmenuGauntletComma
|
|||||||
* @see forge.gui.framework.IVDoc#getLayoutControl()
|
* @see forge.gui.framework.IVDoc#getLayoutControl()
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public CSubmenuGauntletCommander getLayoutControl() {
|
public CSubmenuGauntletCommanderQuick getLayoutControl() {
|
||||||
return CSubmenuGauntletCommander.SINGLETON_INSTANCE;
|
return CSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
@@ -56,7 +56,7 @@ public class NewGauntletScreen extends LaunchScreen {
|
|||||||
Forge.getLocalizer().getMessage("lblQuickGauntlet"),
|
Forge.getLocalizer().getMessage("lblQuickGauntlet"),
|
||||||
Forge.getLocalizer().getMessage("lblCustomGauntlet"),
|
Forge.getLocalizer().getMessage("lblCustomGauntlet"),
|
||||||
Forge.getLocalizer().getMessage("lblGauntletContest"),
|
Forge.getLocalizer().getMessage("lblGauntletContest"),
|
||||||
Forge.getLocalizer().getMessage("lblCommanderGauntlet"),
|
Forge.getLocalizer().getMessage("lblQuickCommanderGauntlet"),
|
||||||
}, new Callback<String>() {
|
}, new Callback<String>() {
|
||||||
@Override
|
@Override
|
||||||
public void run(String result) {
|
public void run(String result) {
|
||||||
@@ -66,7 +66,7 @@ public class NewGauntletScreen extends LaunchScreen {
|
|||||||
createQuickGauntlet();
|
createQuickGauntlet();
|
||||||
} else if(Forge.getLocalizer().getMessage("lblCustomGauntlet").equals(result)) {
|
} else if(Forge.getLocalizer().getMessage("lblCustomGauntlet").equals(result)) {
|
||||||
createCustomGauntlet();
|
createCustomGauntlet();
|
||||||
} else if(Forge.getLocalizer().getMessage("lblCommanderGauntlet").equals(result)) {
|
} else if(Forge.getLocalizer().getMessage("lblQuickCommanderGauntlet").equals(result)) {
|
||||||
createCommandGauntlet();
|
createCommandGauntlet();
|
||||||
} else {
|
} else {
|
||||||
createGauntletContest();
|
createGauntletContest();
|
||||||
|
|||||||
@@ -1503,8 +1503,8 @@ lblGauntletText2=Configure how many opponents you wish to face and what decks or
|
|||||||
lblGauntletText3=Then, try to beat all AI opponents without losing a match.
|
lblGauntletText3=Then, try to beat all AI opponents without losing a match.
|
||||||
lblSelectGauntletType=Select a Gauntlet Type
|
lblSelectGauntletType=Select a Gauntlet Type
|
||||||
lblCustomGauntlet=Custom Gauntlet
|
lblCustomGauntlet=Custom Gauntlet
|
||||||
lblCommanderGauntlet=Commander Gauntlet
|
lblQuickCommanderGauntlet=Quick EDH Gauntlet
|
||||||
lblCommanderGauntletBuilder=Commander Gauntlet Builder
|
lblQuickCommanderGauntletBuilder=Quick EDH Gauntlet Builder
|
||||||
lblGauntletContest=Gauntlet Contest
|
lblGauntletContest=Gauntlet Contest
|
||||||
lblSelectYourDeck=Select Your Deck
|
lblSelectYourDeck=Select Your Deck
|
||||||
lblSelectDeckForOpponent=Select Deck for Opponent
|
lblSelectDeckForOpponent=Select Deck for Opponent
|
||||||
|
|||||||
Reference in New Issue
Block a user