From f4cf70b7837b8491ae76cdda5cc01f2b819c486e Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Fri, 6 Dec 2019 13:28:53 -0800 Subject: [PATCH 1/7] Add Supreme Pizza Adds a pizza with meat, cheese, and veggies. --- data/json/items/comestibles/meat_dishes.json | 15 ++++++++ data/json/recipes/recipe_food.json | 40 ++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 55f662f47d4bf..59e87000c9738 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -775,6 +775,21 @@ "fun": 10, "vitamins": [ [ "vitA", 3 ], [ "vitC", 10 ], [ "calcium", 28 ], [ "iron", 28 ] ] }, + { + "type": "COMESTIBLE", + "id": "pizza_supreme", + "name": "supreme pizza", + "copy-from": "pizza_meat", + "looks-like": "pizza_meat", + "color": "light_red", + "weight": "300 g", + "calories": 641, + "description": "A supreme pizza with ALL the toppings. It's delicious, nutritious, and filling.", + "price": 1500, + "material": [ "wheat", "flesh", "veggy", "milk" ], + "fun": 20, + "vitamins": [ [ "vitA", 12 ], [ "vitC", 20 ], [ "calcium", 32 ], [ "iron", 28 ] ] + }, { "type": "COMESTIBLE", "id": "deluxe_eggs", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 9cf01d4deb56a..bc1ffbd4e5e0e 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4142,6 +4142,46 @@ [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, + { + "type": "recipe", + "result": "pizza_supreme", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 3, + "time": "30 m", + "book_learn": [ [ "cookbook_italian", 3 ] ], + "qualities": [ { "id": "COOK", "level": 3 } ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], + "components": [ + [ [ "flour", 30 ] ], + [ [ + [ "meat_red", 2, "LIST" ], + [ "can_chicken", 2 ], + [ "meat_salted", 2 ], + [ "dry_meat", 2 ], + [ "fish", 2 ], + [ "fish_canned", 2 ], + [ "can_tuna", 2 ], + [ "salted_fish", 2 ], + [ "rehydrated_fish", 2 ], + [ "dry_fish", 2 ] + ], + [ + [ "veggy_any", 2, "LIST" ], + [ "mushroom", 2 ], + [ "dry_mushroom", 2 ], + [ "morel_cooked", 2 ], + [ "tofu", 2 ], + [ "dry_tofu", 2 ], + [ "mushroom_cooked", 2 ], + [ "dry_veggy", 2 ] + ], + [ [ "cheese", 2 ], [ "can_cheese", 2 ], [ "cheese_hard", 2 ] ], + [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ] ], + [ [ "water", 1 ], [ "water_clean", 1 ] ] + ] + }, { "type": "recipe", "result": "smores", From 7147e90a51b2ce0a57e5d9d39e96669b777ea173 Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Fri, 6 Dec 2019 13:40:10 -0800 Subject: [PATCH 2/7] fix syntax extra open bracket --- data/json/recipes/recipe_food.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index bc1ffbd4e5e0e..6a0d06c398307 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4155,7 +4155,7 @@ "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 30 ] ], - [ [ + [ [ "meat_red", 2, "LIST" ], [ "can_chicken", 2 ], [ "meat_salted", 2 ], From c98c5abf2eff9fb2b759826bf236794699131288 Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Fri, 6 Dec 2019 13:50:57 -0800 Subject: [PATCH 3/7] description tweak removed extra fluff --- data/json/items/comestibles/meat_dishes.json | 2 +- data/json/recipes/recipe_food.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 59e87000c9738..5504d286e26fd 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -784,7 +784,7 @@ "color": "light_red", "weight": "300 g", "calories": 641, - "description": "A supreme pizza with ALL the toppings. It's delicious, nutritious, and filling.", + "description": "A supreme pizza with ALL the toppings.", "price": 1500, "material": [ "wheat", "flesh", "veggy", "milk" ], "fun": 20, diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 6a0d06c398307..7ce54a3623422 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4151,7 +4151,7 @@ "difficulty": 3, "time": "30 m", "book_learn": [ [ "cookbook_italian", 3 ] ], - "qualities": [ { "id": "COOK", "level": 3 } ], + "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 30 ] ], From bab9f8d28836afc34b331a61403cd5f0bc84a85c Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:09:13 -0800 Subject: [PATCH 4/7] Formatting replaced tabs with spaces --- data/json/items/comestibles/meat_dishes.json | 6 +++--- data/json/recipes/recipe_food.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 5504d286e26fd..3a4ff49fb6774 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -779,10 +779,10 @@ "type": "COMESTIBLE", "id": "pizza_supreme", "name": "supreme pizza", - "copy-from": "pizza_meat", - "looks-like": "pizza_meat", + "copy-from": "pizza_meat", + "looks-like": "pizza_meat", "color": "light_red", - "weight": "300 g", + "weight": "300 g", "calories": 641, "description": "A supreme pizza with ALL the toppings.", "price": 1500, diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 7ce54a3623422..a959a381ab4bf 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4155,7 +4155,7 @@ "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 30 ] ], - [ + [ [ "meat_red", 2, "LIST" ], [ "can_chicken", 2 ], [ "meat_salted", 2 ], @@ -4177,7 +4177,7 @@ [ "mushroom_cooked", 2 ], [ "dry_veggy", 2 ] ], - [ [ "cheese", 2 ], [ "can_cheese", 2 ], [ "cheese_hard", 2 ] ], + [ [ "cheese", 2 ], [ "can_cheese", 2 ], [ "cheese_hard", 2 ] ], [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] From 30a6b975fb729414cd18a943f99fd2a1df06696f Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Sat, 7 Dec 2019 07:50:33 -0800 Subject: [PATCH 5/7] Update meat_dishes.json --- data/json/items/comestibles/meat_dishes.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 3a4ff49fb6774..8a772ab809fc3 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -780,7 +780,6 @@ "id": "pizza_supreme", "name": "supreme pizza", "copy-from": "pizza_meat", - "looks-like": "pizza_meat", "color": "light_red", "weight": "300 g", "calories": 641, From 697a77379a2d03653f93ec86a0e14ac8d43f1731 Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Sat, 7 Dec 2019 07:53:35 -0800 Subject: [PATCH 6/7] Tweaks, fixed looks-like Changed location of tofu from veggie to meat list, removed looks like, and lowered fun value --- data/json/items/comestibles/meat_dishes.json | 2 +- data/json/recipes/recipe_food.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 8a772ab809fc3..f4007ed964a20 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -786,7 +786,7 @@ "description": "A supreme pizza with ALL the toppings.", "price": 1500, "material": [ "wheat", "flesh", "veggy", "milk" ], - "fun": 20, + "fun": 11, "vitamins": [ [ "vitA", 12 ], [ "vitC", 20 ], [ "calcium", 32 ], [ "iron", 28 ] ] }, { diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index a959a381ab4bf..2b8e9a8c5f54f 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4166,14 +4166,14 @@ [ "salted_fish", 2 ], [ "rehydrated_fish", 2 ], [ "dry_fish", 2 ] + [ "tofu", 2 ], + [ "dry_tofu", 2 ], ], [ [ "veggy_any", 2, "LIST" ], [ "mushroom", 2 ], [ "dry_mushroom", 2 ], [ "morel_cooked", 2 ], - [ "tofu", 2 ], - [ "dry_tofu", 2 ], [ "mushroom_cooked", 2 ], [ "dry_veggy", 2 ] ], From 90682b13c9fda1e937183564f079a41325faa7c8 Mon Sep 17 00:00:00 2001 From: HipAndroid <58538113+HipAndroid@users.noreply.github.com> Date: Sat, 7 Dec 2019 07:58:37 -0800 Subject: [PATCH 7/7] added comma whoops, that'll teach me to copy-paste all willy nilly with no regard for formatting --- data/json/recipes/recipe_food.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 2b8e9a8c5f54f..3f88c31b71e36 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4165,9 +4165,9 @@ [ "can_tuna", 2 ], [ "salted_fish", 2 ], [ "rehydrated_fish", 2 ], - [ "dry_fish", 2 ] + [ "dry_fish", 2 ], [ "tofu", 2 ], - [ "dry_tofu", 2 ], + [ "dry_tofu", 2 ] ], [ [ "veggy_any", 2, "LIST" ],