the way it should have been done

This commit is contained in:
Maxmtg
2011-09-17 16:10:09 +00:00
parent 0835164e7b
commit c11ffe7b50

View File

@@ -5,6 +5,7 @@ import forge.Card;
import forge.CardList; import forge.CardList;
import forge.CardUtil; import forge.CardUtil;
import forge.FileUtil; import forge.FileUtil;
import forge.Player;
import forge.deck.DeckManager; import forge.deck.DeckManager;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
import forge.properties.NewConstants; import forge.properties.NewConstants;
@@ -141,23 +142,9 @@ public class QuestEventManager {
else if(key.equalsIgnoreCase("HumanExtras") && !value.equals("")) { else if(key.equalsIgnoreCase("HumanExtras") && !value.equals("")) {
String[] names = value.split("\\|"); String[] names = value.split("\\|");
CardList templist = new CardList(); CardList templist = new CardList();
Card tempcard;
for(String n : names) { for(String n : names) {
// Token card creation templist.add(readExtraCard(n, AllZone.getHumanPlayer()));
if(n.substring(0,5).equals("TOKEN")) {
tempcard = QuestUtil.createToken(n);
tempcard.addController(AllZone.getHumanPlayer());
tempcard.setOwner(AllZone.getHumanPlayer());
templist.add(tempcard);
}
// Standard card creation
else {
tempcard = AllZone.getCardFactory().getCard(n, AllZone.getHumanPlayer());
tempcard.setCurSetCode(tempcard.getMostRecentSet());
tempcard.setImageFilename(CardUtil.buildFilename(tempcard));
templist.add(tempcard);
}
} }
qq.humanExtraCards = templist; qq.humanExtraCards = templist;
@@ -166,23 +153,9 @@ public class QuestEventManager {
else if(key.equalsIgnoreCase("AIExtras") && !value.equals("")) { else if(key.equalsIgnoreCase("AIExtras") && !value.equals("")) {
String[] names = value.split("\\|"); String[] names = value.split("\\|");
CardList templist = new CardList(); CardList templist = new CardList();
Card tempcard;
for(String n : names) { for(String n : names) {
// Token card creation templist.add(readExtraCard(n, AllZone.getComputerPlayer()));
if(n.substring(0,5).equals("TOKEN")) {
tempcard = QuestUtil.createToken(n);
tempcard.addController(AllZone.getComputerPlayer());
tempcard.setOwner(AllZone.getComputerPlayer());
templist.add(tempcard);
}
// Standard card creation
else {
tempcard = AllZone.getCardFactory().getCard(n, AllZone.getComputerPlayer());
tempcard.setCurSetCode(tempcard.getMostRecentSet());
tempcard.setImageFilename(CardUtil.buildFilename(tempcard));
templist.add(tempcard);
}
} }
qq.aiExtraCards = templist; qq.aiExtraCards = templist;
@@ -195,6 +168,25 @@ public class QuestEventManager {
} }
} }
private Card readExtraCard(String name, Player owner) {
// Token card creation
Card tempcard;
if(name.startsWith("TOKEN")) {
tempcard = QuestUtil.createToken(name);
tempcard.addController(owner);
tempcard.setOwner(owner);
}
// Standard card creation
else {
tempcard = AllZone.getCardFactory().getCard(name, owner);
tempcard.setCurSetCode(tempcard.getMostRecentSet());
tempcard.setImageFilename(CardUtil.buildFilename(tempcard));
}
return tempcard;
}
/** /**
* <p>assembleEventMetadata.</p> * <p>assembleEventMetadata.</p>
* Handler for metadata contained in event files. * Handler for metadata contained in event files.