Bad density (#72369)

* few bad density cleanups * more fixes * fix swapped values, remove items that inherit their density, move innawood change into vanilla * making brew_sake_koji soft so it can be put in the bottles
CleverRaven · Mar 14, 2024 · 31c9dbe · 31c9dbe
1 parent a365e9e
commit 31c9dbe
Show file tree

Hide file tree

Showing 19 changed files with 209 additions and 200 deletions.
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
@@ -6,7 +6,7 @@
     "name": { "str": "phelloderm" },
     "description": "A pliable but hefty layer of living plant matter.",
     "weight": "2 kg",
-    "volume": "300 ml",
+    "volume": "2100 ml",
     "price": 0,
     "price_postapoc": 0,
     "material": [ "mut_wood", "veggy" ],

diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
@@ -685,7 +685,7 @@
     "id": "drink_karsk",
     "looks_like": "coffee",
     "name": { "str_sp": "karsk" },
-    "weight": "252 g",
+    "weight": "250 g",
     "color": "brown",
     "addiction_type": [ "alcohol", { "addiction": "caffeine", "potential": 3 } ],
     "use_action": [ "ALCOHOL" ],

diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
@@ -3,7 +3,8 @@
     "id": "donut_holes",
     "type": "COMESTIBLE",
     "name": { "str_sp": "donut holes" },
-    "weight": "226 g",
+    "material": [ "wheat" ],
+    "weight": "62 g",
     "color": "yellow",
     "spoils_in": "10 days",
     "comestible_type": "FOOD",
@@ -13,7 +14,7 @@
     "description": "These balls of dough have been cut into shape, covered with sugar, and cooked to a crisp.  A staple of fairgrounds everywhere.",
     "price": "25 cent",
     "price_postapoc": "12 cent",
-    "volume": "62 ml",
+    "volume": "226 ml",
     "flags": [ "EATEN_HOT" ],
     "looks_like": "bread",
     "fun": 4
@@ -112,7 +113,7 @@
     "type": "COMESTIBLE",
     "id": "flatbread",
     "name": { "str_sp": "flatbread" },
-    "weight": "85 g",
+    "weight": "15 g",
     "color": "brown",
     "spoils_in": "11 days 16 hours",
     "container": "bag_plastic",
@@ -123,15 +124,15 @@
     "price": "11 cent",
     "price_postapoc": "50 cent",
     "material": [ "wheat" ],
-    "volume": "42 ml",
+    "volume": "60 ml",
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
     "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "flatbread_wheat_free",
     "name": { "str_sp": "wheat-free flatbread" },
-    "weight": "85 g",
+    "weight": "15 g",
     "color": "brown",
     "spoils_in": "11 days 16 hours",
     "container": "bag_plastic",
@@ -142,15 +143,15 @@
     "price": "11 cent",
     "price_postapoc": "50 cent",
     "material": [ "veggy" ],
-    "volume": "42 ml",
+    "volume": "60 ml",
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
     "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "frybread",
     "name": { "str_sp": "frybread" },
-    "weight": "85 g",
+    "weight": "15 g",
     "color": "yellow",
     "spoils_in": "7 days",
     "container": "bag_plastic",
@@ -161,7 +162,7 @@
     "price": "3 cent",
     "price_postapoc": "16 cent",
     "material": [ "wheat" ],
-    "volume": "41 ml",
+    "volume": "60 ml",
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
     "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ]
   },
@@ -211,7 +212,7 @@
     "id": "bread_garlic",
     "looks_like": "bread",
     "name": { "str_sp": "garlic bread" },
-    "weight": "85 g",
+    "weight": "15 g",
     "color": "brown",
     "spoils_in": "10 days",
     "container": "bag_plastic",
@@ -223,7 +224,7 @@
     "price": "6 cent",
     "price_postapoc": "7 cent",
     "material": [ "wheat" ],
-    "volume": "17 ml",
+    "volume": "60 ml",
     "flags": [ "EATEN_HOT" ],
     "fun": 3,
     "vitamins": [ [ "calcium", 2 ], [ "iron", 14 ] ]
@@ -350,7 +351,7 @@
     "type": "COMESTIBLE",
     "id": "cornbread",
     "name": { "str_sp": "cornbread" },
-    "weight": "60 g",
+    "weight": "15 g",
     "color": "yellow",
     "spoils_in": "30 days",
     "container": "bag_plastic",
@@ -362,7 +363,7 @@
     "price_postapoc": "50 cent",
     "material": [ "veggy" ],
     "primary_material": "veggy",
-    "volume": "42 ml",
+    "volume": "60 ml",
     "flags": [ "EATEN_HOT" ],
     "fun": 2,
     "vitamins": [ [ "calcium", 8 ], [ "iron", 6 ] ]
@@ -492,7 +493,8 @@
     "type": "COMESTIBLE",
     "id": "wastebread",
     "name": { "str_sp": "wastebread" },
-    "weight": "60 g",
+    "weight": "15 g",
+    "//1": "avg bread density is 0.25",
     "color": "white",
     "spoils_in": 990,
     "comestible_type": "FOOD",
@@ -504,7 +506,7 @@
     "price_postapoc": "2 cent",
     "material": [ "junk", "wheat" ],
     "primary_material": "wheat",
-    "volume": "12 ml",
+    "volume": "60 ml",
     "flags": [ "EATEN_HOT" ],
     "fun": -1,
     "vitamins": [ [ "calcium", 12 ] ],