From 6a3b558227bda1ccb21ccfe30c5e6a023ec40e26 Mon Sep 17 00:00:00 2001
From: clemty <clemty@gmail.com>
Date: Thu, 1 Oct 2015 23:00:01 +0200
Subject: [PATCH] Fix crash in cnc64gdi01 apparently helicopters can't .Hunt()
 I introduced the bug late in testing, so it didn't trigger in review on the
 plus side, AI will now attack you from a random direction

---
 mods/cnc/maps/cnc64gdi01/cnc64gdi01.lua | 14 +++++++++++++-
 mods/cnc/maps/cnc64gdi01/map.yaml       | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/mods/cnc/maps/cnc64gdi01/cnc64gdi01.lua b/mods/cnc/maps/cnc64gdi01/cnc64gdi01.lua
index 41e923043a..b55e7d466a 100644
--- a/mods/cnc/maps/cnc64gdi01/cnc64gdi01.lua
+++ b/mods/cnc/maps/cnc64gdi01/cnc64gdi01.lua
@@ -15,6 +15,12 @@ AutocreateSquads =
 	{ "arty", "arty" }
 }
 
+HeliPatrolPaths =
+{
+	{ HeliPatrol1.Location, HeliPatrol2.Location, HeliPatrol3.Location, HeliPatrol4.Location, HeliPatrol5.Location, HeliPatrol6.Location },
+	{ HeliPatrol5.Location, HeliPatrol4.Location, HeliPatrol3.Location, HeliPatrol2.Location, HeliPatrol1.Location, HeliPatrol6.Location }
+}
+
 AttackTriggers = { AttackTrigger1, AttackTrigger2, AttackTrigger3, AttackTrigger4 }
 
 harvester = { "harv" }
@@ -176,7 +182,13 @@ end
 
 HeliHunt = function()
 	local helicopters = enemy.GetActorsByType("heli")
-	SquadHunt(helicopters)
+	local patrolpath = Utils.Random(HeliPatrolPaths)
+
+	Utils.Do(helicopters, function(actor)
+		Trigger.OnIdle(actor, function()
+			actor.Patrol(patrolpath)
+		end)
+	end)
 end
 
 SquadHunt = function(actors)
diff --git a/mods/cnc/maps/cnc64gdi01/map.yaml b/mods/cnc/maps/cnc64gdi01/map.yaml
index 48274fc449..ec3f9b7abe 100644
--- a/mods/cnc/maps/cnc64gdi01/map.yaml
+++ b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -709,6 +709,24 @@ Actors:
 		Owner: Nod
 		Location: 28,11
 		Facing: 92
+	HeliPatrol1: waypoint
+		Owner: Nod
+		Location: 15,43
+	HeliPatrol2: waypoint
+		Owner: Nod
+		Location: 3,49
+	HeliPatrol3: waypoint
+		Owner: Nod
+		Location: 24,55
+	HeliPatrol4: waypoint
+		Owner: Nod
+		Location: 44,52
+	HeliPatrol5: waypoint
+		Owner: Nod
+		Location: 45,32
+	HeliPatrol6: waypoint
+		Owner: Nod
+		Location: 26,14
 
 Smudges:
 
@@ -763,6 +781,9 @@ Rules:
 			GenericVisibility: Enemy, Ally, Neutral
 			GenericStancePrefix: false
 			ShowOwnerRow: false
+	BIO.Husk:
+		Tooltip:
+			ShowOwnerRow: false
 	EYE:
 		IonCannonPower:
 			Prerequisites: ~disabled