Merge pull request #6748 from abcdefg30/allies03a

Ported allies-03a

OpenRA.Lint/YamlChecker.cs

@@ -42,6 +42,7 @@ namespace OpenRA.Lint
 
 			try
 			{
+				Log.AddChannel("debug", null);
 				Log.AddChannel("perf", null);
 
 				var options = args.Where(a => a.StartsWith("-"));

OpenRA.sln

@@ -56,8 +56,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tiberian Dawn Lua scripts",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Red Alert Lua scripts", "Red Alert Lua scripts", "{B35D533F-BEB6-4674-A466-324EEFD97259}"
 	ProjectSection(SolutionItems) = preProject
-		mods\ra\maps\allies-01-classic\allies01.lua = mods\ra\maps\allies-01-classic\allies01.lua
-		mods\ra\maps\allies-02-classic\allies02.lua = mods\ra\maps\allies-02-classic\allies02.lua
+		mods\ra\maps\allies-01\allies01.lua = mods\ra\maps\allies-01\allies01.lua
+		mods\ra\maps\allies-02\allies02.lua = mods\ra\maps\allies-02\allies02.lua
+		mods\ra\maps\allies-03a\allies03a.lua = mods\ra\maps\allies-03a\allies03a.lua
 		mods\ra\maps\desert-shellmap\desert-shellmap.lua = mods\ra\maps\desert-shellmap\desert-shellmap.lua
 		mods\ra\maps\intervention\intervention.lua = mods\ra\maps\intervention\intervention.lua
 		mods\ra\maps\fort-lonestar\fort-lonestar.lua = mods\ra\maps\fort-lonestar\fort-lonestar.lua

mods/ra/maps/allies-01/map.yaml

@@ -610,6 +610,7 @@ Rules:
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
+		Demolishable:
 	^Tank:
 		Tooltip:
 			GenericVisibility: Enemy

mods/ra/maps/allies-03a/allies03a.lua

@@ -0,0 +1,270 @@
+ProductionUnits = { "e1", "e1", "e2" }
+ProductionBuildings = { USSRBarracks1, USSRBarracks2 }
+ParatroopersReinforcements = { "e1", "e1", "e1", "e2", "e2" }
+TransportReinforcements = { "e1", "e1", "e1", "e2", "e2" }
+FirstUSSRBase = { USSRFlameTower1, USSRBarracks1, USSRPowerPlant1, USSRPowerPlant2, USSRConstructionYard1, USSRTechCenter, USSRBaseGuard1, USSRBaseGuard2, USSRBaseGuard3, USSRBaseGuard4, USSRBaseGuard5, USSRBaseGuard6, USSRBaseGuard7, USSRBaseGuard8 }
+SecondUSSRBase = { USSRBarracks2, USSRKennel, USSRRadarDome, USSRBaseGuard10, USSRBaseGuard11, USSRBaseGuard12, USSRBaseGuard13, USSRBaseGuard14 }
+Prisoners = { PrisonedMedi1, PrisonedMedi2, PrisonedEngi }
+CameraTriggerArea = { CPos.New(43, 64), CPos.New(44, 64), CPos.New(45, 64), CPos.New(46, 64), CPos.New(47, 64) }
+WaterTransportTriggerArea = { CPos.New(39, 54), CPos.New(40, 54), CPos.New(41, 54), CPos.New(42, 54), CPos.New(43, 54), CPos.New(44, 54), CPos.New(45, 54) }
+ParadropTriggerArea = { CPos.New(81, 60), CPos.New(82, 60), CPos.New(83, 60), CPos.New(63, 63), CPos.New(64, 63), CPos.New(65, 63), CPos.New(66, 63), CPos.New(67, 63), CPos.New(68, 63), CPos.New(69, 63), CPos.New(70, 63), CPos.New(71, 63), CPos.New(72, 63) }
+ReinforcementsTriggerArea = { CPos.New(96, 55), CPos.New(97, 55), CPos.New(97, 56), CPos.New(98, 56) }
+
+IdleHunt = function(actor) Trigger.OnIdle(actor, actor.Hunt) end
+
+ProduceUnits = function(factory, count)
+	if ussr.IsProducing("e1") then
+		Trigger.AfterDelay(DateTime.Seconds(5), function() ProduceUnits(factory, count) end)
+		return
+	end
+
+	local units = { }
+	for i = 0, count, 1 do
+		local type = Utils.Random(ProductionUnits)
+		units[i] = type
+	end
+
+	if not factory.IsDead then
+		factory.IsPrimaryBuilding = true
+		ussr.Build(units, function(soldiers)
+			Utils.Do(soldiers, function(unit) IdleHunt(unit) end)
+		end)
+	end
+end
+
+countFreed = 0
+FreePrisoner = function(unit, type)
+	if not unit.IsDead then
+		local newUnit = Actor.Create(type, true, { Owner = player, Location = unit.Location, CenterPosition = unit.CenterPosition })
+		unit.Destroy()
+		Trigger.AfterDelay(15, function()
+			if not newUnit.IsDead then
+				if not DefendPrisoners then
+					DefendPrisoners = player.AddSecondaryObjective("Keep all rescued Allied soldiers alive.")
+				end
+				Trigger.OnKilled(newUnit, function() player.MarkFailedObjective(DefendPrisoners) end)
+			else
+				player.MarkFailedObjective(FreePrisoners)
+			end
+
+			countFreed = countFreed + 1
+			if countFreed == 3 then
+				player.MarkCompletedObjective(FreePrisoners)
+			end
+		end)
+	end
+end
+
+SendAlliedUnits = function()
+	Camera.Position = TanyaWaypoint.CenterPosition
+
+	local Artillery = Actor.Create("arty", true, { Owner = player, Location = AlliedUnitsEntry.Location })
+	local Tanya = Actor.Create("e7", true, { Owner = player, Location = AlliedUnitsEntry.Location })
+	Tanya.Stance = "HoldFire"
+	Artillery.Stance = "HoldFire"
+	Tanya.Move(TanyaWaypoint.Location)
+	Artillery.Move(ArtilleryWaypoint.Location)
+
+	Trigger.OnKilled(Tanya, function() player.MarkFailedObjective(TanyaSurvive) end)
+end
+
+SendUSSRParadrops = function(units, entry, dropzone)
+	local plane = Actor.Create("badr", true, { Owner = ussr, Location = entry })
+	Utils.Do(units, function(type)
+		local unit = Actor.Create(type, false, { Owner = ussr })
+		plane.LoadPassenger(unit)
+		IdleHunt(unit)
+	end)
+	plane.Paradrop(dropzone)
+end
+
+SendUSSRWaterTransport = function()
+	local units = Reinforcements.ReinforceWithTransport(ussr, "lst", TransportReinforcements, { WaterTransportEntry.Location, WaterTransportLoadout.Location }, { WaterTransportExit.Location })[2]
+	Utils.Do(units, function(unit) IdleHunt(unit) end)
+end
+
+SendUSSRTankReinforcements = function()
+	local camera = Actor.Create("camera", true, { Owner = player, Location = USSRReinforcementsCameraWaypoint.Location })
+	local ussrTank = Reinforcements.Reinforce(ussr, { "3tnk" }, { USSRReinforcementsEntryWaypoint.Location, USSRReinforcementsRallyWaypoint1.Location, USSRReinforcementsRallyWaypoint2.Location })[1]
+	Trigger.OnRemovedFromWorld(ussrTank, function()
+		Trigger.AfterDelay(DateTime.Seconds(3), function()
+			if not	camera.IsDead then
+				camera.Destroy()
+			end
+		end)
+	end)
+end
+
+InitPlayers = function()
+	player = Player.GetPlayer("Greece")
+	ussr = Player.GetPlayer("USSR")
+
+	ussr.Cash = 10000
+
+	Media.PlayMovieFullscreen("brdgtilt.vqa")
+end
+
+InitObjectives = function()
+	Trigger.OnObjectiveAdded(player, function(p, id)
+		Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective")
+	end)
+
+	KillBridges = player.AddPrimaryObjective("Destroy all bridges.")
+	TanyaSurvive = player.AddPrimaryObjective("Tanya must survive.")
+	KillUSSR = player.AddSecondaryObjective("Destroy all soviet Oil Pumps.")
+	FreePrisoners = player.AddSecondaryObjective("Free all imprisoned Allied soldiers.")
+	ussr.AddPrimaryObjective("Bridges must not be destroyed.")
+
+	Trigger.OnObjectiveCompleted(player, function(p, id)
+		Media.DisplayMessage(p.GetObjectiveDescription(id), "Objective completed")
+	end)
+	Trigger.OnObjectiveFailed(player, function(p, id)
+		Media.DisplayMessage(p.GetObjectiveDescription(id), "Objective failed")
+	end)
+
+	Trigger.OnPlayerLost(player, function()
+		Trigger.AfterDelay(25, function()
+			Media.PlaySpeechNotification(player, "Lose")
+			Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("sovtstar.vqa") end)
+		end)
+	end)
+	Trigger.OnPlayerWon(player, function()
+		Trigger.AfterDelay(25, function()
+			Media.PlaySpeechNotification(player, "Win")
+			Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("toofar.vqa") end)
+		end)
+	end)
+end
+
+InitTriggers = function()
+	Utils.Do(ussr.GetGroundAttackers(), function(unit)
+		Trigger.OnDamaged(unit, function() IdleHunt(unit) end)
+	end)
+
+	Trigger.OnAnyKilled(Prisoners, function() player.MarkFailedObjective(FreePrisoners) end)
+
+	Trigger.OnKilled(PGuard1, function() FreePrisoner(PrisonedMedi1, "medi") end)
+	Trigger.OnKilled(PGuard2, function() FreePrisoner(PrisonedMedi2, "medi") FreePrisoner(PrisonedEngi, "hacke6") end)
+
+	Trigger.OnKilled(USSRTechCenter, function()
+		Actor.Create("moneycrate", true, { Owner = ussr, Location = USSRMoneyCrateSpawn.Location })
+	end)
+
+	Trigger.OnKilled(ExplosiveBarrel, function()
+		local bridge = Map.ActorsInBox(USSRReinforcementsCameraWaypoint.CenterPosition, USSRReinforcementsEntryWaypoint.CenterPosition,
+			function(self) return self.Type == "bridge1" end)
+
+		if not bridge[1].IsDead then
+			bridge[1].Kill()
+		end
+	end)
+
+	Utils.Do(FirstUSSRBase, function(unit)
+		Trigger.OnDamaged(unit, function()
+			if not FirstBaseAlert then
+				FirstBaseAlert = true
+				if not baseCamera then -- TODO: remove the Trigger
+					baseCamera = Actor.Create("camera", true, { Owner = player, Location = BaseCameraWaypoint.Location })
+				end
+				Utils.Do(FirstUSSRBase, function(unit)
+					if unit.HasProperty("Move") then
+						IdleHunt(unit)
+					end
+				end)
+				for i = 0, 2 do
+					Trigger.AfterDelay(DateTime.Seconds(i), function()
+						Media.PlaySoundNotification(player, "AlertBuzzer")
+					end)
+				end
+				ProduceUnits(ProductionBuildings[1], Utils.RandomInteger(4, 8))
+			end
+		end)
+	end)
+	Trigger.OnAllRemovedFromWorld(FirstUSSRBase, function() -- The camera can remain when one building is captured
+		if baseCamera then baseCamera.Destroy() end
+	end)
+
+	Utils.Do(SecondUSSRBase, function(unit)
+		Trigger.OnDamaged(unit, function()
+			if not SecondBaseAlert then
+				SecondBaseAlert = true
+				Utils.Do(SecondUSSRBase, function(unit)
+					if unit.HasProperty("Move") then
+						IdleHunt(unit)
+					end
+				end)
+				for i = 0, 2 do
+					Trigger.AfterDelay(DateTime.Seconds(i), function()
+						Media.PlaySoundNotification(player, "AlertBuzzer")
+					end)
+				end
+				ProduceUnits(ProductionBuildings[2], Utils.RandomInteger(5, 7))
+			end
+		end)
+	end)
+
+	Trigger.OnCapture(USSRRadarDome, function(self)
+		largeCamera = Actor.Create("camera.verylarge", true, { Owner = player, Location = LargeCameraWaypoint.Location })
+		Trigger.ClearAll(self)
+		Trigger.AfterDelay(DateTime.Seconds(1), function()
+			Trigger.OnRemovedFromWorld(self, function()
+				Trigger.ClearAll(self)
+				if largeCamera.IsInWorld then largeCamera.Destroy() end
+			end)
+		end)
+	end)
+
+	Trigger.OnEnteredFootprint(CameraTriggerArea, function(a, id)
+		if a.Owner == player and not baseCamera then
+			Trigger.RemoveFootprintTrigger(id)
+			baseCamera = Actor.Create("camera", true, { Owner = player, Location = BaseCameraWaypoint.Location })
+		end
+	end)
+	Trigger.OnEnteredFootprint(WaterTransportTriggerArea, function(a, id)
+		if a.Owner == player and not waterTransportTriggered then
+			waterTransportTriggered = true
+			Trigger.RemoveFootprintTrigger(id)
+			SendUSSRWaterTransport()
+		end
+	end)
+	Trigger.OnEnteredFootprint(ParadropTriggerArea, function(a, id)
+		if a.Owner == player and not paradropsTriggered then
+			paradropsTriggered = true
+			Trigger.RemoveFootprintTrigger(id)
+			SendUSSRParadrops(ParatroopersReinforcements, ParadropTransportEntry1.Location, ParadropLZ.Location)
+			SendUSSRParadrops(ParatroopersReinforcements, ParadropTransportEntry2.Location, ParadropLZ.Location)
+		end
+	end)
+	Trigger.OnEnteredFootprint(ReinforcementsTriggerArea, function(a, id)
+		if a.Owner == player and not reinforcementsTriggered then
+			reinforcementsTriggered = true
+			Trigger.RemoveFootprintTrigger(id)
+			Trigger.AfterDelay(DateTime.Seconds(1), function() SendUSSRTankReinforcements() end)
+		end
+	end)
+
+	Trigger.AfterDelay(0, function()
+		local bridges = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(self) return self.Type == "bridge1" end)
+
+		Trigger.OnAllKilled(bridges, function()
+			player.MarkCompletedObjective(KillBridges)
+			player.MarkCompletedObjective(TanyaSurvive)
+			if DefendPrisoners then player.MarkCompletedObjective(DefendPrisoners) end
+		end)
+
+		local oilPumps = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(self) return self.Type == "v19" end)
+
+		Trigger.OnAllKilled(oilPumps, function()
+			player.MarkCompletedObjective(KillUSSR)
+		end)
+	end)
+end
+
+WorldLoaded = function()
+
+	InitPlayers()
+	InitObjectives()
+	InitTriggers()
+
+	SendAlliedUnits()
+end

