From ac7e2fda9427d8e30cd78725b71f227d32a85c8c Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Mon, 14 Sep 2020 15:33:59 +0100 Subject: [PATCH] Fix wizard armour charging always using 100 mana regardless of shards/grand crystals --- .../java/electroblob/wizardry/item/ItemWizardArmour.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java index ad2f0ff2..82ab6e4e 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java +++ b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java @@ -229,7 +229,11 @@ public class ItemWizardArmour extends ItemArmor implements IWorkbenchItem, IMana int chargeDepleted = this.getManaCapacity(centre.getStack()) - this.getMana(centre.getStack()); - if(crystals.getStack().getCount() * Constants.MANA_PER_CRYSTAL < chargeDepleted){ + int manaPerItem = Constants.MANA_PER_CRYSTAL; + if(crystals.getStack().getItem() == WizardryItems.crystal_shard) manaPerItem = Constants.MANA_PER_SHARD; + if(crystals.getStack().getItem() == WizardryItems.grand_crystal) manaPerItem = Constants.GRAND_CRYSTAL_MANA; + + if(crystals.getStack().getCount() * manaPerItem < chargeDepleted){ // If there aren't enough crystals to fully charge the armour this.rechargeMana(centre.getStack(), crystals.getStack().getCount() * Constants.MANA_PER_CRYSTAL); crystals.decrStackSize(crystals.getStack().getCount());