Merge pull request CleverRaven#72488 from Montimorency/Fix-sugar

Fix sugar
Standing-Storm · Mar 22, 2024 · 517058e · 517058e
2 parents 4026ef1 + 0860d8c
commit 517058e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -1132,6 +1132,7 @@
     "subtype": "collection",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "jar_glass_sealed",
+    "on_overflow": "spill",
     "entries": [ { "item": "sugar", "container-item": "null", "count": [ 10, 120 ] } ]
   },
   {

diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -1676,6 +1676,7 @@
     "subtype": "collection",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "jar_glass_sealed",
+    "on_overflow": "spill",
     "entries": [ { "item": "sugar", "container-item": "null", "count-min": 10, "count-max": 142 } ]
   },
   {

diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json
@@ -86,10 +86,11 @@
     "color": "brown"
   },
   {
+    "//": "Our recipes have traditionally been standardized against sugar units of 5 mg. Refer also to the sugar_standard item group for more sugar-related items and their ratios to one another. Density is now accurate.",
     "type": "COMESTIBLE",
     "id": "sugar",
     "name": { "str_sp": "sugar" },
-    "weight": "2 g",
+    "weight": "5 g",
     "color": "white",
     "container": "box_small",
     "comestible_type": "FOOD",
@@ -98,11 +99,9 @@
     "price": "5 cent",
     "price_postapoc": "4 cent",
     "material": [ "sugar" ],
-    "volume": "3 ml",
+    "volume": "6 ml",
     "calories": 19,
-    "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
-    "//2": "originally was 5g 3ml, and recipes probably use this ratio still;",
-    "//": "a tbsp is 4.2g of sugar, meaning the volume needed to be adjusted."
+    "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
@@ -3883,7 +3883,7 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "max_contains_volume": "1600 ml",
+        "max_contains_volume": "1625 ml",
         "max_contains_weight": "4 kg",
         "airtight": true,
         "moves": 50,