From 8e34371debf04e950b2b053e75896519b2e809c7 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Mon, 15 Mar 2021 15:45:20 +0000
Subject: [PATCH] Streamline ship stats.

- Fishing boat build time from 20 to 15 (5 less than bireme/merchant).
- Quinquereme population from 3 to 5 (biremes have 2, triremes 3)
- Warships get a 2:1 wood to metal cost
- Loot is standardized to 20% of costs, XP to 10% of health, similar to
siege engines and structures.
- Fishing boath & Merchant ship have the same resistance as warships but
accordingly lower HP, for easier stat comparison.

Patch by: Nescio
Accepted By: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2956
This was SVN commit r25058.
---
 .../templates/template_unit_ship_bireme.xml        | 10 +++++-----
 .../templates/template_unit_ship_fishing.xml       | 14 ++------------
 .../templates/template_unit_ship_merchant.xml      | 14 ++------------
 .../templates/template_unit_ship_quinquereme.xml   | 13 ++++++-------
 .../templates/template_unit_ship_trireme.xml       |  8 ++++----
 .../templates/units/brit/ship_trireme.xml          |  3 +++
 .../templates/units/gaul/ship_trireme.xml          |  3 +++
 .../templates/units/iber/ship_trireme.xml          |  3 +++
 .../templates/units/kush/ship_trireme.xml          |  6 ------
 .../templates/units/maur/ship_trireme.xml          |  3 +++
 .../templates/units/ptol/champion_juggernaut.xml   | 11 +++++------
 11 files changed, 36 insertions(+), 52 deletions(-)

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 727849bc6c..9a94d99a65 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
@@ -31,8 +31,8 @@
     <Population>2</Population>
     <BuildTime>20</BuildTime>
     <Resources>
-      <wood>125</wood>
-      <metal>50</metal>
+      <wood>120</wood>
+      <metal>60</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
@@ -49,9 +49,9 @@
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>75</xp>
-    <wood>25</wood>
-    <metal>15</metal>
+    <xp>80</xp>
+    <wood>24</wood>
+    <metal>12</metal>
   </Loot>
   <Sound>
     <SoundGroups>
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 2ed6885a40..ddf9e65778 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
@@ -13,7 +13,7 @@
     </Melee>
   </Attack>
   <Cost>
-    <BuildTime>20</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
@@ -22,7 +22,7 @@
     <Max>1</Max>
   </GarrisonHolder>
   <Health>
-    <Max>200</Max>
+    <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Fishing Boat</GenericName>
@@ -32,18 +32,8 @@
     <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
   </Identity>
   <Loot>
-    <xp>1</xp>
     <wood>10</wood>
   </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
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 45d419e79a..6bd69484f6 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
@@ -11,7 +11,7 @@
     <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
-    <Max>400</Max>
+    <Max>240</Max>
   </Health>
   <Identity>
     <GenericName>Merchantman</GenericName>
@@ -22,18 +22,8 @@
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>25</xp>
-    <wood>15</wood>
+    <metal>20</xp>
   </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
     <GarrisonGainMultiplier>0.2</GarrisonGainMultiplier>
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 5c36520219..c3f8b08a2c 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
@@ -28,12 +28,11 @@
     <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
-    <Population>3</Population>
+    <Population>5</Population>
     <BuildTime>30</BuildTime>
     <Resources>
-      <wood>350</wood>
-      <metal>200</metal>
-      <stone>350</stone>
+      <wood>600</wood>
+      <metal>300</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
@@ -50,9 +49,9 @@
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>150</xp>
-    <wood>40</wood>
-    <metal>30</metal>
+    <xp>200</xp>
+    <wood>120</wood>
+    <metal>60</metal>
   </Loot>
   <Position>
     <TurnRate>2</TurnRate>
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 a0afa9257e..fa13eb9fc5 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
@@ -31,8 +31,8 @@
     <Population>3</Population>
     <BuildTime>25</BuildTime>
     <Resources>
-      <wood>150</wood>
-      <metal>150</metal>
+      <wood>200</wood>
+      <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
@@ -49,8 +49,8 @@
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>100</xp>
-    <wood>30</wood>
+    <xp>140</xp>
+    <wood>40</wood>
     <metal>20</metal>
   </Loot>
   <Position>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
index 247ad10fb7..93dbe03652 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
@@ -18,6 +18,9 @@
     <SpecificName>Pontos</SpecificName>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
index d9229c19bc..b4278adffa 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
@@ -18,6 +18,9 @@
     <SpecificName>Pontos</SpecificName>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
index bb6d533ad4..b4cd39662e 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
@@ -19,6 +19,9 @@
     <Tooltip>Transport many soldiers across the sea.</Tooltip>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
index 2e799785e2..d6edc3a926 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
-  <Cost>
-    <Resources>
-      <wood op="add">50</wood>
-      <metal op="add">50</metal>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
index dc900fff85..8c70376831 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
@@ -18,6 +18,9 @@
     <SpecificName>Yudhpot</SpecificName>
     <Icon>units/maur_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
index e99a2159e6..3ee611c785 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
@@ -4,9 +4,8 @@
     <Population>5</Population>
     <BuildTime>60</BuildTime>
     <Resources>
-      <wood>400</wood>
-      <metal>300</metal>
-      <stone>350</stone>
+      <wood>800</wood>
+      <metal>400</metal>
     </Resources>
   </Cost>
   <Footprint>
@@ -27,9 +26,9 @@
     <Icon>units/rome_ship_quinquereme.png</Icon>
   </Identity>
   <Loot>
-    <xp>200</xp>
-    <wood>50</wood>
-    <metal>50</metal>
+    <xp>400</xp>
+    <wood>160</wood>
+    <metal>80</metal>
   </Loot>
   <TrainingRestrictions>
     <Category>Juggernaut</Category>