From ed1f287b503ccee2e01895015c1c87e5f8fcf643 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Fri, 19 Jan 2024 15:05:18 -0500 Subject: [PATCH] feat(content): rice farming, rice bran, sake, sikhye (#4120) * Rice farming! Added rice seeds, rice bran, sake, sikhye. * style(autofix.ci): automated formatting * Update data/json/items/comestibles/drink.json lol, sorry~ Co-authored-by: scarf * Update data/json/items/comestibles/drink.json Co-authored-by: scarf * Fun bump Increased fun value of sake, and of fruit wine. * Update data/json/items/comestibles/drink.json Co-authored-by: scarf * Rice bran name fix * Added wild rice foraging Made it possible to forage wild rice from shrubs in the summer, since that's when they grow IRL. * Extra comma! * Sikhye charges * style(autofix.ci): automated formatting * Rice bran flour, bird feed, cattle feed Made rice seeds able to be made into bird feed, rice bran able to be made into bird feed, cattle feed, and flour. * Removed rice brain * Update data/json/items/comestibles/alcohol.json Alright, I'll try the eaten_hot and eaten_cold flags together. Co-authored-by: NappingOcean <129575271+NappingOcean@users.noreply.github.com> * Update data/json/itemgroups/Agriculture_Forage_Excavation/forage.json Co-authored-by: Chaosvolt --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: scarf Co-authored-by: NappingOcean <129575271+NappingOcean@users.noreply.github.com> Co-authored-by: Chaosvolt --- .../Agriculture_Forage_Excavation/forage.json | 9 +++++- data/json/itemgroups/Food/food.json | 6 ++-- data/json/items/comestibles/alcohol.json | 29 +++++++++++++++++- data/json/items/comestibles/brewing.json | 21 +++++++++++++ data/json/items/comestibles/drink.json | 24 +++++++++++++++ data/json/items/comestibles/raw_veggy.json | 20 +++++++++++++ data/json/items/comestibles/seed.json | 16 ++++++++++ data/json/recipes/food/brew.json | 20 +++++++++++++ data/json/recipes/food/drinks.json | 14 +++++++++ data/json/recipes/food/other.json | 30 ++++++++++++++++--- 10 files changed, 181 insertions(+), 8 deletions(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index 82e17120408a..b7353b400874 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -37,7 +37,8 @@ { "group": "forage_dogbane", "prob": 10 }, { "group": "forage_bee_balm", "prob": 10 }, { "group": "forage_mugwort", "prob": 10 }, - { "group": "forage_salsify_raw", "prob": 5 } + { "group": "forage_salsify_raw", "prob": 5 }, + { "group": "forage_wildrice", "prob": 10 } ] }, { @@ -172,5 +173,11 @@ "type": "item_group", "subtype": "collection", "entries": [ { "item": "seed_salsify_raw", "prob": 10, "charges": [ 1, 2 ] }, { "item": "salsify_raw", "count": [ 1, 3 ] } ] + }, + { + "id": "forage_wildrice", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "straw_pile", "prob": 25, "count": [ 4, 6 ] }, { "item": "seed_rice", "charges": [ 1, 3 ] } ] } ] diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 8fc973e813b2..d9feb876db1e 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -804,7 +804,8 @@ { "item": "wine_cabernet", "prob": 30 }, { "item": "wine_noir", "prob": 20 }, { "item": "wine_vermouth", "prob": 25 }, - { "item": "wine_marsala", "prob": 15 } + { "item": "wine_marsala", "prob": 15 }, + { "item": "sake", "prob": 5 } ] }, { @@ -822,7 +823,8 @@ { "item": "single_malt_whiskey", "prob": 2 }, { "item": "single_pot_whiskey", "prob": 10 }, { "item": "cheap_whiskey", "prob": 10 }, - { "item": "canadian_whiskey", "prob": 10 } + { "item": "canadian_whiskey", "prob": 10 }, + { "item": "sake", "prob": 4 } ] }, { diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index c5e411775e41..f6a31ebcfda0 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -469,7 +469,7 @@ "phase": "liquid", "charges": 7, "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ], - "fun": 2 + "fun": 20 }, { "type": "COMESTIBLE", @@ -1345,5 +1345,32 @@ "phase": "liquid", "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ], "fun": 20 + }, + { + "type": "COMESTIBLE", + "id": "sake", + "name": { "str_sp": "sake" }, + "weight": "36 g", + "color": "light_red", + "addiction_type": "alcohol", + "use_action": "ALCOHOL", + "stim": -4, + "container": "bottle_glass", + "comestible_type": "DRINK", + "symbol": "~", + "quench": 10, + "healthy": -2, + "addiction_potential": 4, + "calories": 204, + "description": "The traditional alcohol of Japan, this wine is made from rice.", + "price": "550 cent", + "price_postapoc": "1 USD", + "material": [ "alcohol", "water" ], + "primary_material": "alcohol", + "volume": "250 ml", + "phase": "liquid", + "charges": 7, + "flags": [ "UNSAFE_CONSUME", "EATEN_HOT", "EATEN_COLD" ], + "fun": 20 } ] diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index bacabd042682..75715917fde3 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -398,5 +398,26 @@ "comestible_type": "DRINK", "flags": [ "NUTRIENT_OVERRIDE" ], "brewable": { "time": "7 hours", "results": [ "vinegar" ] } + }, + { + "type": "COMESTIBLE", + "id": "brew_sake", + "name": "sake must", + "description": "Unfermented sake, made from rice.", + "weight": "46 g", + "color": "light_red", + "container": "bottle_glass", + "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ], + "symbol": "~", + "calories": 17, + "quench": 6, + "fun": -5, + "price": "0 cent", + "volume": "250 ml", + "price_postapoc": "10 cent", + "charges": 7, + "phase": "liquid", + "comestible_type": "DRINK", + "brewable": { "time": "12 hours", "results": [ "sake", "yeast" ] } } ] diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 48748a2a2685..ef598de18b7b 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1181,5 +1181,29 @@ "price_postapoc": "110 cent", "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] }, "fun": 15 + }, + { + "type": "COMESTIBLE", + "id": "sikhye", + "name": { "str_sp": "sikhye" }, + "weight": "263 g", + "color": "brown", + "spoils_in": "6 days", + "container": "bottle_plastic", + "comestible_type": "DRINK", + "symbol": "~", + "quench": 35, + "healthy": 2, + "calories": 120, + "charges": 8, + "description": "A traditional Korean beverage made from rice, often served as a dessert or a digestive aid.", + "price": "85 cent", + "price_postapoc": "25 cent", + "material": "veggy", + "primary_material": "water", + "volume": "250 ml", + "phase": "liquid", + "flags": [ "EATEN_COLD" ], + "fun": 3 } ] diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 38254f66df58..d3161e55e87f 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -932,5 +932,25 @@ "healthy": -2, "//": "Fiddleheads that haven't been boiled can make you sick.", "vitamins": [ [ "vitC", 6 ], [ "vitA", 10 ], [ "calcium", 4 ] ] + }, + { + "type": "COMESTIBLE", + "id": "rice_bran", + "name": { "str": "rice bran" }, + "weight": "210 g", + "color": "brown", + "comestible_type": "FOOD", + "symbol": "%", + "healthy": -2, + "calories": 333, + "description": "The leftover outer layer of rice seeds, this vegetable matter is quite nutritionally dense and makes for a good cooking oil.", + "price": "90 cent", + "price_postapoc": "50 cent", + "material": "veggy", + "volume": "250 ml", + "fun": -3, + "flags": [ "RAW" ], + "milling": { "into": "flour", "conversion_rate": 5 }, + "vitamins": [ [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 9 ] ] } ] diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index a3b7cd29873b..ce8c1378c40e 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -784,5 +784,21 @@ "price": "1 USD", "charges": 2, "seed_data": { "plant_name": "mustard", "fruit": "seed_mustard", "byproducts": [ "withered" ], "grow": "14 days" } + }, + { + "type": "COMESTIBLE", + "id": "seed_rice", + "copy-from": "seed", + "name": { "str_sp": "raw wild rice" }, + "color": "green", + "looks_like": "dry_rice", + "description": "Some northern wild rice, ready for planting or drying. Must be planted in shallow water.", + "seed_data": { + "plant_name": "rice", + "fruit": "seed_rice", + "byproducts": [ "straw_pile" ], + "grow": "14 days", + "required_terrain_flag": "SHALLOW_WATER" + } } ] diff --git a/data/json/recipes/food/brew.json b/data/json/recipes/food/brew.json index 9f38e8b90edb..c55067ef6d89 100644 --- a/data/json/recipes/food/brew.json +++ b/data/json/recipes/food/brew.json @@ -374,5 +374,25 @@ [ "wild_herbs", 40 ] ] ] + }, + { + "type": "recipe", + "result": "brew_sake", + "result_mult": 3, + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_BREW", + "skill_used": "cooking", + "difficulty": 3, + "time": "80 m", + "batch_time_factors": [ 50, 4 ], + "autolearn": [ [ "cooking", 6 ] ], + "book_learn": [ [ "brewing_cookbook", 3 ], [ "winemaking_beginner", 3 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], + "components": [ + [ [ "water", 3 ], [ "water_clean", 3 ] ], + [ [ "dry_rice", 3 ] ], + [ [ "sugar", 10 ], [ "honeycomb", 1 ], [ "honey_bottled", 2 ], [ "honey_glassed", 4 ], [ "syrup", 2 ] ], + [ [ "yeast", 1 ] ] + ] } ] diff --git a/data/json/recipes/food/drinks.json b/data/json/recipes/food/drinks.json index e413963ccf88..2cbc6457945d 100644 --- a/data/json/recipes/food/drinks.json +++ b/data/json/recipes/food/drinks.json @@ -1298,5 +1298,19 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "water_boiling_heat", 1, "LIST" ] ] ], "components": [ [ [ "sewage", 1 ] ], [ [ "hard_liquor_chem", 1, "LIST" ] ] ] + }, + { + "type": "recipe", + "result": "sikhye", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_DRINKS", + "skill_used": "cooking", + "difficulty": 3, + "time": "10 m", + "autolearn": true, + "batch_time_factors": [ 80, 5 ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], + "components": [ [ [ "dry_rice", 1 ] ], [ [ "barley", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] } ] diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index d02ad7e8a599..ed4cdee01180 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -148,7 +148,8 @@ [ "seed_sunflower", 2 ], [ "seed_canola", 4 ], [ "seed_grapes", 6 ], - [ "seed_weed", 6 ] + [ "seed_weed", 6 ], + [ "rice_bran", 6 ] ] ] }, @@ -961,7 +962,8 @@ [ "acorns_cooked", 2 ], [ "oats", 4 ], [ "starch", 1 ], - [ "dry_rice", 5 ] + [ "dry_rice", 5 ], + [ "rice_bran", 5 ] ] ] }, @@ -1158,7 +1160,8 @@ [ "acorns_cooked", 2 ], [ "oats", 4 ], [ "starch", 1 ], - [ "dry_rice", 5 ] + [ "dry_rice", 5 ], + [ "rice_bran", 5 ] ] ] }, @@ -1210,7 +1213,8 @@ [ "raw_beans", 5 ], [ "cabbage", 5 ], [ "veggy_wild", 5 ], - [ "veggy", 5 ] + [ "veggy", 5 ], + [ "rice_bran", 5 ] ] ] }, @@ -1295,6 +1299,8 @@ [ "sourdough_bread", 1 ], [ "hardtack", 1 ], [ "crackers", 1 ], + [ "seed_rice", 1 ], + [ "rice_bran", 1 ], [ "brioche", 1 ] ] ] @@ -2184,5 +2190,21 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "eggs_small_dry", 2, "LIST" ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "potato", 1 ] ] ] + }, + { + "type": "recipe", + "result": "dry_rice", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 4, + "charges": 1, + "time": "20 m", + "autolearn": true, + "batch_time_factors": [ 80, 5 ], + "byproducts": [ [ "rice_bran", 1 ] ], + "qualities": [ { "id": "COOK", "level": 2 }, { "id": "HAMMER", "level": 1 } ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], + "components": [ [ [ "seed_rice", 1 ] ] ] } ]