read price for boosters

This commit is contained in:
Maxmtg
2011-09-15 16:00:26 +00:00
parent 2985baeb62
commit 826007378d
4 changed files with 9 additions and 3 deletions

2
.gitattributes vendored
View File

@@ -9574,7 +9574,6 @@ src/main/java/forge/PlayerUtil.java svneol=native#text/plain
src/main/java/forge/PlayerZone.java svneol=native#text/plain src/main/java/forge/PlayerZone.java svneol=native#text/plain
src/main/java/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain src/main/java/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain
src/main/java/forge/Quest_Assignment.java svneol=native#text/plain src/main/java/forge/Quest_Assignment.java svneol=native#text/plain
src/main/java/forge/ReadPriceList.java svneol=native#text/plain
src/main/java/forge/ReadQuest_Assignment.java svneol=native#text/plain src/main/java/forge/ReadQuest_Assignment.java svneol=native#text/plain
src/main/java/forge/SetInfo.java svneol=native#text/plain src/main/java/forge/SetInfo.java svneol=native#text/plain
src/main/java/forge/SetUtils.java svneol=native#text/plain src/main/java/forge/SetUtils.java svneol=native#text/plain
@@ -9834,6 +9833,7 @@ src/main/java/forge/quest/data/QuestPreferences.java svneol=native#text/plain
src/main/java/forge/quest/data/QuestUtil.java svneol=native#text/plain src/main/java/forge/quest/data/QuestUtil.java svneol=native#text/plain
src/main/java/forge/quest/data/QuestUtilCards.java -text src/main/java/forge/quest/data/QuestUtilCards.java -text
src/main/java/forge/quest/data/QuestUtilRewards.java -text src/main/java/forge/quest/data/QuestUtilRewards.java -text
src/main/java/forge/quest/data/ReadPriceList.java svneol=native#text/plain
src/main/java/forge/quest/data/bazaar/QuestStallDefinition.java svneol=native#text/plain src/main/java/forge/quest/data/bazaar/QuestStallDefinition.java svneol=native#text/plain
src/main/java/forge/quest/data/bazaar/QuestStallManager.java svneol=native#text/plain src/main/java/forge/quest/data/bazaar/QuestStallManager.java svneol=native#text/plain
src/main/java/forge/quest/data/bazaar/QuestStallPurchasable.java svneol=native#text/plain src/main/java/forge/quest/data/bazaar/QuestStallPurchasable.java svneol=native#text/plain

View File

@@ -20,7 +20,6 @@ import net.slightlymagic.braids.util.lambda.Lambda1;
import net.slightlymagic.maxmtg.Predicate; import net.slightlymagic.maxmtg.Predicate;
import forge.Command; import forge.Command;
import forge.ReadPriceList;
import forge.Singletons; import forge.Singletons;
import forge.deck.Deck; import forge.deck.Deck;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
@@ -32,6 +31,7 @@ import forge.item.CardPrinted;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.ItemPoolView; import forge.item.ItemPoolView;
import forge.quest.data.QuestData; import forge.quest.data.QuestData;
import forge.quest.data.ReadPriceList;
/** /**
* <p> * <p>

View File

@@ -150,6 +150,8 @@ public interface NewConstants {
/** Property path for price. */ /** Property path for price. */
String PRICE = "quest/price"; String PRICE = "quest/price";
/** Property path for price. */
String BOOSTER_PRICE= "quest/boosterprice";
/** Property path for quests. */ /** Property path for quests. */
String QUESTS = "quest/quests"; String QUESTS = "quest/quests";

View File

@@ -1,7 +1,9 @@
package forge; package forge.quest.data;
import com.esotericsoftware.minlog.Log; import com.esotericsoftware.minlog.Log;
import forge.MyRandom;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
import forge.properties.NewConstants; import forge.properties.NewConstants;
@@ -39,6 +41,8 @@ public class ReadPriceList implements NewConstants {
*/ */
private void setup() { private void setup() {
priceMap = readFile(ForgeProps.getFile(QUEST.PRICE)); priceMap = readFile(ForgeProps.getFile(QUEST.PRICE));
priceMap.putAll(readFile(ForgeProps.getFile(QUEST.BOOSTER_PRICE)));
}//setup() }//setup()
/** /**