From 290140bca341bb389785957054ed1d6887a24dd2 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 26 Aug 2021 07:31:39 +0000 Subject: [PATCH] Update GameType.java --- .../src/main/java/forge/game/GameType.java | 42 ++++++------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java index 32bf55d59cc..b1b0c5cf512 100644 --- a/forge-game/src/main/java/forge/game/GameType.java +++ b/forge-game/src/main/java/forge/game/GameType.java @@ -42,21 +42,12 @@ public enum GameType { public Deck apply(RegisteredPlayer player) { Deck deck = new Deck(); CardPool mainDeck = deck.getMain(); - mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); + String setcode = StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())); + mainDeck.add("Plains", setcode, 12, true); + mainDeck.add("Island", setcode, 12, true); + mainDeck.add("Swamp", setcode, 12, true); + mainDeck.add("Mountain", setcode, 12, true); + mainDeck.add("Forest", setcode, 12, true); deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards() .getCard("Momir Vig, Simic Visionary Avatar"), 1); return deck; @@ -67,21 +58,12 @@ public enum GameType { public Deck apply(RegisteredPlayer player) { Deck deck = new Deck(); CardPool mainDeck = deck.getMain(); - mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); - mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4, true); + String setcode = StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())); + mainDeck.add("Plains", setcode, 12, true); + mainDeck.add("Island", setcode, 12, true); + mainDeck.add("Swamp", setcode, 12, true); + mainDeck.add("Mountain", setcode, 12, true); + mainDeck.add("Forest", setcode, 12, true); deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards() .getCard("Momir Vig, Simic Visionary Avatar"), 1); deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards()