From a2c8cde4c4a2e2fd5570befe66c6e86f617db6fc Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Sun, 22 Dec 2019 12:30:04 +0000 Subject: [PATCH] Use correct mana values for grand crystals and crystal shards in scroll creation --- .../java/electroblob/wizardry/item/ItemBlankScroll.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/electroblob/wizardry/item/ItemBlankScroll.java b/src/main/java/electroblob/wizardry/item/ItemBlankScroll.java index 9ed93134..068e78c8 100644 --- a/src/main/java/electroblob/wizardry/item/ItemBlankScroll.java +++ b/src/main/java/electroblob/wizardry/item/ItemBlankScroll.java @@ -48,10 +48,14 @@ public class ItemBlankScroll extends Item implements IWorkbenchItem { int cost = spell.getCost() * centre.getStack().getCount(); // Continuous spell scrolls require enough mana to cast them for the duration defined in ItemScroll. if(spell.isContinuous) cost *= ItemScroll.CASTING_TIME / 20; + + 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() * Constants.MANA_PER_CRYSTAL > cost){ + if(crystals.getStack().getCount() * manaPerItem > cost){ // Rounds up to the nearest whole crystal - crystals.decrStackSize(cost / Constants.MANA_PER_CRYSTAL + 1); + crystals.decrStackSize(cost / manaPerItem + 1); centre.putStack(new ItemStack(WizardryItems.scroll, centre.getStack().getCount(), spell.metadata())); return true; }