Fix unarmed no longer having the proper multiplier

Was relying on the unarmed modifier to apply it, but that modifier is no longer required
SlimeKnights · Jan 22, 2023 · 06f3e54 · 06f3e54
1 parent 1820844
commit 06f3e54
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 6 deletions.
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
@@ -7,7 +7,7 @@
       "tconstruct:knockback_resistance": 0.1
     },
     "multipliers": {
-      "tconstruct:attack_damage": 0.5
+      "tconstruct:attack_damage": 0.4
     }
   },
   "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
@@ -5,7 +5,7 @@
       "tconstruct:armor": 0.0
     },
     "multipliers": {
-      "tconstruct:attack_damage": 0.5
+      "tconstruct:attack_damage": 0.4
     }
   },
   "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
@@ -5,7 +5,7 @@
       "tconstruct:armor": 5.0
     },
     "multipliers": {
-      "tconstruct:attack_damage": 0.6
+      "tconstruct:attack_damage": 0.55
     }
   },
   "slots": {

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java
@@ -386,7 +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)
+      .multiplier(ArmorSlotType.CHESTPLATE, ToolStats.ATTACK_DAMAGE, 0.55f)
       .startingSlots(SlotType.UPGRADE, 3)
       .startingSlots(SlotType.DEFENSE, 2)
       .startingSlots(SlotType.ABILITY, 1);
@@ -397,7 +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)
+      .multiplier(ArmorSlotType.CHESTPLATE, ToolStats.ATTACK_DAMAGE, 0.4f)
       .startingSlots(SlotType.UPGRADE, 1)
       .startingSlots(SlotType.DEFENSE, 4)
       .startingSlots(SlotType.ABILITY, 1);
@@ -406,7 +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)
+      .multiplier(ArmorSlotType.CHESTPLATE, ToolStats.ATTACK_DAMAGE, 0.4f)
       .startingSlots(SlotType.UPGRADE, 5)
       .startingSlots(SlotType.DEFENSE, 0)
       .startingSlots(SlotType.ABILITY, 1, 1, 1, 1)

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/boots.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/boots.json
@@ -6,6 +6,7 @@
   "properties": [
     "390 Durability",
     "+2 Armor",
+    "+2 Toughness",
     "1 Upgrade Slots",
     "4 Defense Slots",
     "1 Ability Slot"

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/chestplate.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/chestplate.json
@@ -6,6 +6,8 @@
   "properties": [
     "480 Durability",
     "+7 Armor",
+    "+2 Toughness",
+    "40% Unarmed Attack",
     "1 Upgrade Slots",
     "4 Defense Slots",
     "1 Ability Slot"

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/helmet.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/helmet.json
@@ -6,6 +6,7 @@
   "properties": [
     "330 Durability",
     "+2 Armor",
+    "+2 Toughness",
     "1 Upgrade Slots",
     "4 Defense Slots",
     "1 Ability Slot"

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/leggings.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/plate/leggings.json
@@ -6,6 +6,7 @@
   "properties": [
     "450 Durability",
     "+5 Armor",
+    "+2 Toughness",
     "1 Upgrade Slots",
     "4 Defense Slots",
     "1 Ability Slot"

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/slime/slimelytra.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/slime/slimelytra.json
@@ -6,6 +6,7 @@
   ],
   "properties": [
     "672 Durability",
+    "40% Unarmed Attack",
     "5 Upgrade Slots",
     "0 Defense Slots",
     "1 Ability Slot",

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/travelers/vest.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/travelers/vest.json
@@ -6,6 +6,7 @@
   "properties": [
     "160 Durability",
     "+5 Armor",
+    "55% Unarmed Attack",
     "3 Upgrade Slots",
     "2 Defense Slots",
     "1 Ability Slot",