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

Update enum name

Browse Source
This commit is contained in:
drdev
2015-04-19 18:39:01 +00:00
parent ff76320e4f
commit 7e913a6322
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/GameType.java
View File

@@ -17,7 +17,7 @@ public enum GameType {
QuestDraft (DeckFormat.Limited, true, true, true, "Quest Draft", ""), QuestDraft (DeckFormat.Limited, true, true, true, "Quest Draft", ""),
PlanarConquest (DeckFormat.PlanarConquest, true, false, false, "Planar Conquest", ""), PlanarConquest (DeckFormat.PlanarConquest, true, false, false, "Planar Conquest", ""),
Constructed (DeckFormat.Constructed, false, true, true, "Constructed", ""), Constructed (DeckFormat.Constructed, false, true, true, "Constructed", ""),
DeckEditor (DeckFormat.Constructed, false, true, true, "Deck Editor", ""), DeckEditorTest (DeckFormat.Constructed, false, true, true, "Deck Editor Test", ""),
Vanguard (DeckFormat.Vanguard, true, true, true, "Vanguard", "Each player has a special \"Avatar\" card that affects the game."), Vanguard (DeckFormat.Vanguard, true, true, true, "Vanguard", "Each player has a special \"Avatar\" card that affects the game."),
Commander (DeckFormat.Commander, false, false, false, "Commander", "Each player has a legendary \"General\" card which can be cast at any time and determines deck colors."), Commander (DeckFormat.Commander, false, false, false, "Commander", "Each player has a legendary \"General\" card which can be cast at any time and determines deck colors."),
TinyLeaders (DeckFormat.TinyLeaders, false, false, false, "Tiny Leaders", "Each player has a legendary \"General\" card which can be cast at any time and determines deck colors. Each card must have CMC less than 4."), TinyLeaders (DeckFormat.TinyLeaders, false, false, false, "Tiny Leaders", "Each player has a legendary \"General\" card which can be cast at any time and determines deck colors. Each card must have CMC less than 4."),

10
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -80,7 +80,7 @@ public class FDeckChooser extends FScreen {
lstDecks.setItemActivateHandler(new FEventHandler() { lstDecks.setItemActivateHandler(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
if (lstDecks.getGameType() == GameType.DeckEditor) { if (lstDecks.getGameType() == GameType.DeckEditorTest) {
//for Deck Editor, edit deck instead of accepting //for Deck Editor, edit deck instead of accepting
editSelectedDeck(); editSelectedDeck();
return; return;
@@ -158,7 +158,7 @@ public class FDeckChooser extends FScreen {
btnRandom.setCommand(new FEventHandler() { btnRandom.setCommand(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
if (lstDecks.getGameType() == GameType.DeckEditor) { if (lstDecks.getGameType() == GameType.DeckEditorTest) {
//for Deck Editor, play deck instead of randomly selecting deck //for Deck Editor, play deck instead of randomly selecting deck
editSelectedDeck(); editSelectedDeck();
return; return;
@@ -177,7 +177,7 @@ public class FDeckChooser extends FScreen {
break; //delay initialize for constructed until saved decks can be reloaded break; //delay initialize for constructed until saved decks can be reloaded
case Commander: case Commander:
case Gauntlet: case Gauntlet:
case DeckEditor: case DeckEditorTest:
initialize(null, DeckType.CUSTOM_DECK); initialize(null, DeckType.CUSTOM_DECK);
break; break;
default: default:
@@ -295,7 +295,7 @@ public class FDeckChooser extends FScreen {
cmbDeckTypes.addItem(DeckType.RANDOM_DECK); cmbDeckTypes.addItem(DeckType.RANDOM_DECK);
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
break; break;
case DeckEditor: case DeckEditorTest:
cmbDeckTypes.addItem(DeckType.CUSTOM_DECK); cmbDeckTypes.addItem(DeckType.CUSTOM_DECK);
cmbDeckTypes.addItem(DeckType.PRECONSTRUCTED_DECK); cmbDeckTypes.addItem(DeckType.PRECONSTRUCTED_DECK);
cmbDeckTypes.addItem(DeckType.QUEST_OPPONENT_DECK); cmbDeckTypes.addItem(DeckType.QUEST_OPPONENT_DECK);
@@ -452,7 +452,7 @@ public class FDeckChooser extends FScreen {
btnNewDeck.setText("New Deck"); btnNewDeck.setText("New Deck");
if (lstDecks.getGameType() == GameType.DeckEditor) { if (lstDecks.getGameType() == GameType.DeckEditorTest) {
//handle special case of Deck Editor screen where this button will start a game with the deck //handle special case of Deck Editor screen where this button will start a game with the deck
btnRandom.setText("Test Deck"); btnRandom.setText("Test Deck");
} }

2
forge-gui-mobile/src/forge/screens/home/HomeScreen.java
View File

@@ -43,7 +43,7 @@ public class HomeScreen extends FScreen {
addButton("Deck Editor", new FEventHandler() { addButton("Deck Editor", new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
FDeckChooser.promptForDeck("Deck Editor", GameType.DeckEditor, false, null); FDeckChooser.promptForDeck("Deck Editor", GameType.DeckEditorTest, false, null);
} }
}); });
/*addButton("Planar Conquest", new FEventHandler() { /*addButton("Planar Conquest", new FEventHandler() {