epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6425 from obrakmann/mission-polish

Browse Source 
Mission follow-up
This commit is contained in:
Matthias Mailänder
2014-09-09 21:07:41 +02:00
parent bdbf0a7290 1201a628d6
commit 6e5d1da468
7 changed files with 61 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mods/cnc/maps/gdi02/gdi02.lua
View File

@@ -42,12 +42,14 @@ WorldLoaded = function()
Trigger.OnPlayerWon(player, function()
Media.PlaySpeechNotification(player, "Win")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("flag.vqa")
end)
end)
Trigger.OnPlayerLost(player, function()
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlaySpeechNotification(player, "Lose")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("gameover.vqa")
end)
end)

2
mods/cnc/maps/gdi04c/gdi04c.lua
View File

@@ -97,8 +97,8 @@ WorldLoaded = function()
end)
Trigger.OnPlayerLost(player, function()
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlaySpeechNotification(player, "Lose")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("gameover.vqa")
end)
end)

5
mods/cnc/maps/gdi04c/map.yaml
View File

@@ -924,9 +924,12 @@ VoxelSequences:
Weapons:
Rockets:
Range: 5c0
Warhead: SpreadDamage
Versus:
None: 20
None: 10
Light: 66
Heavy: 66
Voices:

55
mods/cnc/maps/nod03a/map.yaml
View File

@@ -351,11 +351,6 @@ Actors:
Owner: Neutral
Health: 1
Facing: 0
Actor80: bike
Location: 52,38
Owner: Nod
Health: 1
Facing: 128
Actor82: jeep
Location: 21,22
Owner: GDI
@@ -371,31 +366,11 @@ Actors:
Owner: GDI
Health: 1
Facing: 128
Actor86: mcv
Location: 50,36
Owner: Nod
Health: 1
Facing: 128
Actor87: bike
Location: 51,38
Owner: Nod
Health: 1
Facing: 128
Actor89: jeep
Location: 29,34
Owner: GDI
Health: 1
Facing: 96
Actor90: bggy
Location: 48,38
Owner: Nod
Health: 1
Facing: 128
Actor92: bggy
Location: 49,38
Owner: Nod
Health: 1
Facing: 128
TibFieldHumvee01: jeep
Location: 52,19
Owner: GDI
@@ -489,12 +464,6 @@ Actors:
Health: 1
Facing: 160
SubCell: 2
Actor110: e1
Location: 48,39
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
Actor111: e1
Location: 39,31
Owner: GDI
@@ -507,12 +476,6 @@ Actors:
Health: 1
Facing: 96
SubCell: 0
Actor113: e1
Location: 49,39
Owner: Nod
Health: 1
Facing: 128
SubCell: 3
Actor116: e2
Location: 34,22
Owner: GDI
@@ -537,24 +500,18 @@ Actors:
Health: 1
Facing: 128
SubCell: 0
Actor122: e3
Location: 51,39
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
Actor123: e3
Location: 52,39
Owner: Nod
Health: 1
Facing: 128
SubCell: 1
AttackWaveSpawnA: waypoint
Location: 45,16
Owner: Neutral
NodEntry: waypoint
Location: 54,40
Owner: Neutral
PlayerBase: waypoint
Location: 50,38
Owner: Neutral
NodRallyPoint: waypoint
Location: 45,42
Owner: Neutral
AttackWaveSpawnC: waypoint
Location: 33,16
Owner: Neutral

15
mods/cnc/maps/nod03a/nod03a.lua
View File

@@ -1,3 +1,4 @@
NodUnits = { "bike", "e3", "e1", "bggy", "e1", "e3", "bike", "bggy" }
FirstAttackWave = { "e1", "e1", "e1", "e2", }
SecondThirdAttackWave = { "e1", "e1", "e2", }
@@ -7,6 +8,13 @@ SendAttackWave = function(units, spawnPoint)
end)
end
InsertNodUnits = function()
Reinforcements.Reinforce(player, NodUnits, { NodEntry.Location, NodRallyPoint.Location })
Trigger.AfterDelay(Utils.Seconds(9), function()
Reinforcements.Reinforce(player, { "mcv" }, { NodEntry.Location, PlayerBase.Location })
end)
end
WorldLoaded = function()
player = Player.GetPlayer("Nod")
enemy = Player.GetPlayer("GDI")
@@ -15,6 +23,7 @@ WorldLoaded = function()
nodObjective1 = player.AddPrimaryObjective("Capture the prison")
nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces")
InsertNodUnits()
Trigger.AfterDelay(Utils.Seconds(20), function() SendAttackWave(FirstAttackWave, AttackWaveSpawnA.Location) end)
Trigger.AfterDelay(Utils.Seconds(50), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnB.Location) end)
Trigger.AfterDelay(Utils.Seconds(100), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnC.Location) end)
@@ -23,23 +32,25 @@ WorldLoaded = function()
Trigger.OnObjectiveFailed(player, function() Media.DisplayMessage("Objective failed") end)
Trigger.OnCapture(TechCenter, function()
Trigger.AfterDelay(Utils.Seconds(2), function()
player.MarkCompletedObjective(nodObjective1)
end)
end)
Trigger.OnKilled(TechCenter, function()
player.MarkFailedObjective(nodObjective1)
end)
Trigger.OnPlayerWon(player, function()
Trigger.AfterDelay(Utils.Seconds(2), function()
Media.PlaySpeechNotification(player, "Win")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("desflees.vqa")
end)
end)
Trigger.OnPlayerLost(player, function()
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlaySpeechNotification(player, "Lose")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("flag.vqa")
end)
end)

