From fe8004502491a97f3b52382a8d108a94bbc7ff84 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Wed, 21 Dec 2011 05:40:30 +0000
Subject: [PATCH] This was SVN commit r10780.

---
 .../art/actors/structures/hellenes/fishing_boat.xml |  2 ++
 .../session/portraits/units/256/pers_hero_cyrus.png |  3 +++
 .../ui/session/portraits/units/pers_hero_cyrus.png  |  4 ++--
 .../simulation/templates/gaia/fauna_whale_fin.xml   | 13 +++++++++----
 .../template_unit_mechanical_ship_bireme.xml        |  3 +++
 .../template_unit_mechanical_ship_fishing.xml       |  9 +++++++++
 .../template_unit_mechanical_ship_trireme.xml       |  3 +++
 .../simulation/templates/units/pers_hero_cyrus.xml  |  2 +-
 8 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/ui/session/portraits/units/256/pers_hero_cyrus.png

diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/fishing_boat.xml b/binaries/data/mods/public/art/actors/structures/hellenes/fishing_boat.xml
index fe18e0e3f3..e1e7b9edc8 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/fishing_boat.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/fishing_boat.xml
@@ -7,6 +7,7 @@
       <animations>
         <animation file="mechanical/rowing_boat_move.dae" name="Walk" speed="10"/>
         <animation file="mechanical/rowing_boat_move.dae" name="Run" speed="10"/>
+        <animation file="mechanical/rowing_boat_move.dae" name="carry_meat" speed="10"/>
       </animations>
       <mesh>structural/hele_fishing_boat.dae</mesh>
       <props>
@@ -19,6 +20,7 @@
       <animations>
         <animation file="mechanical/rowing_boat_move.dae" name="Walk" speed="10"/>
         <animation file="mechanical/rowing_boat_move.dae" name="Run" speed="10"/>
+        <animation file="mechanical/rowing_boat_move.dae" name="carry_meat" speed="10"/>
       </animations>
       <mesh>structural/hele_fishing_boat.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/256/pers_hero_cyrus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/256/pers_hero_cyrus.png
new file mode 100644
index 0000000000..3e3d0abc0d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/256/pers_hero_cyrus.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1933d52008f8bdf68b0036a5e3944468b7b9c9e8b4bc95175cc260d3d2b28d00
+size 144658
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_cyrus.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_cyrus.png
index b3aca47c0c..a0a4af16ca 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_cyrus.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_hero_cyrus.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78cb70e291a2176ba470d7b1f34211d72cd89a2d2d31aaa855a28946ae78b692
-size 26091
+oid sha256:089e883ea956969a82625d1efd652e56a0d46e0b84b9ea0c314971b68d313289
+size 40664
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
index 5d2583faf3..65a6f9cb59 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
@@ -26,20 +26,25 @@
     <Amount>2000</Amount>
     <Type>food.fish</Type>
   </ResourceSupply>
+  <StatusBars>
+    <BarWidth>4.0</BarWidth>
+    <BarHeight>0.666</BarHeight>
+    <HeightOffset>5.0</HeightOffset>
+  </StatusBars>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>30.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
-    <RoamTimeMin>10000</RoamTimeMin>
-    <RoamTimeMax>30000</RoamTimeMax>
+    <RoamTimeMin>100000</RoamTimeMin>
+    <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1000</FeedTimeMin>
     <FeedTimeMax>2000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship</PassabilityClass>
-    <WalkSpeed>6.0</WalkSpeed>
+    <WalkSpeed>10.0</WalkSpeed>
     <Run>
-      <Speed>12.0</Speed>
+      <Speed>15.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
index 0afe0e3741..ff605b716a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
@@ -55,5 +55,8 @@
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>12.5</WalkSpeed>
+    <Run>
+      <Speed>18.0</Speed>
+    </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
index b4e869a019..7067e806d6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
@@ -5,6 +5,15 @@
     <Pierce>10.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>5.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="6.0" depth="12.0"/>
     <Height>6.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
index 087edec7d3..96407d1c0e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
@@ -59,5 +59,8 @@
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>14.5</WalkSpeed>
+    <Run>
+      <Speed>20.0</Speed>
+    </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
index f008428b67..e5445f5e7f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
@@ -4,7 +4,7 @@
     <Civ>pers</Civ>
 	<GenericName>Cyrus II The Great</GenericName>
     <SpecificName>Kurush II</SpecificName>
-    <Icon>units/pers_hero_xerxes.png</Icon>
+    <Icon>units/pers_hero_cyrus.png</Icon>
 	<Tooltip>Hero Cavalry Lancer.
 Hero Aura: "Lead from the Front." Boosts attack of nearby cavalry units.</Tooltip>
     <History>(559 BC - 530 BC) The son of a Median princess and the ruler of Anshan; justly called the 'Father of the Empire', Cyrus the Great conquered Media, Lydia, Babylonia and Bactria, thereby establishing the Persian Empire. He was also renown as a benevolent conqueror. Technically the second ruler of the Persians by that name, and so appears as Kurush II on his documents and coins. Kurush I was his grandfather.</History>