diff --git a/.gitattributes b/.gitattributes index 8198f31fa05..77c466f9b85 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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_ComesIntoPlay.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/SetInfo.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/QuestUtilCards.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/QuestStallManager.java svneol=native#text/plain src/main/java/forge/quest/data/bazaar/QuestStallPurchasable.java svneol=native#text/plain diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorShop.java b/src/main/java/forge/gui/deckeditor/DeckEditorShop.java index 9f247f2e4a6..f6d8f31c944 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorShop.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorShop.java @@ -20,7 +20,6 @@ import net.slightlymagic.braids.util.lambda.Lambda1; import net.slightlymagic.maxmtg.Predicate; import forge.Command; -import forge.ReadPriceList; import forge.Singletons; import forge.deck.Deck; import forge.error.ErrorViewer; @@ -32,6 +31,7 @@ import forge.item.CardPrinted; import forge.item.InventoryItem; import forge.item.ItemPoolView; import forge.quest.data.QuestData; +import forge.quest.data.ReadPriceList; /** *
diff --git a/src/main/java/forge/properties/NewConstants.java b/src/main/java/forge/properties/NewConstants.java index 6820a60c3d5..f999a2604a6 100644 --- a/src/main/java/forge/properties/NewConstants.java +++ b/src/main/java/forge/properties/NewConstants.java @@ -150,6 +150,8 @@ public interface NewConstants { /** Property path for price. */ String PRICE = "quest/price"; + /** Property path for price. */ + String BOOSTER_PRICE= "quest/boosterprice"; /** Property path for quests. */ String QUESTS = "quest/quests"; diff --git a/src/main/java/forge/ReadPriceList.java b/src/main/java/forge/quest/data/ReadPriceList.java similarity index 96% rename from src/main/java/forge/ReadPriceList.java rename to src/main/java/forge/quest/data/ReadPriceList.java index 5aaebd4f7b7..8ad6f7e76c0 100644 --- a/src/main/java/forge/ReadPriceList.java +++ b/src/main/java/forge/quest/data/ReadPriceList.java @@ -1,7 +1,9 @@ -package forge; +package forge.quest.data; import com.esotericsoftware.minlog.Log; + +import forge.MyRandom; import forge.error.ErrorViewer; import forge.properties.ForgeProps; import forge.properties.NewConstants; @@ -39,6 +41,8 @@ public class ReadPriceList implements NewConstants { */ private void setup() { priceMap = readFile(ForgeProps.getFile(QUEST.PRICE)); + priceMap.putAll(readFile(ForgeProps.getFile(QUEST.BOOSTER_PRICE))); + }//setup() /**