From 48f77e8e37c0ce3fe0d79cdb5e39e92a747cb388 Mon Sep 17 00:00:00 2001 From: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Date: Fri, 29 Nov 2024 01:47:06 +0100 Subject: [PATCH 1/5] add hobblebush, add missing conditionals for recently added native fruits --- .../furniture_and_terrain/terrain-flora.json | 53 +++++++++++++++++++ data/json/harvest.json | 5 ++ data/json/items/comestibles/fruit_dishes.json | 26 +++++++++ data/json/items/comestibles/raw_fruit.json | 9 ++++ data/json/mapgen_palettes/stream.json | 1 + data/json/regional_map_settings.json | 4 ++ .../json/requirements/cooking_components.json | 1 + 7 files changed, 99 insertions(+) diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json index 81fa3866b611b..5b1f685a3216a 100644 --- a/data/json/furniture_and_terrain/terrain-flora.json +++ b/data/json/furniture_and_terrain/terrain-flora.json @@ -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", diff --git a/data/json/harvest.json b/data/json/harvest.json index 5a9c48c7c6519..60fd83e9d7015 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -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", diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index 36b2af29e05dd..e2a069cb2bbda 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -37,6 +37,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "%s, apple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, @@ -187,6 +188,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "blackberries", "name": { "str_sp": "%s, blackberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blueberries", "name": { "str_sp": "%s, blueberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "cherries", "name": { "str_sp": "%s, cherry" } }, + { "type": "COMPONENT_ID", "condition": "chokeberries", "name": { "str_sp": "%s, chokeberries" } }, { "type": "COMPONENT_ID", "condition": "coconut_flesh", "name": { "str_sp": "%s, coconut" } }, { "type": "COMPONENT_ID", "condition": "crabapple", "name": { "str_sp": "%s, crabapple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "elderberries", "name": { "str_sp": "%s, elderberry" } }, @@ -194,6 +196,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "%s, apple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "lulo", "name": { "str_sp": "%s, lulo" } }, @@ -203,6 +206,7 @@ { "type": "COMPONENT_ID", "condition": "mayapple", "name": { "str_sp": "%s, mayapple" } }, { "type": "COMPONENT_ID", "condition": "melon_chunks", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "mulberries", "name": { "str_sp": "%s, mulberry" } }, + { "type": "COMPONENT_ID", "condition": "nannyberries", "name": { "str_sp": "%s, nannyberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "orange", "name": { "str_sp": "%s, orange" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "papaya", "name": { "str_sp": "%s, papaya" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "peach", "name": { "str_sp": "%s, peach" } }, @@ -214,6 +218,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "raspberries", "name": { "str_sp": "%s, raspberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "rose_hips_cut", "name": { "str_sp": "%s, rose hip" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "strawberries", "name": { "str_sp": "%s, strawberry" } }, + { "type": "COMPONENT_ID", "condition": "tupelo_fruit", "name": { "str_sp": "%s, tupelo fruit" } }, { "type": "COMPONENT_ID", "condition": "watermelon_wedge", "name": { "str_sp": "%s, watermelon" } }, { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } } ], @@ -246,12 +251,14 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "banana", "name": { "str_sp": "%s, banana" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blackberries", "name": { "str_sp": "%s, blackberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blueberries", "name": { "str_sp": "%s, blueberry" } }, + { "type": "COMPONENT_ID", "condition": "chokeberries", "name": { "str_sp": "%s, chokeberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "cherries", "name": { "str_sp": "%s, cherry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "crabapple", "name": { "str_sp": "%s, crabapple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "elderberries", "name": { "str_sp": "%s, elderberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "%s, apple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, @@ -262,6 +269,7 @@ { "type": "COMPONENT_ID", "condition": "mayapple", "name": { "str_sp": "%s, mayapple" } }, { "type": "COMPONENT_ID", "condition": "melon_chunks", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "mulberries", "name": { "str_sp": "%s, mulberry" } }, + { "type": "COMPONENT_ID", "condition": "nannyberries", "name": { "str_sp": "%s, nannyberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "orange", "name": { "str_sp": "%s, orange" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "papaya", "name": { "str_sp": "%s, papaya" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "peach", "name": { "str_sp": "%s, peach" } }, @@ -273,6 +281,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "raspberries", "name": { "str_sp": "%s, raspberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "rose_hips_cut", "name": { "str_sp": "%s, rose hip" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "strawberries", "name": { "str_sp": "%s, strawberry" } }, + { "type": "COMPONENT_ID", "condition": "tupelo_fruit", "name": { "str_sp": "%s, tupelo fruit" } }, { "type": "COMPONENT_ID", "condition": "watermelon_wedge", "name": { "str_sp": "%s, watermelon" } }, { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } } ], @@ -316,6 +325,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID", "condition": "juice_pulp", "name": { "str_sp": "%s, juice pulp" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, @@ -374,6 +384,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "blackberries", "name": { "str_sp": "%s, blackberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blueberries", "name": { "str_sp": "%s, blueberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "cherries", "name": { "str_sp": "%s, cherry" } }, + { "type": "COMPONENT_ID", "condition": "chokeberries", "name": { "str_sp": "%s, chokeberries" } }, { "type": "COMPONENT_ID", "condition": "cholla_bud", "name": { "str_sp": "%s, cholla bud" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "coconut", "name": { "str_sp": "%s, coconut" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "crabapple", "name": { "str_sp": "%s, crabapple" } }, @@ -382,6 +393,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID", "condition": "juice_pulp", "name": { "str_sp": "%s, juice pulp" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, @@ -394,6 +406,7 @@ { "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID", "condition": "melon_chunks", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "mulberries", "name": { "str_sp": "%s, mulberry" } }, + { "type": "COMPONENT_ID", "condition": "nannyberries", "name": { "str_sp": "%s, nannyberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "orange", "name": { "str_sp": "%s, orange" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "papaya", "name": { "str_sp": "%s, papaya" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "peach", "name": { "str_sp": "%s, peach" } }, @@ -405,6 +418,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "raspberries", "name": { "str_sp": "%s, raspberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "rose_hips_cut", "name": { "str_sp": "%s, rose hip" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "strawberries", "name": { "str_sp": "%s, strawberry" } }, + { "type": "COMPONENT_ID", "condition": "tupelo_fruit", "name": { "str_sp": "%s, tupelo fruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "watermelon", "name": { "str_sp": "%s, watermelon" } }, { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } } ], @@ -434,12 +448,14 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "banana", "name": { "str_sp": "%s, banana" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blackberries", "name": { "str_sp": "%s, blackberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blueberries", "name": { "str_sp": "%s, blueberry" } }, + { "type": "COMPONENT_ID", "condition": "chokeberries", "name": { "str_sp": "%s, chokeberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "cherries", "name": { "str_sp": "%s, cherry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "crabapple", "name": { "str_sp": "%s, crabapple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "elderberries", "name": { "str_sp": "%s, elderberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "lulo", "name": { "str_sp": "%s, lulo" } }, @@ -449,6 +465,7 @@ { "type": "COMPONENT_ID", "condition": "mayapple", "name": { "str_sp": "%s, mayapple" } }, { "type": "COMPONENT_ID", "condition": "melon_chunks", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "mulberries", "name": { "str_sp": "%s, mulberry" } }, + { "type": "COMPONENT_ID", "condition": "nannyberries", "name": { "str_sp": "%s, nannyberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "orange", "name": { "str_sp": "%s, orange" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "papaya", "name": { "str_sp": "%s, papaya" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "peach", "name": { "str_sp": "%s, peach" } }, @@ -460,6 +477,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "raspberries", "name": { "str_sp": "%s, raspberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "rose_hips_cut", "name": { "str_sp": "%s, rose hip" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "strawberries", "name": { "str_sp": "%s, strawberry" } }, + { "type": "COMPONENT_ID", "condition": "tupelo_fruit", "name": { "str_sp": "%s, tupelo fruit" } }, { "type": "COMPONENT_ID", "condition": "watermelon_wedge", "name": { "str_sp": "%s, watermelon" } }, { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } } ], @@ -490,11 +508,13 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "blackberries", "name": { "str_sp": "%s, blackberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blueberries", "name": { "str_sp": "%s, blueberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "cherries", "name": { "str_sp": "%s, cherry" } }, + { "type": "COMPONENT_ID", "condition": "chokeberries", "name": { "str_sp": "%s, chokeberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "crabapple", "name": { "str_sp": "%s, crabapple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "elderberries", "name": { "str_sp": "%s, elderberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "lulo", "name": { "str_sp": "%s, lulo" } }, @@ -504,6 +524,7 @@ { "type": "COMPONENT_ID", "condition": "mayapple", "name": { "str_sp": "%s, mayapple" } }, { "type": "COMPONENT_ID", "condition": "melon_chunks", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "mulberries", "name": { "str_sp": "%s, mulberry" } }, + { "type": "COMPONENT_ID", "condition": "nannyberries", "name": { "str_sp": "%s, nannyberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "orange", "name": { "str_sp": "%s, orange" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "papaya", "name": { "str_sp": "%s, papaya" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "peach", "name": { "str_sp": "%s, peach" } }, @@ -515,6 +536,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "raspberries", "name": { "str_sp": "%s, raspberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "rose_hips_cut", "name": { "str_sp": "%s, rose hip" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "strawberries", "name": { "str_sp": "%s, strawberry" } }, + { "type": "COMPONENT_ID", "condition": "tupelo_fruit", "name": { "str_sp": "%s, tupelo fruit" } }, { "type": "COMPONENT_ID", "condition": "watermelon_wedge", "name": { "str_sp": "%s, watermelon" } }, { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } } ], @@ -610,11 +632,13 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "blackberries", "name": { "str_sp": "%s, blackberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "blueberries", "name": { "str_sp": "%s, blueberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "cherries", "name": { "str_sp": "%s, cherry" } }, + { "type": "COMPONENT_ID", "condition": "chokeberries", "name": { "str_sp": "%s, chokeberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "crabapple", "name": { "str_sp": "%s, crabapple" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "elderberries", "name": { "str_sp": "%s, elderberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapefruit", "name": { "str_sp": "%s, grapefruit" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "grapes", "name": { "str_sp": "%s, grape" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "guayaba", "name": { "str_sp": "%s, guava" } }, + { "type": "COMPONENT_ID", "condition": "hobbleberries", "name": { "str_sp": "%s, hobbleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "huckleberries", "name": { "str_sp": "%s, huckleberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "kiwi", "name": { "str_sp": "%s, kiwi" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "lulo", "name": { "str_sp": "%s, lulo" } }, @@ -624,6 +648,7 @@ { "type": "COMPONENT_ID", "condition": "mayapple", "name": { "str_sp": "%s, mayapple" } }, { "type": "COMPONENT_ID", "condition": "melon_chunks", "name": { "str_sp": "%s, melon" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "mulberries", "name": { "str_sp": "%s, mulberry" } }, + { "type": "COMPONENT_ID", "condition": "nannyberries", "name": { "str_sp": "%s, nannyberries" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "orange", "name": { "str_sp": "%s, orange" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "papaya", "name": { "str_sp": "%s, papaya" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "peach", "name": { "str_sp": "%s, peach" } }, @@ -635,6 +660,7 @@ { "type": "COMPONENT_ID_SUBSTRING", "condition": "raspberries", "name": { "str_sp": "%s, raspberry" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "rose_hips_cut", "name": { "str_sp": "%s, rose hip" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "strawberries", "name": { "str_sp": "%s, strawberry" } }, + { "type": "COMPONENT_ID", "condition": "tupelo_fruit", "name": { "str_sp": "%s, tupelo fruit" } }, { "type": "COMPONENT_ID", "condition": "watermelon_wedge", "name": { "str_sp": "%s, watermelon" } }, { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } } ], diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json index 7905e0256504d..5aa18f6678fd9 100644 --- a/data/json/items/comestibles/raw_fruit.json +++ b/data/json/items/comestibles/raw_fruit.json @@ -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", diff --git a/data/json/mapgen_palettes/stream.json b/data/json/mapgen_palettes/stream.json index e9fbd2b0c3263..238c1cfaefec3 100644 --- a/data/json/mapgen_palettes/stream.json +++ b/data/json/mapgen_palettes/stream.json @@ -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 ], diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 7e59d6bf55593..08b933740928b 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -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 }, diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 1a2a3a86dd16e..4679e841e0baa 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1096,6 +1096,7 @@ [ "elderberries", 1 ], [ "nannyberries", 1 ], [ "tupelo_fruit", 1 ], + [ "hobbleberries", 1 ], [ "watermelon_wedge", 1 ] ] ] From 09de9e69d16fd06e06fca745a185dcecd4ccb093 Mon Sep 17 00:00:00 2001 From: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Date: Fri, 29 Nov 2024 03:26:19 +0100 Subject: [PATCH 2/5] add autumn olive --- .../furniture_and_terrain/terrain-flora.json | 55 ++++++++++++++++++- data/json/harvest.json | 5 ++ data/json/items/comestibles/raw_fruit.json | 12 +++- data/json/recipes/recipe_food.json | 2 +- data/json/regional_map_settings.json | 3 +- .../json/requirements/cooking_components.json | 1 + 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json index 5b1f685a3216a..6cd5dc9b899f2 100644 --- a/data/json/furniture_and_terrain/terrain-flora.json +++ b/data/json/furniture_and_terrain/terrain-flora.json @@ -2230,11 +2230,64 @@ ] } }, + { + "type": "terrain", + "id": "t_shrub_autumn_olive", + "name": "autumn olive", + "looks_like": "t_shrub_raspberry", + "description": "An invasive species from Japan which is also called silverberry. Widely planted in the 1940s to combat erosion, it spread far and wide, often even displacing native plants. As it name says, it bears fruits in autumn, which are quite unlike olives.", + "symbol": "#", + "color": "light_blue_green", + "move_cost": 9, + "coverage": 60, + "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "SMALL_HIDE", "BROWSABLE" ], + "transforms_into": "t_shrub_autumn_olive_harvested", + "examine_action": "harvest_ter_nectar", + "harvest_by_season": [ { "seasons": [ "autumn" ], "id": "shrub_autumn_olive_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_autumn_olive_harvested", + "name": "autumn olive", + "looks_like": "t_shrub", + "description": "An invasive species from Japan which is also called silverberry. Widely planted in the 1940s to combat erosion, it spread far and wide, often even displacing native plants. As it name says, it bears fruits in autumn, which are quite unlike olives, but this particular plant has been harvested 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_autumn_olive", + "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_hobblebush", "name": "hobblebush", - "looks_like": "t_shrub", + "looks_like": "t_shrub_blueberry", "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", diff --git a/data/json/harvest.json b/data/json/harvest.json index 60fd83e9d7015..278e343b264f2 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -167,6 +167,11 @@ "type": "harvest", "entries": [ { "drop": "rose_hips", "base_num": [ 1, 3 ], "scale_num": [ 0, 0.5 ] } ] }, + { + "id": "shrub_autumn_olive_harv", + "type": "harvest", + "entries": [ { "drop": "autumn_olive", "base_num": [ 4, 20 ], "scale_num": [ 0, 0.5 ] } ] + }, { "id": "shrub_chokeberry_harv", "type": "harvest", diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json index 5aa18f6678fd9..0ee995062ce5c 100644 --- a/data/json/items/comestibles/raw_fruit.json +++ b/data/json/items/comestibles/raw_fruit.json @@ -130,9 +130,19 @@ "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.", + "description": "Some black hobbleberries. They are quite sweet. Before they ripened, they were deceptively red and utterly bitter.", "fun": 3 }, + { + "type": "COMESTIBLE", + "id": "autumn_olive", + "name": { "str": "handful of autumn olives", "str_pl": "handfuls of autumn olives" }, + "//": "Below is times 1.48 as reference is 100g and blueberries (closest comparable plant) is 148g, so density matches , ", + "calories": 134, + "copy-from": "blueberries", + "description": "Not tasting anything like olives, this sweet, red and very nutritious fruit can also be used as a tomato-substitute in some cases.", + "vitamins": [ [ "vitC", "22200 μg" ], [ "fruit_allergen", 1 ] ] + }, { "type": "COMESTIBLE", "id": "strawberries", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 4645cdef0f30a..554ab32f0e447 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -7455,7 +7455,7 @@ "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "components": [ - [ [ "can_tomato", 1 ], [ "tomato", 1 ] ], + [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "autumn_olive", 1 ] ], [ [ "salt", 2 ], [ "salt_water", 1 ], [ "saline", 2 ], [ "seasoning_salt", 2 ], [ "soysauce", 1 ] ], [ [ "vinegar", 1 ] ] ] diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 08b933740928b..1a1452a6ed7b8 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -47,10 +47,11 @@ "t_shrub_strawberry": 1, "t_shrub_grape": 1 }, - "t_region_shrub_forest": { "t_region_shrub_forest_dense": 60, "t_shrub_rose": 5, "t_shrub_blackberry": 5 }, + "t_region_shrub_forest": { "t_region_shrub_forest_dense": 65, "t_shrub_rose": 5, "t_shrub_blackberry": 5, "t_shrub_autumn_olive": 5 }, "t_region_shrub_plains": { "t_shrub": 10, "t_shrub_blueberry": 2, + "t_shrub_autumn_olive": 2, "t_shrub_blackberry": 2, "t_shrub_rose": 2, "t_shrub_huckleberry": 1, diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 4679e841e0baa..223530dba8a0c 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1097,6 +1097,7 @@ [ "nannyberries", 1 ], [ "tupelo_fruit", 1 ], [ "hobbleberries", 1 ], + [ "autumn_olive", 1 ], [ "watermelon_wedge", 1 ] ] ] From 2c08d1e29045ef12c8b9fd502157642828197dcf Mon Sep 17 00:00:00 2001 From: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Date: Fri, 29 Nov 2024 03:30:36 +0100 Subject: [PATCH 3/5] nerf survival bonus from harvesting --- data/json/harvest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 278e343b264f2..190125f46d0b1 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -170,17 +170,17 @@ { "id": "shrub_autumn_olive_harv", "type": "harvest", - "entries": [ { "drop": "autumn_olive", "base_num": [ 4, 20 ], "scale_num": [ 0, 0.5 ] } ] + "entries": [ { "drop": "autumn_olive", "base_num": [ 4, 20 ], "scale_num": [ 0, 0.1 ] } ] }, { "id": "shrub_chokeberry_harv", "type": "harvest", - "entries": [ { "drop": "chokeberries", "base_num": [ 6, 12 ], "scale_num": [ 0, 0.5 ] } ] + "entries": [ { "drop": "chokeberries", "base_num": [ 6, 12 ], "scale_num": [ 0, 0.1 ] } ] }, { "id": "shrub_spicebush_harv", "type": "harvest", - "entries": [ { "drop": "spicebush_berries", "base_num": [ 1, 4 ], "scale_num": [ 0, 0.5 ] } ] + "entries": [ { "drop": "spicebush_berries", "base_num": [ 1, 4 ], "scale_num": [ 0, 0.1 ] } ] }, { "id": "shrub_grape_harv", @@ -218,7 +218,7 @@ { "id": "shrub_hobblebush_harv", "type": "harvest", - "entries": [ { "drop": "hobbleberries", "base_num": [ 1, 2 ], "scale_num": [ 0, 0.5 ] } ] + "entries": [ { "drop": "hobbleberries", "base_num": [ 1, 2 ], "scale_num": [ 0, 0.1 ] } ] }, { "id": "shrub_peanut_harv", From 0ad287d171b776ae4195dc9e23d8293a9bcb476c Mon Sep 17 00:00:00 2001 From: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Date: Fri, 29 Nov 2024 03:52:08 +0100 Subject: [PATCH 4/5] add to dictionary --- tools/spell_checker/dictionary.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 42b541e6e56e2..9417cc25d5930 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -2633,6 +2633,8 @@ HMS HMTD hnefatafl Hobbes +hobblebush +hobbleberries hoc Hockomock hodag @@ -5606,6 +5608,7 @@ Sikorsky Silat siloed siloing +silverberry Silvergram Silvergrams Silverhawk From 16f7ac2774c8011e32f47c9fa826fc40b2e63b10 Mon Sep 17 00:00:00 2001 From: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Date: Fri, 29 Nov 2024 05:41:53 +0100 Subject: [PATCH 5/5] add to mods, please the linter --- data/json/furniture_and_terrain/terrain-flora.json | 4 ++-- .../mods/Magiclysm/ter_fur_transform/ter_fur_transform.json | 6 ++++++ .../Xedra_Evolved/ter_transforms/arvore_ter_transforms.json | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json index 6cd5dc9b899f2..d4a77cf0d21d1 100644 --- a/data/json/furniture_and_terrain/terrain-flora.json +++ b/data/json/furniture_and_terrain/terrain-flora.json @@ -2288,7 +2288,7 @@ "id": "t_shrub_hobblebush", "name": "hobblebush", "looks_like": "t_shrub_blueberry", - "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.", + "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, @@ -2315,7 +2315,7 @@ "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.", + "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, diff --git a/data/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json b/data/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json index 315e003ee44ff..21784afc0a8a4 100644 --- a/data/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json +++ b/data/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json @@ -340,6 +340,8 @@ "t_bamboo_harvested", "t_shrub", "t_shrub_rose", + "t_shrub_hobblebush", + "t_shrub_spicebush", "t_shrub_lilac", "t_shrub_grape", "t_shrub_peanut", @@ -350,6 +352,8 @@ "t_shrub_blackberry", "t_shrub_huckleberry", "t_shrub_rose_harvested", + "t_shrub_hobblebush_harvested", + "t_shrub_spicebush_harvested", "t_shrub_grape_harvested", "t_shrub_lilac_harvested", "t_shrub_peanut_harvested", @@ -466,6 +470,7 @@ [ "t_tree_walnut_harvested", 16 ], [ "t_tree_nannyberry_harvested", 16 ], [ "t_tree_tupelo_harvested", 16 ], + [ "t_tree_tupelo_harvested", 16 ], [ "t_tree_butternut", 4 ], [ "t_tree_chestnut_harvested", 8 ], [ "t_tree_hazelnut_harvested", 2 ], @@ -493,6 +498,7 @@ [ "t_underbrush", 65 ], [ "t_shrub_spicebush_harvested", 10 ], [ "t_shrub_chokeberry_harvested", 10 ], + [ "t_shrub_autumn_olive_harvested", 10 ], [ "t_shrub_rose", 5 ], [ "t_shrub_blackberry_harvested", 5 ], [ "t_shrub_grape_harvested", 5 ], diff --git a/data/mods/Xedra_Evolved/ter_transforms/arvore_ter_transforms.json b/data/mods/Xedra_Evolved/ter_transforms/arvore_ter_transforms.json index 52a34f336ceb0..be1527a5a61ce 100644 --- a/data/mods/Xedra_Evolved/ter_transforms/arvore_ter_transforms.json +++ b/data/mods/Xedra_Evolved/ter_transforms/arvore_ter_transforms.json @@ -277,6 +277,8 @@ [ "t_grass_tall", 20 ], [ "t_shrub", 30 ], [ "t_underbrush", 65 ], + [ "t_shrub_hobblebush_harvested", 10 ], + [ "t_shrub_autumn_olive_harvested", 10 ], [ "t_shrub_spicebush_harvested", 10 ], [ "t_shrub_chokeberry_harvested", 10 ], [ "t_shrub_rose", 5 ],