Bone audit - 1/? (#74364)

* first bone balancing pass * abstract + tainted ``copy-from`` * skull category * elephant bone * comment cleanup * vitamins and stuff * bone meals * skewer + longbone ``to-hit`` * skull milling * no cowrie salvage * magiclysm solution
CleverRaven · Jul 10, 2024 · 6389b8b · 6389b8b
1 parent 001c76f
commit 6389b8b
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 73 deletions.
diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
@@ -102,7 +102,7 @@
     "description": "A bracelet made of cowrie shells, valued in many African cultures such as the Yoruba.  If you want, you could meditate with this.",
     "material": [ "bone" ],
     "color": "white",
-    "flags": [ "NO_WEAR_EFFECT", "FANCY" ]
+    "flags": [ "NO_WEAR_EFFECT", "FANCY", "NO_SALVAGE" ]
   },
   {
     "id": "cowrie_hair_beads",
@@ -112,7 +112,7 @@
     "description": "An assortment of cowrie shells used to decorate locs or braids.",
     "material": [ "bone" ],
     "color": "white",
-    "flags": [ "NO_WEAR_EFFECT", "FANCY" ]
+    "flags": [ "NO_WEAR_EFFECT", "FANCY", "NO_SALVAGE" ]
   },
   {
     "id": "cowrie_necklace",
@@ -122,7 +122,7 @@
     "description": "A necklace made of cowrie shells, valued in many African cultures such as the Yoruba.  If you want, you could meditate with this.",
     "material": [ "bone" ],
     "color": "white",
-    "flags": [ "NO_WEAR_EFFECT", "FANCY" ]
+    "flags": [ "NO_WEAR_EFFECT", "FANCY", "NO_SALVAGE" ]
   },
   {
     "id": "diamond_dental_grill",

diff --git a/data/json/items/resources/bone.json b/data/json/items/resources/bone.json
@@ -1,68 +1,58 @@
 [
-  {
-    "abstract": "bone_abstract",
-    "type": "COMESTIBLE",
-    "comestible_type": "FOOD",
-    "name": { "str": "abstract bone" },
-    "category": "spare_parts",
-    "color": "white",
-    "price": "0 cent",
-    "material": [ "bone" ],
-    "weight": "1000 g",
-    "flags": [ "RAW", "NUTRIENT_OVERRIDE", "INEDIBLE", "LUPINE" ],
-    "vitamins": [ [ "meat_allergen", 1 ] ]
-  },
   {
     "type": "COMESTIBLE",
     "id": "bone",
     "name": { "str": "bone" },
-    "copy-from": "bone_abstract",
-    "weight": "225 g",
-    "symbol": "%",
     "description": "A bone from some creature or other.  Could be used in cooking and crafting.",
+    "weight": "290 g",
+    "volume": "320 ml",
+    "longest_side": "44 cm",
+    "//": "Values based roughly on a male human femur.",
+    "symbol": "%",
+    "color": "white",
+    "material": [ "bone" ],
+    "comestible_type": "FOOD",
+    "category": "spare_parts",
+    "price": "0 cent",
     "price_postapoc": "10 cent",
     "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_1_4" },
-    "volume": "250 ml",
-    "longest_side": "40 cm",
-    "vitamins": [ [ "calcium", 96 ] ]
+    "calories": 171,
+    "vitamins": [ [ "calcium", "25588 mg" ], [ "meat_allergen", 1 ] ],
+    "melee_damage": { "bash": 3 },
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
+    "flags": [ "RAW", "INEDIBLE", "LUPINE" ]
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "id": "large_bone",
     "name": { "str": "large bone" },
-    "weight": "20 kg",
-    "symbol": "I",
     "description": "A huge bone of a large creature.",
-    "copy-from": "bone_abstract",
+    "weight": "17700 g",
+    "volume": "19550 ml",
+    "longest_side": "110 cm",
+    "//1": "Values based roughly on an adult female African elephant femur.",
+    "symbol": "I",
+    "color": "white",
+    "material": [ "bone" ],
+    "price": "0 cent",
     "price_postapoc": "20 cent",
-    "//": "While it would make sense to be able to mill it, the bone won't fit into a mill...",
-    "volume": "36 L",
-    "longest_side": "2000 cm",
-    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
-    "vitamins": [ [ "calcium", 13824 ] ],
+    "//2": "While it would make sense to be able to mill it, the bone won't fit into a mill…",
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 15 }
   },
   {
     "type": "COMESTIBLE",
     "id": "bone_tainted",
-    "category": "other",
     "name": { "str": "tainted bone" },
-    "weight": "212 g",
+    "description": "A rotten, brittle bone from some unnatural creature or other.  Could be used to make some stuff, like charcoal or glue.  You could eat it, but it will poison you.",
+    "copy-from": "bone",
     "color": "light_gray",
     "use_action": [ "POISON" ],
-    "comestible_type": "FOOD",
-    "symbol": "%",
-    "calories": 17,
-    "description": "A rotten, brittle bone from some unnatural creature or other.  Could be used to make some stuff, like charcoal or glue.  You could eat it, but it will poison you.",
-    "price": "0 cent",
     "price_postapoc": "5 cent",
     "milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_1_4" },
