diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java index edc6b16d43c..79c11721720 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java @@ -52,6 +52,7 @@ public class ConquestPrefsScreen extends FScreen { scroller.add(new PrefsHeader("AEther Shards", FSkinImage.QUEST_COIN, PrefsGroup.BOOSTER)); scroller.add(new PrefsOption("Base Card Value", CQPref.AETHER_BASE_VALUE, PrefsGroup.AETHER)); scroller.add(new PrefsOption("Markup Percentage", CQPref.AETHER_MARKUP, PrefsGroup.AETHER)); + scroller.add(new PrefsOption("Starting Shards", CQPref.AETHER_START_SHARDS, PrefsGroup.AETHER)); scroller.add(new PrefsHeader("Booster Packs", FSkinImage.PACK, PrefsGroup.BOOSTER)); scroller.add(new PrefsOption("Commons", CQPref.BOOSTER_COMMONS, PrefsGroup.BOOSTER)); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 7e118e1d47e..df6d7be1675 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -28,6 +28,7 @@ import forge.itemmanager.ItemColumn; import forge.itemmanager.ItemManagerConfig; import forge.model.FModel; import forge.planarconquest.ConquestPlane.Region; +import forge.planarconquest.ConquestPreferences.CQPref; import forge.properties.ForgeConstants; import forge.util.ItemPool; @@ -73,6 +74,7 @@ public final class ConquestData { public ConquestData(String name0, PaperCard planeswalker0, ConquestPlane startingPlane0, PaperCard startingCommander0) { name = name0; + aetherShards = FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_START_SHARDS); startingPlane = startingPlane0; currentLocation = new ConquestLocation(startingPlane, 0, 0, Region.START_COL); planeswalker = planeswalker0; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java index f9f687f24f6..2895c0aff5d 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java @@ -435,7 +435,7 @@ public enum ConquestPlane { float mythicOdds = mythics.getOdds((float)raresPerBooster / (float)prefs.getPrefInt(CQPref.BOOSTERS_PER_MYTHIC)); //determine value of each rarity based on the base value of a common - commonValue = prefs.getPrefInt(CQPref.CARD_BASE_VALUE); + commonValue = prefs.getPrefInt(CQPref.AETHER_BASE_VALUE); uncommonValue = Math.round(commonValue / (uncommonOdds / commonOdds)); rareValue = Math.round(commonValue / (rareOdds / commonOdds)); mythicValue = mythics.isEmpty() ? 0 : Math.round(commonValue / (mythicOdds / commonOdds)); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java index 9b158d9bc66..75917091e51 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java @@ -29,13 +29,14 @@ public class ConquestPreferences extends PreferencesStore