diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 8fc60d9c8c..045473f505 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -445,24 +446,20 @@ Rules: MissionObjectives: EarlyGameOver: true ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -486,8 +483,6 @@ Rules: GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false ShowOwnerRow: false - HARV: - -MustBeDestroyed: PROC: Buildable: Prerequisites: ~disabled @@ -515,7 +510,6 @@ Rules: GUN: Buildable: Prerequisites: ~disabled - MustBeDestroyed: GTWR: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index dd58233f75..2936f041a7 100644 --- a/mods/cnc/maps/gdi02/gdi02.lua +++ b/mods/cnc/maps/gdi02/gdi02.lua @@ -88,15 +88,6 @@ WorldLoaded = function() gdiObjective1 = player.AddPrimaryObjective("Eliminate all Nod forces in the area") gdiObjective2 = player.AddSecondaryObjective("Capture the Tiberium Refinery") - -- Work around limitations with the yaml merger that prevent MustBeDestroyed from working on the silos - siloARemoved = false - Trigger.OnCapture(SiloA, function() siloARemoved = true end) - Trigger.OnKilled(SiloA, function() siloARemoved = true end) - - siloBRemoved = false - Trigger.OnCapture(SiloB, function() siloBRemoved = true end) - Trigger.OnKilled(SiloB, function() siloBRemoved = true end) - Trigger.OnCapture(NodRefinery, function() player.MarkCompletedObjective(gdiObjective2) end) Trigger.OnKilled(NodRefinery, function() player.MarkFailedObjective(gdiObjective2) end) @@ -107,7 +98,7 @@ Tick = function() if player.HasNoRequiredUnits() then enemy.MarkCompletedObjective(nodObjective) end - if enemy.HasNoRequiredUnits() and siloARemoved and siloBRemoved then + if enemy.HasNoRequiredUnits() then player.MarkCompletedObjective(gdiObjective1) end end diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 62c348865f..22ae73252a 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -750,24 +751,20 @@ Rules: MissionObjectives: EarlyGameOver: true ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -794,7 +791,6 @@ Rules: GenericStancePrefix: false ShowOwnerRow: false HARV: - -MustBeDestroyed: Harvester: SearchFromProcRadius: 32 SearchFromOrderRadius: 20 @@ -802,7 +798,6 @@ Rules: Buildable: Prerequisites: ~disabled SILO: - MustBeDestroyed: Buildable: Prerequisites: ~disabled WEAP: diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 4ec7a782a9..f84bc5b0d2 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -741,22 +742,18 @@ Rules: MissionObjectives: EarlyGameOver: true ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: SpawnViceroid: Probability: 0 Tooltip: @@ -784,8 +781,6 @@ Rules: GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false ShowOwnerRow: false - HARV: - -MustBeDestroyed: WEAP: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index 205059de81..39dde9acf7 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Cheats: False Crates: False Fog: True @@ -565,12 +566,10 @@ Rules: MissionObjectives: EarlyGameOver: true ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -581,7 +580,6 @@ Rules: ^Infantry: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 770e70ee99..c43499b3bf 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -620,12 +621,10 @@ Rules: MissionObjectives: EarlyGameOver: true ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -636,7 +635,6 @@ Rules: ^Infantry: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 9aee35cbfd..542d345ff1 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -884,24 +885,20 @@ Rules: MissionObjectives: EarlyGameOver: true ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -925,8 +922,6 @@ Rules: GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false ShowOwnerRow: false - HARV: - -MustBeDestroyed: ^CivInfantry: Health: HP: 125 diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index f400ea530b..f5b699bebd 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -296,22 +297,18 @@ Rules: ^CivInfantry: MustBeDestroyed: ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -335,8 +332,6 @@ Rules: GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false ShowOwnerRow: false - HARV: - -MustBeDestroyed: Sequences: diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index cd3dcf9ec5..9daeea8780 100644 --- a/mods/cnc/maps/nod01/nod01.lua +++ b/mods/cnc/maps/nod01/nod01.lua @@ -77,13 +77,15 @@ WorldLoaded = function() end Tick = function() - if nod.HasNoRequiredUnits() then - gdi.MarkCompletedObjective(GDIObjective1) - end - if villagers.HasNoRequiredUnits() then - nod.MarkCompletedObjective(NodObjective2) - end - if gdi.HasNoRequiredUnits() then - nod.MarkCompletedObjective(NodObjective3) + if DateTime.GameTime > 2 then + if nod.HasNoRequiredUnits() then + gdi.MarkCompletedObjective(GDIObjective1) + end + if villagers.HasNoRequiredUnits() then + nod.MarkCompletedObjective(NodObjective2) + end + if gdi.HasNoRequiredUnits() then + nod.MarkCompletedObjective(NodObjective3) + end end end diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index d6541ae6ec..800b43f0be 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -540,24 +541,20 @@ Rules: ObjectivesPanel: PanelName: MISSION_OBJECTIVES ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -581,8 +578,6 @@ Rules: GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false ShowOwnerRow: false - HARV: - -MustBeDestroyed: HQ: AirstrikePower: Prerequisites: ~disabled diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index d1c1bb9909..1f7a48c0ba 100644 --- a/mods/cnc/maps/nod03a/nod03a.lua +++ b/mods/cnc/maps/nod03a/nod03a.lua @@ -66,10 +66,12 @@ WorldLoaded = function() end Tick = function() - if player.HasNoRequiredUnits() then - enemy.MarkCompletedObjective(gdiObjective) - end - if enemy.HasNoRequiredUnits() then - player.MarkCompletedObjective(nodObjective2) + if DateTime.GameTime > 2 then + if player.HasNoRequiredUnits() then + enemy.MarkCompletedObjective(gdiObjective) + end + if enemy.HasNoRequiredUnits() then + player.MarkCompletedObjective(nodObjective2) + end end end diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index f704be7a0b..8f78cc2571 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -585,24 +586,20 @@ Rules: ObjectivesPanel: PanelName: MISSION_OBJECTIVES ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Helicopter: SpawnViceroid: Probability: 0 - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -626,8 +623,6 @@ Rules: GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false ShowOwnerRow: false - HARV: - -MustBeDestroyed: HQ: AirstrikePower: Prerequisites: ~disabled diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index a8c5609ab9..da915970ae 100644 --- a/mods/cnc/maps/nod03b/nod03b.lua +++ b/mods/cnc/maps/nod03b/nod03b.lua @@ -79,11 +79,13 @@ WorldLoaded = function() end Tick = function() - if player.HasNoRequiredUnits() then - enemy.MarkCompletedObjective(gdiObjective) - end + if DateTime.GameTime > 2 then + if player.HasNoRequiredUnits() then + enemy.MarkCompletedObjective(gdiObjective) + end - if enemy.HasNoRequiredUnits() then - player.MarkCompletedObjective(nodObjective2) + if enemy.HasNoRequiredUnits() then + player.MarkCompletedObjective(nodObjective2) + end end end diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 44b654d70c..35c462ff1d 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -23,6 +23,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -883,17 +884,14 @@ Rules: PanelName: MISSION_OBJECTIVES -StartGameNotification: ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 4d4b84c40d..6518141688 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/mods/ra/maps/allies-03a/map.yaml @@ -21,6 +21,7 @@ UseAsShellmap: False Type: Campaign Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -1381,18 +1382,15 @@ Rules: PanelName: MISSION_OBJECTIVES -StartGameNotification: ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false Demolishable: ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false diff --git a/mods/ra/maps/intervention/intervention.lua b/mods/ra/maps/intervention/intervention.lua index 192222c144..00aa13468e 100644 --- a/mods/ra/maps/intervention/intervention.lua +++ b/mods/ra/maps/intervention/intervention.lua @@ -201,12 +201,14 @@ SetupWorld = function() end Tick = function() - if soviets.Resources > soviets.ResourceCapacity * 0.75 then - soviets.Resources = soviets.Resources - ((soviets.ResourceCapacity * 0.01) / 25) - end + if DateTime.GameTime > 2 then + if soviets.Resources > soviets.ResourceCapacity * 0.75 then + soviets.Resources = soviets.Resources - ((soviets.ResourceCapacity * 0.01) / 25) + end - if player.HasNoRequiredUnits() then - player.MarkFailedObjective(villageObjective) + if player.HasNoRequiredUnits() then + player.MarkFailedObjective(villageObjective) + end end end diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 73252e6c76..4f3fb23918 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -21,6 +21,7 @@ UseAsShellmap: False Type: Mission Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -2296,27 +2297,22 @@ Rules: GenericVisibility: Enemy ShowOwnerRow: false ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Plane: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Ship: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 392227a6e4..d1bd780c44 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -21,6 +21,7 @@ UseAsShellmap: False Type: Mission Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -2134,17 +2135,14 @@ Rules: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 0aa80801f7..05b4c0ce97 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -23,6 +23,7 @@ Type: Campaign PreviewVideo: soviet1.vqa Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -796,17 +797,14 @@ Rules: ^CivBuilding: MustBeDestroyed: ^Plane: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false @@ -820,7 +818,6 @@ Rules: GenericStancePrefix: false ShowOwnerRow: false PBOX: - MustBeDestroyed: JEEP: Explodes: JamsRadar: @@ -849,4 +846,4 @@ Voices: Notifications: -Translations: \ No newline at end of file +Translations: diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index a8f77c20d1..163875e09b 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -21,6 +21,7 @@ UseAsShellmap: False Type: Mission Options: + ShortGame: False Crates: False Fog: True Shroud: True @@ -1224,17 +1225,14 @@ Rules: ObjectivesPanel: PanelName: MISSION_OBJECTIVES ^Infantry: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Tank: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false ^Vehicle: - MustBeDestroyed: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false