From c0610ad1e794cf43e51adec145351a33180bada8 Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Sat, 3 May 2014 23:06:36 +0200
Subject: [PATCH] Various fixes to gdi04a

* Remove support for difficulty levels
* Fix victory conditions for the enemy player
* Adjust difficulty due to the recent balance changes
---
 mods/cnc/maps/gdi04a/gdi04a.lua | 21 ++++++---------------
 mods/cnc/maps/gdi04a/map.yaml   |  5 ++++-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/mods/cnc/maps/gdi04a/gdi04a.lua b/mods/cnc/maps/gdi04a/gdi04a.lua
index 9651a21b58..d9c27d5dc9 100644
--- a/mods/cnc/maps/gdi04a/gdi04a.lua
+++ b/mods/cnc/maps/gdi04a/gdi04a.lua
@@ -1,20 +1,15 @@
-Nod1Template  = { {HandOfNod, {"e1", "e1", "e1", "e3", "e3"}} }
+Nod1Template  = { {HandOfNod, {"e1", "e1", "e3", "e3"}} }
 Auto1Template = { {HandOfNod, {"e1", "e1", "e3"}} }
 
-if OpenRA.GetDifficulty() == "Easy" then
-	KillsUntilReinforcements = 8
-	HeliDelay = {83, 137, 211}
-else
-	KillsUntilReinforcements = 16
-	HeliDelay = {57, 89, 123}
-end
+KillsUntilReinforcements = 12
+HeliDelay = {83, 137, 211}
 
 GDIReinforcements = {"e2", "e2", "e2", "e2"}
 GDIReinforcementsWaypoints = {GDIReinforcementsEntry, GDIReinforcementsWP1}
 
 NodHelis = {
-		{Utils.Seconds(HeliDelay[1]), {NodHeliEntry, NodHeliLZ1}, {"e1", "e3", "e3"}},
-		{Utils.Seconds(HeliDelay[2]), {NodHeliEntry, NodHeliLZ2}, {"e1", "e1", "e1", "e1", "e1"}},
+		{Utils.Seconds(HeliDelay[1]), {NodHeliEntry, NodHeliLZ1}, {"e1", "e1", "e3"}},
+		{Utils.Seconds(HeliDelay[2]), {NodHeliEntry, NodHeliLZ2}, {"e1", "e1", "e1", "e1"}},
 		{Utils.Seconds(HeliDelay[3]), {NodHeliEntry, NodHeliLZ3}, {"e1", "e1", "e3"}}
 	   }
 
@@ -49,11 +44,7 @@ BuildNod1 = function()
 	Production.BuildTeamFromTemplate(nod, Nod1Template, function(team)
 		Team.Do(team, function(actor)
 			if not Actor.IsDead(actor) then
-				if OpenRA.GetDifficulty() == "Normal" then
-					Actor.OnIdle(actor, Actor.Hunt)
-				else
-					Actor.Scatter(actor)
-				end
+				Actor.OnIdle(actor, Actor.Hunt)
 				Actor.OnKilled(actor, KillCounter)
 			end
 		end)
diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml
index 7a74ce92b7..618a85cd1c 100644
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -29,7 +29,6 @@ Options:
 	FragileAlliances: False
 	StartingCash: 0
 	ConfigurableStartingUnits: False
-	Difficulties: Easy,Normal
 
 Players:
 	PlayerReference@Nod:
@@ -551,6 +550,10 @@ Rules:
 		-ConquestVictoryConditions:
 	^Infantry:
 		MustBeDestroyed:
+	^Vehicle:
+		MustBeDestroyed:
+	^Tank:
+		MustBeDestroyed:
 	CRATE:
 		Crate:
 			Lifetime: 9999