Fix and standardize TD mission difficulty dropdowns

mods/cnc/bits/scripts/campaign-global.lua

@@ -6,9 +6,6 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
-
-Difficulty = Map.LobbyOption("difficulty")
-
 IdleHunt = function(actor)
 	if actor.HasProperty("Hunt") and not actor.IsDead then
 		Trigger.OnIdle(actor, actor.Hunt)

mods/cnc/maps/funpark01/rules.yaml

@@ -16,8 +16,7 @@ World:
 		Values:
 			easy: Easy
 			normal: Normal
-		Default: easy
+		Default: normal
-		Locked: false
 
 Player:
 	EnemyWatcher:

mods/cnc/maps/gdi05a/gdi05a.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 RepairThreshold = { easy = 0.3, normal = 0.6, hard = 0.9 }
 

mods/cnc/maps/gdi05a/rules.yaml

@@ -33,8 +33,7 @@ World:
 			easy: Easy
 			normal: Normal
 			hard: Hard
-		Default: easy
+		Default: normal
-		Locked: false
 
 Player:
 	EnemyWatcher:

mods/cnc/maps/gdi06/gdi06.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 IslandSamSites = { SAM01, SAM02 }
 NodBase = { PowerPlant1, PowerPlant2, PowerPlant3, PowerPlant4, PowerPlant5, Refinery, HandOfNod, Silo1, Silo2, Silo3, Silo4, ConYard, CommCenter }

mods/cnc/maps/gdi06/rules.yaml

@@ -39,8 +39,7 @@ World:
 			easy: Easy
 			normal: Normal
 			hard: Hard
-		Default: easy
+		Default: normal
-		Locked: false
 
 Player:
 	PlayerResources:

mods/cnc/maps/nod06a/nod06a.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 NodStartUnitsRight =
 {

mods/cnc/maps/nod06a/rules.yaml

@@ -18,7 +18,6 @@ World:
 			hard: Hard
 			tough: Real tough guy
 		Default: normal
-		Locked: false
 
 Player:
 	EnemyWatcher:

mods/cnc/maps/nod06b/nod06b.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 NodUnitsVehicle1 =
 {

mods/cnc/maps/nod06b/rules.yaml

@@ -18,7 +18,6 @@ World:
 			hard: Hard
 			tough: Real tough guy
 		Default: normal
-		Locked: false
 
 Player:
 	PlayerResources:

mods/cnc/maps/nod09/nod09.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 if Difficulty == "easy" then
 	Rambo = "rmbo.easy"

mods/cnc/maps/nod09/rules.yaml

@@ -34,8 +34,7 @@ World:
 			easy: Easy
 			normal: Normal
 			hard: Hard
-		Default: easy
+		Default: normal
-		Locked: false
 
 Player:
 	PlayerResources:

mods/cnc/maps/nod10a/nod10a.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 if Difficulty == "easy" then
 	Rambo = "rmbo.easy"

mods/cnc/maps/nod10a/rules.yaml

@@ -29,8 +29,7 @@ World:
 			easy: Easy
 			normal: Normal
 			hard: Hard
-		Default: easy
+		Default: normal
-		Locked: false
 	-LegacyBridgeLayer:
 
 ^CivBuilding:

mods/cnc/maps/nod10b/nod10b.lua

@@ -6,6 +6,7 @@
    the License, or (at your option) any later version. For more
    information, see COPYING.
 ]]
+Difficulty = Map.LobbyOption("difficulty")
 
 if Difficulty == "easy" then
 	Rambo = "rmbo.easy"

mods/cnc/maps/nod10b/rules.yaml

@@ -14,8 +14,7 @@ World:
 			easy: Easy
 			normal: Normal
 			hard: Hard
-		Default: easy
+		Default: normal
-		Locked: false
 	-LegacyBridgeLayer:
 
 Player:

mods/cnc/rules/campaign-maprules.yaml

@@ -15,13 +15,6 @@ World:
 	MapOptions:
 		ShortGameCheckboxLocked: True
 		ShortGameCheckboxEnabled: False
-	ScriptLobbyDropdown@difficulty:
-		ID: difficulty
-		Label: Difficulty
-		Values:
-			normal: Normal
-		Default: normal
-		Locked: true
 
 Player:
 	-ConquestVictoryConditions: