From 4eafac6da55e68a96f23a47dd645a3586c0177f4 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 9 May 2021 14:46:47 -0700 Subject: Port to Bright Nights --- json/items/comestible/meat_dishes.json | 44 +++---------------------------- json/items/comestible/veggy_dishes.json | 17 ++---------- json/recipes/food/canned.json | 6 ++--- json/recipes/recipe_food.json | 6 ++--- json/requirements/cooking_components.json | 1 + 5 files changed, 13 insertions(+), 61 deletions(-) diff --git a/json/items/comestible/meat_dishes.json b/json/items/comestible/meat_dishes.json index 0fab8d1..6d481b3 100644 --- a/json/items/comestible/meat_dishes.json +++ b/json/items/comestible/meat_dishes.json @@ -2,52 +2,16 @@ { "type": "COMESTIBLE", "id": "chili", - "name": { "str": "chili con carne", "str_pl": "chilis con carne" }, - "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "chili con cabron", "str_pl": "chilis con cabron" } }, - { - "type": "COMPONENT_ID", - "condition": "mutant", - "name": { "str": "chili con chupacabra", "str_pl": "chilis con chupacabra" } - } - ], - "weight": "253 g", - "color": "red", - "spoils_in": "1 day", - "container": "can_medium", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": 1, - "calories": 299, - "description": "A spicy stew containing chili peppers, meat, tomatoes and beans.", - "price": 290, - "material": [ "flesh", "veggy", "bean", "tomato" ], - "volume": "500 ml", - "phase": "liquid", - "flags": [ "EATEN_HOT" ], - "fun": 5, - "charges": 2, - "vitamins": [ [ "vitA", 14 ], [ "vitC", 7 ], [ "calcium", 6 ], [ "iron", 27 ] ] + "copy-from": "chili", + "phase": "liquid" }, { "type": "COMESTIBLE", "id": "meat_stirfry", "looks_like": "tofu_stirfry", + "copy-from": "tofu_stirfry", "name": { "str": "meat stirfry", "str_pl": "meat stirfry" }, - "weight": "135 g", - "color": "yellow", - "spoils_in": "4 days", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": 1, - "calories": 525, - "charges": 4, "description": "A meat stirfry with rice and a sweet bold flavor sure to be on your mind through these dark days.", - "price": 1200, - "material": [ "flesh", "veggy" ], - "volume": "1 L", - "flags": [ "EATEN_HOT" ], - "fun": 12, - "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 5 ], [ "vitC", 24 ] ] + "material": [ "flesh", "veggy" ] } ] diff --git a/json/items/comestible/veggy_dishes.json b/json/items/comestible/veggy_dishes.json index 9ba957d..12aeced 100644 --- a/json/items/comestible/veggy_dishes.json +++ b/json/items/comestible/veggy_dishes.json @@ -23,21 +23,8 @@ "type": "COMESTIBLE", "id": "veggy_stirfry", "looks_like": "tofu_stirfry", + "copy-from": "tofu_stirfry", "name": { "str": "veggy stirfry", "str_pl": "veggy stirfry" }, - "weight": "135 g", - "color": "yellow", - "spoils_in": "4 days", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": 1, - "calories": 525, - "charges": 4, - "description": "A vegetable stirfry with rice and a sweet bold flavor sure to be on your mind through these dark days.", - "price": 1200, - "material": "veggy", - "volume": "1 L", - "flags": [ "EATEN_HOT" ], - "fun": 12, - "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 5 ], [ "vitC", 24 ] ] + "description": "A vegetable stirfry with rice and a sweet bold flavor sure to be on your mind through these dark days." } ] diff --git a/json/recipes/food/canned.json b/json/recipes/food/canned.json index 5f8467e..070153d 100644 --- a/json/recipes/food/canned.json +++ b/json/recipes/food/canned.json @@ -8,7 +8,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "autolearn": true, + "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ @@ -33,7 +33,7 @@ "difficulty": 4, "time": "1 h", "charges": 2, - "autolearn": true, + "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], @@ -52,7 +52,7 @@ "difficulty": 4, "time": "1 h 10 m", "charges": 12, - "autolearn": true, + "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], diff --git a/json/recipes/recipe_food.json b/json/recipes/recipe_food.json index 91b8174..b6c36eb 100644 --- a/json/recipes/recipe_food.json +++ b/json/recipes/recipe_food.json @@ -26,7 +26,7 @@ "batch_time_factors": [ 25, 2 ], "components": [ [ [ "tofu", 4 ], [ "dry_tofu", 4 ] ], - [ [ "dry_rice", 4 ], [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], + [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], [ [ "cooking_oil", 1 ] ], [ [ "beet_syrup", 1 ], @@ -54,7 +54,7 @@ "batch_time_factors": [ 25, 2 ], "components": [ [ [ "meat_red", 4, "LIST" ], [ "dry_meat", 4 ], [ "can_chicken", 4 ] ], - [ [ "dry_rice", 4 ], [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], + [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], [ [ "fry_oil", 2, "LIST" ] ], [ [ "beet_syrup", 1 ], @@ -82,7 +82,7 @@ "batch_time_factors": [ 25, 2 ], "components": [ [ [ "veggy_any_uncooked", 4, "LIST" ] ], - [ [ "dry_rice", 4 ], [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], + [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], [ [ "cooking_oil", 1 ] ], [ [ "beet_syrup", 1 ], diff --git a/json/requirements/cooking_components.json b/json/requirements/cooking_components.json index 98f16f6..b4ddcc1 100644 --- a/json/requirements/cooking_components.json +++ b/json/requirements/cooking_components.json @@ -11,6 +11,7 @@ [ "veggy_any", 1, "LIST" ], [ "sauerkraut", 1 ], [ "can_corn", 1 ], + [ "hominy", 1 ], [ "dry_veggy", 1 ], [ "con_milk", 1 ], [ "flatbread", 1 ], -- cgit v1.2.1