diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 081d33c2bd..3460840178 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -667,6 +667,11 @@ Rules: ChargeTime: 60 DropItems: E1,E1,E1,E2,E2 #-RallyPoint: # TODO https://github.com/OpenRA/OpenRA/issues/6818 + -Sellable: + DOME: + -Sellable: + POWR: + -Sellable: Sequences: diff --git a/mods/ra/maps/soviet-01/soviet01.lua b/mods/ra/maps/soviet-01/soviet01.lua index b9a988869f..a37d2247d7 100644 --- a/mods/ra/maps/soviet-01/soviet01.lua +++ b/mods/ra/maps/soviet-01/soviet01.lua @@ -17,6 +17,7 @@ JeepDemolishingBridge = function() StartJeep.Move(StartJeepMovePoint.Location) Trigger.OnIdle(StartJeep, function() + Trigger.ClearAll(StartJeep) if not BridgeBarrel.IsDead then BridgeBarrel.Kill() end @@ -45,8 +46,12 @@ WorldLoaded = function() Media.DisplayMessage(p.GetObjectiveDescription(id), "Objective failed") end) - CivilProtectionObjective = france.AddPrimaryObjective("Protect the civilians.") VillageRaidObjective = player.AddPrimaryObjective("Raze the village.") + + Trigger.OnAllRemovedFromWorld(Airfields, function() + player.MarkFailedObjective(VillageRaidObjective) + end) + JeepDemolishingBridge() Trigger.OnPlayerWon(player, function() @@ -64,8 +69,4 @@ Tick = function() if france.HasNoRequiredUnits() and germany.HasNoRequiredUnits() then player.MarkCompletedObjective(VillageRaidObjective) end - - if player.HasNoRequiredUnits() then - france.MarkCompletedObjective(CivilProtectionObjective) - end end