From bc704b288a30242a94b399bb164d5b696546eb6b Mon Sep 17 00:00:00 2001
From: WhiteTreePaladin <brian@wildfiregames.com>
Date: Sat, 24 Jul 2010 20:26:25 +0000
Subject: [PATCH] Made Animal AI default to "PASSIVE" if its type was not found
 Added rudimentary fishing for units and merchant ships Adjusted resource
 gather rates Improved Mountain Pass map

This was SVN commit r7799.
---
 .../public/maps/scenarios/Mountain-Pass-x8.pmp   |  2 +-
 .../public/maps/scenarios/Mountain-Pass-x8.xml   |  4 ++--
 .../public/simulation/components/AnimalAI.js     |  7 ++++++-
 .../simulation/components/ResourceGatherer.js    | 13 ++++++++++++-
 .../simulation/templates/gaia/fauna_fish.xml     | 10 ++++++++++
 .../gaia/special_treasure_golden_fleece.xml      |  2 +-
 .../templates/template_unit_cavalry.xml          |  3 ++-
 .../templates/template_unit_fauna_fish.xml       | 16 ++++++++++++++++
 .../templates/template_unit_infantry.xml         |  5 +++--
 .../template_unit_mechanical_ship_merchant.xml   |  8 ++++++++
 .../template_unit_support_female_citizen.xml     |  9 +++++----
 11 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
 create mode 100644 binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml

diff --git a/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.pmp b/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.pmp
index 8354afd8fa..445959d110 100644
--- a/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.pmp
+++ b/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62719c8e313cdf9b9f308118576e701754f190bc7a347b29a47ac1a370f120cd
+oid sha256:94345f8d113e8c72957382a90a762343aac337001dd36ca18decfd3ca2b627d7
 size 208242
diff --git a/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.xml b/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.xml
index e32218a217..994250e39c 100644
--- a/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.xml
+++ b/binaries/data/mods/public/maps/scenarios/Mountain-Pass-x8.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cb81fdbb2f99013ec13389f70c2e69677df345a22814a110027d354a9e08703
-size 87064
+oid sha256:dcafa7cc22c68c5c7a39ca91334bfc862f41ee89ca7c45f7f322200dfb3b68a5
+size 83966
diff --git a/binaries/data/mods/public/simulation/components/AnimalAI.js b/binaries/data/mods/public/simulation/components/AnimalAI.js
index 5482cd64b2..9aafd6b546 100644
--- a/binaries/data/mods/public/simulation/components/AnimalAI.js
+++ b/binaries/data/mods/public/simulation/components/AnimalAI.js
@@ -186,7 +186,12 @@ AnimalAI.prototype.Init = function()
 AnimalAI.prototype.OnCreate = function()
 {
 	var startingState = this.template.NaturalBehaviour;
-	startingState = startingState.toUpperCase(startingState) + ".FEEDING";
+	startingState = startingState.toUpperCase(startingState);
+
+	if (startingState == "SKITTISH")
+		startingState = startingState + ".FEEDING";
+	else
+		startingState = "PASSIVE.FEEDING";
 
 	AnimalFsm.Init(this, startingState);
 };
diff --git a/binaries/data/mods/public/simulation/components/ResourceGatherer.js b/binaries/data/mods/public/simulation/components/ResourceGatherer.js
index e138bcf25f..3199357c64 100644
--- a/binaries/data/mods/public/simulation/components/ResourceGatherer.js
+++ b/binaries/data/mods/public/simulation/components/ResourceGatherer.js
@@ -3,6 +3,7 @@ function ResourceGatherer() {}
 ResourceGatherer.prototype.Schema =
 	"<a:help>Lets the unit gather resources from entities that have the ResourceSupply component.</a:help>" +
 	"<a:example>" +
+		"<MaxDistance>2.0</MaxDistance>" +
 		"<BaseSpeed>1.0</BaseSpeed>" +
 		"<Rates>" +
 			"<food.fish>1</food.fish>" +
@@ -11,6 +12,9 @@ ResourceGatherer.prototype.Schema =
 			"<wood.tree>2</wood.tree>" +
 		"</Rates>" +
 	"</a:example>" +
+	"<element name='MaxDistance' a:help='Max resource-gathering distance'>" +
+		"<ref name='positiveDecimal'/>" +
+	"</element>" +
 	"<element name='BaseSpeed' a:help='Base resource-gathering rate (in resource units per second)'>" +
 		"<ref name='positiveDecimal'/>" +
 	"</element>" +
@@ -46,7 +50,14 @@ ResourceGatherer.prototype.GetGatherRates = function()
 
 ResourceGatherer.prototype.GetRange = function()
 {
-	return { "max": 2, "min": 0 };
+	//this.template
+	//warn(this.template);
+	
+	
+	return { "max": this.template.MaxDistance, "min": 0 };
+	
+	
+//	return { "max": 2, "min": 0 };
 	// maybe this should depend on the unit or target or something?
 }
 
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
new file mode 100644
index 0000000000..64319dd37f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_fish">
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Fish</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/fish.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
index c481c44326..117c65e67a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
@@ -7,7 +7,7 @@
 	<IconCell>1</IconCell>
   </Identity>
   <ResourceSupply>
-    <Amount>5000</Amount>
+    <Amount>3000</Amount>
     <Type>metal.treasure</Type>
   </ResourceSupply>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 423fd86f73..a39bf1e6ab 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -25,9 +25,10 @@
     <metal>1</metal>
   </Loot>
   <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <food.meat>20</food.meat>
+      <food.meat>12</food.meat>
 	  <metal.treasure>10000</metal.treasure>
     </Rates>
   </ResourceGatherer>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
new file mode 100644
index 0000000000..918c91a149
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna">
+  <Identity>
+    <GenericName>Fish</GenericName>
+  </Identity>
+  <Position>
+	<Altitude>-4.0</Altitude>
+	<Floating>true</Floating>
+  </Position>
+  <UnitMotion disable=""/>
+  <AnimalAI disable=""/>
+  <ResourceSupply>
+    <Amount>500</Amount>
+    <Type>food.fish</Type>
+  </ResourceSupply>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 3a3ef53522..ff131e8ef3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -25,12 +25,13 @@
   </Loot>
   <Looter/>
   <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <food.fish>1</food.fish>
+      <food.fish>.8</food.fish>
       <food.fruit>1</food.fruit>
       <food.grain>1</food.grain>
-      <food.meat>1</food.meat>
+      <food.meat>8</food.meat>
       <metal.ore>3</metal.ore>
 	  <metal.treasure>10000</metal.treasure>
       <stone.rock>3</stone.rock>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
index adaf5860a7..2ecf79d644 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
@@ -10,6 +10,14 @@
       <metal>100</metal>
     </Resources>
   </Cost>
+  <ResourceGatherer>
+    <MaxDistance>12.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <food.fish>1</food.fish>
+	  <metal.treasure>10000</metal.treasure>
+    </Rates>
+  </ResourceGatherer>
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 6b1a34d0a3..6135fd9992 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -14,12 +14,13 @@
     </Resources>
   </Cost>
   <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <food.fish>0.8</food.fish>
-      <food.fruit>3</food.fruit>
-      <food.grain>3</food.grain>
-      <food.meat>0.5</food.meat>
+      <food.fish>.8</food.fish>
+      <food.fruit>2</food.fruit>
+      <food.grain>1</food.grain>
+      <food.meat>6</food.meat>
       <metal.ore>1</metal.ore>
 	  <metal.treasure>10000</metal.treasure>
       <stone.rock>1</stone.rock>