From a17628cdd653a723addb29ddec2d4c5b0fdf3ba0 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 3 May 2013 06:12:39 +0000 Subject: [PATCH] - Fixed Challenges in Classic mode. --- .../gui/home/quest/SSubmenuQuestUtil.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java index eb0a6d6c51c..2db559e165f 100644 --- a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java +++ b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java @@ -394,26 +394,22 @@ public class SSubmenuQuestUtil { worker.execute(); PlayerStartConditions humanStart = new PlayerStartConditions(SSubmenuQuestUtil.getCurrentDeck()); PlayerStartConditions aiStart = new PlayerStartConditions(event.getEventDeck()); + + int extraLifeHuman = 0; + int lifeAI = 20; + if (event instanceof QuestEventChallenge) { + lifeAI = ((QuestEventChallenge) event).getAILife(); - if (qData.getMode() == QuestMode.Fantasy) { - int lifeAI = 20; - int extraLifeHuman = 0; - - if (event instanceof QuestEventChallenge) { - lifeAI = ((QuestEventChallenge) event).getAILife(); - - if (qData.getAssets().hasItem(QuestItemType.ZEPPELIN)) { - extraLifeHuman = 3; - } + if (qData.getAssets().hasItem(QuestItemType.ZEPPELIN)) { + extraLifeHuman = 3; } + } + humanStart.setStartingLife(qData.getAssets().getLife(qData.getMode()) + extraLifeHuman); + aiStart.setStartingLife(lifeAI); - humanStart.setStartingLife(qData.getAssets().getLife(qData.getMode()) + extraLifeHuman); - aiStart.setStartingLife(lifeAI); - - humanStart.setCardsOnBattlefield(QuestUtil.getHumanStartingCards(qData, event)); - aiStart.setCardsOnBattlefield(QuestUtil.getComputerStartingCards(event)); - } // End isFantasy - + humanStart.setCardsOnBattlefield(QuestUtil.getHumanStartingCards(qData, event)); + aiStart.setCardsOnBattlefield(QuestUtil.getComputerStartingCards(event)); + MatchStartHelper msh = new MatchStartHelper(); msh.addPlayer(Singletons.getControl().getLobby().getQuestPlayer(), humanStart);