fix CleverRaven#37837

jkraybill · Feb 9, 2020 · f716661 · f716661
1 parent da56791
commit f716661
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json
@@ -645,20 +645,20 @@
     "type": "COMESTIBLE",
     "id": "cactus_pad",
     "name": "cactus pad",
-    "weight": "100 g",
+    "weight": "149 g",
     "color": "green",
     "spoils_in": "1 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 15,
     "healthy": 1,
-    "calories": 100,
+    "calories": 15,
     "description": "An edible pad of a cactus.",
     "price": 50,
     "material": "fruit",
     "volume": "250 ml",
     "fun": -1,
     "flags": [ "RAW" ],
-    "vitamins": [ [ "vitA", 10 ], [ "vitC", 16 ], [ "calcium", 16 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitA", 9 ], [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 3 ] ]
   }
 ]
diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
@@ -721,18 +721,19 @@
     "type": "COMESTIBLE",
     "id": "nopalitos",
     "name": "nopalito",
-    "weight": "200 g",
+    "weight": "298 g",
     "color": "green",
     "spoils_in": "10 days",
+    "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 30,
     "healthy": 1,
-    "calories": 55,
+    "calories": 45,
     "description": "A less prickly version of cactus pads.",
     "price": 100,
     "material": "veggy",
-    "volume": "250 ml",
-    "vitamins": [ [ "vitA", 27 ], [ "vitC", 30 ], [ "calcium", 32 ], [ "iron", 8 ] ],
+    "volume": "500 ml",
+    "vitamins": [ [ "vitA", 27 ], [ "vitC", 27 ], [ "calcium", 48 ], [ "iron", 9 ] ],
     "fun": 3
   },
   {