mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
Renamed "getAIDeckNewFormat()" to "getAIDeckFromFile()" in quest area.
Renamed "getAIDeck()" to "getAIDeckFromMap()" in quest area. Updated references.
This commit is contained in:
@@ -611,7 +611,7 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar {
|
|||||||
StringBuffer allText = new StringBuffer();
|
StringBuffer allText = new StringBuffer();
|
||||||
|
|
||||||
for (String aNameList : nameList) {
|
for (String aNameList : nameList) {
|
||||||
deck = QuestBattleManager.getAIDeck(aNameList);
|
deck = QuestBattleManager.getAIDeckFromMap(aNameList);
|
||||||
allText.append(deck.getName()).append("\r\n");
|
allText.append(deck.getName()).append("\r\n");
|
||||||
allText.append(getExportDeckText(deck));
|
allText.append(getExportDeckText(deck));
|
||||||
allText.append("++++++++++++++++++++++++++++++++++++++++++++++++++++++ \r\n \r\n");
|
allText.append("++++++++++++++++++++++++++++++++++++++++++++++++++++++ \r\n \r\n");
|
||||||
@@ -634,7 +634,7 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar {
|
|||||||
|
|
||||||
setComputerPlayer(deckName);
|
setComputerPlayer(deckName);
|
||||||
|
|
||||||
Deck d = QuestBattleManager.getAIDeck(deckName);
|
Deck d = QuestBattleManager.getAIDeckFromMap(deckName);
|
||||||
CardList deck = new CardList();
|
CardList deck = new CardList();
|
||||||
|
|
||||||
for (int i = 0; i < d.countMain(); i++) {
|
for (int i = 0; i < d.countMain(); i++) {
|
||||||
|
|||||||
@@ -57,17 +57,17 @@ public class QuestBattleManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>getAIDeck.</p>
|
* <p>getAIDeckFromMap.</p>
|
||||||
* Returns a deck object stored in the
|
* Returns a deck object stored in the
|
||||||
*{@link forge.quest.gui.main.aiDecks} map.
|
*{@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.
|
||||||
*/
|
*/
|
||||||
public static Deck getAIDeck(String deckName) {
|
public static Deck getAIDeckFromMap(String deckName) {
|
||||||
if (!aiDecks.containsKey(deckName)) {
|
if (!aiDecks.containsKey(deckName)) {
|
||||||
ErrorViewer.showError(new Exception(),
|
ErrorViewer.showError(new Exception(),
|
||||||
"QuestData : getDeckFromMap(String deckName) error, deck name not found - %s", deckName);
|
"QuestData : getAIDeckFromMap(String deckName) error, deck name not found - %s", deckName);
|
||||||
}
|
}
|
||||||
|
|
||||||
return aiDecks.get(deckName);
|
return aiDecks.get(deckName);
|
||||||
@@ -80,7 +80,7 @@ public class QuestBattleManager {
|
|||||||
* @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 getDeckFromFile(String deckName) {
|
public static Deck getAIDeckFromFile(String deckName) {
|
||||||
final File file = ForgeProps.getFile(NewConstants.QUEST.DECKS);
|
final File file = ForgeProps.getFile(NewConstants.QUEST.DECKS);
|
||||||
final DeckManager manager = new DeckManager(file);
|
final DeckManager manager = new DeckManager(file);
|
||||||
return manager.getDeck(deckName);
|
return manager.getDeck(deckName);
|
||||||
|
|||||||
@@ -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.getDeckFromFile(oppDeckName);
|
oppDeck = QuestBattleManager.getAIDeckFromFile(oppDeckName);
|
||||||
|
|
||||||
oppName = oppDeck.getMetadata("DisplayName");
|
oppName = oppDeck.getMetadata("DisplayName");
|
||||||
oppDiff = oppDeck.getMetadata("Difficulty");
|
oppDiff = oppDeck.getMetadata("Difficulty");
|
||||||
|
|||||||
@@ -680,7 +680,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
|
|||||||
*/
|
*/
|
||||||
void setupBattle(Deck humanDeck) {
|
void setupBattle(Deck humanDeck) {
|
||||||
|
|
||||||
Deck computer = QuestBattleManager.getDeckFromFile((selectedOpponent).getName());
|
Deck computer = QuestBattleManager.getAIDeckFromFile((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.getDeckFromFile("quest" + selectedQuest.getId());
|
Deck computerDeck = QuestBattleManager.getAIDeckFromFile("quest" + selectedQuest.getId());
|
||||||
Constant.Runtime.ComputerDeck[0] = computerDeck;
|
Constant.Runtime.ComputerDeck[0] = computerDeck;
|
||||||
|
|
||||||
AllZone.setQuestAssignment(selectedQuest);
|
AllZone.setQuestAssignment(selectedQuest);
|
||||||
|
|||||||
Reference in New Issue
Block a user