Fruit Audit 2: New Vitamin Syntax Boogaloo (#69259)

* first half * fruit done * add nopales + alphabetize the dictionary * drinkz * canned stuff * Update raw_fruit.json * Update iteminfo_test.cpp * you better not work on me this time you stupid recipe syntax * maybe???? I doubt it * perish * no gods among pulp * gruh? * rose hips and crabapples
CleverRaven · Jan 14, 2024 · d0ae609 · d0ae609
1 parent 56dadb6
commit d0ae609
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 90 deletions.
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
@@ -127,22 +127,22 @@
     "id": "can_coconut",
     "looks_like": "milk",
     "name": { "str_sp": "coconut milk" },
-    "weight": "238 g",
+    "weight": "226 g",
     "color": "white",
     "spoils_in": "1 day",
     "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
-    "calories": 470,
+    "calories": 445,
     "description": "A dense, sweet, creamy sauce, often used in curries.",
     "price": 350,
     "price_postapoc": 500,
     "material": [ "fruit" ],
     "volume": "500 ml",
     "phase": "liquid",
     "charges": 2,
-    "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ] ],
+    "vitamins": [ [ "vitC", "2300 μg" ], [ "iron", "7500 μg" ], [ "calcium", "40700 μg" ] ],
     "fun": 1
   },
   {
@@ -1066,21 +1066,21 @@
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
     "//": "most store-bought oj is fortified with calcium.",
-    "vitamins": [ [ "vitC", 96 ], [ "calcium", 23 ] ],
+    "vitamins": [ [ "vitC", "83700 μg" ], [ "iron", "320 μg" ], [ "calcium", "348600 μg" ] ],
     "fun": 3
   },
   {
     "type": "COMESTIBLE",
     "id": "oj_fresh",
     "looks_like": "oj",
     "name": { "str_sp": "fresh orange juice" },
-    "weight": "249 g",
+    "weight": "248 g",
     "color": "yellow",
     "spoils_in": "2 days",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 35,
-    "calories": 126,
+    "calories": 111,
     "//": "Calories shouldn't matter since it won't spawn - should only be craftable.",
     "description": "Freshly-squeezed from real oranges!  Tasty and nutritious.",
     "price": 14,
@@ -1091,22 +1091,22 @@
     "charges": 1,
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
-    "vitamins": [ [ "vitC", 83 ], [ "calcium", 1 ], [ "iron", 1 ] ],
+    "vitamins": [ [ "vitC", "124 mg" ], [ "iron", "500 μg" ], [ "calcium", "27300 μg" ] ],
     "fun": 3
   },
   {
     "type": "COMESTIBLE",
     "id": "orangesoda",
     "looks_like": "juice",
     "name": { "str_sp": "orange soda" },
-    "weight": "248 g",
+    "weight": "227 g",
     "color": "yellow",
     "container": "can_drink",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 18,
     "healthy": -1,
-    "calories": 126,
+    "calories": 130,
     "description": "Unlike cola this is caffeine free, however it is still carbonated, sweet, and tastes vaguely orange-like.",
     "price": 95,
     "price_postapoc": 50,

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -354,15 +354,15 @@
     "price": 50,
     "price_postapoc": 10,
     "material": [ "water" ],
-    "weight": "250 g",
+    "weight": "240 g",
     "volume": "250 ml",
     "comestible_type": "DRINK",
     "container": "carton_sealed",
     "quench": 47,
-    "calories": 47,
+    "calories": 45,
     "fun": 3,
     "phase": "liquid",
-    "vitamins": [ [ "calcium", 6 ], [ "iron", 4 ], [ "vitC", 10 ] ]
+    "vitamins": [ [ "vitC", "5800 μg" ], [ "iron", "700 μg" ], [ "calcium", "57600 μg" ] ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
@@ -99,22 +99,22 @@
     "type": "COMESTIBLE",
     "id": "can_peach",
     "name": { "str_sp": "peaches in syrup" },
-    "weight": "244 g",
+    "weight": "251 g",
     "color": "yellow",
     "spoils_in": "1 day 6 hours",
     "container": "can_food",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 6,
-    "calories": 58,
+    "calories": 135,
     "sealed": true,
     "description": "Yellow cling peach slices packed in light syrup.",
     "price": 96,
     "price_postapoc": 150,
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": 5,
-    "vitamins": [ [ "vitC", 7 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "6 mg" ], [ "iron", "900 μg" ], [ "calcium", "7500 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -134,7 +134,7 @@
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": 7,
-    "vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 5 ] ]
+    "vitamins": [ [ "vitC", "18900 μg" ], [ "iron", "1 mg" ], [ "calcium", "36900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",