From 1cad5cd2df082ccfe7077995686ad5989cf6b895 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 23 Feb 2015 18:33:37 +0000 Subject: [PATCH] Made the Crystal Bow fire faster. --- .../common/item/equipment/tool/bow/ItemCrystalBow.java | 5 +++++ .../common/item/equipment/tool/bow/ItemLivingwoodBow.java | 8 ++++++-- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 648e9d38a..754529f4d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -27,6 +27,11 @@ public class ItemCrystalBow extends ItemLivingwoodBow { super(LibItemNames.CRYSTAL_BOW); } + @Override + float chargeVelocityMultiplier() { + return 2F; + } + @Override boolean postsEvent() { return false; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 1e61a0ad9..e71a0bead 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -79,7 +79,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { @Override public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_; + int j = (int) ((getMaxItemUseDuration(p_77615_1_) - p_77615_4_) * chargeVelocityMultiplier()); ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j); MinecraftForge.EVENT_BUS.post(event); @@ -127,6 +127,10 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } } + float chargeVelocityMultiplier() { + return 1F; + } + boolean postsEvent() { return true; } @@ -174,7 +178,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(stack != usingItem) return itemIcon; - int j = getMaxItemUseDuration(stack) - useRemaining; + int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); if(j >= 18) return pullIcons[2]; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 94b53a47d..ab8839f42 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1973,7 +1973,7 @@ botania.page.livingwoodBow1=Does it shoot airplanes? # -- CRYSTAL BOW botania.entry.crystalBow=Crystal Bow -botania.page.crystalBow0=Crafted with &1Dragonstone&0, the &1Crystal Bow&0 is a ranged weapon with the capacity to generate arrows from &4Mana&0. Similarly to the &1Livingwood Bow&0, it'll repair using &4Mana&0 as well, but carrying &1Arrows&0 is not required as they are created through the magical energies. +botania.page.crystalBow0=Crafted with &1Dragonstone&0, the &1Crystal Bow&0 is a ranged weapon with the capacity to generate arrows from &4Mana&0. Similarly to the &1Livingwood Bow&0, it'll repair using &4Mana&0 as well, but carrying &1Arrows&0 is not required as they are created through the magical energies.
Given the lightweight and flexible structure of the bow, it can also fire at a much increased velocity than a conventional wooden one. botania.page.crystalBow1=The elves are roving # - ENDER ARTEFACTS