-    "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal.",
-    "material": [ "bone" ],
-    "volume": "250 ml",
     "fun": -10,
-    "flags": [ "NO_SALVAGE" ],
-    "vitamins": [ [ "meat_allergen", 1 ] ]
+    "extend": { "flags": [ "NO_SALVAGE" ] },
+    "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal."
   },
   {
     "type": "COMESTIBLE",
@@ -71,7 +61,7 @@
     "name": { "str": "human bone" },
     "description": "A bone from a human being.  Could be used to make some stuff, if you're feeling sufficiently ghoulish.",
     "//": "No extend support for vitamins, we need to overwrite",
-    "vitamins": [ [ "calcium", 96 ], [ "human_flesh_vitamin", 100 ] ]
+    "vitamins": [ [ "calcium", "25588 mg" ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 100 ] ]
   },
   {
     "type": "GENERIC",
@@ -92,28 +82,22 @@
     "description": "This bone meal can be used to craft fertilizer and some other things.",
     "price": "6 cent",
     "price_postapoc": "2 cent",
+    "calories": 35,
+    "vitamins": [ [ "calcium", "5294 mg" ], [ "meat_allergen", 1 ] ],
     "material": [ "powder" ],
-    "volume": "62 ml",
+    "volume": "125 ml",
     "flags": [ "EDIBLE_FROZEN" ],
     "fun": -10
   },
   {
     "type": "COMESTIBLE",
     "id": "meal_bone_tainted",
     "name": { "str_sp": "tainted bone meal" },
-    "weight": "60 g",
-    "color": "white",
+    "copy-from": "meal_bone",
     "use_action": [ "POISON" ],
-    "comestible_type": "FOOD",
-    "symbol": "%",
     "description": "This is a grayish bone meal made from rotten bones.",
-    "calories": 4,
-    "price": "1 cent",
-    "price_postapoc": "1 cent",
-    "material": [ "powder" ],
-    "volume": "62 ml",
-    "flags": [ "EDIBLE_FROZEN" ],
-    "fun": -10
+    "price": "0 cent",
+    "price_postapoc": "1 cent"
   },
   {
     "type": "GENERIC",
@@ -127,7 +111,6 @@
     "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
     "weight": "10 g",
     "volume": "25 ml",
-    "to_hit": -5,
     "milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_6_1" },
     "qualities": [ [ "COOK", 1 ] ],
     "use_action": [ "HEAT_SOLID_ITEMS" ]
@@ -138,7 +121,7 @@
     "name": { "str": "abstract skull" },
     "description": "This is a dummy item.  If you see it something went wrong.",
     "flags": [ "TRADER_AVOID" ],
-    "category": "spare_parts",
+    "category": "other",
     "weight": "1 kg",
     "volume": "1400 ml",
     "symbol": "@",
@@ -171,7 +154,8 @@
     "copy-from": "skull_abstract",
     "weight": "35 g",
     "volume": "270 ml",
-    "longest_side": "7 cm"
+    "longest_side": "7 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_2_1" }
   },
   {
     "type": "GENERIC",
@@ -181,7 +165,8 @@
     "copy-from": "skull_abstract",
     "weight": "65 g",
     "volume": "500 ml",
-    "longest_side": "12 cm"
+    "longest_side": "12 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_1_1" }
   },
   {
     "type": "GENERIC",
@@ -198,10 +183,7 @@
     "id": "skull_canis_triclopean",
     "name": { "str": "triclopean canine skull" },
     "description": "The skull of a what looks like a dog, although it has an extra eye socket.",
-    "copy-from": "skull_abstract",
-    "weight": "65 g",
-    "volume": "500 ml",
-    "longest_side": "12 cm"
+    "copy-from": "skull_canis_medium"
   },
   {
     "type": "GENERIC",
@@ -211,7 +193,8 @@
     "copy-from": "skull_abstract",
     "weight": "40 g",
     "volume": "300 ml",
-    "longest_side": "10 cm"
+    "longest_side": "10 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_2_1" }
   },
   {
     "type": "GENERIC",
@@ -221,7 +204,8 @@
     "copy-from": "skull_abstract",
     "weight": "65 g",
     "volume": "500 ml",
-    "longest_side": "13 cm"
+    "longest_side": "13 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_1_1" }
   },
   {
     "type": "GENERIC",
@@ -241,7 +225,8 @@
     "copy-from": "skull_abstract",
     "weight": "75 g",
     "volume": "575 ml",
-    "longest_side": "12 cm"
+    "longest_side": "12 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_1_1" }
   },
   {
     "type": "GENERIC",
@@ -261,7 +246,8 @@
     "copy-from": "skull_abstract",
     "weight": "45 g",
     "volume": "275 ml",
-    "longest_side": "11 cm"
+    "longest_side": "11 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_2_1" }
   },
   {
     "type": "GENERIC",
@@ -271,7 +257,8 @@
     "copy-from": "skull_abstract",
     "weight": "56 g",
     "volume": "300 ml",
-    "longest_side": "8 cm"
+    "longest_side": "8 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_2_1" }
   },
   {
     "type": "GENERIC",
@@ -281,7 +268,8 @@
     "copy-from": "skull_abstract",
     "weight": "3 g",
     "volume": "20 ml",
-    "longest_side": "5 cm"
+    "longest_side": "5 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_20_1" }
   },
   {
     "type": "GENERIC",
@@ -291,7 +279,8 @@
     "copy-from": "skull_abstract",
     "weight": "90 g",
     "volume": "450 ml",
-    "longest_side": "10 cm"
+    "longest_side": "10 cm",
+    "milling": { "into": "meal_bone", "recipe": "meal_bone_mill_1_1" }
   },
   {
     "type": "GENERIC",

diff --git a/data/json/obsoletion_and_migration_0.I/blacklist_temperature_removal.json b/data/json/obsoletion_and_migration_0.I/blacklist_temperature_removal.json
@@ -21,7 +21,8 @@
       "wax",
       "bifocal_contacts_weekly",
       "bifocal_transition_contacts_weekly",
-      "butternut"
+      "butternut",
+      "large_bone"
     ],
     "//1": "CAUTION: this list is for items that are safe for straightforward deactivation",
     "//2": "items that may be active for additional reasons other than temperature tracking should use separate special case handling"

diff --git a/data/mods/Magiclysm/professions.json b/data/mods/Magiclysm/professions.json
@@ -3,7 +3,7 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "pouch_wild_druid",
-    "entries": [ { "item": "fur" }, { "item": "fur" }, { "item": "fur" }, { "item": "bone_tainted" }, { "item": "bone_tainted" } ]
+    "entries": [ { "item": "fur", "count": 3 } ]
   },
   {
     "type": "item_group",