Audit pine nuts and remove the recipe (#40305)

* Obsolete pine nut recipe and enhance pine nut spawns
CleverRaven · May 8, 2020 · 730d5fa · 730d5fa
1 parent ac82610
commit 730d5fa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -317,7 +317,7 @@
       { "item": "wheat", "prob": 3 },
       { "item": "onion", "prob": 3 },
       { "item": "garlic", "prob": 3 },
-      { "item": "pine_nuts", "prob": 2 },
+      { "item": "pine_nuts", "prob": 10 },
       { "item": "carrot", "prob": 3 }
     ]
   },
@@ -385,7 +385,7 @@
       { "item": "blackberries", "prob": 7 },
       { "item": "cholla_bud", "prob": 3 },
       { "item": "garlic", "prob": 3 },
-      { "item": "pine_nuts", "prob": 2 }
+      { "item": "pine_nuts", "prob": 10 }
     ]
   },
   {
@@ -460,7 +460,7 @@
       { "item": "coffee_syrup", "prob": 10 },
       { "item": "fruit_leather", "prob": 25 },
       { "item": "kernels", "prob": 25 },
-      { "item": "pine_nuts", "prob": 5 },
+      { "item": "pine_nuts", "prob": 20 },
       { "group": "teabag_box", "prob": 10 }
     ]
   },
@@ -476,7 +476,7 @@
       { "item": "mintpatties", "prob": 8 },
       { "item": "choco_coffee_beans", "prob": 8 },
       { "item": "fruit_leather", "prob": 15 },
-      { "item": "pine_nuts", "prob": 4 }
+      { "item": "pine_nuts", "prob": 20 }
     ]
   },
   {

diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json
@@ -3,23 +3,23 @@
     "type": "COMESTIBLE",
     "id": "pine_nuts",
     "name": { "str_sp": "pine nuts" },
-    "weight": "30 g",
+    "weight": "15 g",
     "color": "brown",
     "spoils_in": 1080,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "quench": -2,
+    "quench": -1,
     "healthy": 1,
-    "calories": 202,
+    "calories": 101,
     "description": "A handful of tasty crunchy nuts from a pinecone.",
-    "price": 136,
-    "price_postapoc": 600,
+    "price": 68,
+    "price_postapoc": 300,
     "material": "nut",
-    "volume": "250 ml",
+    "volume": "125 ml",
     "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
     "charges": 4,
-    "vitamins": [ [ "iron", 9 ] ],
+    "vitamins": [ [ "iron", 5 ] ],
     "fun": 2
   },
   {

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -2834,21 +2834,6 @@
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [ [ [ "buckwheat", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "pine_nuts",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
-    "skill_used": "cooking",
-    "skills_required": [ "survival", 2 ],
-    "difficulty": 1,
-    "charges": 1,
-    "time": "1 m 30 s",
-    "autolearn": true,
-    "batch_time_factors": [ 80, 1 ],
-    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [ [ [ "pinecone", 1 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "walnut_roasted",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -2459,5 +2459,10 @@
     "type": "recipe",
     "result": "shotcanister_pebble",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "pine_nuts",
+    "obsolete": true
   }
 ]