From 952af60dfa3fecb81852483825c55ea941fcda25 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 21 Feb 2020 20:46:52 -0500 Subject: [PATCH 1/9] hotdogs homemade --- data/json/items/comestibles/offal_dishes.json | 18 +++++++ data/json/recipes/food/offal_dishes.json | 50 +++++++++++++++++++ data/json/recipes/recipe_food.json | 9 ++-- 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json index 3c01fb11ae520..6a9642a611a05 100644 --- a/data/json/items/comestibles/offal_dishes.json +++ b/data/json/items/comestibles/offal_dishes.json @@ -261,5 +261,23 @@ "charges": 6, "calories": 400, "flags": [ "EATEN_HOT" ] + }, + { + "id": "sausage_casings", + "copy-from": "spice", + "type": "COMESTIBLE", + "name": "sausage casing", + "name_plural": "sausage casings", + "description": "Sausage casings made from animal intestines. Ready to be used for forming meat products.", + "color": "red", + "material": "flesh", + "charges": 60 + }, + { + "type": "COMESTIBLE", + "id": "homemade_hotdogs", + "name": "homemade hot dog", + "name_plural": "homemade hot dogs", + "copy-from": "hotdogs_frozen" } ] diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index d8c3c8a407d1f..65e8b1a25c9d9 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -367,5 +367,55 @@ [ [ "pepper", 3 ] ], [ [ "milk_standard", 1, "LIST" ] ] ] + }, + { + "type": "recipe", + "result": "sausage_casings", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 5, + "time": "50 m", + "batch_time_factors": [ 83, 5 ], + "charges": 60, + "byproducts": [ [ "ruined_chunks", 2 ] ], + "//": "Charcuterie: The Craft of Salting, Smoking, and Curing would be a good book for someone to use for further meat products recipes.", + "book_learn": [ [ "offalcooking", 3 ] ], + "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], + "tools": [ [ [ "funnel" ] ] ], + "components": [ + [ [ "offal", 2, ] ], + [ [ "salt", 20 ] ], + [ [ "water", 2 ] ], + [ [ "bag_plastic", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "homemade_hotdogs", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 4, + "charges": 2, + "time": "10 m", + "book_learn": [ [ "offalcooking", 3 ] ], + "batch_time_factors": [ 50, 3 ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 1 } ], + "components": [ + [ [ "meat_nofish", 2, "LIST" ] ], + [ [ "sausage_casings", 2 ] ], + [ + [ "salt_water", 4 ], + [ "saline", 8 ], + [ "salt", 4 ], + [ "chem_saltpetre", 2 ], + [ "soysauce", 2 ], + [ "seasoning_italian", 4 ], + [ "wild_herbs", 4 ], + [ "seasoning_salt", 4 ], + [ "pepper", 4 ] + ] + ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 5f6469ae8b576..0e8c44c1da136 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -744,7 +744,8 @@ [ "wild_herbs", 4 ], [ "seasoning_salt", 4 ], [ "pepper", 4 ] - ] + ], + [ [ "sausage_casings", 1 ] ] ] }, { @@ -4329,7 +4330,7 @@ "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "hotdogs_frozen", 1 ] ] ] + "components": [ [ [ "hotdogs_frozen", 1 ], [ "homemade_hotdogs", 1 ] ] ] }, { "type": "recipe", @@ -4343,7 +4344,7 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ [ "hotdogs_frozen", 1 ] ], + [ [ "hotdogs_frozen", 1 ], [ "homemade_hotdogs", 1 ] ], [ [ "flatbread", 1 ], [ "bread", 1 ], @@ -4368,7 +4369,7 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ [ "hotdogs_frozen", 2 ] ], + [ [ "hotdogs_frozen", 2 ], [ "homemade_hotdogs", 2 ] ], [ [ "chili", 1 ] ], [ [ "flatbread", 2 ], From 538663ac42ee2742087344cdcd2fb1581380859d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 21 Feb 2020 20:54:38 -0500 Subject: [PATCH 2/9] Update recipe_food.json --- data/json/recipes/recipe_food.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 0e8c44c1da136..d6c9324f10781 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4330,7 +4330,7 @@ "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "hotdogs_frozen", 1 ], [ "homemade_hotdogs", 1 ] ] ] + "components": [ [ [ "hotdogs_frozen", 1 ], [ "homemade_hotdogs", 1 ], [ "bratwurst_sausage", 1 ] ] ] }, { "type": "recipe", @@ -4344,7 +4344,7 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ [ "hotdogs_frozen", 1 ], [ "homemade_hotdogs", 1 ] ], + [ [ "hotdogs_frozen", 1 ], [ "homemade_hotdogs", 1 ], [ "bratwurst_sausage", 1 ] ], [ [ "flatbread", 1 ], [ "bread", 1 ], @@ -4369,7 +4369,7 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ [ "hotdogs_frozen", 2 ], [ "homemade_hotdogs", 2 ] ], + [ [ "hotdogs_frozen", 2 ], [ "homemade_hotdogs", 2 ], [ "bratwurst_sausage", 2 ] ], [ [ "chili", 1 ] ], [ [ "flatbread", 2 ], From aafbefa30b326389eea968ea788aef57f47e8145 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 21 Feb 2020 21:40:49 -0500 Subject: [PATCH 3/9] Update offal_dishes.json --- data/json/recipes/food/offal_dishes.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 65e8b1a25c9d9..029aba6875e75 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -383,12 +383,7 @@ "book_learn": [ [ "offalcooking", 3 ] ], "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], "tools": [ [ [ "funnel" ] ] ], - "components": [ - [ [ "offal", 2, ] ], - [ [ "salt", 20 ] ], - [ [ "water", 2 ] ], - [ [ "bag_plastic", 1 ] ] - ] + "components": [ [ [ "offal", 2 ] ], [ [ "salt", 20 ] ], [ [ "water", 2 ] ], [ [ "bag_plastic", 1 ] ] ] }, { "type": "recipe", From b133f146a5e1993d790a2f67e1b1a3e0ea0f8c49 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 21 Feb 2020 23:41:28 -0500 Subject: [PATCH 4/9] replace offal with stomach --- data/json/recipes/food/offal_dishes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 029aba6875e75..11a3a9fc2dc20 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -383,7 +383,7 @@ "book_learn": [ [ "offalcooking", 3 ] ], "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], "tools": [ [ [ "funnel" ] ] ], - "components": [ [ [ "offal", 2 ] ], [ [ "salt", 20 ] ], [ [ "water", 2 ] ], [ [ "bag_plastic", 1 ] ] ] + "components": [ [ [ "stomach", 2 ], [ "stomach_large", 1 ] ], [ [ "salt", 20 ] ], [ [ "water", 2 ] ], [ [ "bag_plastic", 1 ] ] ] }, { "type": "recipe", From 4269af5d10cb2b066928752dcb39e5d314f16b74 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 22 Feb 2020 00:23:16 -0500 Subject: [PATCH 5/9] add -1 to funnel --- data/json/recipes/food/offal_dishes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 11a3a9fc2dc20..01f3eeadaeac5 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -382,7 +382,7 @@ "//": "Charcuterie: The Craft of Salting, Smoking, and Curing would be a good book for someone to use for further meat products recipes.", "book_learn": [ [ "offalcooking", 3 ] ], "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], - "tools": [ [ [ "funnel" ] ] ], + "tools": [ [ [ "funnel", -1 ] ] ], "components": [ [ [ "stomach", 2 ], [ "stomach_large", 1 ] ], [ [ "salt", 20 ] ], [ [ "water", 2 ] ], [ [ "bag_plastic", 1 ] ] ] }, { From c03cbd6d9a29579b13d5fdffa299149dd89d1b7d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 5 Mar 2020 23:35:30 -0500 Subject: [PATCH 6/9] Corndogs too! --- data/json/items/comestibles/junkfood.json | 10 ++++++++++ data/json/recipes/recipe_food.json | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 8fb06ab7f402f..6aad5f3255bda 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -949,6 +949,16 @@ "description": "A heavily processed sausage, dipped in batter and deep fried. Cooked, this corn dog now tastes much better, but will spoil.", "fun": 18 }, + { + "type": "COMESTIBLE", + "id": "corndogs_homemade", + "name": "homemade corn dog", + "copy-from": "corndogs_frozen", + "spoils_in": "1 day", + "healthy": -2, + "description": "A homemade sausage, dipped in batter and deep fried. Cooked, this corn dog now tastes much better, but will spoil.", + "fun": 18 + }, { "type": "COMESTIBLE", "id": "choc_pancakes", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index d6c9324f10781..dede53fbdf4e3 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4439,6 +4439,25 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "corndogs_frozen", 1 ] ] ] }, + { + "type": "recipe", + "result": "corndogs_homemade", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 2, + "time": "1 m 45 s", + "charges": 1, + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], + "components": [ + [ [ "hotdogs_frozen", 1 ], [ "hotdogs_cooked", 1 ], [ "bratwurst_sausage", 1 ], [ "sausage_wasteland", 1 ] ], + [ [ "splinter", 1 ] ], + [ [ "cornmeal", 1 ] ], + [ [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ] ] + ] + }, { "type": "recipe", "result": "blt", From 50f7dcb5e139aa12653c01f7f929b269b526a079 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Apr 2020 15:56:00 -0500 Subject: [PATCH 7/9] update charge to fix calorie test Used copy from and noticed that my recipe makes one corndog their's assumes two. --- data/json/items/comestibles/junkfood.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 6aad5f3255bda..90c1177acfd78 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -956,6 +956,7 @@ "copy-from": "corndogs_frozen", "spoils_in": "1 day", "healthy": -2, + "charges": 1, "description": "A homemade sausage, dipped in batter and deep fried. Cooked, this corn dog now tastes much better, but will spoil.", "fun": 18 }, From 5f9982309a6d98e1fbfdfc90db02682a6a35f817 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Apr 2020 16:49:19 -0500 Subject: [PATCH 8/9] adds bag and ups calories --- data/json/items/comestibles/junkfood.json | 4 +++- data/json/recipes/recipe_food.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 90c1177acfd78..d082e939a3688 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -958,7 +958,9 @@ "healthy": -2, "charges": 1, "description": "A homemade sausage, dipped in batter and deep fried. Cooked, this corn dog now tastes much better, but will spoil.", - "fun": 18 + "fun": 18, + "calories": 250 + }, { "type": "COMESTIBLE", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index dede53fbdf4e3..0e105884d3d79 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4455,7 +4455,8 @@ [ [ "hotdogs_frozen", 1 ], [ "hotdogs_cooked", 1 ], [ "bratwurst_sausage", 1 ], [ "sausage_wasteland", 1 ] ], [ [ "splinter", 1 ] ], [ [ "cornmeal", 1 ] ], - [ [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ] ] + [ [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ] ], + [ [ "bag_plastic", 1 ] ] ] }, { From 59c0612ffdad303f41d8ca429d3c29234f299e1e Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Apr 2020 18:01:41 -0500 Subject: [PATCH 9/9] Update junkfood.json --- data/json/items/comestibles/junkfood.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index d082e939a3688..4cff05c544aef 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -960,7 +960,6 @@ "description": "A homemade sausage, dipped in batter and deep fried. Cooked, this corn dog now tastes much better, but will spoil.", "fun": 18, "calories": 250 - }, { "type": "COMESTIBLE",