external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add starting shards preference

Browse Source
This commit is contained in:
drdev
2015-12-13 19:39:46 +00:00
parent 5d9f7dcc7e
commit 6a9f15cf45
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java
View File

@@ -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));

2
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -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;

2
forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
View File

@@ -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));

9
forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java
View File

@@ -29,13 +29,14 @@ public class ConquestPreferences extends PreferencesStore<ConquestPreferences.CQ
public static enum CQPref {
CURRENT_CONQUEST("DEFAULT"),
AETHER_BASE_VALUE("100"),
AETHER_MARKUP("50"),
AETHER_START_SHARDS("1000"),
BOOSTER_COMMONS("11"),
BOOSTER_UNCOMMONS("3"),
BOOSTER_RARES("1"),
BOOSTERS_PER_MYTHIC("8"),
CARD_BASE_VALUE("100"),
AETHER_MARKUP("50");
BOOSTERS_PER_MYTHIC("8");
private final String strDefaultVal;