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

Renamed "getAIDeckNewFormat()" to "getDeckFromFile()" and updated references in Quest area.

Browse Source
This commit is contained in:
Doublestrike
2011-09-01 11:05:15 +00:00
parent 57bdf06959
commit 61d83fbb93
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/quest/data/QuestBattleManager.java
View File

@@ -58,6 +58,8 @@ public class QuestBattleManager {
/** /**
* <p>getAIDeck.</p> * <p>getAIDeck.</p>
* Returns a deck object stored in the
*{@link forge.quest.gui.main.aiDecks} map.
* *
* @param deckName a {@link java.lang.String} object. * @param deckName a {@link java.lang.String} object.
* @return a {@link forge.deck.Deck} object. * @return a {@link forge.deck.Deck} object.
@@ -72,13 +74,16 @@ public class QuestBattleManager {
} }
/** /**
* <p>getAIDeckNewFormat.</p> * <p>getDeckFromFile.</p>
* Returns a deck object built from a file name.
* *
* @param deckName a {@link java.lang.String} object. * @param deckName a {@link java.lang.String} object.
* @return a {@link forge.deck.Deck} object. * @return a {@link forge.deck.Deck} object.
*/ */
public static Deck getAIDeckNewFormat(String deckName) { public static Deck getDeckFromFile(String deckName) {
return (new DeckManager(ForgeProps.getFile(NewConstants.QUEST.DECKS))).getDeck(deckName); final File file = ForgeProps.getFile(NewConstants.QUEST.DECKS);
final DeckManager manager = new DeckManager(file);
return manager.getDeck(deckName);
} }
/** /**

2
src/main/java/forge/quest/gui/main/QuestBattle.java
View File

@@ -59,7 +59,7 @@ public class QuestBattle extends QuestSelectablePanel {
String[] oppDecks = QuestBattleManager.getOpponents(); String[] oppDecks = QuestBattleManager.getOpponents();
for (String oppDeckName : oppDecks) { for (String oppDeckName : oppDecks) {
// Get deck object and properties for this opponent. // Get deck object and properties for this opponent.
oppDeck = QuestBattleManager.getAIDeckNewFormat(oppDeckName); oppDeck = QuestBattleManager.getDeckFromFile(oppDeckName);
oppName = oppDeck.getMetadata("DisplayName"); oppName = oppDeck.getMetadata("DisplayName");
oppDiff = oppDeck.getMetadata("Difficulty"); oppDiff = oppDeck.getMetadata("Difficulty");

4
src/main/java/forge/quest/gui/main/QuestMainPanel.java
View File

@@ -680,7 +680,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
*/ */
void setupBattle(Deck humanDeck) { void setupBattle(Deck humanDeck) {
Deck computer = QuestBattleManager.getAIDeckNewFormat((selectedOpponent).getName()); Deck computer = QuestBattleManager.getDeckFromFile((selectedOpponent).getName());
Constant.Runtime.ComputerDeck[0] = computer; Constant.Runtime.ComputerDeck[0] = computer;
AllZone.getGameAction().newGame(humanDeck, computer, forge.quest.data.QuestUtil.getHumanPlantAndPet(questData), AllZone.getGameAction().newGame(humanDeck, computer, forge.quest.data.QuestUtil.getHumanPlantAndPet(questData),
@@ -695,7 +695,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
private void setupQuest(Deck humanDeck) { private void setupQuest(Deck humanDeck) {
Quest_Assignment selectedQuest = ((QuestQuest) selectedOpponent).getQuestAssignment(); Quest_Assignment selectedQuest = ((QuestQuest) selectedOpponent).getQuestAssignment();
Deck computerDeck = QuestBattleManager.getAIDeckNewFormat("quest" + selectedQuest.getId()); Deck computerDeck = QuestBattleManager.getDeckFromFile("quest" + selectedQuest.getId());
Constant.Runtime.ComputerDeck[0] = computerDeck; Constant.Runtime.ComputerDeck[0] = computerDeck;
AllZone.setQuestAssignment(selectedQuest); AllZone.setQuestAssignment(selectedQuest);