diff --git a/res/quest/quests.txt b/res/quest/quests.txt index 934de54dfee..11776c7d2be 100644 --- a/res/quest/quests.txt +++ b/res/quest/quests.txt @@ -1,5 +1,5 @@ 1 -Dungeoncrawling (White) +Dungeon Crawling (White) Guarded by white creatures Medium Repeatable @@ -8,7 +8,7 @@ Three white rares 100 2 -Dungeoncrawling (Blue) +Dungeon Crawling (Blue) Guarded by blue creatures. Medium Repeatable @@ -17,7 +17,7 @@ Three blue rares 100 3 -Dungeoncrawling (Black) +Dungeon Crawling (Black) Guarded by black creatures. Medium Repeatable @@ -26,7 +26,7 @@ Three black rares 100 4 -Dungeoncrawling (Red) +Dungeon Crawling (Red) Guarded by red creatures. Medium Repeatable @@ -35,7 +35,7 @@ Three red rares 100 5 -Dungeoncrawling (Green) +Dungeon Crawling (Green) Guarded by green creatures. Medium Repeatable @@ -44,7 +44,7 @@ Three green rares 100 6 -Dungeoncrawling (Colorless) +Dungeon Crawling (Colorless) Guarded by artifact creatures. Hard Repeatable @@ -53,7 +53,7 @@ Three colorless rares 150 7 -Dungeoncrawling (Gold) +Dungeon Crawling (Gold) Guarded by gold creatures. Hard Repeatable diff --git a/src/forge/Gui_WinLose.java b/src/forge/Gui_WinLose.java index 6310326fde9..02f46a3b4eb 100644 --- a/src/forge/Gui_WinLose.java +++ b/src/forge/Gui_WinLose.java @@ -213,10 +213,13 @@ public class Gui_WinLose extends JFrame implements NewConstants { if (!Constant.Quest.fantasyQuest[0]) AllZone.GameAction.newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0]); else{ + if (AllZone.QuestAssignment != null) + QuestUtil.setupQuest(AllZone.QuestAssignment); //AllZone.GameAction.newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0], humanList, computerList, humanLife, computerLife); CardList humanList = QuestUtil.getHumanPlantAndPet(AllZone.QuestData, AllZone.QuestAssignment); CardList computerList = new CardList(); + int humanLife = QuestUtil.getLife(AllZone.QuestData); int computerLife = 20; @@ -237,6 +240,8 @@ public class Gui_WinLose extends JFrame implements NewConstants { AllZone.GameAction.newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0]); else{ //AllZone.GameAction.newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0], humanList, computerList, humanLife, computerLife); + if (AllZone.QuestAssignment != null) + QuestUtil.setupQuest(AllZone.QuestAssignment); CardList humanList = QuestUtil.getHumanPlantAndPet(AllZone.QuestData, AllZone.QuestAssignment); CardList computerList = QuestUtil.getComputerCreatures(AllZone.QuestData, AllZone.QuestAssignment); diff --git a/src/forge/QuestUtil.java b/src/forge/QuestUtil.java index 9d7cdf8594d..56099bb01dc 100644 --- a/src/forge/QuestUtil.java +++ b/src/forge/QuestUtil.java @@ -217,7 +217,28 @@ public class QuestUtil { } else if (id == 8) { + CardList humanList = new CardList(); + for (int i=0;i<3;i++) + { + Card c = CardFactoryUtil.makeToken("Sheep", "G 0 1 Sheep", Constant.Player.Human, "G", + new String[] {"Creature","Sheep"}, 0, 1, new String[]{""}).get(0); + humanList.add(c); + } + qa.setHuman(humanList); + qa.setCardRewardList(pack.getRare(3)); + } + else if (id == 9) + { + CardList humanList = new CardList(); + Card c = AllZone.CardFactory.getCard("Trusty Machete", Constant.Player.Human); + humanList.add(c); + qa.setHuman(humanList); + + for (int i=0;i<3;i++) + qa.addCompy("Wall of Wood"); + + qa.setCardRewardList(pack.getRare(4, 4)); } }