diff --git a/mods/cnc/maps/gdi01/gdi01.lua b/mods/cnc/maps/gdi01/gdi01.lua index 4cb5b1faa1..52fbc5f8e7 100644 --- a/mods/cnc/maps/gdi01/gdi01.lua +++ b/mods/cnc/maps/gdi01/gdi01.lua @@ -3,12 +3,12 @@ VehicleReinforcements = { "jeep" } NodPatrol = { "e1", "e1" } MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("consyard.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("gameover.vqa") end diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 072923e57e..4a82cf473e 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -459,8 +459,12 @@ Rules: Loop: false LuaScriptInterface: LuaScripts: gdi01.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true ^Infantry: MustBeDestroyed: PROC: diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index 978fcf0265..ea566859d3 100644 --- a/mods/cnc/maps/gdi02/gdi02.lua +++ b/mods/cnc/maps/gdi02/gdi02.lua @@ -5,12 +5,12 @@ VehicleReinforcements = { "jeep" } AttackerSquadSize = 3 MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("flag.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("gameover.vqa") end diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 08a82ce766..402d22c050 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -736,8 +736,12 @@ Rules: -CrateSpawner: LuaScriptInterface: LuaScripts: gdi02.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true PROC: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/gdi03/gdi03.lua b/mods/cnc/maps/gdi03/gdi03.lua index 8809c80b20..988d060522 100644 --- a/mods/cnc/maps/gdi03/gdi03.lua +++ b/mods/cnc/maps/gdi03/gdi03.lua @@ -1,10 +1,10 @@ MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("bombaway.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("gameover.vqa") end diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 5deae0f5e8..1b5b6ecf1c 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -897,8 +897,12 @@ Rules: -CrateSpawner: LuaScriptInterface: LuaScripts: gdi03.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true ^Infantry: MustBeDestroyed: WEAP: diff --git a/mods/cnc/maps/gdi04a/gdi04a.lua b/mods/cnc/maps/gdi04a/gdi04a.lua index 4835100100..c911c0ecdf 100644 --- a/mods/cnc/maps/gdi04a/gdi04a.lua +++ b/mods/cnc/maps/gdi04a/gdi04a.lua @@ -127,11 +127,11 @@ WorldLoaded = function() end MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("burdet1.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("gameover.vqa") end diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index c0f56925fb..f99bae6bc2 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -546,8 +546,12 @@ Rules: -CrateSpawner: LuaScriptInterface: LuaScripts: gdi04a.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true ^Infantry: MustBeDestroyed: ^Vehicle: diff --git a/mods/cnc/maps/gdi04b/gdi04b.lua b/mods/cnc/maps/gdi04b/gdi04b.lua index f0774926b7..ba071d47e7 100644 --- a/mods/cnc/maps/gdi04b/gdi04b.lua +++ b/mods/cnc/maps/gdi04b/gdi04b.lua @@ -162,11 +162,11 @@ WorldLoaded = function() end MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("burdet1.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("gameover.vqa") end diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 98e836adc3..03790c811b 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -625,8 +625,12 @@ Rules: -CrateSpawner: LuaScriptInterface: LuaScripts: gdi04b.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true ^Infantry: MustBeDestroyed: ^Vehicle: diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index e1d33804d0..df75bd136c 100644 --- a/mods/cnc/maps/gdi04c/gdi04c.lua +++ b/mods/cnc/maps/gdi04c/gdi04c.lua @@ -109,11 +109,11 @@ WorldLoaded = function() end MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("burdet1.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("gameover.vqa") end diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 35a8b22e92..91929a834d 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -895,8 +895,12 @@ Rules: -CrateSpawner: LuaScriptInterface: LuaScripts: gdi04c.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true ^Infantry: MustBeDestroyed: ^Vehicle: diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index fc6b415d6e..1419f6cb4a 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -299,12 +299,16 @@ Smudges: Rules: Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true World: -CrateSpawner: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: LuaScripts: nod01.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES C10: Tooltip: Name: Nikoomba diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index 7628104eb4..6db3abfa2d 100644 --- a/mods/cnc/maps/nod01/nod01.lua +++ b/mods/cnc/maps/nod01/nod01.lua @@ -2,11 +2,11 @@ RifleInfantryReinforcements = { "e1", "e1", } RocketInfantryReinforcements = { "e3", "e3", "e3" } MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("nodlose.vqa") end diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 34d7eb053a..b61ce9c898 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -565,12 +565,16 @@ Smudges: Rules: Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true World: -CrateSpawner: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: LuaScripts: nod03a.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES NUK2: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index ab8fae4894..f1cf69e834 100644 --- a/mods/cnc/maps/nod03a/nod03a.lua +++ b/mods/cnc/maps/nod03a/nod03a.lua @@ -2,12 +2,12 @@ FirstAttackWave = { "e1", "e1", "e1", "e2", } SecondThirdAttackWave = { "e1", "e1", "e2", } MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("desflees.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("flag.vqa") end diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 5ef9dc9f71..9f3b265393 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -634,12 +634,16 @@ Smudges: Rules: Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true World: -CrateSpawner: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: LuaScripts: nod03b.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES NUK2: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index 8171a58770..88a6037a87 100644 --- a/mods/cnc/maps/nod03b/nod03b.lua +++ b/mods/cnc/maps/nod03b/nod03b.lua @@ -3,12 +3,12 @@ SecondAttackWave = { "e1", "e1", "e1", } ThirdAttackWave = { "e1", "e1", "e1", "e2", } MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("desflees.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("flag.vqa") end diff --git a/mods/ra/maps/allies-01-classic/allies01.lua b/mods/ra/maps/allies-01-classic/allies01.lua index df16280cdc..d9fbed7ae5 100644 --- a/mods/ra/maps/allies-01-classic/allies01.lua +++ b/mods/ra/maps/allies-01-classic/allies01.lua @@ -105,12 +105,12 @@ CreateEinstein = function() end MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) --Media.PlayMovieFullscreen("snowbomb.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("bmap.vqa") end diff --git a/mods/ra/maps/allies-01-classic/map.yaml b/mods/ra/maps/allies-01-classic/map.yaml index 3e9eafda8f..427eb01ffc 100644 --- a/mods/ra/maps/allies-01-classic/map.yaml +++ b/mods/ra/maps/allies-01-classic/map.yaml @@ -574,12 +574,16 @@ Smudges: Rules: Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true World: -CrateSpawner: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: LuaScripts: allies01.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES TRAN.Extraction: Inherits: TRAN RenderUnit: diff --git a/mods/ra/maps/allies-02-classic/allies02.lua b/mods/ra/maps/allies-02-classic/allies02.lua index 18834f4241..616478a37c 100644 --- a/mods/ra/maps/allies-02-classic/allies02.lua +++ b/mods/ra/maps/allies-02-classic/allies02.lua @@ -23,12 +23,12 @@ RunInitialActivities = function() end MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) Media.PlayMovieFullscreen("montpass.vqa") end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) Media.PlayMovieFullscreen("frozen.vqa") end diff --git a/mods/ra/maps/allies-02-classic/map.yaml b/mods/ra/maps/allies-02-classic/map.yaml index c075d75304..ab1c51bbf1 100644 --- a/mods/ra/maps/allies-02-classic/map.yaml +++ b/mods/ra/maps/allies-02-classic/map.yaml @@ -869,12 +869,16 @@ Smudges: Rules: Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true World: -CrateSpawner: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: LuaScripts: allies02.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES ^Infantry: MustBeDestroyed: ^Tank: diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 00669d8f17..1a8b95c1c1 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -2214,12 +2214,16 @@ Smudges: Rules: Player: -ConquestVictoryConditions: + MissionObjectives: + EarlyGameOver: true World: -CrateSpawner: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: LuaScripts: mission.lua + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES CAMERA: RevealsShroud: Range: 18c0 diff --git a/mods/ra/maps/intervention/mission.lua b/mods/ra/maps/intervention/mission.lua index ab3f9156f9..36aef85741 100644 --- a/mods/ra/maps/intervention/mission.lua +++ b/mods/ra/maps/intervention/mission.lua @@ -264,9 +264,9 @@ WorldLoaded = function() end MissionFailed = function() - Mission.MissionOver(nil, { player }, false) + Mission.MissionOver(nil, { player }, true) end MissionAccomplished = function() - Mission.MissionOver({ player }, nil, false) + Mission.MissionOver({ player }, nil, true) end diff --git a/mods/ra/maps/koth-athena/map.yaml b/mods/ra/maps/koth-athena/map.yaml index 31441ff12b..d8a89a439b 100644 --- a/mods/ra/maps/koth-athena/map.yaml +++ b/mods/ra/maps/koth-athena/map.yaml @@ -2119,6 +2119,9 @@ Rules: ResetOnHoldLost: true RatioRequired: 1 CriticalRatioRequired: 1 + World: + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Sequences: diff --git a/mods/ra/maps/koth-crossroads/map.yaml b/mods/ra/maps/koth-crossroads/map.yaml index 9e70dd1f57..71e684ce8e 100644 --- a/mods/ra/maps/koth-crossroads/map.yaml +++ b/mods/ra/maps/koth-crossroads/map.yaml @@ -270,6 +270,9 @@ Rules: ResetOnHoldLost: true RatioRequired: 1 CriticalRatioRequired: 1 + World: + ObjectivesPanel: + PanelName: MISSION_OBJECTIVES Sequences: