diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java index 7483b80de99..bf1c3279fe7 100644 --- a/forge-game/src/main/java/forge/game/GameType.java +++ b/forge-game/src/main/java/forge/game/GameType.java @@ -41,11 +41,21 @@ public enum GameType { public Deck apply(RegisteredPlayer player) { Deck deck = new Deck(); CardPool mainDeck = deck.getMain(); - mainDeck.add("Plains", 12); - mainDeck.add("Island", 12); - mainDeck.add("Swamp", 12); - mainDeck.add("Mountain", 12); - mainDeck.add("Forest", 12); + mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards() .getCard("Momir Vig, Simic Visionary Avatar"), 1); return deck; @@ -56,11 +66,21 @@ public enum GameType { public Deck apply(RegisteredPlayer player) { Deck deck = new Deck(); CardPool mainDeck = deck.getMain(); - mainDeck.add("Plains", 12); - mainDeck.add("Island", 12); - mainDeck.add("Swamp", 12); - mainDeck.add("Mountain", 12); - mainDeck.add("Forest", 12); + mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Plains", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Island", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Swamp", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Mountain", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); + mainDeck.add("Forest", StaticData.instance().getBlockLands().get(MyRandom.getRandom().nextInt(StaticData.instance().getBlockLands().size())), 4); deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards() .getCard("Momir Vig, Simic Visionary Avatar"), 1); deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards()