add tupelo

data/json/furniture_and_terrain/terrain-flora.json

@@ -1224,6 +1224,61 @@
       ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_tree_tupelo",
+    "name": "tupelo tree",
+    "description": "Its name, originating from Native American tongues and garbled by the settlers, approximately means \"swamp tree\".  During autumn it bears cherry-like fruits.",
+    "symbol": "7",
+    "color": [ "light_green", "red_green", "light_green", "brown" ],
+    "move_cost": 0,
+    "coverage": 80,
+    "roof": "t_treetop",
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT", "BROWSABLE", "CLIMB_ADJACENT" ],
+    "transforms_into": "t_tree_tupelo_harvested",
+    "examine_action": "harvest_ter_nectar",
+    "looks_like": "t_tree_plum",
+    "harvest_by_season": [ { "seasons": [ "autumn" ], "id": "tupelo_harv" } ],
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_tree_tupelo_harvested",
+    "name": "tupelo tree",
+    "description": "Its name, originating from Native American tongues and garbled by the settlers, approximately means \"swamp tree\".  During autumn it bears cherry-like fruits, but someone picked this one clean already.",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "light_green", "brown" ],
+    "move_cost": 0,
+    "coverage": 80,
+    "roof": "t_treetop",
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT", "HARVESTED", "CLIMB_ADJACENT" ],
+    "examine_action": "harvested_plant",
+    "transforms_into": "t_tree_tupelo",
+    "looks_like": "t_tree_plum_harvested",
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_tree_nannyberry",

data/json/harvest.json

@@ -269,6 +269,11 @@
     "type": "harvest",
     "entries": [ { "drop": "nannyberries", "base_num": [ 8, 20 ], "scale_num": [ 0, 0.5 ] } ]
   },
+  {
+    "id": "tupelo_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "tupelo_fruit", "base_num": [ 8, 20 ], "scale_num": [ 0, 0.5 ] } ]
+  },
   {
     "id": "mulberry_harv",
     "type": "harvest",

data/json/items/comestibles/fruit_dishes.json

@@ -31,6 +31,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_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" } },
@@ -46,6 +47,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" } },
@@ -57,8 +59,8 @@
       { "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": "chokeberries", "name": { "str_sp": "%s, chokeberries" } },
       { "type": "COMPONENT_ID", "condition": "wintergreen_berry", "name": { "str_sp": "%s, wintergreen berry" } }
     ],
     "weight": "34 g",
@@ -326,6 +328,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" } },
@@ -337,6 +340,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" } }
     ],

data/json/items/comestibles/raw_fruit.json

@@ -319,11 +319,19 @@
     "description": "Some dark blue nannyberries, tasting like prunes mixed with banana.",
     "copy-from": "elderberries",
     "//": "Nannyberries are described as rather dry, perfectly fine to eat as is but it will not hydrate you.",
-    "use_action": [],
+    "use_action": [ ],
     "quench": 0,
     "fun": 2,
     "color": "black"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "tupelo_fruit",
+    "name": { "str": "handful of tupelo fruits", "str_pl": "handfuls of tupelo fruits" },
+    "description": "Some dark blue tupelo fruits.  They are tart and feature a hard seed but are still enjoyable.",
+    "fun": 1,
+    "copy-from": "nannyberries"
+  },
   {
     "type": "COMESTIBLE",
     "id": "chokeberries",

data/json/regional_map_settings.json

@@ -496,6 +496,7 @@
               "t_tree_plum": 1,
               "t_tree_elderberry": 2,
               "t_tree_nannyberry": 10,
+              "t_tree_tupelo": 10,
               "t_tree_mulberry": 2,
               "t_tree_sassafras": 3,
               "t_region_tree_dead": 90

data/json/requirements/cooking_components.json

@@ -1095,6 +1095,7 @@
         [ "mulberries", 1 ],
         [ "elderberries", 1 ],
         [ "nannyberries", 1 ],
+        [ "tupelo_fruit", 1 ],
         [ "watermelon_wedge", 1 ]
       ]
     ]