From 520d899064b794742927a3e89356413adc9cc4a1 Mon Sep 17 00:00:00 2001
From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
Date: Sat, 19 Mar 2022 16:38:00 +0000
Subject: [PATCH] [art] make the olive tree a source of wood, as it is hard to
 see that it is a food supply

Thread: https://wildfiregames.com/forum/topic/73939-fruit-trees-are-too-difficult-to-tell-apart-from-other-trees/
Accepted by: @wowgetoffyourcellphone
Patch by: @marder

Differential Revision: https://code.wildfiregames.com/D4561

git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@26675 3db68df2-c116-0410-a063-a993310a9797
---
 .../public/maps/random/rmbiome/generic/aegean.js   |   2 +-
 .../maps/skirmishes/corinthian_isthmus_4p.xml      |   4 +-
 .../mods/public/maps/skirmishes/egypt_3pv3p.xml    |  30 +++---
 .../mods/public/maps/skirmishes/hindu_kush_2p.xml  |   4 +-
 .../public/maps/skirmishes/sicilia_nomad_2p.xml    |  56 +++++------
 .../public/maps/skirmishes/tuscan_acropolis_4p.xml | 102 ++++++++++-----------
 .../templates/gaia/{fruit => tree}/olive.xml       |   2 +-
 7 files changed, 100 insertions(+), 100 deletions(-)
 rename binaries/data/mods/public/simulation/templates/gaia/{fruit => tree}/olive.xml (88%)

diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js b/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js
index 2c1305d871..213440cc98 100644
--- a/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js
+++ b/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js
@@ -7,7 +7,7 @@ function setupBiome_aegean()
 		]]);
 
 	g_Gaia.tree3 = pickRandom([
-		"gaia/fruit/olive",
+		"gaia/tree/olive",
 		"gaia/tree/juniper_prickly",
 		"gaia/tree/date_palm",
 		"gaia/tree/cretan_date_palm_short",
diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
index 58b3bb66fa..b16f1bf4aa 100644
--- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
@@ -12783,13 +12783,13 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4660">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1846.50074" z="1376.011"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="4662">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1828.26966" z="1372.04554"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
index 53eae44100..94e7b3e093 100644
--- a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -17926,7 +17926,7 @@
 			<Actor seed="39214"/>
 		</Entity>
 		<Entity uid="4336">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1243.80347" z="54.82265"/>
 			<Orientation y="2.35621"/>
@@ -23263,84 +23263,84 @@
 			<Orientation y="1.8109"/>
 		</Entity>
 		<Entity uid="5442">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="412.11255" z="1438.14283"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40294"/>
 		</Entity>
 		<Entity uid="5443">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="398.36277" z="1437.76429"/>
 			<Orientation y="-2.04773"/>
 			<Actor seed="34760"/>
 		</Entity>
 		<Entity uid="5444">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="383.70966" z="1439.18787"/>
 			<Orientation y="3.57213"/>
 			<Actor seed="15436"/>
 		</Entity>
 		<Entity uid="5445">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="371.21186" z="1439.41993"/>
 			<Orientation y="-0.2434"/>
 			<Actor seed="49694"/>
 		</Entity>
 		<Entity uid="5446">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="413.66276" z="1449.30286"/>
 			<Orientation y="2.83381"/>
 			<Actor seed="49694"/>
 		</Entity>
 		<Entity uid="5447">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="401.17591" z="1448.73023"/>
 			<Orientation y="6.64933"/>
 			<Actor seed="15436"/>
 		</Entity>
 		<Entity uid="5448">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="386.46155" z="1449.20801"/>
 			<Orientation y="1.02947"/>
 			<Actor seed="34760"/>
 		</Entity>
 		<Entity uid="5449">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="372.78248" z="1447.90552"/>
 			<Orientation y="5.43342"/>
 			<Actor seed="40294"/>
 		</Entity>
 		<Entity uid="5450">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="374.38465" z="1460.17664"/>
 			<Orientation y="2.01603"/>
 			<Actor seed="49694"/>
 		</Entity>
 		<Entity uid="5451">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="386.88245" z="1459.94459"/>
 			<Orientation y="4.63532"/>
 			<Actor seed="15436"/>
 		</Entity>
 		<Entity uid="5452">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="401.66181" z="1458.47095"/>
 			<Orientation y="-0.31743"/>
 			<Actor seed="34760"/>
 		</Entity>
 		<Entity uid="5453">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="415.28534" z="1458.89954"/>
 			<Orientation y="2.35622"/>
@@ -110022,14 +110022,14 @@
 			<Actor seed="30932"/>
 		</Entity>
 		<Entity uid="22828">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="206.36002" z="1121.82288"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37676"/>
 		</Entity>
 		<Entity uid="22829">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="199.75284" z="1144.92347"/>
 			<Orientation y="-2.72709"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml b/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml
index ba4d7cad68..044589d305 100644
--- a/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml
@@ -264,14 +264,14 @@
 			<Actor seed="45478"/>
 		</Entity>
 		<Entity uid="57">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="349.86438" z="278.23603"/>
 			<Orientation y="-1.96483"/>
 			<Actor seed="51760"/>
 		</Entity>
 		<Entity uid="58">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="229.74488" z="311.85566"/>
 			<Orientation y="0.26473"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml b/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml
index 91198b9574..d16cf4a8c3 100644
--- a/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml
@@ -15869,21 +15869,21 @@
 			<Actor seed="31658"/>
 		</Entity>
 		<Entity uid="3477">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="200.3747" z="557.71076"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52508"/>
 		</Entity>
 		<Entity uid="3478">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="213.4319" z="549.32111"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33662"/>
 		</Entity>
 		<Entity uid="3479">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="211.04328" z="566.93775"/>
 			<Orientation y="2.35621"/>
@@ -15946,91 +15946,91 @@
 			<Actor seed="28479"/>
 		</Entity>
 		<Entity uid="3488">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="777.37867" z="483.45527"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35292"/>
 		</Entity>
 		<Entity uid="3489">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="796.60157" z="477.7389"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56995"/>
 		</Entity>
 		<Entity uid="3490">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="781.68512" z="457.261"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1117"/>
 		</Entity>
 		<Entity uid="3491">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="797.52063" z="453.4209"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42917"/>
 		</Entity>
 		<Entity uid="3492">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="809.08161" z="462.97352"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60197"/>
 		</Entity>
 		<Entity uid="3493">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="790.45997" z="490.12772"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27705"/>
 		</Entity>
 		<Entity uid="3494">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="767.35102" z="495.46088"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63080"/>
 		</Entity>
 		<Entity uid="3495">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="767.63306" z="476.73777"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4100"/>
 		</Entity>
 		<Entity uid="3496">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="771.87812" z="450.48188"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41226"/>
 		</Entity>
 		<Entity uid="3497">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="785.4806" z="443.27933"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="115"/>
 		</Entity>
 		<Entity uid="3498">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="797.41694" z="440.40033"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62573"/>
 		</Entity>
 		<Entity uid="3499">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="759.13459" z="454.93409"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32190"/>
 		</Entity>
 		<Entity uid="3500">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="751.67768" z="477.7389"/>
 			<Orientation y="2.35621"/>
@@ -16072,84 +16072,84 @@
 			<Actor seed="55770"/>
 		</Entity>
 		<Entity uid="3512">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="661.09754" z="232.83909"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34653"/>
 		</Entity>
 		<Entity uid="3513">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="651.60853" z="247.68152"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="6537"/>
 		</Entity>
 		<Entity uid="3514">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="657.35615" z="266.18531"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29857"/>
 		</Entity>
 		<Entity uid="3515">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="658.94581" z="252.76047"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43280"/>
 		</Entity>
 		<Entity uid="3516">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="655.67975" z="231.4047"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40182"/>
 		</Entity>
 		<Entity uid="3517">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="881.9438" z="265.02796"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="65088"/>
 		</Entity>
 		<Entity uid="3518">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="900.93946" z="265.8288"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21985"/>
 		</Entity>
 		<Entity uid="3519">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="931.0257" z="314.47336"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48457"/>
 		</Entity>
 		<Entity uid="3520">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="495.82837" z="889.40442"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34940"/>
 		</Entity>
 		<Entity uid="3521">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="656.05176" z="809.34974"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37691"/>
 		</Entity>
 		<Entity uid="3522">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="672.50678" z="800.33509"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32284"/>
 		</Entity>
 		<Entity uid="3523">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="653.15186" z="780.79365"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
index 3b2d2d5437..5923b3ddb0 100644
--- a/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
@@ -7042,357 +7042,357 @@
 			<Actor seed="42726"/>
 		</Entity>
 		<Entity uid="1129">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="955.18635" z="1004.34766"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51472"/>
 		</Entity>
 		<Entity uid="1130">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1037.08472" z="989.5976"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="35408"/>
 		</Entity>
 		<Entity uid="1131">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1051.13575" z="975.01844"/>
 			<Orientation y="1.12581"/>
 			<Actor seed="42148"/>
 		</Entity>
 		<Entity uid="1132">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1066.77955" z="1041.99878"/>
 			<Orientation y="-1.37096"/>
 			<Actor seed="14282"/>
 		</Entity>
 		<Entity uid="1133">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1035.74207" z="1049.29847"/>
 			<Orientation y="0.22957"/>
 			<Actor seed="25288"/>
 		</Entity>
 		<Entity uid="1134">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1051.66431" z="1091.49891"/>
 			<Orientation y="1.7241"/>
 			<Actor seed="5084"/>
 		</Entity>
 		<Entity uid="1135">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1098.8357" z="1078.16712"/>
 			<Orientation y="2.97065"/>
 			<Actor seed="19542"/>
 		</Entity>
 		<Entity uid="1136">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1111.62415" z="1001.04474"/>
 			<Orientation y="2.00283"/>
 			<Actor seed="39474"/>
 		</Entity>
 		<Entity uid="1137">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1123.5442" z="1003.10859"/>
 			<Orientation y="-1.83758"/>
 			<Actor seed="48042"/>
 		</Entity>
 		<Entity uid="1138">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1091.14295" z="996.7674"/>
 			<Orientation y="-0.07506"/>
 			<Actor seed="58238"/>
 		</Entity>
 		<Entity uid="1139">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1086.2273" z="1041.34192"/>
 			<Orientation y="-1.06695"/>
 			<Actor seed="16172"/>
 		</Entity>
 		<Entity uid="1140">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1076.80237" z="1048.00342"/>
 			<Orientation y="-0.03628"/>
 			<Actor seed="51968"/>
 		</Entity>
 		<Entity uid="1141">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1068.91395" z="1101.89063"/>
 			<Orientation y="-1.22286"/>
 			<Actor seed="33222"/>
 		</Entity>
 		<Entity uid="1142">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1054.39014" z="1134.21082"/>
 			<Orientation y="1.00123"/>
 			<Actor seed="10774"/>
 		</Entity>
 		<Entity uid="1143">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1127.47144" z="1087.10914"/>
 			<Orientation y="2.75084"/>
 			<Actor seed="47392"/>
 		</Entity>
 		<Entity uid="1144">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="871.23047" z="1073.18848"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10866"/>
 		</Entity>
 		<Entity uid="1145">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="941.7212" z="1048.4286"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="55304"/>
 		</Entity>
 		<Entity uid="1146">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="910.5074" z="938.32013"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13316"/>
 		</Entity>
 		<Entity uid="1147">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="945.76795" z="890.08747"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13746"/>
 		</Entity>
 		<Entity uid="1148">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="911.58411" z="847.34144"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42020"/>
 		</Entity>
 		<Entity uid="1149">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="884.5315" z="837.47742"/>
 			<Orientation y="-1.06611"/>
 			<Actor seed="24890"/>
 		</Entity>
 		<Entity uid="1150">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="823.18781" z="860.88874"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26638"/>
 		</Entity>
 		<Entity uid="1151">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="927.33967" z="732.77112"/>
 			<Orientation y="1.74793"/>
 			<Actor seed="4916"/>
 		</Entity>
 		<Entity uid="1152">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="954.97553" z="731.27295"/>
 			<Orientation y="2.46998"/>
 			<Actor seed="58686"/>
 		</Entity>
 		<Entity uid="1153">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="986.14594" z="698.15613"/>
 			<Orientation y="-3.04537"/>
 			<Actor seed="15756"/>
 		</Entity>
 		<Entity uid="1154">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="949.21204" z="657.85358"/>
 			<Orientation y="2.86208"/>
 			<Actor seed="28354"/>
 		</Entity>
 		<Entity uid="1155">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="962.18342" z="611.83808"/>
 			<Orientation y="2.54543"/>
 			<Actor seed="48278"/>
 		</Entity>
 		<Entity uid="1156">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="979.14216" z="545.49494"/>
 			<Orientation y="2.31006"/>
 			<Actor seed="65298"/>
 		</Entity>
 		<Entity uid="1157">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1009.49909" z="524.94666"/>
 			<Orientation y="2.77791"/>
 			<Actor seed="49820"/>
 		</Entity>
 		<Entity uid="1158">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1016.80048" z="507.62714"/>
 			<Orientation y="2.16538"/>
 			<Actor seed="10856"/>
 		</Entity>
 		<Entity uid="1159">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1021.65052" z="450.13437"/>
 			<Orientation y="2.76679"/>
 			<Actor seed="25000"/>
 		</Entity>
 		<Entity uid="1160">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1034.66004" z="421.54853"/>
 			<Orientation y="1.73171"/>
 			<Actor seed="24146"/>
 		</Entity>
 		<Entity uid="1161">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1059.92688" z="413.18625"/>
 			<Orientation y="2.92865"/>
 			<Actor seed="13820"/>
 		</Entity>
 		<Entity uid="1162">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1104.50855" z="359.78657"/>
 			<Orientation y="1.59249"/>
 			<Actor seed="42848"/>
 		</Entity>
 		<Entity uid="1163">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1133.29896" z="362.08854"/>
 			<Orientation y="1.91216"/>
 			<Actor seed="50660"/>
 		</Entity>
 		<Entity uid="1164">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1149.7013" z="362.08173"/>
 			<Orientation y="1.21113"/>
 			<Actor seed="32426"/>
 		</Entity>
 		<Entity uid="1165">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1217.19886" z="373.5651"/>
 			<Orientation y="2.08335"/>
 			<Actor seed="21060"/>
 		</Entity>
 		<Entity uid="1166">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1248.09437" z="366.34876"/>
 			<Orientation y="1.83959"/>
 			<Actor seed="44306"/>
 		</Entity>
 		<Entity uid="1167">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1275.16883" z="347.68097"/>
 			<Orientation y="2.84958"/>
 			<Actor seed="11706"/>
 		</Entity>
 		<Entity uid="1168">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1286.71363" z="333.6167"/>
 			<Orientation y="-2.37354"/>
 			<Actor seed="17140"/>
 		</Entity>
 		<Entity uid="1169">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1217.62183" z="269.14222"/>
 			<Orientation y="-1.34302"/>
 			<Actor seed="56972"/>
 		</Entity>
 		<Entity uid="1170">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1171.23096" z="266.9741"/>
 			<Orientation y="-1.27569"/>
 			<Actor seed="5966"/>
 		</Entity>
 		<Entity uid="1171">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1138.0896" z="272.58136"/>
 			<Orientation y="-1.92045"/>
 			<Actor seed="62032"/>
 		</Entity>
 		<Entity uid="1172">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1111.52393" z="275.81708"/>
 			<Orientation y="-1.7019"/>
 			<Actor seed="22998"/>
 		</Entity>
 		<Entity uid="1173">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1176.12037" z="206.02991"/>
 			<Orientation y="1.03716"/>
 			<Actor seed="8316"/>
 		</Entity>
 		<Entity uid="1174">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1194.03602" z="155.46293"/>
 			<Orientation y="-1.65645"/>
 			<Actor seed="41020"/>
 		</Entity>
 		<Entity uid="1175">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="1141.84632" z="156.12134"/>
 			<Orientation y="-1.01204"/>
 			<Actor seed="50128"/>
 		</Entity>
 		<Entity uid="1176">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="472.56653" z="112.26581"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38642"/>
 		</Entity>
 		<Entity uid="1177">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="471.40058" z="67.51197"/>
 			<Orientation y="1.40644"/>
 			<Actor seed="28882"/>
 		</Entity>
 		<Entity uid="1178">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="503.04902" z="78.08411"/>
 			<Orientation y="2.6931"/>
 			<Actor seed="17088"/>
 		</Entity>
 		<Entity uid="1179">
-			<Template>gaia/fruit/olive</Template>
+			<Template>gaia/tree/olive</Template>
 			<Player>0</Player>
 			<Position x="526.60578" z="40.25799"/>
 			<Orientation y="2.35621"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fruit/olive.xml b/binaries/data/mods/public/simulation/templates/gaia/tree/olive.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/gaia/fruit/olive.xml
rename to binaries/data/mods/public/simulation/templates/gaia/tree/olive.xml
index 6a3bb4d8e8..76174a842d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fruit/olive.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/tree/olive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_gaia_fruit">
+<Entity parent="template_gaia_tree">
   <Footprint>
     <Height>10</Height>
   </Footprint>
-- 
2.11.4.GIT