Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions forge-game/src/main/java/forge/game/GameType.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,29 @@ public enum GameType {
MomirBasic (DeckFormat.Constructed, false, false, false, "lblMomirBasic", "lblMomirBasicDesc", player -> {
Deck deck = new Deck();
CardPool mainDeck = deck.getMain();
String setcode = Aggregates.random(StaticData.instance().getBlockLands());
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);
for (int i = 0; i < 12; i++) {
String setcode = Aggregates.random(StaticData.instance().getBlockLands());
mainDeck.add("Plains", setcode, 1, true);
mainDeck.add("Island", setcode, 1, true);
mainDeck.add("Swamp", setcode, 1, true);
mainDeck.add("Mountain", setcode, 1, true);
mainDeck.add("Forest", setcode, 1, true);
}
deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards()
.getCard("Momir Vig, Simic Visionary Avatar"), 1);
return deck;
}),
MoJhoSto (DeckFormat.Constructed, false, false, false, "lblMoJhoSto", "lblMoJhoStoDesc", player -> {
Deck deck = new Deck();
CardPool mainDeck = deck.getMain();
String setcode = Aggregates.random(StaticData.instance().getBlockLands());
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);
for (int i = 0; i < 12; i++) {
String setcode = Aggregates.random(StaticData.instance().getBlockLands());
mainDeck.add("Plains", setcode, 1, true);
mainDeck.add("Island", setcode, 1, true);
mainDeck.add("Swamp", setcode, 1, true);
mainDeck.add("Mountain", setcode, 1, true);
mainDeck.add("Forest", setcode, 1, true);
}
deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards()
.getCard("Momir Vig, Simic Visionary Avatar"), 1);
deck.getOrCreate(DeckSection.Avatar).add(StaticData.instance().getVariantCards()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ public Runnable startGame() {
else if (autoGenerateVariant != null) {
Deck autoDeck = autoGenerateVariant.autoGenerateDeck(rp);
deck = new Deck();
FModel.getBlocks(); // Ensure blocks are loaded for Momir Basic and MoJhoSto deck generation
for (DeckSection d : DeckSection.values()) {
if (autoDeck.has(d)) {
deck.getOrCreate(d).clear();
Expand Down