Revamp unarmed

Instead of requiring an ability slot, now only requires applying any melee upgrade. Works well with the fact that unarmed no longer damages chestplates The ability from before has been renamed to ambidextrous, its only purpose is attacking with both hands now
SlimeKnights · Dec 20, 2022 · a6bedfb · a6bedfb
1 parent df1ceaf
commit a6bedfb
Show file tree

Hide file tree

Showing 82 changed files with 173 additions and 754 deletions.
diff --git a/src/generated/resources/data/tconstruct/advancements/smeltery/abilities.json b/src/generated/resources/data/tconstruct/advancements/smeltery/abilities.json
@@ -268,14 +268,14 @@
         ]
       }
     },
-    "unarmed": {
+    "ambidextrous": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
             "type": "tconstruct:tool",
             "modifiers": {
-              "name": "tconstruct:unarmed",
+              "name": "tconstruct:ambidextrous",
               "level": 1
             }
           }
@@ -535,7 +535,7 @@
       "tool_belt"
     ],
     [
-      "unarmed"
+      "ambidextrous"
     ],
     [
       "zoom"

diff --git a/...ipes/tools/modifiers/ability/unarmed.json → ...tools/modifiers/ability/ambidextrous.json b/...ipes/tools/modifiers/ability/unarmed.json → ...tools/modifiers/ability/ambidextrous.json
@@ -24,7 +24,7 @@
     "abilities": 1
   },
   "result": {
-    "name": "tconstruct:unarmed",
+    "name": "tconstruct:ambidextrous",
     "level": 1
   },
   "max_level": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/looting_level_1.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/looting_level_1.json
@@ -28,7 +28,7 @@
     "type": "forge:difference",
     "base": [
       {
-        "tag": "tconstruct:modifiable/melee"
+        "tag": "tconstruct:modifiable/melee_or_unarmed"
       },
       {
         "tag": "tconstruct:modifiable/ranged"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/looting_level_2.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/looting_level_2.json
@@ -21,7 +21,7 @@
     "type": "forge:difference",
     "base": [
       {
-        "tag": "tconstruct:modifiable/melee"
+        "tag": "tconstruct:modifiable/melee_or_unarmed"
       },
       {
         "tag": "tconstruct:modifiable/ranged"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/looting_level_3.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/looting_level_3.json
@@ -21,7 +21,7 @@
     "type": "forge:difference",
     "base": [
       {
-        "tag": "tconstruct:modifiable/melee"
+        "tag": "tconstruct:modifiable/melee_or_unarmed"
       },
       {
         "tag": "tconstruct:modifiable/ranged"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/melting.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/melting.json
@@ -27,9 +27,14 @@
       "item": "minecraft:lava_bucket"
     }
   ],
-  "tools": {
-    "tag": "tconstruct:modifiable/melee_or_harvest"
-  },
+  "tools": [
+    {
+      "tag": "tconstruct:modifiable/melee_or_unarmed"
+    },
+    {
+      "tag": "tconstruct:modifiable/harvest"
+    }
+  ],
   "slots": {
     "abilities": 1
   },

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/melting_unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/melting_unarmed.json
diff --git a/...ls/modifiers/salvage/ability/unarmed.json → ...difiers/salvage/ability/ambidextrous.json b/...ls/modifiers/salvage/ability/unarmed.json → ...difiers/salvage/ability/ambidextrous.json
@@ -6,6 +6,6 @@
   "slots": {
     "abilities": 1
   },
-  "modifier": "tconstruct:unarmed",
+  "modifier": "tconstruct:ambidextrous",
   "min_level": 1
 }
diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/looting_level_1.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/looting_level_1.json
@@ -4,7 +4,7 @@
     "type": "forge:difference",
     "base": [
       {
-        "tag": "tconstruct:modifiable/melee"
+        "tag": "tconstruct:modifiable/melee_or_unarmed"
       },
       {
         "tag": "tconstruct:modifiable/ranged"

diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/looting_level_2.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/looting_level_2.json
@@ -4,7 +4,7 @@
     "type": "forge:difference",
     "base": [
       {
-        "tag": "tconstruct:modifiable/melee"
+        "tag": "tconstruct:modifiable/melee_or_unarmed"
       },
       {
         "tag": "tconstruct:modifiable/ranged"

diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/looting_level_3.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/looting_level_3.json
@@ -4,7 +4,7 @@
     "type": "forge:difference",
     "base": [
       {
-        "tag": "tconstruct:modifiable/melee"
+        "tag": "tconstruct:modifiable/melee_or_unarmed"
       },
       {
         "tag": "tconstruct:modifiable/ranged"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/melting.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/melting.json
@@ -2,10 +2,10 @@
   "type": "tconstruct:modifier_salvage",
   "tools": [
     {
-      "tag": "tconstruct:modifiable/melee_or_harvest"
+      "tag": "tconstruct:modifiable/melee_or_unarmed"
     },
     {
-      "tag": "tconstruct:modifiable/unarmed"
+      "tag": "tconstruct:modifiable/harvest"
     }
   ],
   "slots": {

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/antiaquatic.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/antiaquatic.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },

diff --git a/...ated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/bane_of_sssss.json b/...ated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/bane_of_sssss.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/cooling.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/cooling.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/experienced.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/experienced.json
@@ -2,13 +2,13 @@
   "type": "tconstruct:modifier_salvage",
   "tools": [
     {
-      "tag": "tconstruct:modifiable/melee_or_harvest"
+      "tag": "tconstruct:modifiable/melee_or_unarmed"
     },
     {
-      "tag": "tconstruct:modifiable/armor/leggings"
+      "tag": "tconstruct:modifiable/harvest"
     },
     {
-      "tag": "tconstruct:modifiable/unarmed"
+      "tag": "tconstruct:modifiable/armor/leggings"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/fiery.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/fiery.json
@@ -2,13 +2,10 @@
   "type": "tconstruct:modifier_salvage",
   "tools": [
     {
-      "tag": "tconstruct:modifiable/melee"
+      "tag": "tconstruct:modifiable/melee_or_unarmed"
     },
     {
       "tag": "tconstruct:modifiable/ranged/bows"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/killager.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/killager.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },

diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_1.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_1.json
diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_2.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_2.json
diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_3.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_3.json
diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/magnetic.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/magnetic.json
@@ -2,7 +2,10 @@
   "type": "tconstruct:modifier_salvage",
   "tools": [
     {
-      "tag": "tconstruct:modifiable/melee_or_harvest"
+      "tag": "tconstruct:modifiable/melee"
+    },
+    {
+      "tag": "tconstruct:modifiable/harvest"
     },
     {
       "tag": "tconstruct:modifiable/armor"

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/necrotic.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/necrotic.json
@@ -2,13 +2,10 @@
   "type": "tconstruct:modifier_salvage",
   "tools": [
     {
-      "tag": "tconstruct:modifiable/melee"
+      "tag": "tconstruct:modifiable/melee_or_unarmed"
     },
     {
       "tag": "tconstruct:modifiable/ranged/bows"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/padded.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/padded.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/severing.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/severing.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },

diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/sharpness.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/sharpness.json
@@ -1,13 +1,8 @@
 {
   "type": "tconstruct:modifier_salvage",
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/melee"
-    },
-    {
-      "tag": "tconstruct:modifiable/unarmed"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/melee_or_unarmed"
+  },
   "slots": {
     "upgrades": 1
   },