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

Booster pack quest reward bug fixed.

Browse Source
This commit is contained in:
Doublestrike
2011-09-18 09:44:45 +00:00
parent 5bcff0d420
commit 967aae211e
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/forge/quest/data/QuestUtil.java
View File

@@ -130,37 +130,37 @@ public class QuestUtil {
String[] temp = s.split(" "); String[] temp = s.split(" ");
int qty = Integer.parseInt(temp[0]); int qty = Integer.parseInt(temp[0]);
// Determine rarity // Determine rarity
CardRarity rar = CardRarity.Uncommon; CardRarity rar = CardRarity.Uncommon;
if(temp[1].equals("rare") || temp[1].equals("rares")) { if(temp[2].equalsIgnoreCase("rare") || temp[2].equalsIgnoreCase("rares")) {
rar = CardRarity.Rare; rar = CardRarity.Rare;
} }
// Determine color ("random" defaults to null color) // Determine color ("random" defaults to null color)
String col = null; String col = null;
if(temp[2].toLowerCase().equals("black")) { if(temp[1].equalsIgnoreCase("black")) {
col = Constant.Color.Black; col = Constant.Color.Black;
} }
else if(temp[2].toLowerCase().equals("blue")) { else if(temp[1].equalsIgnoreCase("blue")) {
col = Constant.Color.Blue; col = Constant.Color.Blue;
} }
else if(temp[2].toLowerCase().equals("colorless")) { else if(temp[1].equalsIgnoreCase("colorless")) {
col = Constant.Color.Colorless; col = Constant.Color.Colorless;
} }
else if(temp[2].toLowerCase().equals("green")) { else if(temp[1].equalsIgnoreCase("green")) {
col = Constant.Color.Green; col = Constant.Color.Green;
} }
else if(temp[2].toLowerCase().equals("multicolor")) { else if(temp[1].equalsIgnoreCase("multicolor")) {
col = "Multicolor"; // Note: No constant color for this?? col = "Multicolor"; // Note: No constant color for this??
} }
else if(temp[2].toLowerCase().equals("red")) { else if(temp[1].equalsIgnoreCase("red")) {
col = Constant.Color.Red; col = Constant.Color.Red;
} }
else if(temp[2].toLowerCase().equals("white")) { else if(temp[1].equalsIgnoreCase("white")) {
col = Constant.Color.White; col = Constant.Color.White;
} }
System.out.println(rar+" "+col+" "+qty);
return BoosterUtils.generateCards(qty, rar, col); return BoosterUtils.generateCards(qty, rar, col);
} }

9
src/main/java/forge/quest/gui/main/QuestEventManager.java
View File

@@ -168,7 +168,14 @@ public class QuestEventManager {
} }
} }
/**
* <p>readExtraCard.</p>
* Creates single card for a string read from unique event properties.
*
* @param name
* @param owner
* @return
*/
private Card readExtraCard(String name, Player owner) { private Card readExtraCard(String name, Player owner) {
// Token card creation // Token card creation
Card tempcard; Card tempcard;