91
mods/cnc/maps/nod03b/map.yaml
View File

@@ -457,16 +457,12 @@ Actors:
Owner: Neutral
Health: 1
Facing: 0
Actor69: mcv
Location: 52,37
Owner: Nod
Health: 1
Facing: 128
Actor70: bike
Location: 48,39
Owner: Nod
Health: 1
Facing: 128
McvEntry: waypoint
Location: 54,38
Owner: Neutral
McvDeploy: waypoint
Location: 52,36
Owner: Neutral
Actor72: jeep
Location: 28,21
Owner: GDI
@@ -487,56 +483,17 @@ Actors:
Owner: GDI
Health: 1
Facing: 128
Actor76: bggy
Location: 49,38
Owner: Nod
Health: 1
Facing: 128
NodEntry: waypoint
Location: 54,40
Owner: Neutral
NodRallypoint: waypoint
Location: 50,42
Owner: Neutral
Actor77: jeep
Location: 47,21
Owner: GDI
Health: 1
Facing: 160
Actor78: bike
Location: 49,39
Owner: Nod
Health: 1
Facing: 128
Actor79: bggy
Location: 49,37
Owner: Nod
Health: 1
Facing: 128
Actor83: e6
Location: 48,40
Owner: Nod
Health: 1
Facing: 128
SubCell: 3
Actor84: e6
Location: 48,40
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
Actor85: e6
Location: 48,41
Owner: Nod
Health: 1
Facing: 128
SubCell: 0
Actor99: e1
Location: 50,41
Owner: Nod
Health: 1
Facing: 128
SubCell: 3
Actor100: e1
Location: 50,41
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
Actor101: c1
Location: 16,36
Owner: Neutral
@@ -567,30 +524,6 @@ Actors:
Health: 1
Facing: 224
SubCell: 4
Actor112: e1
Location: 50,40
Owner: Nod
Health: 1
Facing: 128
SubCell: 3
Actor114: e1
Location: 50,40
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
Actor115: e1
Location: 49,40
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
Actor116: e1
Location: 49,41
Owner: Nod
Health: 1
Facing: 128
SubCell: 4
PlayerBase: waypoint
Location: 50,39
Owner: Neutral

21
mods/cnc/maps/nod03b/nod03b.lua
View File

@@ -1,3 +1,5 @@
NodUnits = { "e1", "e1", "bggy", "bike", "e1", "e1", "bike", "bggy", "e1", "e1" }
Engineers = { "e6", "e6", "e6" }
FirstAttackWaveUnits = { "e1", "e1", "e2" }
SecondAttackWaveUnits = { "e1", "e1", "e1" }
ThirdAttackWaveUnits = { "e1", "e1", "e1", "e2" }
@@ -21,6 +23,14 @@ SecondAttackWave = function(soldier)
soldier.AttackMove(PlayerBase.Location)
end
InsertNodUnits = function()
Reinforcements.Reinforce(player, { "mcv" }, { McvEntry.Location, McvDeploy.Location })
Reinforcements.Reinforce(player, NodUnits, { NodEntry.Location, NodRallypoint.Location })
Trigger.AfterDelay(Utils.Seconds(15), function()
Reinforcements.Reinforce(player, Engineers, { McvEntry.Location, PlayerBase.Location })
end)
end
WorldLoaded = function()
player = Player.GetPlayer("Nod")
enemy = Player.GetPlayer("GDI")
@@ -29,6 +39,7 @@ WorldLoaded = function()
nodObjective1 = player.AddPrimaryObjective("Capture the prison")
nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces")
InsertNodUnits()
Trigger.OnObjectiveCompleted(player, function() Media.DisplayMessage("Objective completed") end)
Trigger.OnObjectiveFailed(player, function() Media.DisplayMessage("Objective failed") end)
@@ -36,19 +47,23 @@ WorldLoaded = function()
Trigger.AfterDelay(Utils.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end)
Trigger.AfterDelay(Utils.Seconds(140), function() SendAttackWave(ThirdAttackWaveUnits, FirstAttackWave) end)
Trigger.OnCapture(TechCenter, function() player.MarkCompletedObjective(nodObjective1) end)
Trigger.OnKilled(TechCenter, function() player.MarkFailedObjective(nodObjective1) end)
Trigger.OnCapture(TechCenter, function()
Trigger.AfterDelay(Utils.Seconds(2), function()
player.MarkCompletedObjective(nodObjective1)
end)
end)
Trigger.OnPlayerWon(player, function()
Trigger.AfterDelay(Utils.Seconds(2), function()
Media.PlaySpeechNotification(player, "Win")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("desflees.vqa")
end)
end)
Trigger.OnPlayerLost(player, function()
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlaySpeechNotification(player, "Lose")
Trigger.AfterDelay(Utils.Seconds(1), function()
Media.PlayMovieFullscreen("flag.vqa")
end)
end)