mods/ra/missions.yaml

@@ -1,3 +1,4 @@
 Allied Campaign:
-	./mods/ra/maps/allies-01-classic
-	./mods/ra/maps/allies-02-classic
+	./mods/ra/maps/allies-01
+	./mods/ra/maps/allies-02
+	./mods/ra/maps/allies-03a

mods/ra/rules/defaults.yaml

@@ -640,3 +640,26 @@
 	RenderBuilding:
 		Palette: terrain
 
+^Crate:
+	Tooltip:
+		Name: Crate
+		GenericName: Crate
+	Crate:
+		Lifetime: 180
+		TerrainTypes: Clear, Rough, Road, Ore, Beach
+	RenderSprites:
+		Palette: effect
+	WithCrateBody:
+		Images: scrate
+		XmasImages: xcratea, xcrateb, xcratec, xcrated
+	Selectable:
+		Selectable: false
+		Bounds: 15,15,-1,-1
+	ProximityCaptor:
+		Types: Crate
+	BodyOrientation:
+	Parachutable:
+		KilledOnImpassableTerrain: false
+		ParachuteSequence: parach
+	Passenger:
+

mods/ra/rules/misc.yaml

@@ -57,14 +57,7 @@ MINV:
 		OccupiesSpace: true
 
 CRATE:
-	Tooltip:
-		Name: Crate
-	Crate:
-		Lifetime: 120
-		TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
-	Parachutable:
-		KilledOnImpassableTerrain: false
-		ParachuteSequence: parach
+	Inherits: ^Crate
 	GiveCashCrateAction:
 		Amount: 1000
 		SelectionShares: 50
@@ -155,40 +148,26 @@ CRATE:
 		Notification: ironcur9.aud
 		Upgrades: invulnerability
 		Duration: 600
-	RenderSprites:
-		Palette: effect
-	WithCrateBody:
-		Images: scrate
-		XmasImages: xcratea, xcrateb, xcratec, xcrated
-	Selectable:
-		Selectable: false
-		Bounds: 15,15,-1,-1
-	ProximityCaptor:
-		Types: Crate
-	Passenger:
-	BodyOrientation:
 
 MONEYCRATE:
+	Inherits: ^Crate
 	Tooltip:
 		Name: Money Crate
-	Crate:
-		Lifetime: 180
-		TerrainTypes: Clear, Rough, Road, Ore, Beach
 	GiveCashCrateAction:
 		Amount: 500
 		SelectionShares: 1
 		UseCashTick: true
-	RenderSprites:
-		Palette: effect
 	WithCrateBody:
 		Images: wcrate
-		XmasImages: xcratea, xcrateb, xcratec, xcrated
-	Selectable:
-		Selectable: false
-		Bounds: 15,15,-1,-1
-	ProximityCaptor:
-		Types: Crate
-	BodyOrientation:
+
+HEALCRATE:
+	Inherits: ^Crate
+	Tooltip:
+		Name: Heal Crate
+	HealUnitsCrateAction:
+		Notification: heal2.aud
+		SelectionShares: 1
+		Effect: heal
 
 CAMERA:
 	Immobile: