From 938406df560569eb8d2944324c41feda2b04a41a Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Fri, 25 May 2018 23:51:03 -0500 Subject: Fix for #2420. Small knife damage reduced, mob damage immunitiy implemented. Butchery knife damage buffed. Based on mining level, 5+ will instakill cows. Looting enchantment does not appear to work, filing separate ticket for that. --- src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java | 2 +- src/main/java/gregtech/common/tools/GT_Tool_Knife.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java index 8700c1835b..64f5501777 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java @@ -31,7 +31,7 @@ public class GT_Tool_ButcheryKnife } public float getBaseDamage() { - return 1.0F; + return 3.0F; } public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java index 61e5959d5f..6a381ae2d1 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java @@ -2,6 +2,7 @@ package gregtech.common.tools; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; @@ -27,7 +28,11 @@ public class GT_Tool_Knife } public float getBaseDamage() { - return 2.0F; + return 1.0F; + } + + public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { + return aOriginalHurtResistance * 6; } public float getSpeedMultiplier() { -- cgit From fba6f54ff98e9603445f9c05bac2b3bac24f6388 Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Sat, 26 May 2018 00:47:24 -0500 Subject: https://github.com/GTNewHorizons/NewHorizons/issues/2202 Tweak base values for knife/butchery knife. --- src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java | 2 +- src/main/java/gregtech/common/tools/GT_Tool_Knife.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java index 64f5501777..52994e22b2 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java @@ -27,7 +27,7 @@ public class GT_Tool_ButcheryKnife } public int getToolDamagePerEntityAttack() { - return 400; + return 200; } public float getBaseDamage() { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java index 6a381ae2d1..db49fb35df 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java @@ -24,15 +24,15 @@ public class GT_Tool_Knife } public int getToolDamagePerEntityAttack() { - return 200; + return 600; } public float getBaseDamage() { - return 1.0F; + return 0F; } public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { - return aOriginalHurtResistance * 6; + return aOriginalHurtResistance * 3; } public float getSpeedMultiplier() { -- cgit