Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Polish issues with mission difficulty dropdowns #19426

Merged
merged 3 commits into from
Jul 2, 2021
Merged

Polish issues with mission difficulty dropdowns #19426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31cef85
Fix and standardize TD mission difficulty dropdowns
Smittytron May 23, 2021
ab9b944
Fix difficulty dropdown for RA mission Sarin Gas 2: Down Under
Smittytron May 23, 2021
5160727
Switch remaining RA missions to Normal default difficulty
Smittytron Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions mods/cnc/bits/scripts/campaign-global.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions mods/cnc/maps/funpark01/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ World:
Values:
easy: Easy
normal: Normal
Default: easy
Locked: false
Default: normal

Player:
EnemyWatcher:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/gdi05a/gdi05a.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
3 changes: 1 addition & 2 deletions mods/cnc/maps/gdi05a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Locked: false
Default: normal

Player:
EnemyWatcher:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/gdi06/gdi06.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 1 addition & 2 deletions mods/cnc/maps/gdi06/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Locked: false
Default: normal

Player:
PlayerResources:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/nod06a/nod06a.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
the License, or (at your option) any later version. For more
information, see COPYING.
]]
Difficulty = Map.LobbyOption("difficulty")

NodStartUnitsRight =
{
Expand Down
1 change: 0 additions & 1 deletion mods/cnc/maps/nod06a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ World:
hard: Hard
tough: Real tough guy
Default: normal
Locked: false

Player:
EnemyWatcher:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/nod06b/nod06b.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
the License, or (at your option) any later version. For more
information, see COPYING.
]]
Difficulty = Map.LobbyOption("difficulty")

NodUnitsVehicle1 =
{
Expand Down
1 change: 0 additions & 1 deletion mods/cnc/maps/nod06b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ World:
hard: Hard
tough: Real tough guy
Default: normal
Locked: false

Player:
PlayerResources:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/nod09/nod09.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions mods/cnc/maps/nod09/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Locked: false
Default: normal

Player:
PlayerResources:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/nod10a/nod10a.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions mods/cnc/maps/nod10a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Locked: false
Default: normal
-LegacyBridgeLayer:

^CivBuilding:
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/maps/nod10b/nod10b.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions mods/cnc/maps/nod10b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Locked: false
Default: normal
-LegacyBridgeLayer:

Player:
Expand Down
7 changes: 0 additions & 7 deletions mods/cnc/rules/campaign-maprules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ World:
MapOptions:
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
ScriptLobbyDropdown@difficulty:
abcdefg30 marked this conversation as resolved.
Show resolved Hide resolved
ID: difficulty
Label: Difficulty
Values:
normal: Normal
Default: normal
Locked: true

Player:
-ConquestVictoryConditions:
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/ant-01/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Default: normal
LuaScript:
Scripts: ant-01.lua, ant-attack.lua, campaign-global.lua
MissionData:
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/fall-of-greece-2-evacuation/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Default: normal

PARADROP:
ParatroopersPower:
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/sarin-gas-2-down-under/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ World:
Values:
normal: Normal
hard: Hard
Default: Normal
Default: normal

Player:
PlayerResources:
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-10/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ World:
easy: Easy
normal: Normal
hard: Hard
Default: easy
Default: normal

Player:
PlayerResources:
Expand Down