From b3d0c21a9efeadd96a9f02f9c0e0888b100bd0d8 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Wed, 22 Jan 2020 22:21:29 +0100
Subject: [PATCH 1/3] Added flag to the 5 variants

---
 data/json/furniture_and_terrain/terrain-flora.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json
index 8c14745bec7e9..a98466a92c572 100644
--- a/data/json/furniture_and_terrain/terrain-flora.json
+++ b/data/json/furniture_and_terrain/terrain-flora.json
@@ -1253,7 +1253,7 @@
     "symbol": "#",
     "color": "light_green",
     "move_cost": 6,
-    "flags": [ "TRANSPARENT", "DIGGABLE", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "PLACE_ITEM", "SHRUB", "SHORT" ],
+    "flags": [ "TRANSPARENT", "DIGGABLE", "CONTAINER", "FLAMMABLE_ASH", "NOCOLLIDE", "THIN_OBSTACLE", "PLACE_ITEM", "SHRUB", "SHORT" ],
     "examine_action": "shrub_wildveggies",
     "bash": {
       "str_min": 4,
@@ -1278,6 +1278,7 @@
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
+      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",
@@ -1308,6 +1309,7 @@
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
+      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",
@@ -1338,6 +1340,7 @@
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
+      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",
@@ -1368,6 +1371,7 @@
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
+      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",

From f258ad6f6862febfc6fb1861f506c3f3516403b9 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Wed, 22 Jan 2020 22:33:00 +0100
Subject: [PATCH 2/3] Linting

---
 data/json/furniture_and_terrain/terrain-flora.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json
index a98466a92c572..bdf5049d15056 100644
--- a/data/json/furniture_and_terrain/terrain-flora.json
+++ b/data/json/furniture_and_terrain/terrain-flora.json
@@ -1253,7 +1253,17 @@
     "symbol": "#",
     "color": "light_green",
     "move_cost": 6,
-    "flags": [ "TRANSPARENT", "DIGGABLE", "CONTAINER", "FLAMMABLE_ASH", "NOCOLLIDE", "THIN_OBSTACLE", "PLACE_ITEM", "SHRUB", "SHORT" ],
+    "flags": [
+      "TRANSPARENT",
+      "DIGGABLE",
+      "CONTAINER",
+      "FLAMMABLE_ASH",
+      "NOCOLLIDE",
+      "THIN_OBSTACLE",
+      "PLACE_ITEM",
+      "SHRUB",
+      "SHORT"
+    ],
     "examine_action": "shrub_wildveggies",
     "bash": {
       "str_min": 4,

From 7ae9ac6a769f8ddbbd3210c3d3d7ea7fb8b8eadb Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Fri, 24 Jan 2020 18:00:07 +0100
Subject: [PATCH 3/3] Reverted flag change and added coverage

---
 .../furniture_and_terrain/terrain-flora.json  | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json
index bdf5049d15056..5c6c822e5514f 100644
--- a/data/json/furniture_and_terrain/terrain-flora.json
+++ b/data/json/furniture_and_terrain/terrain-flora.json
@@ -1253,17 +1253,8 @@
     "symbol": "#",
     "color": "light_green",
     "move_cost": 6,
-    "flags": [
-      "TRANSPARENT",
-      "DIGGABLE",
-      "CONTAINER",
-      "FLAMMABLE_ASH",
-      "NOCOLLIDE",
-      "THIN_OBSTACLE",
-      "PLACE_ITEM",
-      "SHRUB",
-      "SHORT"
-    ],
+    "coverage": 40,
+    "flags": [ "TRANSPARENT", "DIGGABLE", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "PLACE_ITEM", "SHRUB", "SHORT" ],
     "examine_action": "shrub_wildveggies",
     "bash": {
       "str_min": 4,
@@ -1283,12 +1274,12 @@
     "symbol": "#",
     "color": "green",
     "move_cost": 6,
+    "coverage": 40,
     "flags": [
       "TRANSPARENT",
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
-      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",
@@ -1314,12 +1305,12 @@
     "symbol": "#",
     "color": "green",
     "move_cost": 6,
+    "coverage": 40,
     "flags": [
       "TRANSPARENT",
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
-      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",
@@ -1345,12 +1336,12 @@
     "symbol": "#",
     "color": "green",
     "move_cost": 6,
+    "coverage": 40,
     "flags": [
       "TRANSPARENT",
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
-      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",
@@ -1376,12 +1367,12 @@
     "symbol": "#",
     "color": "green",
     "move_cost": 6,
+    "coverage": 40,
     "flags": [
       "TRANSPARENT",
       "DIGGABLE",
       "CONTAINER",
       "FLAMMABLE_ASH",
-      "NOCOLLIDE",
       "THIN_OBSTACLE",
       "PLACE_ITEM",
       "SHRUB",