From 2969487cddb113f26e7ea35a535c4edd0f91e3a6 Mon Sep 17 00:00:00 2001
From: Freagarach <freagarach@wildfiregames.com>
Date: Wed, 25 Jan 2023 08:56:55 +0000
Subject: [PATCH] Improving corral tooltips/info.

Reduces unnecessary text.
The corral defines the interval and the animal auras define the amount.

Patch by: @Grapjas
Differential revision: https://code.wildfiregames.com/D4896
Comments by: @Langbart, @Stan
Fixes #6687

This was SVN commit r27487.
---
 .../data/auras/structures/corral_garrison.json        |  9 ---------
 .../data/auras/structures/corral_garrison_large.json  | 10 ++++++++++
 .../data/auras/structures/corral_garrison_medium.json | 10 ++++++++++
 .../data/auras/structures/corral_garrison_small.json  | 10 ++++++++++
 .../public/simulation/templates/gaia/fauna_camel.xml  |  3 +++
 .../simulation/templates/gaia/fauna_cattle_cow.xml    |  3 +++
 .../simulation/templates/gaia/fauna_cattle_sanga.xml  |  3 +++
 .../simulation/templates/gaia/fauna_cattle_zebu.xml   |  3 +++
 .../public/simulation/templates/gaia/fauna_goat.xml   |  6 +++---
 .../public/simulation/templates/gaia/fauna_horse.xml  |  3 +++
 .../public/simulation/templates/gaia/fauna_pig.xml    |  6 +++---
 .../public/simulation/templates/gaia/fauna_sheep.xml  |  3 +++
 .../templates/template_structure_resource_corral.xml  | 11 +++++++----
 .../templates/template_unit_fauna_herd_domestic.xml   |  8 +-------
 .../template_unit_fauna_herd_domestic_cattle.xml      |  3 ---
 15 files changed, 62 insertions(+), 29 deletions(-)
 delete mode 100644 binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
 create mode 100644 binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json
 create mode 100644 binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_medium.json
 create mode 100644 binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json

diff --git a/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
deleted file mode 100644
index 9f3e6a97ac..0000000000
--- a/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"type": "garrisonedUnits",
-	"affects": ["Domestic"],
-	"modifications": [
-		{ "value": "ResourceTrickle/Rates/food", "add": 1 }
-	],
-	"auraDescription" : "Garrison domesticated animals within the Corral to enable a slow trickle of food per animal. Pigs, Sheep, and Goats: 1 food/4 seconds. Cattle: 1 food/2 seconds.",
-	"auraName": "Ranching and Corralling"
-}
diff --git a/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json
new file mode 100644
index 0000000000..b5e1f347b2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json
@@ -0,0 +1,10 @@
+{
+	"type": "garrison",
+	"affects": ["Corral"],
+	"modifications": [
+		{ "value": "ResourceTrickle/Rates/food", "add": 3 }
+	],
+	"auraDescription" : "Garrison within the Corral to gain a slow trickle of +3 food.",
+	"auraName": "Ranching and Corralling",
+	"stackable": true
+}
diff --git a/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_medium.json b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_medium.json
new file mode 100644
index 0000000000..dbb56213fd
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_medium.json
@@ -0,0 +1,10 @@
+{
+	"type": "garrison",
+	"affects": ["Corral"],
+	"modifications": [
+		{ "value": "ResourceTrickle/Rates/food", "add": 2 }
+	],
+	"auraDescription" : "Garrison within the Corral to gain a slow trickle of +2 food.",
+	"auraName": "Ranching and Corralling",
+	"stackable": true
+}
diff --git a/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json
new file mode 100644
index 0000000000..1d39d6d41b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json
@@ -0,0 +1,10 @@
+{
+	"type": "garrison",
+	"affects": ["Corral"],
+	"modifications": [
+		{ "value": "ResourceTrickle/Rates/food", "add": 1 }
+	],
+	"auraDescription" : "Garrison within the Corral to gain a slow trickle of +1 food.",
+	"auraName": "Ranching and Corralling",
+	"stackable": true
+}
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
index e875565f78..115baa0f10 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_medium
+  </Auras>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>5.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
index f095a59907..6318b005b7 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
index aaaa68e7ee..e2f0b1f461 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
index e412d05036..d6b8ff16b5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
index 71d0054427..3e945711e0 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
@@ -25,9 +28,6 @@
     <Max>70</Max>
     <MaxGatherers>2</MaxGatherers>
   </ResourceSupply>
-  <ResourceTrickle>
-    <Interval>5000</Interval>
-  </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/goat_select.xml</select>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
index d6b00ccb8e..9c12a797ac 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_medium
+  </Auras>
   <Footprint>
     <Square width="3.0" depth="6.0"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
index 4715033af9..bbf2faec30 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Auras datatype="tokens">
+    structures/corral_garrison_medium
+  </Auras>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
@@ -25,9 +28,6 @@
     <Max>150</Max>
     <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
-  <ResourceTrickle>
-    <Interval>3000</Interval>
-  </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_select.xml</select>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
index 79b9d3449f..0558709c04 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
index 712d398e81..ea5fb4e40e 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
-  <Auras datatype="tokens">
-    structures/corral_garrison
-  </Auras>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
@@ -28,13 +25,19 @@
   <Identity>
     <GenericName>Corral</GenericName>
     <SelectionGroupName>template_structure_resource_corral</SelectionGroupName>
-    <Tooltip>Raise Domestic Animals for food.</Tooltip>
+    <Tooltip>Raise Domestic Animals for food. Garrison animals to gain a trickle of food.</Tooltip>
     <VisibleClasses datatype="tokens">Economic Village Corral</VisibleClasses>
     <Icon>structures/corral.png</Icon>
     <Requirements>
       <Techs>phase_village</Techs>
     </Requirements>
   </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <food>0</food>
+    </Rates>
+    <Interval>5000</Interval>
+  </ResourceTrickle>
   <Loot>
     <wood>20</wood>
   </Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
index 5a232141c3..bc91485c1f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
@@ -2,14 +2,8 @@
 <Entity parent="template_unit_fauna_herd">
   <Identity>
     <Classes datatype="tokens">Domestic</Classes>
-    <Tooltip>Kill to gather meat for quick food or garrison in a Corral for a slow food trickle.</Tooltip>
+    <Tooltip>Kill to gather meat for quick food.</Tooltip>
   </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <food>0</food>
-    </Rates>
-    <Interval>4000</Interval>
-  </ResourceTrickle>
   <Vision>
     <Range>6</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
index 6efd1e925c..58ed9cad38 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
@@ -5,9 +5,6 @@
       <Techs>phase_city</Techs>
     </Requirements>
   </Identity>
-  <ResourceTrickle>
-    <Interval>2000</Interval>
-  </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>