From 4a375b7abf5bfdd4d111b1acfbbabde28df62f5d Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:06:03 -0500 Subject: [PATCH 01/15] Rice farming! Added rice seeds, rice bran, sake, sikhye. --- data/json/itemgroups/Food/food.json | 6 +++-- data/json/items/comestibles/alcohol.json | 27 ++++++++++++++++++++++ data/json/items/comestibles/brewing.json | 21 +++++++++++++++++ data/json/items/comestibles/drink.json | 23 ++++++++++++++++++ data/json/items/comestibles/raw_veggy.json | 19 +++++++++++++++ data/json/items/comestibles/seed.json | 16 +++++++++++++ data/json/recipes/food/brew.json | 23 ++++++++++++++++++ data/json/recipes/food/drinks.json | 18 +++++++++++++++ data/json/recipes/food/other.json | 23 +++++++++++++++++- 9 files changed, 173 insertions(+), 3 deletions(-) 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..f9e717bda676 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -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_COLD" ], + "fun": 2 } ] 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..966c4300aa35 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1181,5 +1181,28 @@ "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, + "description": "A traditional Korean beverage made from rice, often served as a dessert or a digestive aid. It's tastiest when wearing a scarf.", + "price": "85 cent", + "price_postapoc": "25 cent", + "material": "veggy", + "primary_material": "water", + "volume": "250 ml", + "phase": "liquid", + "flags": [ "EATEN_HOT" ], + "fun": 2 } ] diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 38254f66df58..5c95ecc5f9b7 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -932,5 +932,24 @@ "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", "str_pl": "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" ], + "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..1164be68bed5 100644 --- a/data/json/recipes/food/brew.json +++ b/data/json/recipes/food/brew.json @@ -374,5 +374,28 @@ [ "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..2af5390bd144 100644 --- a/data/json/recipes/food/drinks.json +++ b/data/json/recipes/food/drinks.json @@ -1298,5 +1298,23 @@ "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..c3910ba824fa 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 ] ] ] }, @@ -2184,5 +2185,25 @@ "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 ] + ] + ] } ] From f4c1986e6c3f6ee8be1cfa0993fc613f867b023c Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 02:10:58 +0000 Subject: [PATCH 02/15] style(autofix.ci): automated formatting --- data/json/recipes/food/brew.json | 5 +---- data/json/recipes/food/drinks.json | 6 +----- data/json/recipes/food/other.json | 6 +----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/data/json/recipes/food/brew.json b/data/json/recipes/food/brew.json index 1164be68bed5..c55067ef6d89 100644 --- a/data/json/recipes/food/brew.json +++ b/data/json/recipes/food/brew.json @@ -386,10 +386,7 @@ "time": "80 m", "batch_time_factors": [ 50, 4 ], "autolearn": [ [ "cooking", 6 ] ], - "book_learn": [ - [ "brewing_cookbook", 3 ], - [ "winemaking_beginner", 3 ] - ], + "book_learn": [ [ "brewing_cookbook", 3 ], [ "winemaking_beginner", 3 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], diff --git a/data/json/recipes/food/drinks.json b/data/json/recipes/food/drinks.json index 2af5390bd144..2cbc6457945d 100644 --- a/data/json/recipes/food/drinks.json +++ b/data/json/recipes/food/drinks.json @@ -1311,10 +1311,6 @@ "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 ] ] - ] + "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 c3910ba824fa..fff75ed1da4e 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -2200,10 +2200,6 @@ "byproducts": [ [ "rice_bran", 1 ] ], "qualities": [ { "id": "COOK", "level": 2 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ - [ - [ "seed_rice", 1 ] - ] - ] + "components": [ [ [ "seed_rice", 1 ] ] ] } ] From d2834ac869eebfa9194fa26d4f7563b8db2b90bb Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:14:40 -0500 Subject: [PATCH 03/15] Update data/json/items/comestibles/drink.json lol, sorry~ Co-authored-by: scarf --- data/json/items/comestibles/drink.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 966c4300aa35..d6d1833d0867 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1195,7 +1195,7 @@ "quench": 35, "healthy": 2, "calories": 120, - "description": "A traditional Korean beverage made from rice, often served as a dessert or a digestive aid. It's tastiest when wearing a scarf.", + "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", From 31f35414ca1b87788ce15c22c0214c3f8bac70e5 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:15:19 -0500 Subject: [PATCH 04/15] Update data/json/items/comestibles/drink.json Co-authored-by: scarf --- data/json/items/comestibles/drink.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index d6d1833d0867..fe97f9648b67 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1202,7 +1202,7 @@ "primary_material": "water", "volume": "250 ml", "phase": "liquid", - "flags": [ "EATEN_HOT" ], + "flags": [ "EATEN_COLD" ], "fun": 2 } ] From e17bcbe39c968a6e5d5ae5479f3dacffea78215e Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:20:02 -0500 Subject: [PATCH 05/15] Fun bump Increased fun value of sake, and of fruit wine. --- data/json/items/comestibles/alcohol.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index f9e717bda676..403ff40fe340 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", @@ -1371,6 +1371,6 @@ "phase": "liquid", "charges": 7, "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ], - "fun": 2 + "fun": 20 } ] From a42a56a18fc4e61b000c83cc92d5c368d9c16056 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:23:13 -0500 Subject: [PATCH 06/15] Update data/json/items/comestibles/drink.json Co-authored-by: scarf --- data/json/items/comestibles/drink.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index fe97f9648b67..a11bc6a31da7 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1203,6 +1203,6 @@ "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 2 + "fun": 3 } ] From 2a567a6a6a2262417c2df495e7f97d9eb0064942 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:34:42 -0500 Subject: [PATCH 07/15] Rice bran name fix --- data/json/items/comestibles/raw_veggy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 5c95ecc5f9b7..28c3eccd1dbf 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -936,7 +936,7 @@ { "type": "COMESTIBLE", "id": "rice_bran", - "name": { "str": "rice bran", "str_pl": "rice bran" }, + "name": { "str": "rice bran" }, "weight": "210 g", "color": "brown", "comestible_type": "FOOD", From c5a8bcbf52d54e5f3b36ebd84a5d3a02e7f98006 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:44:37 -0500 Subject: [PATCH 08/15] Added wild rice foraging Made it possible to forage wild rice from shrubs in the summer, since that's when they grow IRL. --- .../Agriculture_Forage_Excavation/forage.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index 82e17120408a..a673edb672fe 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -16,7 +16,8 @@ { "group": "forage_carrot_wild", "prob": 5 }, { "group": "forage_bee_balm", "prob": 5 }, { "group": "forage_mugwort", "prob": 5 }, - { "group": "forage_salsify_raw", "prob": 5 } + { "group": "forage_salsify_raw", "prob": 5 }, + ] }, { @@ -37,7 +38,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 +174,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": "seed_rice", "prob": 10, "charges": [ 1, 3 ] } ] } ] From 100185e15016ccdcc33fd1f318b26e2042c2038f Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:50:47 -0500 Subject: [PATCH 09/15] Extra comma! --- data/json/itemgroups/Agriculture_Forage_Excavation/forage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index a673edb672fe..b7ed96199ac1 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -16,7 +16,7 @@ { "group": "forage_carrot_wild", "prob": 5 }, { "group": "forage_bee_balm", "prob": 5 }, { "group": "forage_mugwort", "prob": 5 }, - { "group": "forage_salsify_raw", "prob": 5 }, + { "group": "forage_salsify_raw", "prob": 5 } ] }, From caf9834157cd151b08f8d77f4fe885e36bd26aea Mon Sep 17 00:00:00 2001 From: Chorus System Date: Wed, 17 Jan 2024 21:51:20 -0500 Subject: [PATCH 10/15] Sikhye charges --- data/json/items/comestibles/drink.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index a11bc6a31da7..ef598de18b7b 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1195,6 +1195,7 @@ "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", From fa68686e860f46475b53f3a40d9b4ab7ca53b565 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 02:52:08 +0000 Subject: [PATCH 11/15] style(autofix.ci): automated formatting --- data/json/itemgroups/Agriculture_Forage_Excavation/forage.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index b7ed96199ac1..b53a2edf4320 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -17,7 +17,6 @@ { "group": "forage_bee_balm", "prob": 5 }, { "group": "forage_mugwort", "prob": 5 }, { "group": "forage_salsify_raw", "prob": 5 } - ] }, { From 0cc552663d6101d1666c4e28d9d4f6f8a08457cb Mon Sep 17 00:00:00 2001 From: Chorus System Date: Thu, 18 Jan 2024 17:12:44 -0500 Subject: [PATCH 12/15] 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. --- data/json/items/comestibles/raw_veggy.json | 1 + data/json/recipes/food/other.json | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 28c3eccd1dbf..d3161e55e87f 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -950,6 +950,7 @@ "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/recipes/food/other.json b/data/json/recipes/food/other.json index fff75ed1da4e..5e23069db8af 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -962,7 +962,8 @@ [ "acorns_cooked", 2 ], [ "oats", 4 ], [ "starch", 1 ], - [ "dry_rice", 5 ] + [ "dry_rice", 5 ], + [ "rice_bran", 5 ] ] ] }, @@ -1159,7 +1160,8 @@ [ "acorns_cooked", 2 ], [ "oats", 4 ], [ "starch", 1 ], - [ "dry_rice", 5 ] + [ "dry_rice", 5 ], + [ "rice_bran", 5 ] ] ] }, @@ -1211,7 +1213,8 @@ [ "raw_beans", 5 ], [ "cabbage", 5 ], [ "veggy_wild", 5 ], - [ "veggy", 5 ] + [ "veggy", 5 ], + [ "rice_brain", 5 ] ] ] }, @@ -1296,6 +1299,8 @@ [ "sourdough_bread", 1 ], [ "hardtack", 1 ], [ "crackers", 1 ], + [ "seed_rice", 1 ], + [ "rice_bran", 1 ], [ "brioche", 1 ] ] ] From 1ac058468b1974ac42441b9cce53bde192cade07 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Thu, 18 Jan 2024 17:28:02 -0500 Subject: [PATCH 13/15] Removed rice brain --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 5e23069db8af..ed4cdee01180 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -1214,7 +1214,7 @@ [ "cabbage", 5 ], [ "veggy_wild", 5 ], [ "veggy", 5 ], - [ "rice_brain", 5 ] + [ "rice_bran", 5 ] ] ] }, From 14383eb97cacdf7b8f13b195e8c9c24560a8ab3b Mon Sep 17 00:00:00 2001 From: Chorus System Date: Fri, 19 Jan 2024 11:43:43 -0500 Subject: [PATCH 14/15] 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> --- data/json/items/comestibles/alcohol.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index 403ff40fe340..f6a31ebcfda0 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -1370,7 +1370,7 @@ "volume": "250 ml", "phase": "liquid", "charges": 7, - "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ], + "flags": [ "UNSAFE_CONSUME", "EATEN_HOT", "EATEN_COLD" ], "fun": 20 } ] From 0adaa35c39f2c5bc2cd0b260b1d55248b6ea877e Mon Sep 17 00:00:00 2001 From: Chorus System Date: Fri, 19 Jan 2024 14:12:45 -0500 Subject: [PATCH 15/15] Update data/json/itemgroups/Agriculture_Forage_Excavation/forage.json Co-authored-by: Chaosvolt --- data/json/itemgroups/Agriculture_Forage_Excavation/forage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index b53a2edf4320..b7353b400874 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -178,6 +178,6 @@ "id": "forage_wildrice", "type": "item_group", "subtype": "collection", - "entries": [ { "item": "seed_rice", "prob": 10, "charges": [ 1, 3 ] } ] + "entries": [ { "item": "straw_pile", "prob": 25, "count": [ 4, 6 ] }, { "item": "seed_rice", "charges": [ 1, 3 ] } ] } ]