From cd6c31e76e13c41c17ba0dc79656501a4c3f8256 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Wed, 22 Mar 2017 22:38:22 +0000
Subject: [PATCH] Revert UnitAI changes of 79fb493da3 (besides the patrol
 comment) and use an exotic template instead.

The originally intended approach to support move-orders independent of
the Identity classes can be discussed in an independent proposal.

Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D176
This was SVN commit r19323.
---
 .../mods/public/maps/random/polar_sea_triggers.js  |  2 +-
 .../mods/public/simulation/components/UnitAI.js    | 14 +++++++++-----
 .../templates/trigger/fauna_wolf_snow_domestic.xml |  6 ++++++
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_domestic.xml

diff --git a/binaries/data/mods/public/maps/random/polar_sea_triggers.js b/binaries/data/mods/public/maps/random/polar_sea_triggers.js
index accf56bd4a..8a5f627e93 100644
--- a/binaries/data/mods/public/maps/random/polar_sea_triggers.js
+++ b/binaries/data/mods/public/maps/random/polar_sea_triggers.js
@@ -1,6 +1,6 @@
 const debugLog = false;
 
-var attackerTemplate = "gaia/fauna_wolf_snow";
+var attackerTemplate = "trigger/fauna_wolf_snow_domestic";
 
 var minWaveSize = 1;
 var maxWaveSize = 3;
diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index a6cee5e991..18ddbaced1 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -182,7 +182,8 @@ UnitAI.prototype.UnitFsmSpec = {
 
 	// Called when being told to walk as part of a formation
 	"Order.FormationWalk": function(msg) {
-		if (this.IsTurret())
+		// Let players move captured domestic animals around
+		if (this.IsAnimal() && !this.IsDomestic() || this.IsTurret())
 		{
 			this.FinishOrder();
 			return;
@@ -254,7 +255,8 @@ UnitAI.prototype.UnitFsmSpec = {
 	},
 
 	"Order.Walk": function(msg) {
-		if (this.IsTurret())
+		// Let players move captured domestic animals around
+		if (this.IsAnimal() && !this.IsDomestic() || this.IsTurret())
 		{
 			this.FinishOrder();
 			return;
@@ -282,7 +284,8 @@ UnitAI.prototype.UnitFsmSpec = {
 	},
 
 	"Order.WalkAndFight": function(msg) {
-		if (this.IsTurret())
+		// Let players move captured domestic animals around
+		if (this.IsAnimal() && !this.IsDomestic() || this.IsTurret())
 		{
 			this.FinishOrder();
 			return;
@@ -308,7 +311,8 @@ UnitAI.prototype.UnitFsmSpec = {
 
 
 	"Order.WalkToTarget": function(msg) {
-		if (this.IsTurret())
+		// Let players move captured domestic animals around
+		if (this.IsAnimal() && !this.IsDomestic() || this.IsTurret())
 		{
 			this.FinishOrder();
 			return;
@@ -511,7 +515,7 @@ UnitAI.prototype.UnitFsmSpec = {
 	},
 
 	"Order.Patrol": function(msg) {
-		if (this.IsTurret())
+		if (this.IsAnimal() || this.IsTurret())
 		{
 			this.FinishOrder();
 			return;
diff --git a/binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_domestic.xml b/binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_domestic.xml
new file mode 100644
index 0000000000..9f8383d3ae
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/trigger/fauna_wolf_snow_domestic.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="gaia/fauna_wolf_snow">
+  <Identity>
+    <Classes datatype="tokens">Domestic</Classes>
+  </Identity>
+</Entity>