external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate QuestEventManager instances for Duels and challenges.

Browse Source
This commit is contained in:
Maxmtg
2012-03-23 05:33:42 +00:00
parent bc320dd6ce
commit d2b475ee35
7 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/Card.java
View File

@@ -67,7 +67,7 @@ public class Card extends GameEntity implements Comparable<Card> {
private long value; private long value;
private final Map<String, CardCharacteristics> characteristicsMap = new HashMap<String, CardCharacteristics>(); private final Map<String, CardCharacteristics> characteristicsMap = new HashMap<String, CardCharacteristics>(2);
private String curCharacteristics = "Original"; private String curCharacteristics = "Original";
private String preTFDCharacteristic = "Original"; private String preTFDCharacteristic = "Original";

2
src/main/java/forge/gui/home/quest/CSubmenuChallenges.java
View File

@@ -117,7 +117,7 @@ public enum CSubmenuChallenges implements ICSubmenu {
view.getLblTitle().setText("Challenges: " + AllZone.getQuest().getRank()); view.getLblTitle().setText("Challenges: " + AllZone.getQuest().getRank());
view.getPnlChallenges().removeAll(); view.getPnlChallenges().removeAll();
final List<QuestEventChallenge> challenges = AllZone.getQuest().getEventManager().generateChallenges(); final List<QuestEventChallenge> challenges = AllZone.getQuest().getChallengesManager().generateChallenges();
for (final QuestEventChallenge c : challenges) { for (final QuestEventChallenge c : challenges) {
final SelectablePanel temp = new SelectablePanel(c); final SelectablePanel temp = new SelectablePanel(c);

2
src/main/java/forge/gui/home/quest/CSubmenuDuels.java
View File

@@ -100,7 +100,7 @@ public enum CSubmenuDuels implements ICSubmenu {
view.getLblTitle().setText("Duels: " + AllZone.getQuest().getRank()); view.getLblTitle().setText("Duels: " + AllZone.getQuest().getRank());
view.getPnlDuels().removeAll(); view.getPnlDuels().removeAll();
final List<QuestEventDuel> duels = AllZone.getQuest().getEventManager().generateDuels(); final List<QuestEventDuel> duels = AllZone.getQuest().getDuelsManager().generateDuels();
for (final QuestEventDuel d : duels) { for (final QuestEventDuel d : duels) {
final SelectablePanel temp = new SelectablePanel(d); final SelectablePanel temp = new SelectablePanel(d);

3
src/main/java/forge/gui/home/quest/SubmenuQuestUtil.java
View File

@@ -227,7 +227,8 @@ public class SubmenuQuestUtil {
Constant.Runtime.COMPUTER_DECK[0] = event.getEventDeck(); Constant.Runtime.COMPUTER_DECK[0] = event.getEventDeck();
Constant.Runtime.setGameType(GameType.Quest); Constant.Runtime.setGameType(GameType.Quest);
qData.getEventManager().randomizeOpponents(); qData.getChallengesManager().randomizeOpponents();
qData.getDuelsManager().randomizeOpponents();
qData.setCurrentEvent(event); qData.setCurrentEvent(event);
qData.save(); qData.save();

8
src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java
View File

@@ -282,11 +282,11 @@ public enum CSubmenuConstructed implements ICSubmenu {
final List<String> eventNames = new ArrayList<String>(); final List<String> eventNames = new ArrayList<String>();
for (final QuestEvent e : quest.getEventManager().getAllDuels()) { for (final QuestEvent e : quest.getDuelsManager().getAllDuels()) {
eventNames.add(e.getEventDeck().getName()); eventNames.add(e.getEventDeck().getName());
} }
for (final QuestEvent e : quest.getEventManager().getAllChallenges()) { for (final QuestEvent e : quest.getChallengesManager().getAllChallenges()) {
eventNames.add(e.getEventDeck().getName()); eventNames.add(e.getEventDeck().getName());
} }
@@ -419,7 +419,7 @@ public enum CSubmenuConstructed implements ICSubmenu {
deck.getMain().add(cards); deck.getMain().add(cards);
} }
else if (lst0.getName().equals(ESubmenuConstructedTypes.QUESTEVENTS.toString())) { else if (lst0.getName().equals(ESubmenuConstructedTypes.QUESTEVENTS.toString())) {
deck = quest.getEventManager().getEvent(selection[0]).getEventDeck(); deck = quest.getDuelsManager().getEvent(selection[0]).getEventDeck();
} }
// Custom deck // Custom deck
else if (lst0.getName().equals(ESubmenuConstructedTypes.CUSTOM.toString())) { else if (lst0.getName().equals(ESubmenuConstructedTypes.CUSTOM.toString())) {
@@ -444,7 +444,7 @@ public enum CSubmenuConstructed implements ICSubmenu {
deck = Singletons.getModel().getDecks().getConstructed().get(deckName); deck = Singletons.getModel().getDecks().getConstructed().get(deckName);
} }
else { else {
deck = quest.getEventManager().getEvent(deckName).getEventDeck(); deck = quest.getDuelsManager().getEvent(deckName).getEventDeck();
} }
// Dump into map and display. // Dump into map and display.

3
src/main/java/forge/properties/NewConstants.java
View File

@@ -198,7 +198,8 @@ public final class NewConstants {
public static final String PREFS = "quest/prefs"; public static final String PREFS = "quest/prefs";
/** The DECKS. */ /** The DECKS. */
public static final String DECKS = "quest/decks-dir"; public static final String DUELS = "quest/duels-dir";
public static final String CHALLENGES = "quest/challenges-dir";
/** The XMLDATA. */ /** The XMLDATA. */
public static final String XMLDATA = "quest/data-xml"; public static final String XMLDATA = "quest/data-xml";

23
src/main/java/forge/quest/QuestController.java
View File

@@ -70,7 +70,8 @@ public class QuestController {
/** The available quests. */ /** The available quests. */
private List<Integer> availableQuests = null; private List<Integer> availableQuests = null;
private QuestEventManager eventManager = null; private QuestEventManager duelManager = null;
private QuestEventManager challengesManager = null;
private QuestBazaarManager bazaar = null; private QuestBazaarManager bazaar = null;
@@ -104,6 +105,7 @@ public class QuestController {
return selectedPets.get(slot); return selectedPets.get(slot);
} }
// Cards - class uses data from here // Cards - class uses data from here
/** /**
* Gets the cards. * Gets the cards.
@@ -162,7 +164,8 @@ public class QuestController {
this.myCards = this.model == null ? null : new QuestUtilCards(this); this.myCards = this.model == null ? null : new QuestUtilCards(this);
this.currentEvent = null; this.currentEvent = null;
this.getEventManager().randomizeOpponents(); this.getChallengesManager().randomizeOpponents();
this.getDuelsManager().randomizeOpponents();
} }
/** /**
@@ -316,13 +319,21 @@ public class QuestController {
* *
* @return the event manager * @return the event manager
*/ */
public QuestEventManager getEventManager() { public QuestEventManager getDuelsManager() {
if (this.eventManager == null) { if (this.duelManager == null) {
this.eventManager = new QuestEventManager(ForgeProps.getFile(NewConstants.Quest.DECKS)); this.duelManager = new QuestEventManager(ForgeProps.getFile(NewConstants.Quest.DUELS));
} }
return this.eventManager; return this.duelManager;
} }
public QuestEventManager getChallengesManager() {
if (this.challengesManager == null) {
this.challengesManager = new QuestEventManager(ForgeProps.getFile(NewConstants.Quest.CHALLENGES));
}
return this.challengesManager;
}
public QuestPetStorage getPetsStorage() { public QuestPetStorage getPetsStorage() {
if ( this.pets == null ) { if ( this.pets == null ) {
this.pets = new QuestPetStorage(ForgeProps.getFile(NewConstants.Quest.BAZAAR)); this.pets = new QuestPetStorage(ForgeProps.getFile(NewConstants.Quest.BAZAAR));