konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed horn of plenty getting recharging much more than intended

Browse Source
This commit is contained in:
Evan Debenham
2022-11-16 14:27:23 -05:00
parent 56f34f9c76
commit e2e3d11ac9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
+11 -2
View File
@@ -241,6 +241,12 @@ public class HornOfPlenty extends Artifact {
@Override @Override
public void restoreFromBundle(Bundle bundle) { public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
//pre-2.0.0 saves
if (partialCharge > 1){
partialCharge /= Hunger.STARVING/5f;
}
storedFoodEnergy = bundle.getInt(STORED); storedFoodEnergy = bundle.getInt(STORED);
if (charge >= 8) image = ItemSpriteSheet.ARTIFACT_HORN4; if (charge >= 8) image = ItemSpriteSheet.ARTIFACT_HORN4;
@@ -260,12 +266,15 @@ public class HornOfPlenty extends Artifact {
//This means that a standard ration will be recovered in ~5.333 hero levels //This means that a standard ration will be recovered in ~5.333 hero levels
float chargeGain = Hunger.STARVING * levelPortion * (0.25f + (0.125f*level())); float chargeGain = Hunger.STARVING * levelPortion * (0.25f + (0.125f*level()));
chargeGain *= RingOfEnergy.artifactChargeMultiplier(target); chargeGain *= RingOfEnergy.artifactChargeMultiplier(target);
//each charge is equal to 1/5 the max hunger value
chargeGain /= Hunger.STARVING/5;
partialCharge += chargeGain; partialCharge += chargeGain;
//charge is in increments of 1/5 max hunger value. //charge is in increments of 1/5 max hunger value.
while (partialCharge >= Hunger.STARVING/5) { while (partialCharge >= 1) {
charge++; charge++;
partialCharge -= Hunger.STARVING/5; partialCharge -= 1;
int oldImage = image; int oldImage = image;
if (charge >= 8) image = ItemSpriteSheet.ARTIFACT_HORN4; if (charge >= 8) image = ItemSpriteSheet.ARTIFACT_HORN4;