Updates to axe, hammer, and anvil qualities (cataclysmbnteam#2999)

Coolthulhu · Jun 30, 2023 · f101739 · f101739
1 parent ddf5abb
commit f101739
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 76 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-railroads.json b/data/json/furniture_and_terrain/terrain-railroads.json
@@ -39,11 +39,7 @@
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
-      "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] }
-      ]
+      "items": [ { "item": "railroad_track_small", "count": [ 1, 2 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] } ]
     },
     "connects_to": "RAIL",
     "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
@@ -70,11 +66,7 @@
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
-      "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] }
-      ]
+      "items": [ { "item": "railroad_track_small", "count": [ 1, 2 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] } ]
     },
     "connects_to": "RAIL",
     "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
@@ -101,11 +93,7 @@
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
-      "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] }
-      ]
+      "items": [ { "item": "railroad_track_small", "count": [ 1, 2 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] } ]
     },
     "connects_to": "RAIL",
     "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
@@ -132,11 +120,7 @@
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
-      "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] }
-      ]
+      "items": [ { "item": "railroad_track_small", "count": [ 1, 2 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] } ]
     },
     "connects_to": "RAIL",
     "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
@@ -163,11 +147,7 @@
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
-      "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] }
-      ]
+      "items": [ { "item": "railroad_track_small", "count": [ 1, 2 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] } ]
     },
     "connects_to": "RAIL",
     "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
@@ -194,11 +174,7 @@
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
-      "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] }
-      ]
+      "items": [ { "item": "railroad_track_small", "count": [ 1, 2 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] } ]
     },
     "connects_to": "RAIL",
     "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
@@ -313,17 +289,18 @@
         { "item": "steel_lump", "count": [ 1, 2 ] },
         { "item": "steel_chunk", "count": [ 1, 4 ] },
         { "item": "scrap", "count": [ 3, 12 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 0, 20 ] }
       ]
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
       "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "railroad_track_small", "count": [ 1, 2 ] },
         { "item": "log", "count": [ 0, 1 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 10, 30 ] },
+        { "item": "sheet_metal", "count": [ 1, 2 ] }
       ]
     },
     "connects_to": "RAIL",
@@ -347,17 +324,18 @@
         { "item": "steel_lump", "count": [ 1, 2 ] },
         { "item": "steel_chunk", "count": [ 1, 4 ] },
         { "item": "scrap", "count": [ 3, 12 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 0, 20 ] }
       ]
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
       "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "railroad_track_small", "count": [ 1, 2 ] },
         { "item": "log", "count": [ 0, 1 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 10, 30 ] },
+        { "item": "sheet_metal", "count": [ 1, 2 ] }
       ]
     },
     "connects_to": "RAIL",
@@ -381,17 +359,18 @@
         { "item": "steel_lump", "count": [ 1, 2 ] },
         { "item": "steel_chunk", "count": [ 1, 4 ] },
         { "item": "scrap", "count": [ 3, 12 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 0, 20 ] }
       ]
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
       "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "railroad_track_small", "count": [ 1, 2 ] },
         { "item": "log", "count": [ 0, 1 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 10, 30 ] },
+        { "item": "sheet_metal", "count": [ 1, 2 ] }
       ]
     },
     "connects_to": "RAIL",
@@ -415,17 +394,18 @@
         { "item": "steel_lump", "count": [ 1, 2 ] },
         { "item": "steel_chunk", "count": [ 1, 4 ] },
         { "item": "scrap", "count": [ 3, 12 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 0, 20 ] }
       ]
     },
     "deconstruct": {
       "ter_set": "t_rock_floor",
       "items": [
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_chunk", "count": [ 1, 4 ] },
-        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "railroad_track_small", "count": [ 1, 2 ] },
         { "item": "log", "count": [ 0, 1 ] },
-        { "item": "splinter", "count": [ 10, 20 ] }
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 10, 30 ] },
+        { "item": "sheet_metal", "count": [ 1, 2 ] }
       ]
     },
     "connects_to": "RAIL",
