From bd26f04e5a72caf5a4b6b748fede4e2fc8316c4c Mon Sep 17 00:00:00 2001
From: bb <bb@wildfiregames.com>
Date: Fri, 31 May 2019 12:00:49 +0000
Subject: [PATCH] Set ship status bars in parent

Patch By: Nescio
Reviewed By: wraitii
Comments By: Imarok, Stan
Differential Revision: https://code.wildfiregames.com/D1842
This was SVN commit r22326.
---
 .../mods/public/simulation/templates/template_unit_ship.xml  | 5 +++++
 .../simulation/templates/template_unit_ship_bireme.xml       | 5 -----
 .../public/simulation/templates/template_unit_ship_fire.xml  | 5 -----
 .../simulation/templates/template_unit_ship_fishing.xml      | 5 +++++
 .../simulation/templates/template_unit_ship_merchant.xml     | 5 -----
 .../simulation/templates/template_unit_ship_quinquereme.xml  | 5 -----
 .../simulation/templates/template_unit_ship_trireme.xml      | 5 -----
 7 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
index d9962ee321..1341995e02 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -78,6 +78,11 @@
       <death>actor/ship/warship_death.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.5</BarHeight>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <PassabilityClass>ship</PassabilityClass>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
index 5c2ee00de8..d24f74605e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -67,11 +67,6 @@
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.55</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
index 1efc4607af..d0de3418b4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -46,11 +46,6 @@
   <Loot disable=""/>
   <Repairable disable=""/>
   <ResourceGatherer disable=""/>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.6</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
index 107c34602b..5520942265 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -54,6 +54,11 @@
       <order_attack>actor/ship/boat_move.xml</order_attack>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <BarWidth>2.0</BarWidth>
+    <BarHeight>0.333</BarHeight>
+    <HeightOffset>5.0</HeightOffset>
+  </StatusBars>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
index 9b05b35607..ae915da136 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -45,11 +45,6 @@
       <metal>50</metal>
     </Capacities>
   </ResourceGatherer>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
index 0da0fcc37b..450a4ec7ab 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -75,11 +75,6 @@
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
index 65de6f7238..ec710fd51a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -67,11 +67,6 @@
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
   </UnitMotion>