Merge pull request CleverRaven#60579 from casswedson/nerf-nails

fix: some furniture generates too many nails
Sevaaas1 · Aug 30, 2022 · e45b649 · e45b649
2 parents b5e0cb5 + 280a496
commit e45b649
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
@@ -246,7 +246,7 @@
       "sound_fail": "thump.",
       "items": [
         { "item": "pine_bough", "count": [ 4, 6 ] },
-        { "item": "nail", "count": [ 5, 14 ] },
+        { "item": "nail", "charges": [ 5, 14 ] },
         { "item": "stick", "count": [ 1, 3 ] }
       ]
     },
@@ -287,7 +287,7 @@
       "sound_fail": "thump.",
       "items": [
         { "item": "pine_bough", "count": [ 4, 6 ] },
-        { "item": "nail", "count": [ 5, 14 ] },
+        { "item": "nail", "charges": [ 5, 14 ] },
         { "item": "stick", "count": [ 1, 3 ] }
       ]
     }

diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -599,7 +599,7 @@
       "sound_fail": "whump.",
       "items": [
         { "item": "2x4", "count": [ 2, 4 ] },
-        { "item": "nail", "count": [ 5, 18 ] },
+        { "item": "nail", "charges": [ 5, 18 ] },
         { "item": "splinter", "count": [ 5, 17 ] }
       ]
     }
@@ -623,7 +623,7 @@
       "sound_fail": "thump!",
       "items": [
         { "item": "2x4", "count": [ 2, 4 ] },
-        { "item": "nail", "count": [ 5, 18 ] },
+        { "item": "nail", "charges": [ 5, 18 ] },
         { "item": "splinter", "count": [ 5, 17 ] },
         { "item": "scrap", "count": [ 15, 60 ] }
       ]

diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json
@@ -669,7 +669,7 @@
       "str_min_supported": 100,
       "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
     },
-    "deconstruct": { "items": [ { "item": "r_carpet", "count": 1 }, { "item": "nail", "count": [ 2, 5 ] } ], "ter_set": "t_floor" }
+    "deconstruct": { "items": [ { "item": "r_carpet", "count": 1 }, { "item": "nail", "charges": [ 2, 5 ] } ], "ter_set": "t_floor" }
   },
   {
     "type": "terrain",