Fix unarmed damage debuff only happening on the offhand

Also bump unarmed damage to 50% instead of 40%, and let travelers have 60%
SlimeKnights · Jan 22, 2023 · 1820844 · 1820844
1 parent e58faa4
commit 1820844
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/plate_chestplate.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/plate_chestplate.json
@@ -5,6 +5,9 @@
       "tconstruct:armor": 7.0,
       "tconstruct:armor_toughness": 2.0,
       "tconstruct:knockback_resistance": 0.1
+    },
+    "multipliers": {
+      "tconstruct:attack_damage": 0.5
     }
   },
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/slime_chestplate.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/slime_chestplate.json
@@ -3,6 +3,9 @@
     "base": {
       "tconstruct:durability": 672.0,
       "tconstruct:armor": 0.0
+    },
+    "multipliers": {
+      "tconstruct:attack_damage": 0.5
     }
   },
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/travelers_chestplate.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/travelers_chestplate.json
@@ -3,6 +3,9 @@
     "base": {
       "tconstruct:durability": 160.0,
       "tconstruct:armor": 5.0
+    },
+    "multipliers": {
+      "tconstruct:attack_damage": 0.6
     }
   },
   "slots": {

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java
@@ -386,6 +386,7 @@ TinkerTags.Blocks.TREE_LOGS, new TreeAOEIterator(0, 0),
     defineArmor(ArmorDefinitions.TRAVELERS)
       .durabilityFactor(10)
       .statEach(ToolStats.ARMOR, 1, 4, 5, 1)
+      .multiplier(ArmorSlotType.CHESTPLATE, ToolStats.ATTACK_DAMAGE, 0.6f)
       .startingSlots(SlotType.UPGRADE, 3)
       .startingSlots(SlotType.DEFENSE, 2)
       .startingSlots(SlotType.ABILITY, 1);
@@ -396,6 +397,7 @@ TinkerTags.Blocks.TREE_LOGS, new TreeAOEIterator(0, 0),
       .statEach(ToolStats.ARMOR, 2, 5, 7, 2)
       .statAll(ToolStats.ARMOR_TOUGHNESS, 2)
       .statAll(ToolStats.KNOCKBACK_RESISTANCE, 0.1f)
+      .multiplier(ArmorSlotType.CHESTPLATE, ToolStats.ATTACK_DAMAGE, 0.5f)
       .startingSlots(SlotType.UPGRADE, 1)
       .startingSlots(SlotType.DEFENSE, 4)
       .startingSlots(SlotType.ABILITY, 1);
@@ -404,6 +406,7 @@ TinkerTags.Blocks.TREE_LOGS, new TreeAOEIterator(0, 0),
     defineArmor(ArmorDefinitions.SLIMESUIT)
       .statEach(ToolStats.DURABILITY, 546, 630, 672, 362)
       .statAll(ToolStats.ARMOR, 0)
+      .multiplier(ArmorSlotType.CHESTPLATE, ToolStats.ATTACK_DAMAGE, 0.5f)
       .startingSlots(SlotType.UPGRADE, 5)
       .startingSlots(SlotType.DEFENSE, 0)
       .startingSlots(SlotType.ABILITY, 1, 1, 1, 1)

diff --git a/src/main/java/slimeknights/tconstruct/tools/modifiers/ability/armor/UnarmedModifier.java b/src/main/java/slimeknights/tconstruct/tools/modifiers/ability/armor/UnarmedModifier.java
@@ -15,7 +15,6 @@
 public class UnarmedModifier extends OffhandAttackModifier {
   @Override
   public void addToolStats(ToolRebuildContext context, int level, ModifierStatsBuilder builder) {
-    ToolStats.ATTACK_DAMAGE.multiplyAll(builder, 0.4f);
     // main hand has 4.0 attack speed, so make the offhand have that too
     ToolStats.ATTACK_SPEED.add(builder, 4.0 - context.getBaseStats().get(ToolStats.ATTACK_SPEED));
   }