@@ -578,16 +558,17 @@
         { "item": "steel_lump", "count": [ 0, 1 ] },
         { "item": "steel_chunk", "count": [ 0, 2 ] },
         { "item": "scrap", "count": [ 2, 6 ] },
-        { "item": "splinter", "count": [ 6, 12 ] }
+        { "item": "splinter", "count": [ 6, 12 ] },
+        { "item": "nail", "charges": [ 0, 10 ] }
       ]
     },
     "deconstruct": {
       "ter_set": "t_railroad_rubble",
       "items": [
-        { "item": "steel_lump", "count": [ 0, 1 ] },
-        { "item": "steel_chunk", "count": [ 0, 2 ] },
-        { "item": "scrap", "count": [ 2, 6 ] },
-        { "item": "splinter", "count": [ 6, 12 ] }
+        { "item": "railroad_track_small", "count": 1 },
+        { "item": "2x4", "count": 4 },
+        { "item": "nail", "charges": 20 },
+        { "item": "sheet_metal_small", "count": 2 }
       ]
     },
     "connects_to": "RAIL",
@@ -609,10 +590,10 @@
       "sound_fail": "clang!",
       "ter_set": "t_railroad_rubble",
       "items": [
-        { "item": "steel_lump", "count": [ 0, 1 ] },
-        { "item": "steel_chunk", "count": [ 0, 2 ] },
-        { "item": "scrap", "count": [ 2, 6 ] },
-        { "item": "splinter", "count": [ 6, 12 ] }
+        { "item": "railroad_track_small", "count": 1 },
+        { "item": "2x4", "count": 4 },
+        { "item": "nail", "charges": 20 },
+        { "item": "sheet_metal_small", "count": 2 }
       ]
     },
     "deconstruct": {
@@ -621,7 +602,8 @@
         { "item": "steel_lump", "count": [ 0, 1 ] },
         { "item": "steel_chunk", "count": [ 0, 2 ] },
         { "item": "scrap", "count": [ 2, 6 ] },
-        { "item": "splinter", "count": [ 6, 12 ] }
+        { "item": "splinter", "count": [ 6, 12 ] },
+        { "item": "nail", "charges": [ 0, 10 ] }
       ]
     },
     "connects_to": "RAIL",

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -683,7 +683,8 @@
     "price_postapoc": 10,
     "material": [ "wood", "steel" ],
     "weight": "40 kg",
