From 9873c3ad2d4a6c26e976b78b80b3ee3b5195e9d2 Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Sat, 1 Oct 2011 00:13:35 +0000 Subject: [PATCH] Replaced AllZone global "QuestChallenge" with its superclass "QuestEvent". --- src/main/java/forge/AllZone.java | 27 --------------- src/main/java/forge/GameAction.java | 9 ++--- src/main/java/forge/Gui_WinLose.java | 34 +++++++++++-------- src/main/java/forge/quest/data/QuestUtil.java | 19 ++++++----- .../java/forge/quest/gui/QuestMainPanel.java | 3 -- .../forge/quest/gui/main/QuestChallenge.java | 5 +++ .../java/forge/quest/gui/main/QuestDuel.java | 5 ++- .../java/forge/quest/gui/main/QuestEvent.java | 12 ++++++- 8 files changed, 54 insertions(+), 60 deletions(-) diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index b9af4528876..87ae6631229 100644 --- a/src/main/java/forge/AllZone.java +++ b/src/main/java/forge/AllZone.java @@ -17,7 +17,6 @@ import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.quest.data.QuestMatchState; import forge.quest.data.QuestData; -import forge.quest.gui.main.QuestChallenge; import forge.quest.gui.main.QuestEvent; import forge.quest.gui.main.QuestEventManager; @@ -42,11 +41,6 @@ public final class AllZone implements NewConstants { /** Global questData. */ private static forge.quest.data.QuestData questData = null; - - /** Global QuestChallenge. */ - private static QuestChallenge questChallenge = null; - // QuestChallenge extends QuestEvent. This global will be deprecated shortly, - // and the QuestEvent global used instead. doublestrike 28-09-11 /** Global QuestChallenge. */ private static QuestEvent questEvent = null; @@ -141,27 +135,6 @@ public final class AllZone implements NewConstants { public static void setQuestData(final QuestData questData0) { questData = questData0; } - - /** - *

getQuestChallenge.

- * - * @return a {@link forge.quest.gui.main.QuestChallenge} object. - * @since 1.0.15 - */ - // QuestChallenge extends QuestEvent. This global will be deprecated shortly, - // and the QuestEvent global used instead. doublestrike 28-09-11 - public static QuestChallenge getQuestChallenge() { - return questChallenge; - } - - /** - *

setQuestChallenge.

- * - * @param {@link forge.quest.gui.main.QuestChallenge} object. - */ - public static void setQuestChallenge(final QuestChallenge q) { - questChallenge = q; - } /** *

getQuestEvent.

diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 38d75831fe3..13495190e22 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -30,6 +30,7 @@ import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants.LANG.GameAction.GAMEACTION_TEXT; import forge.quest.gui.main.QuestChallenge; +import forge.quest.gui.main.QuestEvent; import java.util.ArrayList; import java.util.Arrays; @@ -654,7 +655,7 @@ public class GameAction { AllZone.getDisplay().savePrefs(); frame.setEnabled(false); //frame.dispose(); - Gui_WinLose gwl = new Gui_WinLose(AllZone.getMatchState(), AllZone.getQuestData(), AllZone.getQuestChallenge()); + Gui_WinLose gwl = new Gui_WinLose(AllZone.getMatchState(), AllZone.getQuestData(), AllZone.getQuestEvent()); //gwl.setAlwaysOnTop(true); gwl.toFront(); canShowWinLose = false; @@ -1092,15 +1093,15 @@ public class GameAction { * @param computer a {@link forge.CardList} object. */ public final void newGame(final Deck humanDeck, final Deck computerDeck, final CardList human, - final CardList computer, final int humanLife, final int computerLife, final QuestChallenge qc) + final CardList computer, final int humanLife, final int computerLife, final QuestEvent qe) { this.newGame(humanDeck, computerDeck); AllZone.getComputerPlayer().setLife(computerLife, null); AllZone.getHumanPlayer().setLife(humanLife, null); - if (qc != null) { - computer.addAll(forge.quest.data.QuestUtil.getComputerStartingCards(AllZone.getQuestData(), AllZone.getQuestChallenge())); + if (qe != null && ((QuestChallenge)qe).getEventType().equals("challenge")) { + computer.addAll(forge.quest.data.QuestUtil.getComputerStartingCards(AllZone.getQuestData(), AllZone.getQuestEvent())); } for (Card c : human) { diff --git a/src/main/java/forge/Gui_WinLose.java b/src/main/java/forge/Gui_WinLose.java index f84c8996123..d9c73ddebe1 100644 --- a/src/main/java/forge/Gui_WinLose.java +++ b/src/main/java/forge/Gui_WinLose.java @@ -17,6 +17,7 @@ import forge.quest.data.QuestMatchState; import forge.quest.data.QuestPreferences; import forge.quest.gui.QuestFrame; import forge.quest.gui.main.QuestChallenge; +import forge.quest.gui.main.QuestEvent; import forge.view.swing.Gui_HomeScreen; import forge.view.swing.OldGuiNewGame; import net.miginfocom.swing.MigLayout; @@ -66,7 +67,7 @@ public class Gui_WinLose extends JFrame implements NewConstants { private class WinLoseModel { public QuestMatchState match; public QuestData quest; - public QuestChallenge qc; + public QuestEvent event; } private WinLoseModel model; @@ -78,11 +79,11 @@ public class Gui_WinLose extends JFrame implements NewConstants { * @param quest a QuestData object * @param chall a QuestChallenge object */ - public Gui_WinLose(final QuestMatchState matchState, final QuestData quest, final QuestChallenge chall) { + public Gui_WinLose(final QuestMatchState matchState, final QuestData quest, final QuestEvent event) { model = new WinLoseModel(); model.match = matchState; model.quest = quest; - model.qc = chall; + model.event = event; try { jbInit(); @@ -188,25 +189,28 @@ public class Gui_WinLose extends JFrame implements NewConstants { void prepareForNextRound() { if (Constant.Quest.fantasyQuest[0]) { int extraLife = 0; - if (model.qc != null) { + + System.out.println("Gui_WinLose: "+model.event.getEventType()); // ghandi + + if (model.event.getEventType().equals("challenge")) { if (model.quest.getInventory().hasItem("Zeppelin")) { extraLife = 3; } } //AllZone.getGameAction().newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0], //humanList, computerList, humanLife, computerLife); - CardList humanList = forge.quest.data.QuestUtil.getHumanStartingCards(model.quest, model.qc); + CardList humanList = forge.quest.data.QuestUtil.getHumanStartingCards(model.quest, model.event); CardList computerList = new CardList(); int humanLife = model.quest.getLife() + extraLife; int computerLife = 20; - if (model.qc != null) { - computerLife = model.qc.getAILife(); + if (model.event.getEventType().equals("challenge")) { + computerLife = ((QuestChallenge)model.event).getAILife(); } AllZone.getGameAction().newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0], - humanList, computerList, humanLife, computerLife, model.qc); + humanList, computerList, humanLife, computerLife, model.event); } else { AllZone.getGameAction().newGame(Constant.Runtime.HumanDeck[0], Constant.Runtime.ComputerDeck[0]); } @@ -377,7 +381,7 @@ public class Gui_WinLose extends JFrame implements NewConstants { giveQuestRewards(wonMatch); model.match.reset(); - AllZone.setQuestChallenge(null); + AllZone.setQuestEvent(null); model.quest.saveData(); @@ -455,16 +459,16 @@ public class Gui_WinLose extends JFrame implements NewConstants { } // Rewards from QuestAssignment - if (wonMatch && model.qc != null) { + if (wonMatch && model.event.getEventType().equals("challenge")) { // Set repeatability - if(!model.qc.getRepeatable()) { - model.quest.addCompletedChallenge(model.qc.getId()); + if(!((QuestChallenge)model.event).getRepeatable()) { + model.quest.addCompletedChallenge(((QuestChallenge)model.event).getId()); } model.quest.addChallengesPlayed(); - List challengeRewardCards = model.qc.getCardRewardList(); - long questRewardCredits = model.qc.getCreditsReward(); + List challengeRewardCards = ((QuestChallenge)model.event).getCardRewardList(); + long questRewardCredits = ((QuestChallenge)model.event).getCreditsReward(); StringBuilder sb = new StringBuilder(); sb.append("Challenge Completed - \r\n"); @@ -485,7 +489,7 @@ public class Gui_WinLose extends JFrame implements NewConstants { String fileName = "BoxIcon.png"; ImageIcon icon = getIcon(fileName); - String title = "Challenge Rewards for " + model.qc.getTitle(); + String title = "Challenge Rewards for " + ((QuestChallenge)model.event).getTitle(); JOptionPane.showMessageDialog(null, sb.toString(), title, JOptionPane.INFORMATION_MESSAGE, icon); } /* diff --git a/src/main/java/forge/quest/data/QuestUtil.java b/src/main/java/forge/quest/data/QuestUtil.java index 9b3e9798842..8a8969b15b6 100644 --- a/src/main/java/forge/quest/data/QuestUtil.java +++ b/src/main/java/forge/quest/data/QuestUtil.java @@ -7,6 +7,7 @@ import forge.card.CardRarity; import forge.card.BoosterUtils; import forge.item.CardPrinted; import forge.quest.gui.main.QuestChallenge; +import forge.quest.gui.main.QuestEvent; import java.util.List; @@ -30,17 +31,17 @@ public class QuestUtil { /** *

getComputerStartingCards.

- * Returns extra AI cards in play at start of quest. + * Returns extra AI cards in play at start of event. * * @param qd a {@link forge.quest.data.QuestData} object. - * @param qc a QuestChallenge object. + * @param qe a {@link forge.quest.gui.main.QuestEvent} object. * @return a {@link forge.CardList} object. */ - public static CardList getComputerStartingCards(final QuestData qd, QuestChallenge qc) { + public static CardList getComputerStartingCards(final QuestData qd, QuestEvent qe) { CardList list = new CardList(); - if (qc != null) { - list.addAll(qc.getAIExtraCards()); + if (qe.getEventType().equals("challenge")) { + list.addAll(((QuestChallenge)qe).getAIExtraCards()); } return list; } @@ -72,14 +73,14 @@ public class QuestUtil { * and cards in play at start of quest. * * @param qd a {@link forge.quest.data.QuestData} object. - * @param qc a QuestChallenge object. + * @param qe a {@link forge.quest.gui.main.QuestEvent} object. * @return a {@link forge.CardList} object. */ - public static CardList getHumanStartingCards(final QuestData qd, QuestChallenge qc) { + public static CardList getHumanStartingCards(final QuestData qd, QuestEvent qe) { CardList list = getHumanStartingCards(qd); - if (qc != null) { - list.addAll(qc.getHumanExtraCards()); + if (qe.getEventType().equals("challenge")) { + list.addAll(((QuestChallenge)qe).getHumanExtraCards()); } return list; diff --git a/src/main/java/forge/quest/gui/QuestMainPanel.java b/src/main/java/forge/quest/gui/QuestMainPanel.java index b80899c09a3..c5fa1b49c36 100644 --- a/src/main/java/forge/quest/gui/QuestMainPanel.java +++ b/src/main/java/forge/quest/gui/QuestMainPanel.java @@ -722,9 +722,6 @@ public class QuestMainPanel extends QuestAbstractPanel { Constant.Runtime.ComputerDeck[0] = computer; AllZone.setQuestEvent(selectedChallenge); - - // will be deprecated in favor of setQuestEvent, see note in AllZone. doublestrike 28-09-11 - AllZone.setQuestChallenge(selectedChallenge); int extraLife = 0; diff --git a/src/main/java/forge/quest/gui/main/QuestChallenge.java b/src/main/java/forge/quest/gui/main/QuestChallenge.java index 6e53834a589..d132def2e06 100644 --- a/src/main/java/forge/quest/gui/main/QuestChallenge.java +++ b/src/main/java/forge/quest/gui/main/QuestChallenge.java @@ -29,6 +29,11 @@ public class QuestChallenge extends QuestEvent { public CardList aiExtraCards = new CardList(); public List cardRewardList = new ArrayList(); + public QuestChallenge() { + super(); + eventType = "challenge"; + } + /** *

getAILife.

* diff --git a/src/main/java/forge/quest/gui/main/QuestDuel.java b/src/main/java/forge/quest/gui/main/QuestDuel.java index 6ec4ba452ff..8bf4cf0075b 100644 --- a/src/main/java/forge/quest/gui/main/QuestDuel.java +++ b/src/main/java/forge/quest/gui/main/QuestDuel.java @@ -7,6 +7,9 @@ package forge.quest.gui.main; */ public class QuestDuel extends QuestEvent { - // [QuestDuel has no unique properties yet.] + public QuestDuel() { + super(); + eventType = "duel"; + } } diff --git a/src/main/java/forge/quest/gui/main/QuestEvent.java b/src/main/java/forge/quest/gui/main/QuestEvent.java index adeb6f5bba5..9dbd8d384f1 100644 --- a/src/main/java/forge/quest/gui/main/QuestEvent.java +++ b/src/main/java/forge/quest/gui/main/QuestEvent.java @@ -15,7 +15,8 @@ public class QuestEvent { public String description = ""; public String difficulty = "Medium"; public String icon = "Unknown.jpg"; - public String name = "Noname"; + public String name = "Noname"; + public String eventType = null; /** *

getTitle.

@@ -53,6 +54,15 @@ public class QuestEvent { return eventDeck; } + /** + *

getEventDeck.

+ * + * @return {@link forge.deck.Deck} + */ + public final String getEventType() { + return eventType; + } + /** *

getIcon.

*