From 53f3cf6b395f40b69fed8a44ef6d0b48620aa3bc Mon Sep 17 00:00:00 2001 From: NappingOcean <129575271+NappingOcean@users.noreply.github.com> Date: Wed, 6 Nov 2024 00:58:45 +0900 Subject: [PATCH] feat(content): Add kimchi dishes to the game (#5665) * Add kimchi-based korean dishes * Spacing fix * More spacing fix * Apply suggestions from code review * tofu_kimchi * fix type of tofu_kimchi * and fix spoiling date * calories test retry * Calories test re-retry --------- Co-authored-by: Chaosvolt --- data/json/items/comestibles/meat_dishes.json | 51 ++++++++++++ data/json/items/comestibles/veggy_dishes.json | 70 ++++++++++++++++ data/json/items/comestibles/wheat.json | 17 ++++ data/json/items/tool/cooking.json | 26 ++++++ data/json/recipes/food/meat.json | 39 +++++++++ data/json/recipes/food/other.json | 28 +++++++ data/json/recipes/food/pasta.json | 21 +++++ data/json/recipes/food/veggi.json | 82 +++++++++++++++++++ 8 files changed, 334 insertions(+) diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 07978e06ad44..1922bc3befe5 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -1403,5 +1403,56 @@ "material": [ "veggy", "flesh" ], "fun": 10, "looks_like": "rice_cooked" + }, + { + "id": "deluxe_rice_kimchi", + "type": "COMESTIBLE", + "name": { "str_sp": "kimchi fried rice" }, + "description": "Fried rice with the unique flavor of kimchi. The rich oil and spicy flavor are well balanced.", + "weight": "250 g", + "volume": "300 ml", + "color": "light_red", + "symbol": "%", + "comestible_type": "FOOD", + "calories": 450, + "quench": -3, + "fun": 10, + "material": [ "veggy", "flesh" ], + "looks_like": "deluxe_rice", + "flags": [ "EATEN_HOT" ] + }, + { + "id": "samhap", + "type": "COMESTIBLE", + "name": { "str_sp": "samhap" }, + "description": "A Korean dish that combines boiled meat, kimchi, and raw fish all at once. The flavors blend into delicious harmony.", + "weight": "300 g", + "volume": "330 ml", + "color": "yellow", + "symbol": "%", + "comestible_type": "FOOD", + "calories": 234, + "quench": -1, + "charges": 3, + "fun": 12, + "material": [ "veggy", "flesh" ], + "flags": [ "EATEN_HOT" ] + }, + { + "id": "bossam", + "type": "COMESTIBLE", + "name": { "str_sp": "bossam" }, + "description": "A Korean dish of boiled meat served with kimchi. The tender meat is paired with a spicy flavor.", + "weight": "250 g", + "volume": "250 ml", + "color": "yellow", + "symbol": "%", + "comestible_type": "FOOD", + "calories": 310, + "quench": -1, + "charges": 2, + "fun": 10, + "material": [ "veggy", "flesh" ], + "flags": [ "EATEN_HOT" ] } ] diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index aebc0e788fbc..3ba8ded19499 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -961,5 +961,75 @@ "charges": 4, "vitamins": [ [ "calcium", 8 ], [ "iron", 4 ] ], "fun": 4 + }, + { + "type": "COMESTIBLE", + "id": "kimchi", + "name": { "str_sp": "kimchi" }, + "conditional_names": [ { "type": "COMPONENT_ID", "condition": "cucumber", "name": "oi-sobagi" } ], + "weight": "100 g", + "volume": "120 ml", + "color": "red", + "comestible_type": "FOOD", + "symbol": "%", + "healthy": 2, + "calories": 20, + "//": "Yup, kimchi does not have much calories.", + "looks_like": "fruit_leather", + "quench": -2, + "description": "A spicy pickled veggie made of variable ingredients. Before the Cataclysm, it was traditionally stored in a dedicated refrigerator, but it's actually a preserved food.", + "price": "2 USD", + "material": "veggy", + "charges": 4, + "vitamins": [ [ "vitC", 48 ], [ "calcium", 7 ], [ "iron", 2 ] ], + "fun": 2 + }, + { + "type": "COMESTIBLE", + "id": "kimchi_raw", + "name": { "str_sp": "unfermented kimchi" }, + "copy-from": "kimchi", + "description": "A spicy, seasoned vegetable that takes on a more complex flavor when fermented. Traditionally, they are fermented in large clay pots.", + "quench": 1, + "healthy": 1, + "fun": 1 + }, + { + "type": "COMESTIBLE", + "id": "buchimgae_veggy", + "name": { "str": "buchimgae" }, + "conditional_names": [ { "type": "COMPONENT_ID", "condition": "kimchi", "name": "kimchi %s" } ], + "description": "A Korean vegetable fritter made by coating ingredients in a light egg batter and pan-frying them into a thin, savory pancake.", + "weight": "100 g", + "volume": "250 ml", + "color": "yellow", + "symbol": "%", + "calories": 361, + "quench": -2, + "comestible_type": "FOOD", + "spoils_in": "2 days 12 hours", + "price": "3 USD", + "price_postapoc": "5 USD", + "fun": 12, + "flags": [ "EATEN_HOT" ] + }, + { + "id": "tofu_kimchi", + "type": "COMESTIBLE", + "name": { "str_sp": "tofu kimchi" }, + "description": "Soft, boiled tofu served with spicy, stir-fried kimchi. The mild tofu complements the bold flavors of the kimchi for a balanced taste.", + "material": "veggy", + "weight": "160 g", + "volume": "180 ml", + "color": "white", + "symbol": "%", + "looks_like": "tofu_stirfry", + "spoils_in": "1 day", + "healthy": 2, + "calories": 180, + "charges": 2, + "fun": 6, + "comestible_type": "FOOD", + "flags": [ "EATEN_HOT" ] } ] diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index b48f0fd19ad3..07ee57cd51d9 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -702,5 +702,22 @@ "price_postapoc": "5 USD", "fun": 15, "use_action": "WEED_CAKE" + }, + { + "id": "noodles_kimchi", + "type": "COMESTIBLE", + "name": { "str_sp": "kimchimari guksu" }, + "description": "Noodles served chilled with kimchi. The cold but spicy flavor brings a unique refreshment.", + "material": [ "wheat", "veggy" ], + "comestible_type": "FOOD", + "weight": "300 g", + "volume": "350 ml", + "spoils_in": "18 hours", + "symbol": "%", + "color": "light_red", + "calories": 300, + "quench": 4, + "fun": 6, + "flags": [ "EATEN_COLD" ] } ] diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 2bacb3bd4738..ff0681c1a9a3 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -1079,5 +1079,31 @@ ] ], "magazine_well": "250 ml" + }, + { + "type": "GENERIC", + "id": "kimchi_hydria", + "name": { "str": "kimchi gimjangdok" }, + "category": "food", + "description": "A dok, or clay jar, in which kimchi is stored for the winter. Traditionally, this is buried in the ground, but it doesn't matter if you leave it above ground; just close the lid and wait for it to ferment, and you'll have delicious kimchi.", + "weight": "13 kg", + "volume": "15 L", + "material": [ "clay", "veggy" ], + "price": "10 cent", + "looks_like": "clay_hydria", + "color": "brown", + "symbol": ")", + "use_action": { + "type": "delayed_transform", + "target": "kimchi", + "target_charges": 400, + "container": "clay_hydria", + "moves": 50, + "transform_age": 86400, + "menu_text": "Open dok", + "msg": "You lift the lid and the smell of tangy, spicy, ripe kimchi makes you salivate.", + "not_ready_msg": "This kimchi is not done fermenting yet." + }, + "flags": [ "SHATTERS" ] } ] diff --git a/data/json/recipes/food/meat.json b/data/json/recipes/food/meat.json index 317cb1f9788c..ba1fe93ff2ce 100644 --- a/data/json/recipes/food/meat.json +++ b/data/json/recipes/food/meat.json @@ -3135,5 +3135,44 @@ [ [ "gochujang", 24 ] ], [ [ "vinegar", 2 ] ] ] + }, + { + "type": "recipe", + "result": "samhap", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 5, + "book_learn": [ [ "cookbook_sushi", 4 ] ], + "time": "30 m", + "autolearn": true, + "charges": 3, + "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "meat_red", 1, "LIST" ] ], + [ [ "seasoning_mild", 2, "LIST" ] ], + [ [ "water", 1 ], [ "water_clean", 1 ] ], + [ [ "fish", 1 ] ], + [ [ "vinegar", 1 ], [ "soysauce", 1 ] ], + [ [ "kimchi", 3 ], [ "kimchi_raw", 3 ] ] + ] + }, + { + "type": "recipe", + "result": "bossam", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 4, + "autolearn": true, + "time": "30 m", + "charges": 2, + "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "meat_red", 1, "LIST" ] ], + [ [ "seasoning_mild", 2, "LIST" ] ], + [ [ "water", 1 ], [ "water_clean", 1 ] ], + [ [ "kimchi", 3 ], [ "kimchi_raw", 3 ] ] + ] } ] diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 8fb81798b86e..4c8d2c4cdd93 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -2265,5 +2265,33 @@ [ [ "garlic_clove", 3 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] + }, + { + "type": "recipe", + "result": "deluxe_rice_kimchi", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 3, + "time": "15 m", + "autolearn": true, + "batch_time_factors": [ 80, 1 ], + "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], + "components": [ + [ [ "rice_cooked", 1 ], [ "dry_rice", 1 ] ], + [ [ "kimchi", 2 ], [ "kimchi_raw", 2 ] ], + [ [ "veggy_any", 1, "LIST" ] ], + [ + [ "meat_sausage_cooked", 1, "LIST" ], + [ "meat_sausage_raw", 1, "LIST" ], + [ "fish", 1 ], + [ "fishs_cooked", 1, "LIST" ], + [ "bacon", 2 ], + [ "cracklins", 2 ], + [ "eggs_small_dry", 2, "LIST" ] + ], + [ [ "any_butter_or_oil", 1, "LIST" ] ] + ] } ] diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json index a61c52a8cdf9..bfc6867aae56 100644 --- a/data/json/recipes/food/pasta.json +++ b/data/json/recipes/food/pasta.json @@ -189,5 +189,26 @@ [ [ "cheese_any", 2, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] + }, + { + "result": "noodles_kimchi", + "type": "recipe", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_PASTA", + "skill_used": "cooking", + "difficulty": 3, + "time": "10 m", + "batch_time_factors": [ 80, 5 ], + "autolearn": true, + "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], + "components": [ + [ [ "spaghetti_raw", 1 ], [ "noodles_fast", 1 ] ], + [ [ "kimchi", 2 ] ], + [ [ "water_clean", 1 ], [ "broth", 1 ] ], + [ [ "mushroom", 1 ], [ "mushroom_morel", 1 ], [ "veggy_any_fresh_uncooked", 1, "LIST" ] ], + [ [ "vinegar", 1 ] ], + [ [ "sugar", 1 ] ] + ] } ] diff --git a/data/json/recipes/food/veggi.json b/data/json/recipes/food/veggi.json index 8feb8cbdfefe..d3ad46cecb23 100644 --- a/data/json/recipes/food/veggi.json +++ b/data/json/recipes/food/veggi.json @@ -2487,5 +2487,87 @@ ], [ [ "sausage_casings_plastic", 1 ] ] ] + }, + { + "type": "recipe", + "result": "kimchi_raw", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "difficulty": 4, + "time": "30 m", + "charges": 4, + "book_learn": [ [ "cookbook_sushi", 3 ] ], + "batch_time_factors": [ 80, 1 ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "veggy_any_uncooked", 4, "LIST" ] ], + [ [ "salt", 4 ] ], + [ [ "chilly-p", 4 ] ], + [ + [ "garlic_clove", 1 ], + [ "sugar", 4 ], + [ "soysauce", 4 ], + [ "vinegar", 4 ], + [ "fish", 1 ], + [ "offals_raw", 1, "LIST" ] + ] + ] + }, + { + "type": "recipe", + "result": "kimchi_hydria", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "difficulty": 3, + "time": "15 m", + "book_learn": [ [ "cookbook_sushi", 3 ] ], + "components": [ [ [ "kimchi_raw", 400 ] ], [ [ "clay_hydria", 1 ] ], [ [ "salt_water", 12 ] ] ] + }, + { + "type": "recipe", + "result": "buchimgae_veggy", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "autolearn": true, + "difficulty": 4, + "time": "18 m", + "batch_time_factors": [ 80, 5 ], + "book_learn": [ [ "cookbook_sushi", 3 ] ], + "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], + "components": [ + [ [ "veggy_any_uncooked", 4, "LIST" ], [ "kimchi", 4 ], [ "kimchi_raw", 4 ] ], + [ [ "batter", 2, "LIST" ] ], + [ [ "eggs_small_dry", 1, "LIST" ] ], + [ [ "fry_oil", 2, "LIST" ] ], + [ [ "seasoning_mild", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "result": "tofu_kimchi", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_VEGGI", + "skill_used": "cooking", + "difficulty": 3, + "time": "15 m", + "batch_time_factors": [ 80, 1 ], + "book_learn": [ [ "cookbook_sushi", 3 ] ], + "qualities": [ + { "id": "COOK", "level": 2 }, + { "id": "CUT", "level": 1 }, + { "id": "BOIL", "level": 2 }, + { "id": "CONTAIN", "level": 1 } + ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], + "components": [ + [ [ "kimchi", 3 ], [ "kimchi_raw", 3 ] ], + [ [ "any_butter_or_oil", 1, "LIST" ] ], + [ [ "tofu", 1 ] ], + [ [ "water", 1 ], [ "water_clean", 1 ] ] + ] } ]