feat(port): jarless sourdoughs (cataclysmbnteam#3352)

* Allow to start sourdough without a glass jar (#56324) * Allow to start sourdough without a glass jar * Migrate sourdough to a glass jar with a sourdough * Update Dana's family sourdough starter according to the recent changes in sourdough Co-authored-by: Kevin Granade <kevin.granade@gmail.com> Co-authored-by: David Seguin <davidseguin@live.ca> * chore: obsolete old sourdough recipe see: CleverRaven/Cataclysm-DDA@4b90b94 Co-authored-by: Qrox <qrox@sina.com> * chore: make sourdough starter easier see: CleverRaven/Cataclysm-DDA#65724 Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> --------- Co-authored-by: Daniel Vartanov <dan@vartanov.net> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: Qrox <qrox@sina.com> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
chaosvolt · Oct 5, 2023 · a16e244 · a16e244
1 parent 259503e
commit a16e244
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 52 deletions.
diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
@@ -21,46 +21,46 @@
     "fun": 4
   },
   {
-    "id": "sourdough_young",
-    "type": "GENERIC",
+    "id": "sourdough_young_uncovered",
+    "type": "COMESTIBLE",
     "category": "food",
     "name": { "str": "juvenile sourdough starter" },
-    "description": "This jar contains a floury paste that is slowly going bad.  Someday it will be sourdough.",
-    "weight": "52 g",
-    "volume": "250 ml",
+    "description": "A floury paste that is slowly going bad.  Someday it will be sourdough.",
+    "weight": "750 g",
+    "volume": "480 ml",
     "price": 10,
     "price_postapoc": 10,
-    "bashing": 8,
-    "material": [ "glass", "wheat" ],
-    "looks_like": "jar_glass",
+    "material": [ "wheat" ],
     "symbol": "%",
     "color": "white",
+    "fun": -5,
+    "calories": 192,
     "use_action": {
-      "target": "sourdough_starter",
-      "msg": "After feeding it and caring for it for weeks, your sourdough starter is finally ready for the big leagues.",
+      "target": "sourdough_starter_uncovered",
+      "msg": "After feeding it and caring for it for a week, your sourdough starter is finally ready for the big leagues.",
       "moves": 50,
       "type": "delayed_transform",
       "transform_age": 200000,
       "not_ready_msg": "You've been caring for your starter for a while, but it's going to need longer before you can do anything tasty with it."
     }
   },
   {
-    "id": "sourdough_split",
-    "type": "GENERIC",
+    "id": "sourdough_split_uncovered",
+    "type": "COMESTIBLE",
     "category": "food",
     "name": { "str": "freshly fed sourdough starter" },
-    "description": "This jar contains a floury paste with sourdough starter mixed in.  It needs a few hours to recover its strength before it can be used again.",
-    "weight": "52 g",
-    "volume": "250 ml",
+    "description": "A floury paste with sourdough starter mixed in.  It needs a day to recover its strength before it can be used again.",
+    "weight": "750 g",
+    "volume": "480 ml",
     "price": 10,
     "price_postapoc": 10,
-    "bashing": 8,
-    "material": [ "glass", "wheat" ],
-    "looks_like": "jar_glass",
+    "material": [ "wheat" ],
     "symbol": "%",
     "color": "white",
+    "fun": -5,
+    "calories": 192,
     "use_action": {
-      "target": "sourdough_starter",
+      "target": "sourdough_starter_uncovered",
       "msg": "The starter is now stinky and bubbly, and looks ready for cooking.",
       "moves": 50,
       "type": "delayed_transform",
@@ -69,20 +69,20 @@
     }
   },
   {
-    "id": "sourdough_starter",
-    "type": "GENERIC",
+    "id": "sourdough_starter_uncovered",
+    "type": "COMESTIBLE",
     "category": "food",
     "name": { "str": "sourdough starter" },
-    "description": "This jar contains a precious mix of flour, water, molds and bacteria from the air.  When you add flour and water to it, after a few hours it froths and rises.",
-    "weight": "52 g",
-    "looks_like": "jar_glass",
-    "volume": "250 ml",
+    "description": "A precious mix of flour, water, molds and bacteria from the air.  When you add flour and water to it, after a few hours it froths and rises.",
+    "weight": "750 g",
+    "volume": "480 ml",
     "price": 50,
     "price_postapoc": 10,
-    "bashing": 8,
-    "material": [ "glass", "wheat" ],
+    "material": [ "wheat" ],
     "symbol": "%",
-    "color": "white"
+    "color": "yellow",
+    "fun": -1,
+    "calories": 192
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json
@@ -490,10 +490,14 @@
   {
     "id": "landough_calrisean",
     "type": "GENERIC",
-    "copy-from": "sourdough_starter",
-    "looks_like": "sourdough_starter",
+    "copy-from": "sourdough_starter_uncovered",
+    "looks_like": "jar_glass_sealed",
     "name": { "str_sp": "Dana's family sourdough starter" },
-    "description": "This crusty old jar has a glow-in-the-dark millennium falcon decal on the side, and a label that reads, \"Landough Calrisean.  Dana's.  Do not touch on pain of death\".  It's been abandoned for some time and doesn't look like it could be readily salvaged as a sourdough culture, but maybe an experienced sourdough baker could manage it."
+    "description": "This crusty old jar has a glow-in-the-dark Millennium Falcon decal on the side, and a label that reads, \"Landough Calrisean.  Dana's.  Do not touch on pain of death\".  It's been abandoned for some time and doesn't look like it could be readily salvaged as a sourdough culture, but maybe an experienced sourdough baker could manage it.",
+    "weight": "450 g",
+    "volume": "680 ml",
+    "bashing": 8,
+    "material": [ "glass", "wheat" ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migration.json
@@ -1304,6 +1304,24 @@
     "type": "MIGRATION",
     "replace": "peanut"
   },
+  {
+    "id": "sourdough_young",
+    "type": "MIGRATION",
+    "replace": "jar_glass_sealed",
+    "contents": [ "sourdough_young_uncovered" ]
+  },
+  {
+    "id": "sourdough_split",
+    "type": "MIGRATION",
+    "replace": "jar_glass_sealed",
+    "contents": [ "sourdough_split_uncovered" ]
+  },
+  {
+    "id": "sourdough_starter",
+    "type": "MIGRATION",
+    "replace": "jar_glass_sealed",
+    "contents": [ "sourdough_starter_uncovered" ]
+  },
   {
     "id": "1cyl_combustion_small",
     "type": "MIGRATION",

diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
@@ -3163,5 +3163,15 @@
     "result": "jug_plastic",
     "id_suffix": "plastic-mod",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sourdough_young",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sourdough_split",
+    "obsolete": true
   }
 ]
diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json
@@ -394,20 +394,20 @@
   },
   {
     "type": "recipe",
-    "result": "sourdough_young",
+    "result": "sourdough_young_uncovered",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_BREAD",
     "skill_used": "cooking",
-    "difficulty": 5,
+    "difficulty": 3,
     "time": "10 m",
     "//": "Making the very first starter is a lot more finnicky than splitting it once it's mature.",
     "autolearn": true,
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "jar_glass", 1 ] ], [ [ "flour", 4 ] ] ]
+    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "flour", 4 ] ] ]
   },
   {
     "type": "recipe",
-    "result": "sourdough_split",
+    "result": "sourdough_split_uncovered",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_BREAD",
     "skill_used": "cooking",
@@ -416,12 +416,12 @@
     "result_mult": 2,
     "autolearn": true,
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "jar_glass", 1 ] ], [ [ "flour", 4 ] ], [ [ "sourdough_starter", 1 ] ] ]
+    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "flour", 4 ] ], [ [ "sourdough_starter_uncovered", 1 ] ] ]
   },
   {
     "type": "recipe",
     "result": "sourdough_bread",
-    "byproducts": [ [ "sourdough_split", 1 ] ],
+    "byproducts": [ [ "sourdough_split_uncovered", 1 ] ],
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_BREAD",
     "skill_used": "cooking",
@@ -431,7 +431,7 @@
     "autolearn": true,
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
-    "components": [ [ [ "flour", 10 ] ], [ [ "sourdough_starter", 1 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ]
+    "components": [ [ [ "flour", 10 ] ], [ [ "sourdough_starter_uncovered", 1 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/uncraft/food/sourdough.json b/data/json/uncraft/food/sourdough.json