Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(content): rice farming, rice bran, sake, sikhye #4120

Merged
merged 16 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
{
Expand All @@ -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 }
]
},
{
Expand Down
29 changes: 28 additions & 1 deletion data/json/items/comestibles/alcohol.json
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
"phase": "liquid",
"charges": 7,
"flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
"fun": 2
"fun": 20
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -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" ],
yay855 marked this conversation as resolved.
Show resolved Hide resolved
"fun": 20
}
]
21 changes: 21 additions & 0 deletions data/json/items/comestibles/brewing.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] }
}
]
23 changes: 23 additions & 0 deletions data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
"price": "85 cent",
"price_postapoc": "25 cent",
"material": "veggy",
"primary_material": "water",
"volume": "250 ml",
"phase": "liquid",
"flags": [ "EATEN_COLD" ],
"fun": 3
}
]
19 changes: 19 additions & 0 deletions data/json/items/comestibles/raw_veggy.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
"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 ] ]
}
]
16 changes: 16 additions & 0 deletions data/json/items/comestibles/seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
20 changes: 20 additions & 0 deletions data/json/recipes/food/brew.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
]
}
]
14 changes: 14 additions & 0 deletions data/json/recipes/food/drinks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
}
]
19 changes: 18 additions & 1 deletion data/json/recipes/food/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@
[ "seed_sunflower", 2 ],
[ "seed_canola", 4 ],
[ "seed_grapes", 6 ],
[ "seed_weed", 6 ]
[ "seed_weed", 6 ],
[ "rice_bran", 6 ]
]
]
},
Expand Down Expand Up @@ -2184,5 +2185,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 ] ] ]
}
]
Loading