From 33dd2e2bd5b1e288d367d733acd295072ee35707 Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Fri, 30 Aug 2024 21:58:56 -0500 Subject: [PATCH 1/4] remove toaster from generic items --- data/json/items/generic.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 76d610b4ea035..aff3b74e6163a 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -1438,21 +1438,6 @@ "weight": "5 g", "volume": "1 ml" }, - { - "type": "GENERIC", - "id": "toaster", - "symbol": ",", - "color": "light_gray", - "name": { "str": "toaster" }, - "description": "A small two-slice toaster, not much use as anything but spare parts.", - "price": "10 USD", - "price_postapoc": "10 cent", - "material": [ "aluminum", "plastic" ], - "weight": "725 g", - "volume": "750 ml", - "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }, - "melee_damage": { "bash": 2 } - }, { "id": "broken_kord", "type": "GENERIC", From 4e664c487d7dbd7b56b8fb63029a6d1ac83662ef Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Fri, 30 Aug 2024 22:00:41 -0500 Subject: [PATCH 2/4] add toaster to cooking tools --- data/json/items/tool/cooking.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index b62f40701fe89..0a9f8b0417c06 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -1173,5 +1173,21 @@ "rigid": true } ] + }, + { + "type": "TOOL", + "id": "toaster", + "symbol": ",", + "color": "light_gray", + "name": { "str": "toaster" }, + "description": "A small two-slice toaster, can be used to toast toast and few other things.", + "price": "10 USD", + "price_postapoc": "10 cent", + "material": [ "aluminum", "plastic" ], + "weight": "725 g", + "volume": "750 ml", + "use_action": [ { "type": "link_up", "cable_length": 2, "charge_rate": "1400 W" } ], + "flags": [ "WATER_BREAK", "ALLOWS_REMOTE_USE" ], + "ammo": [ "battery" ] } ] From 16540f544887623d5cf5d08899cd4691e1177860 Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Fri, 30 Aug 2024 22:02:53 -0500 Subject: [PATCH 3/4] add toast recipe with toaster --- data/json/recipes/food/bread.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 5ab59be063572..b641053d31474 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -144,6 +144,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "toast", + "id_suffix": "without_toaster", "category": "CC_FOOD", "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", @@ -157,6 +158,20 @@ "proficiencies": [ { "proficiency": "prof_food_prep" } ], "components": [ [ [ "bread_toastable", 1, "LIST" ] ] ] }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "toast", + "id_suffix": "with_toaster", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_BREAD", + "skill_used": "cooking", + "autolearn": true, + "charges": 1, + "time": "1 m", + "tools": [ [ [ "toaster", 5 ] ] ], + "components": [ [ [ "bread_toastable", 1, "LIST" ] ] ] + }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", From 19bb115aceaaa5ecd77b130e226ac62ce5691529 Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Fri, 30 Aug 2024 22:08:19 -0500 Subject: [PATCH 4/4] add toaster recipes for toaster pastries --- data/json/recipes/recipe_food.json | 46 ++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index a859ad9c6f68c..32c896f1fb998 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -7190,6 +7190,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "toasterpastry", + "id_suffix": "without_toaster", "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", @@ -7203,6 +7204,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "homemade_toasterpastry", + "id_suffix": "without_toaster", "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", @@ -7216,6 +7218,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "homemade_toasterpastry2", + "id_suffix": "without_toaster", "category": "CC_FOOD", "subcategory": "CSC_FOOD_SNACK", "skill_used": "cooking", @@ -7226,6 +7229,49 @@ "//": "Toasting a pop-tart takes a minute at most", "components": [ [ [ "toastem4", 1 ] ], [ [ "any_frosting", 1, "LIST" ] ] ] }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "toasterpastry", + "id_suffix": "with_toaster", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_SNACK", + "skill_used": "cooking", + "time": "1 m", + "charges": 1, + "autolearn": true, + "tools": [ [ [ "toaster", 5 ] ] ], + "components": [ [ [ "toasterpastryfrozen", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "homemade_toasterpastry", + "id_suffix": "with_toaster", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_SNACK", + "skill_used": "cooking", + "time": "1 m", + "charges": 1, + "autolearn": true, + "tools": [ [ [ "toaster", 5 ] ] ], + "components": [ [ [ "toastem4", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "homemade_toasterpastry2", + "id_suffix": "with_toaster", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_SNACK", + "skill_used": "cooking", + "time": "1 m", + "charges": 1, + "autolearn": true, + "tools": [ [ [ "toaster", 5 ] ] ], + "//": "Toasting a pop-tart takes a minute at most", + "components": [ [ [ "toastem4", 1 ] ], [ [ "any_frosting", 1, "LIST" ] ] ] + }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE",