From 27562ab88f5020858bf89eb85bab24045b07feec Mon Sep 17 00:00:00 2001 From: Smittytron Date: Sun, 23 May 2021 09:08:47 -0500 Subject: [PATCH] Fix and standardize TD mission difficulty dropdowns --- mods/cnc/bits/scripts/campaign-global.lua | 3 --- mods/cnc/maps/funpark01/rules.yaml | 3 +-- mods/cnc/maps/gdi05a/gdi05a.lua | 1 + mods/cnc/maps/gdi05a/rules.yaml | 3 +-- mods/cnc/maps/gdi06/gdi06.lua | 1 + mods/cnc/maps/gdi06/rules.yaml | 3 +-- mods/cnc/maps/nod06a/nod06a.lua | 1 + mods/cnc/maps/nod06a/rules.yaml | 1 - mods/cnc/maps/nod06b/nod06b.lua | 1 + mods/cnc/maps/nod06b/rules.yaml | 1 - mods/cnc/maps/nod09/nod09.lua | 1 + mods/cnc/maps/nod09/rules.yaml | 3 +-- mods/cnc/maps/nod10a/nod10a.lua | 1 + mods/cnc/maps/nod10a/rules.yaml | 3 +-- mods/cnc/maps/nod10b/nod10b.lua | 1 + mods/cnc/maps/nod10b/rules.yaml | 3 +-- mods/cnc/rules/campaign-maprules.yaml | 7 ------- 17 files changed, 13 insertions(+), 24 deletions(-) diff --git a/mods/cnc/bits/scripts/campaign-global.lua b/mods/cnc/bits/scripts/campaign-global.lua index 615e9d40ee..095aad1ec3 100644 --- a/mods/cnc/bits/scripts/campaign-global.lua +++ b/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) diff --git a/mods/cnc/maps/funpark01/rules.yaml b/mods/cnc/maps/funpark01/rules.yaml index 92ec620693..fc676c2384 100644 --- a/mods/cnc/maps/funpark01/rules.yaml +++ b/mods/cnc/maps/funpark01/rules.yaml @@ -16,8 +16,7 @@ World: Values: easy: Easy normal: Normal - Default: easy - Locked: false + Default: normal Player: EnemyWatcher: diff --git a/mods/cnc/maps/gdi05a/gdi05a.lua b/mods/cnc/maps/gdi05a/gdi05a.lua index 45715ad1a9..fe1f79d6e1 100644 --- a/mods/cnc/maps/gdi05a/gdi05a.lua +++ b/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 } diff --git a/mods/cnc/maps/gdi05a/rules.yaml b/mods/cnc/maps/gdi05a/rules.yaml index f30c930123..c14935d181 100644 --- a/mods/cnc/maps/gdi05a/rules.yaml +++ b/mods/cnc/maps/gdi05a/rules.yaml @@ -33,8 +33,7 @@ World: easy: Easy normal: Normal hard: Hard - Default: easy - Locked: false + Default: normal Player: EnemyWatcher: diff --git a/mods/cnc/maps/gdi06/gdi06.lua b/mods/cnc/maps/gdi06/gdi06.lua index 6d848b3524..0b4f9158e4 100644 --- a/mods/cnc/maps/gdi06/gdi06.lua +++ b/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 } diff --git a/mods/cnc/maps/gdi06/rules.yaml b/mods/cnc/maps/gdi06/rules.yaml index 9f98fb9b46..a520ea0f2e 100644 --- a/mods/cnc/maps/gdi06/rules.yaml +++ b/mods/cnc/maps/gdi06/rules.yaml @@ -39,8 +39,7 @@ World: easy: Easy normal: Normal hard: Hard - Default: easy - Locked: false + Default: normal Player: PlayerResources: diff --git a/mods/cnc/maps/nod06a/nod06a.lua b/mods/cnc/maps/nod06a/nod06a.lua index 7b35d497da..d7126752bc 100644 --- a/mods/cnc/maps/nod06a/nod06a.lua +++ b/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 = { diff --git a/mods/cnc/maps/nod06a/rules.yaml b/mods/cnc/maps/nod06a/rules.yaml index ed47381bcd..04bd91c141 100644 --- a/mods/cnc/maps/nod06a/rules.yaml +++ b/mods/cnc/maps/nod06a/rules.yaml @@ -18,7 +18,6 @@ World: hard: Hard tough: Real tough guy Default: normal - Locked: false Player: EnemyWatcher: diff --git a/mods/cnc/maps/nod06b/nod06b.lua b/mods/cnc/maps/nod06b/nod06b.lua index 0d913d6f0d..5349acc45b 100644 --- a/mods/cnc/maps/nod06b/nod06b.lua +++ b/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 = { diff --git a/mods/cnc/maps/nod06b/rules.yaml b/mods/cnc/maps/nod06b/rules.yaml index fbd86d7ced..6fd1f6c827 100644 --- a/mods/cnc/maps/nod06b/rules.yaml +++ b/mods/cnc/maps/nod06b/rules.yaml @@ -18,7 +18,6 @@ World: hard: Hard tough: Real tough guy Default: normal - Locked: false Player: PlayerResources: diff --git a/mods/cnc/maps/nod09/nod09.lua b/mods/cnc/maps/nod09/nod09.lua index b0796db1d0..f9015f6764 100644 --- a/mods/cnc/maps/nod09/nod09.lua +++ b/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" diff --git a/mods/cnc/maps/nod09/rules.yaml b/mods/cnc/maps/nod09/rules.yaml index 9b58e06e07..5de5aadc18 100644 --- a/mods/cnc/maps/nod09/rules.yaml +++ b/mods/cnc/maps/nod09/rules.yaml @@ -34,8 +34,7 @@ World: easy: Easy normal: Normal hard: Hard - Default: easy - Locked: false + Default: normal Player: PlayerResources: diff --git a/mods/cnc/maps/nod10a/nod10a.lua b/mods/cnc/maps/nod10a/nod10a.lua index 22eb007924..28b81eb1dd 100644 --- a/mods/cnc/maps/nod10a/nod10a.lua +++ b/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" diff --git a/mods/cnc/maps/nod10a/rules.yaml b/mods/cnc/maps/nod10a/rules.yaml index 26e9708e55..216007c5e0 100644 --- a/mods/cnc/maps/nod10a/rules.yaml +++ b/mods/cnc/maps/nod10a/rules.yaml @@ -29,8 +29,7 @@ World: easy: Easy normal: Normal hard: Hard - Default: easy - Locked: false + Default: normal -LegacyBridgeLayer: ^CivBuilding: diff --git a/mods/cnc/maps/nod10b/nod10b.lua b/mods/cnc/maps/nod10b/nod10b.lua index e7f3e01f08..b911475678 100644 --- a/mods/cnc/maps/nod10b/nod10b.lua +++ b/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" diff --git a/mods/cnc/maps/nod10b/rules.yaml b/mods/cnc/maps/nod10b/rules.yaml index c45d610781..8fdb4db853 100644 --- a/mods/cnc/maps/nod10b/rules.yaml +++ b/mods/cnc/maps/nod10b/rules.yaml @@ -14,8 +14,7 @@ World: easy: Easy normal: Normal hard: Hard - Default: easy - Locked: false + Default: normal -LegacyBridgeLayer: Player: diff --git a/mods/cnc/rules/campaign-maprules.yaml b/mods/cnc/rules/campaign-maprules.yaml index 91c9fd4b02..d7820fbc5b 100644 --- a/mods/cnc/rules/campaign-maprules.yaml +++ b/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: