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

Quest and Battle icons are now set properly in matches

Browse Source
This commit is contained in:
jendave
2011-08-06 15:33:11 +00:00
parent 018daca6bb
commit 0c41c9d305
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/forge/quest/main/QuestMainPanel.java
View File

@@ -505,6 +505,8 @@ public class QuestMainPanel extends QuestAbstractPanel {
Constant.Runtime.HumanDeck[0] = humanDeck; Constant.Runtime.HumanDeck[0] = humanDeck;
moveDeckToTop(humanDeckName); moveDeckToTop(humanDeckName);
Constant.Quest.oppIconName[0] = getMatchIcon();
// Dev Mode occurs before Display // Dev Mode occurs before Display
Constant.Runtime.DevMode[0] = devModeCheckBox.isSelected(); Constant.Runtime.DevMode[0] = devModeCheckBox.isSelected();
@@ -539,11 +541,6 @@ public class QuestMainPanel extends QuestAbstractPanel {
Deck computer = questData.ai_getDeckNewFormat((selectedOpponent).getName()); Deck computer = questData.ai_getDeckNewFormat((selectedOpponent).getName());
Constant.Runtime.ComputerDeck[0] = computer; Constant.Runtime.ComputerDeck[0] = computer;
String oppIconName = selectedOpponent.getName();
oppIconName = oppIconName.substring(0, oppIconName.length() - 1).trim() + ".jpg";
Constant.Quest.oppIconName[0] = oppIconName;
AllZone.GameAction.newGame( AllZone.GameAction.newGame(
humanDeck, humanDeck,
computer, computer,
@@ -561,7 +558,6 @@ public class QuestMainPanel extends QuestAbstractPanel {
Constant.Runtime.ComputerDeck[0] = computerDeck; Constant.Runtime.ComputerDeck[0] = computerDeck;
AllZone.QuestAssignment = selectedQuest; AllZone.QuestAssignment = selectedQuest;
Constant.Quest.oppIconName[0] = selectedQuest.getIconName();
int extraLife = 0; int extraLife = 0;
@@ -580,6 +576,20 @@ public class QuestMainPanel extends QuestAbstractPanel {
} }
String getMatchIcon(){
String oppIconName;
if (isShowingQuests){
Quest_Assignment selectedQuest = ((QuestQuest) selectedOpponent).getQuestAssignment();
oppIconName = selectedQuest.getIconName();
}
else{
oppIconName = selectedOpponent.getName();
oppIconName = oppIconName.substring(0, oppIconName.length() - 1).trim() + ".jpg";
}
return oppIconName;
}
void showQuests() { void showQuests() {
if (isShowingQuests) { if (isShowingQuests) {
this.nextMatchLayout.show(nextMatchPanel, BATTLES); this.nextMatchLayout.show(nextMatchPanel, BATTLES);