fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Carry excess progression over when upgrading

Browse Source
This commit is contained in:
Electroblob77
2020-06-04 12:37:57 +01:00
parent 92b54edb4a
commit d11c3fcc2f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/item/ItemWand.java
+9 -7
View File
@@ -658,13 +658,15 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
|| WandHelper.getProgression(wand) >= tier.progression)
&& tier == this.tier.next()){
// We're not carrying over excess progression for now, but if we do want to, this is how
// if(!Wizardry.settings.legacyWandLevelling){
// // Easy way to carry excess progression over to the new stack
// WandHelper.setProgression(wand, WandHelper.getProgression(wand) - tier.progression);
// }
WandHelper.setProgression(wand, 0);
if(Wizardry.settings.legacyWandLevelling){
// Progression has little meaning with legacy upgrade mechanics so just reset it
// In theory, you can get 'free' progression when upgrading since progression can't be negative,
// so the flipside of that is you lose any excess
WandHelper.setProgression(wand, 0);
}else{
// Carry excess progression over to the new stack
WandHelper.setProgression(wand, WandHelper.getProgression(wand) - tier.progression);
}
if(player != null) WizardData.get(player).setTierReached(tier);