-    "volume": "30000 ml"
+    "volume": "30000 ml",
+    "qualities": [ [ "ANVIL", 2 ] ]
   },
   {
     "type": "GENERIC",
@@ -2964,15 +2965,15 @@
     "color": "brown",
     "name": { "str": "fire brick" },
     "category": "spare_parts",
-    "description": "A reinforced brick designed to withstand intense heat.",
+    "description": "A reinforced brick designed to withstand intense heat.  It could also be used as an impromptu anvil for light metalworking.",
     "price": 2500,
     "price_postapoc": 10,
     "material": [ "clay", "stone" ],
     "weight": "969 g",
     "volume": "500 ml",
     "bashing": 8,
     "to_hit": -2,
-    "qualities": [ [ "HAMMER", 1 ] ]
+    "qualities": [ [ "HAMMER", 1 ], [ "ANVIL", 1 ] ]
   },
   {
     "id": "survival_kit",

diff --git a/data/json/items/melee/axes.json b/data/json/items/melee/axes.json
@@ -67,7 +67,7 @@
     "bashing": 19,
     "cutting": 51,
     "price_postapoc": 10000,
-    "qualities": [ [ "COOK", 1 ], [ "BUTCHER", -70 ] ]
+    "qualities": [ [ "AXE", 1 ], [ "COOK", 1 ], [ "BUTCHER", -70 ] ]
   },
   {
     "id": "halberd_fake",

diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -322,7 +322,7 @@
     "to_hit": 1,
     "price": 12000,
     "price_postapoc": 500,
-    "qualities": [ [ "HAMMER", 1 ] ]
+    "qualities": [ [ "HAMMER", 2 ] ]
   },
   {
     "id": "hammer_sledge_short",
@@ -367,7 +367,7 @@
     "to_hit": -1,
     "price": 6000,
     "price_postapoc": 250,
-    "qualities": [ [ "HAMMER", 2 ] ]
+    "qualities": [ [ "HAMMER", 3 ] ]
   },
   {
     "id": "hockey_stick",
@@ -477,7 +477,7 @@
     "cutting": 34,
     "to_hit": 1,
     "price_postapoc": 10000,
-    "qualities": [ [ "COOK", 1 ] ]
+    "qualities": [ [ "HAMMER", 2 ], [ "COOK", 1 ] ]
   },
   {
     "id": "lucern_hammerfake",
@@ -493,7 +493,8 @@
     "weight": "2700 g",
     "volume": "3750 ml",
     "bashing": 48,
-    "cutting": 8
+    "cutting": 8,
+    "qualities": [ [ "HAMMER", 1 ], [ "COOK", 1 ] ]
   },
   {
     "id": "mace",
@@ -906,6 +907,6 @@
     "bashing": 22,
     "cutting": 23,
     "price": 16000,
-    "qualities": [ [ "HAMMER", 1 ] ]
+    "qualities": [ [ "HAMMER", 2 ] ]
   }
 ]
diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -32,7 +32,7 @@
     "material": "bronze",
     "symbol": ";",
     "color": "yellow",
-    "qualities": [ [ "ANVIL", 2 ] ],
+    "qualities": [ [ "ANVIL", 3 ] ],
     "flags": [ "DURABLE_MELEE" ]
   },
   {

diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json
@@ -122,7 +122,7 @@
     "material": [ "wood", "copper" ],
     "symbol": "/",
     "color": "brown",
-    "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -44 ] ],
+    "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -44 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ]
   },

diff --git a/data/json/items/vehicle/plating.json b/data/json/items/vehicle/plating.json
@@ -64,7 +64,7 @@
     "category": "veh_parts",
     "price": 12000,
     "price_postapoc": 250,
-    "qualities": [ [ "COOK", 1 ] ]
+    "qualities": [ [ "COOK", 1 ], [ "ANVIL", 2 ] ]
   },
   {
     "type": "GENERIC",
@@ -81,7 +81,7 @@
     "category": "veh_parts",
     "price": 18500,
     "price_postapoc": 500,
-    "qualities": [ [ "COOK", 1 ] ]
+    "qualities": [ [ "COOK", 1 ], [ "ANVIL", 2 ] ]
   },
   {
     "type": "GENERIC",
@@ -133,7 +133,7 @@
     "category": "veh_parts",
     "price": 16000,
     "price_postapoc": 500,
-    "qualities": [ [ "COOK", 1 ], [ "ANVIL", 1 ] ]
+    "qualities": [ [ "COOK", 1 ], [ "ANVIL", 2 ] ]
   },
   {
     "type": "GENERIC",
@@ -150,7 +150,7 @@
     "category": "veh_parts",
     "price": 16000,
     "price_postapoc": 750,
-    "qualities": [ [ "COOK", 1 ] ]
+    "qualities": [ [ "COOK", 1 ], [ "ANVIL", 2 ] ]
   },
   {
     "type": "GENERIC",

diff --git a/data/json/recipes/other/tools.json b/data/json/recipes/other/tools.json
@@ -459,7 +459,7 @@
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_TOOLS",
     "skill_used": "fabrication",
-    "difficulty": 3,
+    "difficulty": 4,
     "time": "1 h",
     "reversible": true,
     "autolearn": true,