Merge pull request #75550 from Karol1223/bark

Small bark audit - fixing bark resource density
CleverRaven · Aug 11, 2024 · 2d4e043 · 2d4e043
2 parents 59cd81d + 989d69d
commit 2d4e043
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 31 deletions.
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -2719,42 +2719,37 @@
   },
   {
     "type": "GENERIC",
-    "id": "tanbark",
+    "abstract": "bark_abstract",
     "symbol": ",",
     "color": "brown",
-    "name": { "str_sp": "tanbark" },
-    "description": "A sheet of tannin-rich bark from a tree, useful for tanning leather",
+    "name": { "str": "piece of abstract bark", "str_pl": "pieces of abstract bark" },
+    "description": "A sheet of bark from a hypothetical tree.  Useful for making adding new bark items slightly simpler.",
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "material": [ "wood" ],
-    "weight": "323 g",
+    "weight": "200 g",
     "volume": "250 ml"
   },
+  {
+    "type": "GENERIC",
+    "id": "tanbark",
+    "name": { "str": "piece of tanbark", "str_pl": "pieces of tanbark" },
+    "description": "A sheet of tannin-rich bark from a tree, useful for tanning leather",
+    "copy-from": "bark_abstract"
+  },
   {
     "type": "GENERIC",
     "id": "birchbark",
-    "symbol": ",",
-    "color": "brown",
-    "name": { "str": "birchbark" },
+    "name": { "str": "piece of birchbark", "str_pl": "pieces of birchbark" },
     "description": "A sheet of tough, water-resistant bark taken from a birch tree.",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "material": [ "wood" ],
-    "weight": "323 g",
-    "volume": "250 ml"
+    "copy-from": "bark_abstract"
   },
   {
     "type": "GENERIC",
     "id": "willowbark",
-    "symbol": ",",
-    "color": "brown",
-    "name": { "str_sp": "willowbark" },
+    "name": { "str": "piece of willowbark", "str_pl": "pieces of willowbark" },
     "description": "A sheet of bark taken from a willow tree.  Used in the production of aspirin.",
-    "price": "0 cent",
-    "price_postapoc": "10 cent",
-    "material": [ "wood" ],
-    "weight": "323 g",
-    "volume": "250 ml"
+    "copy-from": "bark_abstract"
   },
   {
     "type": "GENERIC",
@@ -3761,15 +3756,9 @@
   {
     "type": "GENERIC",
     "id": "alder_bark",
-    "symbol": ",",
-    "color": "brown",
-    "name": { "str_sp": "alder bark" },
+    "name": { "str": "piece of alder bark", "str_pl": "pieces of alder bark" },
     "description": "A strip of bark pulled from an alder tree.  Used in the production of topical hemostatics.",
-    "price": "0 cent",
-    "price_postapoc": "10 cent",
-    "material": [ "wood" ],
-    "weight": "200 g",
-    "volume": "250 ml"
+    "copy-from": "bark_abstract"
   },
   {
     "id": "wallet",

diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json
@@ -31,7 +31,6 @@
       "liquid_soap",
       "chem_aluminium_sulphate",
       "bot_lab_security_drone_GR",
-      "birchbark",
       "small_lcd_screen",
       "biscuit",
       "koji",
@@ -66,7 +65,6 @@
       "bone_marrow",
       "conc_venom",
       "hoboreel",
-      "tanbark",
       "dog_whistle_wood",
       "tailor_japanese",
       "dandelionburdock_tea",
@@ -146,7 +144,6 @@
       "primitive_hammer",
       "throwing_stick",
       "cookbook_sushi",
-      "willowbark",
       "soap",
       "bo",
       "broken_manhack",