add hobblebush and autumn olive

data/json/furniture_and_terrain/terrain-flora.json

@@ -2230,6 +2230,112 @@
       ]
     }
   },
+  {
+    "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_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",
+    "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",

data/json/harvest.json

@@ -167,15 +167,20 @@
     "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.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",
@@ -210,6 +215,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.1 ] } ]
+  },
   {
     "id": "shrub_peanut_harv",
     "type": "harvest",