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

add hobblebush and autumn olive #78227

Merged
merged 5 commits into from
Nov 29, 2024
Merged
Changes from 1 commit
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
Next Next commit
add hobblebush, add missing conditionals for recently added native fr…
…uits
NetSysFire committed Nov 29, 2024
commit 48f77e8e37c0ce3fe0d79cdb5e39e92a747cb388
53 changes: 53 additions & 0 deletions data/json/furniture_and_terrain/terrain-flora.json
Original file line number Diff line number Diff line change
@@ -2230,6 +2230,59 @@
]
}
},
{
"type": "terrain",
"id": "t_shrub_hobblebush",
"name": "hobblebush",
"looks_like": "t_shrub",
"description": "Called hobblebush because it may hinder and trip, hobbles, unwary hikers with its branches bending over and taking root. It also bears surprisingly sweet berries in autumn.",
"symbol": "#",
"color": "light_blue_green",
"move_cost": 9,
"coverage": 40,
"flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "SMALL_HIDE", "BROWSABLE" ],
"transforms_into": "t_shrub_hobblebush_harvested",
"examine_action": "harvest_ter_nectar",
"harvest_by_season": [ { "seasons": [ "autumn" ], "id": "shrub_hobblebush_harv" } ],
"bash": {
"str_min": 4,
"str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [ 1, 2 ] },
{ "item": "leaves", "count": [ 1, 10 ] },
{ "item": "twig", "prob": 80, "count": [ 1, 5 ] }
]
}
},
{
"type": "terrain",
"id": "t_shrub_hobblebush_harvested",
"name": "hobblebush",
"looks_like": "t_shrub",
"description": "Called hobblebush because it may hinder and trip, hobbles, unwary hikers with its branches bending over and taking root. It also bears surprisingly sweet berries in autumn, if it hadn't been picked clean already.",
"symbol": "#",
"color": "blue_green",
"move_cost": 9,
"coverage": 40,
"flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "HARVESTED", "SMALL_HIDE" ],
"transforms_into": "t_shrub_hobblebush",
"examine_action": "harvested_plant",
"bash": {
"str_min": 4,
"str_max": 60,
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [
{ "item": "withered", "prob": 50, "count": [ 1, 2 ] },
{ "item": "leaves", "count": [ 1, 10 ] },
{ "item": "twig", "prob": 80, "count": [ 1, 5 ] }
]
}
},
{
"type": "terrain",
"id": "t_shrub_blueberry",
5 changes: 5 additions & 0 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
@@ -210,6 +210,11 @@
"type": "harvest",
"entries": [ { "drop": "blueberries", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ]
},
{
"id": "shrub_hobblebush_harv",
"type": "harvest",
"entries": [ { "drop": "hobbleberries", "base_num": [ 1, 2 ], "scale_num": [ 0, 0.5 ] } ]
},
{
"id": "shrub_peanut_harv",
"type": "harvest",
26 changes: 26 additions & 0 deletions data/json/items/comestibles/fruit_dishes.json

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions data/json/items/comestibles/raw_fruit.json
Original file line number Diff line number Diff line change
@@ -124,6 +124,15 @@
"smoking_result": "dry_fruit",
"vitamins": [ [ "vitC", "14400 μg" ], [ "iron", "400 μg" ], [ "calcium", "8900 μg" ], [ "fruit_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
"id": "hobbleberries",
"name": { "str": "handful of hobbleberries", "str_pl": "handfuls of hobbleberries" },
"copy-from": "blueberries",
"color": "black",
"description": "Some black hobbleberries. They are quite sweet. Before they ripened, they were red and utterly bitter.",
"fun": 3
},
{
"type": "COMESTIBLE",
"id": "strawberries",
1 change: 1 addition & 0 deletions data/json/mapgen_palettes/stream.json
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
[ "t_null", 100 ],
[ "t_sand", 1 ],
[ "t_shrub_spicebush", 10 ],
[ "t_shrub_hobblebush", 10 ],
[ "t_clay", 4 ],
[ "t_grass_long", 900 ],
[ "t_region_shrub_forest", 20 ],
4 changes: 4 additions & 0 deletions data/json/regional_map_settings.json
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@
"t_underbrush": 30,
"t_shrub": 10,
"t_fern": 5,
"t_shrub_hobblebush": 2,
"t_shrub_blueberry": 2,
"t_shrub_raspberry": 2,
"t_shrub_huckleberry": 2,
@@ -58,6 +59,7 @@
},
"t_region_shrub_swamp": {
"t_fern": 2,
"t_shrub_hobblebush": 2,
"t_shrub_raspberry": 2,
"t_shrub_chokeberry": 2,
"t_shrub_blueberry": 2,
@@ -70,6 +72,7 @@
"t_shrub_strawberry": 6,
"t_shrub_raspberry": 4,
"t_shrub_grape": 4,
"t_shrub_hobblebush": 2,
"t_shrub_blackberry": 2,
"t_shrub_huckleberry": 2,
"t_shrub_peanut": 1
@@ -82,6 +85,7 @@
"t_shrub_lilac": 20,
"t_shrub_chokeberry": 15,
"t_tree_nannyberry": 15,
"t_shrub_hobblebush": 5,
"t_bamboo_long": 5
},
"t_region_shrub": { "t_region_shrub_decorative": 60, "t_underbrush": 10, "t_region_shrub_fruit": 30 },
1 change: 1 addition & 0 deletions data/json/requirements/cooking_components.json
Original file line number Diff line number Diff line change
@@ -1096,6 +1096,7 @@
[ "elderberries", 1 ],
[ "nannyberries", 1 ],
[ "tupelo_fruit", 1 ],
[ "hobbleberries", 1 ],
[ "watermelon_wedge", 1 ]
]
]