From 9d45528496ea0b2ba99a43558719bb7298fb5938 Mon Sep 17 00:00:00 2001
From: Smittytron <Smitty3228@gmail.com>
Date: Sat, 11 Nov 2017 17:23:45 -0600
Subject: [PATCH] Remove Airstrike from nod06a Normal Difficulty

---
 mods/cnc/maps/nod06a/map.yaml   | 34 ++++++++++++++++++++++++++++++---
 mods/cnc/maps/nod06a/nod06a.lua |  6 ++++--
 mods/cnc/maps/nod06a/rules.yaml |  7 +++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml
index be0ad546d1..b31d8da30d 100644
--- a/mods/cnc/maps/nod06a/map.yaml
+++ b/mods/cnc/maps/nod06a/map.yaml
@@ -26,14 +26,13 @@ Players:
 		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
-		Playable: False
 		Faction: gdi
 		Color: F5D378
 		Enemies: Nod
 	PlayerReference@Nod:
 		Name: Nod
-		Playable: True
 		AllowBots: False
+		Playable: True
 		Required: True
 		LockFaction: True
 		Faction: nod
@@ -637,10 +636,39 @@ Actors:
 		Location: 36,23
 		Owner: GDI
 	Detonator: CRATE.plain
-		Location: 59, 43
+		Location: 59,43
 		Owner: GDI
 	Radar: hq
 		Location: 57,32
 		Owner: GDI
+	Actor187: jeep
+		Owner: GDI
+		Location: 40,21
+		Facing: 92
+		TurretFacing: 92
+	Actor188: e1
+		Owner: GDI
+		Location: 41,22
+		SubCell: 3
+		Facing: 92
+		TurretFacing: 92
+	Actor189: e1
+		Owner: GDI
+		Location: 39,20
+		SubCell: 3
+		Facing: 92
+		TurretFacing: 92
+	Actor190: e3
+		Owner: GDI
+		Location: 40,20
+		SubCell: 3
+		Facing: 92
+		TurretFacing: 92
+	Actor191: e3
+		Owner: GDI
+		Location: 40,20
+		SubCell: 1
+		Facing: 92
+		TurretFacing: 92
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
diff --git a/mods/cnc/maps/nod06a/nod06a.lua b/mods/cnc/maps/nod06a/nod06a.lua
index d4f2b28447..c73c769a6b 100644
--- a/mods/cnc/maps/nod06a/nod06a.lua
+++ b/mods/cnc/maps/nod06a/nod06a.lua
@@ -166,8 +166,10 @@ WorldLoaded = function()
 	OnAnyDamaged(Atk1ActorTriggerActivator, Atk1TriggerFunction)
 
 	OnAnyDamaged(Atk2ActorTriggerActivator, Atk2TriggerFunction)
-
-	Trigger.OnDamaged(Atk3Activator, Atk3TriggerFunction)
+	
+	if Map.LobbyOption("difficulty") == "hard" then
+		Trigger.OnDamaged(Atk3Activator, Atk3TriggerFunction)
+	end
 
 	Trigger.OnAllKilled(Chn1ActorTriggerActivator, Chn1TriggerFunction)
 
diff --git a/mods/cnc/maps/nod06a/rules.yaml b/mods/cnc/maps/nod06a/rules.yaml
index fbaea154e6..ed4ca4fc3b 100644
--- a/mods/cnc/maps/nod06a/rules.yaml
+++ b/mods/cnc/maps/nod06a/rules.yaml
@@ -9,6 +9,13 @@ World:
 		BriefingVideo: nod6.vqa
 		StartVideo: sundial.vqa
 		LossVideo: banner.vqa
+	ScriptLobbyDropdown@difficulty:
+		ID: difficulty
+		Label: Difficulty
+		Values:
+			normal: Normal
+			hard: Hard
+		Default: normal
 
 Player:
 	EnemyWatcher: