diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java index 2c73e841..f6b4a7c1 100644 --- a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java @@ -118,11 +118,9 @@ public abstract class ProjectileWeapon extends ToolCore implements IAccuracy, IW public float getProjectileSpeed(ItemStack itemStack) { NBTTagCompound toolTag = itemStack.getTagCompound().getCompoundTag("InfiTool"); - return toolTag.getFloat("FlightSpeed") * projectileSpeedModifier(itemStack); + return toolTag.getFloat("FlightSpeed"); } - protected float projectileSpeedModifier(ItemStack itemStack) { return 1.0f; } - /* Bow usage */ @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index 57db051c..416279d5 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -138,11 +138,14 @@ public class WeaponryHandler { flightSpeed = (top.flightSpeedMax + bottom.flightSpeedMax)/2 * string.flightSpeedModifier; // SHORT bows have a SHORTER windup because they're SHORT. hahahaha.... get it? - if(event.tool instanceof ShortBow) + if(event.tool instanceof ShortBow) { drawSpeed *= 0.9; + } // longbows have LONGER drawspeed. LOGIC! - if(event.tool instanceof LongBow) + if(event.tool instanceof LongBow) { drawSpeed *= 1.5f; + flightSpeed *= 1.3f; + } } else if(event.tool instanceof Crossbow) { @@ -155,6 +158,9 @@ public class WeaponryHandler { // crossbows are more efficient the higher the base drawspeed is. So the higher the drawspeed, the more bonus you get drawSpeed *= 2.5f; drawSpeed -= drawSpeed*0.25f; + + // crossbows are stronk + flightSpeed *= 1.5; } else return; diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 90a1f317..85901261 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -55,11 +55,6 @@ public class Crossbow extends ProjectileWeapon { return 1.0f; } - @Override - public float getProjectileSpeed(ItemStack itemStack) { - return super.getProjectileSpeed(itemStack); - } - @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/weaponry/weapons/LongBow.java b/src/main/java/tconstruct/weaponry/weapons/LongBow.java index fda84eaa..256deb1c 100644 --- a/src/main/java/tconstruct/weaponry/weapons/LongBow.java +++ b/src/main/java/tconstruct/weaponry/weapons/LongBow.java @@ -31,11 +31,6 @@ public class LongBow extends BowBaseAmmo { return 1.7f; } - @Override - protected float projectileSpeedModifier(ItemStack itemStack) { - return 1.5f; - } - @Override protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy) { if(arrows.getItem() instanceof ArrowAmmo)