Smooth out the highend-damage balance for bow and arrows so it doesn'…

…t affect low end much
SlimeKnights · Feb 9, 2015 · ee661bf · ee661bf
1 parent 434516d
commit ee661bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java
@@ -184,10 +184,6 @@ public void onHitEntity(MovingObjectPosition movingobjectposition) {
         NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool");
         float speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
 
-        // yay for balance on existing stuff.. sigh
-        if(this instanceof ArrowEntity)
-            speed = Math.max(0, speed-2);
-
         // absolute distance travelled minus the current tick
         float distance = speed * (this.ticksInAir-1);
         // distance travelled in the current tick
@@ -220,9 +216,9 @@ public void onHitEntity(MovingObjectPosition movingobjectposition) {
         // add quartz damage
         damage += (totalAttack - baseAttack);
 
-        // we substract flat damage for balance ;-;
+        // this is needed so really high scaling bow&arrow combinations don't get out of hand
         if(this instanceof ArrowEntity)
-            damage = Math.max(0, damage - 5f);
+            damage = Math.max(0, damage - totalAttack/2f);
 
         boolean shotByPlayer = this.shootingEntity != null && this.shootingEntity instanceof EntityPlayer;
 

diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java
@@ -48,6 +48,11 @@ public float getMinWindupProgress(ItemStack itemStack) {
         return 0.5f;
     }
 
+    @Override
+    public float getProjectileSpeed(ItemStack itemStack) {
+        return super.getProjectileSpeed(itemStack) * 0.9f;
+    }
+
     @Override
     public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon)
     {