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

Adventure - Difficulty data storage fix

Browse Source
This commit is contained in:
jjayers99
2023-07-16 22:00:40 -04:00
parent a710e43bc6
commit dd1285aa3a
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
View File

@@ -282,9 +282,37 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
if (this.difficultyData.sellFactor == 0) if (this.difficultyData.sellFactor == 0)
this.difficultyData.sellFactor = 0.2f; this.difficultyData.sellFactor = 0.2f;
this.difficultyData.shardSellRatio = data.readFloat("sellFactor"); //Previously these were not being read from or written to save files, causing defaults to appear after reload
if (this.difficultyData.shardSellRatio == 0) //Pull from config if appropriate
this.difficultyData.shardSellRatio = 0.8f; DifficultyData configuredDifficulty = null;
for (DifficultyData candidate : Config.instance().getConfigData().difficulties) {
if (candidate.name.equals(this.difficultyData.name)) {
configuredDifficulty = candidate;
break;
}
}
if (configuredDifficulty != null && (this.difficultyData.shardSellRatio == data.readFloat("shardSellRatio") || data.readFloat("shardSellRatio") == 0))
this.difficultyData.shardSellRatio = configuredDifficulty.shardSellRatio;
else
this.difficultyData.shardSellRatio = data.readFloat("shardSellRatio");
if (configuredDifficulty != null && !data.containsKey("goldLoss"))
this.difficultyData.goldLoss = configuredDifficulty.goldLoss;
else
this.difficultyData.goldLoss = data.readFloat("goldLoss");
if (configuredDifficulty != null && !data.containsKey("lifeLoss"))
this.difficultyData.lifeLoss = configuredDifficulty.lifeLoss;
else
this.difficultyData.lifeLoss = data.readFloat("lifeLoss");
if (configuredDifficulty != null && !data.containsKey("spawnRank"))
this.difficultyData.spawnRank = configuredDifficulty.spawnRank;
else
this.difficultyData.spawnRank = data.readInt("spawnRank");
if (configuredDifficulty != null && !data.containsKey("rewardMaxFactor"))
this.difficultyData.rewardMaxFactor = configuredDifficulty.rewardMaxFactor;
else
this.difficultyData.rewardMaxFactor = data.readFloat("rewardMaxFactor");
// END SPECIAL CASES
name = data.readString("name"); name = data.readString("name");
heroRace = data.readInt("heroRace"); heroRace = data.readInt("heroRace");
@@ -413,6 +441,10 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
data.store("enemyLifeFactor", this.difficultyData.enemyLifeFactor); data.store("enemyLifeFactor", this.difficultyData.enemyLifeFactor);
data.store("sellFactor", this.difficultyData.sellFactor); data.store("sellFactor", this.difficultyData.sellFactor);
data.store("shardSellRatio", this.difficultyData.shardSellRatio); data.store("shardSellRatio", this.difficultyData.shardSellRatio);
data.store("goldLoss", this.difficultyData.goldLoss);
data.store("lifeLoss", this.difficultyData.lifeLoss);
data.store("spawnRank", this.difficultyData.spawnRank);
data.store("rewardMaxFactor", this.difficultyData.rewardMaxFactor);
data.store("name", name); data.store("name", name);
data.store("heroRace", heroRace); data.store("heroRace", heroRace);