From 8711d8799ca179293e3a59631d5b5806c248a58e Mon Sep 17 00:00:00 2001
From: Smittytron <Smitty3228@gmail.com>
Date: Sat, 6 Feb 2021 19:02:22 -0600
Subject: [PATCH] Improve AI response in Nod03a

---
 mods/cnc/maps/nod03a/map.yaml   | 45 ++++++++++++++++++---------------
 mods/cnc/maps/nod03a/nod03a.lua | 30 +++++++++++++++++++++-
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml
index 4904013385..1cff58cdae 100644
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -26,15 +26,15 @@ Players:
 		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
+		Bot: campaign
 		Faction: gdi
 		Color: F5D378
 		Allies: GDI
 		Enemies: Nod
-		Bot: campaign
 	PlayerReference@Nod:
 		Name: Nod
-		Playable: True
 		AllowBots: False
+		Playable: True
 		Required: True
 		LockFaction: True
 		Faction: nod
@@ -214,28 +214,28 @@ Actors:
 	Actor55: t18
 		Location: 38,31
 		Owner: Neutral
-	Actor56: pyle
+	Base2: pyle
 		Location: 25,20
 		Owner: GDI
-	Actor57: fact
+	Base1: fact
 		Location: 27,20
 		Owner: GDI
-	Actor58: silo
+	Base5: silo
 		Location: 23,17
 		Owner: GDI
-	Actor59: silo
+	Base4: silo
 		Location: 23,19
 		Owner: GDI
-	Actor60: proc
+	Base3: proc
 		Location: 20,17
 		Owner: GDI
-	Actor61: nuke
+	Base6: nuke
 		Location: 25,17
 		Owner: GDI
-	Actor62: nuke
+	Base7: nuke
 		Location: 27,17
 		Owner: GDI
-	Actor63: gtwr
+	GuardTower: gtwr
 		Location: 28,24
 		Owner: GDI
 	Actor64: v24
@@ -283,11 +283,11 @@ Actors:
 	Actor79: v26
 		Location: 37,19
 		Owner: Neutral
-	Actor82: jeep
+	Humvee2: jeep
 		Location: 21,22
 		Owner: GDI
 		Facing: 512
-	Actor83: jeep
+	Humvee1: jeep
 		Location: 20,22
 		Owner: GDI
 		Facing: 512
@@ -318,11 +318,11 @@ Actors:
 		Owner: GDI
 		Facing: 384
 		SubCell: 4
-	Actor101: e1
+	Patrol3: e1
 		Location: 34,23
 		Owner: GDI
-		Facing: 384
 		SubCell: 2
+		Facing: 384
 	Actor102: c1
 		Location: 19,40
 		Owner: Neutral
@@ -354,11 +354,11 @@ Actors:
 		Owner: GDI
 		Facing: 384
 		SubCell: 3
-	Actor109: e1
+	Patrol1: e1
 		Location: 34,25
 		Owner: GDI
-		Facing: 640
 		SubCell: 2
+		Facing: 640
 	Actor111: e1
 		Location: 39,31
 		Owner: GDI
@@ -368,16 +368,16 @@ Actors:
 		Owner: GDI
 		Facing: 384
 		SubCell: 0
-	Actor116: e2
+	Patrol4: e2
 		Location: 34,22
 		Owner: GDI
-		Facing: 384
 		SubCell: 3
-	Actor117: e2
+		Facing: 384
+	Patrol2: e2
 		Location: 34,23
 		Owner: GDI
-		Facing: 640
 		SubCell: 4
+		Facing: 640
 	Actor118: e2
 		Location: 42,18
 		Owner: GDI
@@ -427,7 +427,10 @@ Actors:
 	AttackWaveSpawnC: waypoint
 		Location: 33,16
 		Owner: Neutral
-	CellTrig: waypoint
+	PatrolA: waypoint
+		Location: 24,26
+		Owner: Neutral
+	PatrolB: waypoint
 		Location: 32,47
 		Owner: Neutral
 
diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua
index a11002f60f..3035c55031 100644
--- a/mods/cnc/maps/nod03a/nod03a.lua
+++ b/mods/cnc/maps/nod03a/nod03a.lua
@@ -10,10 +10,14 @@
 NodUnits = { "bike", "e3", "e1", "bggy", "e1", "e3", "bike", "bggy" }
 FirstAttackWave = { "e1", "e1", "e1", "e2", }
 SecondThirdAttackWave = { "e1", "e1", "e2", }
+GDIBase = { Base1, Base2, Base3, Base4, Base5, Base6, Base7 }
+Humvees = { Humvee1, Humvee2 }
+PatrolTeam = { Patrol1, Patrol2, Patrol3, Patrol4 }
+PatrolRoute = { PatrolA.Location, PatrolB.Location }
 
 SendAttackWave = function(units, spawnPoint)
 	Reinforcements.Reinforce(GDI, units, { spawnPoint }, DateTime.Seconds(1), function(actor)
-		actor.AttackMove(PlayerBase.Location)
+		IdleHunt(actor)
 	end)
 end
 
@@ -36,6 +40,10 @@ WorldLoaded = function()
 		Nod.MarkFailedObjective(CapturePrison)
 	end)
 
+	Utils.Do(PatrolTeam, function(a)
+		a.Patrol(PatrolRoute, true)
+	end)
+
 	Media.PlaySpeechNotification(Nod, "Reinforce")
 	Reinforcements.Reinforce(Nod, NodUnits, { NodEntry.Location, NodRallyPoint.Location })
 	Trigger.AfterDelay(DateTime.Seconds(9), function()
@@ -45,6 +53,26 @@ WorldLoaded = function()
 	Trigger.AfterDelay(DateTime.Seconds(20), function() SendAttackWave(FirstAttackWave, AttackWaveSpawnA.Location) end)
 	Trigger.AfterDelay(DateTime.Seconds(50), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnB.Location) end)
 	Trigger.AfterDelay(DateTime.Seconds(100), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnC.Location) end)
+
+	Trigger.OnDamaged(GuardTower, function()
+		if not TowerDamaged then
+			TowerDamaged = true
+			Utils.Do(Humvees, function(unit)
+				IdleHunt(unit)
+			end)
+		end
+	end)
+
+	Trigger.OnAnyKilled(GDIBase, function()
+		if not BaseAttacked then
+			BaseAttacked = true
+			Utils.Do(GDI.GetGroundAttackers(), function(unit)
+				if not unit.IsDead then
+					IdleHunt(unit)
+				end
+			end)
+		end
+	end)
 end
 
 Tick = function()