Adjust missions

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

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

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:

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

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

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

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

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:
 

mods/cnc/maps/nod01/nod01.lua

@@ -77,6 +77,7 @@ WorldLoaded = function()
 end
 
 Tick = function()
+	if DateTime.GameTime > 2 then
 		if nod.HasNoRequiredUnits() then
 			gdi.MarkCompletedObjective(GDIObjective1)
 		end
@@ -86,4 +87,5 @@ Tick = function()
 		if gdi.HasNoRequiredUnits() then
 			nod.MarkCompletedObjective(NodObjective3)
 		end
+	end
 end

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

mods/cnc/maps/nod03a/nod03a.lua

@@ -66,10 +66,12 @@ WorldLoaded = function()
 end
 
 Tick = function()
+	if DateTime.GameTime > 2 then
 		if player.HasNoRequiredUnits() then
 			enemy.MarkCompletedObjective(gdiObjective)
 		end
 		if enemy.HasNoRequiredUnits() then
 			player.MarkCompletedObjective(nodObjective2)
 		end
+	end
 end

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

mods/cnc/maps/nod03b/nod03b.lua

@@ -79,6 +79,7 @@ WorldLoaded = function()
 end
 
 Tick = function()
+	if DateTime.GameTime > 2 then
 		if player.HasNoRequiredUnits() then
 			enemy.MarkCompletedObjective(gdiObjective)
 		end
@@ -86,4 +87,5 @@ Tick = function()
 		if enemy.HasNoRequiredUnits() then
 			player.MarkCompletedObjective(nodObjective2)
 		end
+	end
 end

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

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

mods/ra/maps/intervention/intervention.lua

@@ -201,6 +201,7 @@ SetupWorld = function()
 end
 
 Tick = function()
+	if DateTime.GameTime > 2 then
 		if soviets.Resources > soviets.ResourceCapacity * 0.75 then
 			soviets.Resources = soviets.Resources - ((soviets.ResourceCapacity * 0.01) / 25)
 		end
@@ -208,6 +209,7 @@ Tick = function()
 		if player.HasNoRequiredUnits() then
 			player.MarkFailedObjective(villageObjective)
 		end
+	end
 end
 
 WorldLoaded = function()

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

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

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:

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