From 5eb9be62483639b2741c38bd545cf79e6560b844 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Wed, 6 Nov 2019 08:07:21 +0000 Subject: [PATCH] Pioneer random quest mode --- forge-gui/res/quest/world/worlds.txt | 1 + forge-gui/src/main/java/forge/quest/QuestController.java | 5 ++++- forge-gui/src/main/java/forge/quest/QuestWorld.java | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/forge-gui/res/quest/world/worlds.txt b/forge-gui/res/quest/world/worlds.txt index 9a71672caec..243a2ff2d5e 100644 --- a/forge-gui/res/quest/world/worlds.txt +++ b/forge-gui/res/quest/world/worlds.txt @@ -1,5 +1,6 @@ Name:Main world Name:Random Standard +Name:Random Pioneer Name:Random Modern Name:Random Commander Name:Amonkhet|Dir:Amonkhet|Sets:AKH, HOU diff --git a/forge-gui/src/main/java/forge/quest/QuestController.java b/forge-gui/src/main/java/forge/quest/QuestController.java index 86fc937f89a..57ed852e5c8 100644 --- a/forge-gui/src/main/java/forge/quest/QuestController.java +++ b/forge-gui/src/main/java/forge/quest/QuestController.java @@ -448,7 +448,10 @@ public class QuestController { if (world.getName().equals(QuestWorld.STANDARDWORLDNAME)) { this.duelManager = new QuestEventLDADuelManager(FModel.getFormats().getStandard()); return; - } else if (world.getName().equals(QuestWorld.MODERNWORLDNAME)) { + } else if (world.getName().equals(QuestWorld.PIONEERWORLDNAME)) { + this.duelManager = new QuestEventLDADuelManager(FModel.getFormats().getPioneer()); + return; + }else if (world.getName().equals(QuestWorld.MODERNWORLDNAME)) { this.duelManager = new QuestEventLDADuelManager(FModel.getFormats().getModern()); return; }else if (world.isCustom()) { diff --git a/forge-gui/src/main/java/forge/quest/QuestWorld.java b/forge-gui/src/main/java/forge/quest/QuestWorld.java index b5a27b5b04c..52ad44988f0 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWorld.java +++ b/forge-gui/src/main/java/forge/quest/QuestWorld.java @@ -40,6 +40,7 @@ public class QuestWorld implements Comparable{ private final String dir; private final GameFormatQuest format; public static final String STANDARDWORLDNAME = "Random Standard"; + public static final String PIONEERWORLDNAME = "Random Pioneer"; public static final String MODERNWORLDNAME = "Random Modern"; public static final String RANDOMCOMMANDERWORLDNAME = "Random Commander"; @@ -195,6 +196,12 @@ public class QuestWorld implements Comparable{ FModel.getFormats().getStandard().getBannedCardNames(),false); } + if (useName.equalsIgnoreCase(QuestWorld.PIONEERWORLDNAME)){ + useFormat = new GameFormatQuest(QuestWorld.PIONEERWORLDNAME, + FModel.getFormats().getPioneer().getAllowedSetCodes(), + FModel.getFormats().getPioneer().getBannedCardNames(),false); + } + if (useName.equalsIgnoreCase(QuestWorld.MODERNWORLDNAME)){ useFormat = new GameFormatQuest(QuestWorld.MODERNWORLDNAME, FModel.getFormats().getModern().getAllowedSetCodes(),