From 1e901cb59ab2d1632e7f1d0f25c14019c04798ce Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 1 Sep 2014 01:51:38 +0000
Subject: [PATCH] Code cleanup

---
 .../src/main/java/forge/deck/DeckFormat.java  |  2 +-
 .../src/main/java/forge/game/GameType.java    | 28 +++++++++----------
 .../src/main/java/forge/game/Match.java       |  4 +--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java
index a75d99f5487..c305c985a27 100644
--- a/forge-core/src/main/java/forge/deck/DeckFormat.java
+++ b/forge-core/src/main/java/forge/deck/DeckFormat.java
@@ -41,8 +41,8 @@ public enum DeckFormat {
     Limited     ( Range.between(40, Integer.MAX_VALUE), null, Integer.MAX_VALUE),
     Commander   ( Range.is(99),                         Range.between(0, 10), 1),
     Vanguard    ( Range.between(60, Integer.MAX_VALUE), Range.is(0), 4),
-    Planechase  ( Range.between(60, Integer.MAX_VALUE), Range.is(0), 4),
     MomirBasic  ( Range.is(60),                         Range.is(0), Integer.MAX_VALUE),
+    Planechase  ( Range.between(60, Integer.MAX_VALUE), Range.is(0), 4),
     Archenemy   ( Range.between(60, Integer.MAX_VALUE), Range.is(0), 4);
 
     private final Range<Integer> mainRange;
diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java
index aae5c674a61..ec8f841282c 100644
--- a/forge-game/src/main/java/forge/game/GameType.java
+++ b/forge-game/src/main/java/forge/game/GameType.java
@@ -17,23 +17,21 @@ public enum GameType {
     QuestDraft      (DeckFormat.Limited, true, true, true, "Quest Draft"),
     Constructed     (DeckFormat.Constructed, false, true, true, "Constructed"),
     Vanguard        (DeckFormat.Vanguard, true, true, true, "Vanguard"),
+    MomirBasic      (DeckFormat.MomirBasic, false, false, false, "Momir Basic"),
     Commander       (DeckFormat.Commander, false, false, false, "Commander"),
     Planechase      (DeckFormat.Planechase, false, false, true, "Planechase"),
-    MomirBasic      (DeckFormat.MomirBasic, false, false, false, "Momir Basic"),
     Archenemy       (DeckFormat.Archenemy, false, false, true, "Archenemy"),
     ArchenemyRumble (DeckFormat.Archenemy, false, false, true, "Archenemy Rumble");
 
-    private final DeckFormat decksFormat;
-    private final boolean bCardpoolLimited;
-    private final boolean canSideboard;
-    private final boolean addWonCardsMidgame;
+    private final DeckFormat deckFormat;
+    private final boolean isCardPoolLimited, canSideboard, addWonCardsMidGame;
     private final String name;
 
-    GameType(DeckFormat formatType, boolean isDeckBuilderLimited, boolean sideboardingAllowed, boolean addAnteMidGame, String name0) {
-        bCardpoolLimited = isDeckBuilderLimited;
-        decksFormat = formatType;
-        canSideboard = sideboardingAllowed;
-        addWonCardsMidgame = addAnteMidGame;
+    GameType(DeckFormat deckFormat0, boolean isCardPoolLimited0, boolean canSideboard0, boolean addWonCardsMidgame0, String name0) {
+        deckFormat = deckFormat0;
+        isCardPoolLimited = isCardPoolLimited0;
+        canSideboard = canSideboard0;
+        addWonCardsMidGame = addWonCardsMidgame0;
         name = name0;
     }
 
@@ -41,14 +39,14 @@ public enum GameType {
      * @return the decksFormat
      */
     public DeckFormat getDecksFormat() {
-        return decksFormat;
+        return deckFormat;
     }
 
     /**
      * @return the isCardpoolLimited
      */
-    public boolean isCardpoolLimited() {
-        return bCardpoolLimited;
+    public boolean isCardPoolLimited() {
+        return isCardPoolLimited;
     }
 
     /**
@@ -58,7 +56,9 @@ public enum GameType {
         return canSideboard;
     }
 
-    public boolean canAddWonCardsMidgame() { return addWonCardsMidgame; }
+    public boolean canAddWonCardsMidGame() {
+        return addWonCardsMidGame;
+    }
 
     public boolean isCommandZoneNeeded() {
     	return true; //TODO: Figure out way to move command zone into field so it can be hidden when empty
diff --git a/forge-game/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java
index 276cb8d9256..3ac00bb9a7d 100644
--- a/forge-game/src/main/java/forge/game/Match.java
+++ b/forge-game/src/main/java/forge/game/Match.java
@@ -262,7 +262,7 @@ public class Match {
             }
         }
 
-        if (!rAICards.isEmpty() && !rules.getGameType().isCardpoolLimited()) {
+        if (!rAICards.isEmpty() && !rules.getGameType().isCardPoolLimited()) {
             game.getAction().revealAnte("AI can't play these cards well", rAICards);
         }
 
@@ -348,7 +348,7 @@ public class Match {
                 outcome.anteResult.put(fromGame, GameOutcome.AnteResult.won(losses));
             }
 
-            if (rules.getGameType().canAddWonCardsMidgame()) {
+            if (rules.getGameType().canAddWonCardsMidGame()) {
                 // But only certain game types lets you swap midgame
                 List<PaperCard> chosen = fromGame.getController().chooseCardsYouWonToAddToDeck(losses);
                 if (null != chosen) {