Tool starting trait tweaks

Pickadzes and mattocks no longer start with melee traits, they both do enough other stuff to not need one Kama once again has tilling, for consistency with scythes. Having multiple tools start with tilling is reasonable as its the most important right click action
SlimeKnights · Dec 19, 2023 · cc72e93 · cc72e93
1 parent a113fa8
commit cc72e93
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 15 deletions.
diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/kama.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/kama.json
@@ -24,6 +24,10 @@
     "abilities": 1
   },
   "traits": [
+    {
+      "name": "tconstruct:tilling",
+      "level": 1
+    },
     {
       "name": "tconstruct:shears",
       "level": 1

diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/mattock.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/mattock.json
@@ -26,10 +26,6 @@
     "abilities": 1
   },
   "traits": [
-    {
-      "name": "tconstruct:sticky",
-      "level": 1
-    },
     {
       "name": "tconstruct:tilling",
       "level": 1

diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/pickadze.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/pickadze.json
@@ -29,10 +29,6 @@
     {
       "name": "tconstruct:pathing",
       "level": 1
-    },
-    {
-      "name": "tconstruct:bane_of_sssss",
-      "level": 1
     }
   ],
   "actions": [

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java
@@ -134,7 +134,6 @@ protected void addToolDefinitions() {
       .multiplier(ToolStats.MINING_SPEED, 1.1f)
       .multiplier(ToolStats.ATTACK_DAMAGE, 1.1f)
       // traits
-      .trait(ModifierIds.sticky, 1)
       .trait(TinkerModifiers.tilling)
       // harvest
       .action(ToolActions.AXE_DIG)
@@ -161,7 +160,6 @@ protected void addToolDefinitions() {
       .multiplier(ToolStats.ATTACK_DAMAGE, 1.15f)
       // traits
       .trait(TinkerModifiers.pathing)
-      .trait(ModifierIds.baneOfSssss)
       // harvest
       .action(ToolActions.PICKAXE_DIG)
       .action(ToolActions.SHOVEL_DIG)
@@ -255,6 +253,7 @@ TinkerTags.Blocks.TREE_LOGS, new TreeAOEIterator(0, 0),
       .multiplier(ToolStats.ATTACK_DAMAGE, 0.5f)
       .smallToolStartingSlots()
       // traits
+      .trait(TinkerModifiers.tilling)
       .trait(TinkerModifiers.shears)
       .trait(TinkerModifiers.harvest)
       // harvest

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/kama.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/kama.json
@@ -10,6 +10,7 @@
     "1.6 Attack Speed",
     "Shears plants and animals",
     "Small AOE Attack",
-    "Harvest plants"
+    "Harvest plants",
+    "Tills dirt"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/mattock.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/mattock.json
@@ -10,7 +10,6 @@
     "0.9 Attack Speed",
     "110% Mining Modifier",
     "125% Durability Modifier",
-    "Knockback I",
     "Tills dirt"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/tools/kama.json b/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/tools/kama.json
@@ -6,6 +6,7 @@
     }
   ],
   "properties": [
+    "Tills dirt",
     "Interact with crops to harvest them",
     "Shears blocks and animals",
     "Effective on plants",

diff --git a/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/tools/mattock.json b/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/tools/mattock.json
@@ -13,7 +13,6 @@
   ],
   "properties": [
     "Tills dirt",
-    "Effective on dirt and logs",
-    "Extra knockback"
+    "Effective on dirt and logs"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/tools/scythe.json b/src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/tools/scythe.json
@@ -13,7 +13,7 @@
   ],
   "properties": [
     "Advanced harvesting tool",
-    "3x3 AoE Harvesting",
+    "3x3 AoE harvesting and tilling",
     "Effective on all types of foliage",
     "AoE attack capabilities"
   ]