diff --git a/artsrc/cnc/campaign/gdi01.psd b/artsrc/cnc/campaign/gdi01.psd new file mode 100644 index 0000000000..55b08e3a4d Binary files /dev/null and b/artsrc/cnc/campaign/gdi01.psd differ diff --git a/artsrc/cnc/campaign/gdi02.psd b/artsrc/cnc/campaign/gdi02.psd new file mode 100644 index 0000000000..03e5b04cee Binary files /dev/null and b/artsrc/cnc/campaign/gdi02.psd differ diff --git a/artsrc/cnc/campaign/gdi03.psd b/artsrc/cnc/campaign/gdi03.psd new file mode 100644 index 0000000000..8b47dc7e2d Binary files /dev/null and b/artsrc/cnc/campaign/gdi03.psd differ diff --git a/artsrc/cnc/campaign/gdi04.psd b/artsrc/cnc/campaign/gdi04.psd new file mode 100644 index 0000000000..50b500655c Binary files /dev/null and b/artsrc/cnc/campaign/gdi04.psd differ diff --git a/artsrc/cnc/campaign/nod01.psd b/artsrc/cnc/campaign/nod01.psd new file mode 100644 index 0000000000..7a970e7160 Binary files /dev/null and b/artsrc/cnc/campaign/nod01.psd differ diff --git a/artsrc/cnc/campaign/nod03.psd b/artsrc/cnc/campaign/nod03.psd new file mode 100644 index 0000000000..b51c9ced79 Binary files /dev/null and b/artsrc/cnc/campaign/nod03.psd differ diff --git a/mods/cnc/maps/gdi01/gdi01.lua b/mods/cnc/maps/gdi01/gdi01.lua index 88f6de7228..705a060c9a 100644 --- a/mods/cnc/maps/gdi01/gdi01.lua +++ b/mods/cnc/maps/gdi01/gdi01.lua @@ -39,7 +39,7 @@ CheckForBase = function() end WorldLoaded = function() - Media.PlayMovieFullscreen("gdi1.vqa", function() Media.PlayMovieFullscreen("landing.vqa") end) + Media.PlayMovieFullscreen("landing.vqa") player = Player.GetPlayer("GDI") enemy = Player.GetPlayer("Nod") diff --git a/mods/cnc/maps/gdi01/map.png b/mods/cnc/maps/gdi01/map.png index e0f20803e4..516b843424 100644 Binary files a/mods/cnc/maps/gdi01/map.png and b/mods/cnc/maps/gdi01/map.png differ diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index cddcee6915..cb528ed011 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -8,6 +8,8 @@ Title: Storm the Beachhead Description: Use the units provided to protect the Mobile Construction Vehicle. (MCV)\n\nYou should then deploy the MCV by double clicking on it.\n\nThen you can begin to build up a base. Start with a Power Plant.\n\nFinally, search out and destroy all enemy Nod units in the surrounding area. +PreviewVideo: gdi1.vqa + Author: Westwood Studios Tileset: TEMPERAT diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index 1fd1bc5e09..62942563ec 100644 --- a/mods/cnc/maps/gdi02/gdi02.lua +++ b/mods/cnc/maps/gdi02/gdi02.lua @@ -65,8 +65,6 @@ WorldLoaded = function() Trigger.OnKilled(NodRefinery, function() player.MarkFailedObjective(gdiObjective2) end) Trigger.OnAllKilled(nodInBaseTeam, BridgeheadSecured) - - Media.PlayMovieFullscreen("gdi2.vqa") end Tick = function() diff --git a/mods/cnc/maps/gdi02/map.png b/mods/cnc/maps/gdi02/map.png index 6b2ae51c7c..6d6d1b6ef4 100644 Binary files a/mods/cnc/maps/gdi02/map.png and b/mods/cnc/maps/gdi02/map.png differ diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 9ef2308f9e..41949c011a 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -8,6 +8,8 @@ Title: Knock out the Refinery Description: Defend your position, deploy the MCV, then build a sizable force to search out and destroy the Nod base in the area.\n\nAll Nod units and structures must be either destroyed or captured to complete objective. +PreviewVideo: gdi2.vqa + Author: Westwood Studios Tileset: TEMPERAT diff --git a/mods/cnc/maps/gdi03/gdi03.lua b/mods/cnc/maps/gdi03/gdi03.lua index 988d060522..942a931a7e 100644 --- a/mods/cnc/maps/gdi03/gdi03.lua +++ b/mods/cnc/maps/gdi03/gdi03.lua @@ -24,7 +24,7 @@ WorldLoaded = function() player = OpenRA.GetPlayer("GDI") enemy = OpenRA.GetPlayer("Nod") - Media.PlayMovieFullscreen("gdi3.vqa", function() Media.PlayMovieFullscreen("samdie.vqa") end) + Media.PlayMovieFullscreen("samdie.vqa") samSites = Team.New({ Sam1, Sam2, Sam3, Sam4 }) Team.AddEventHandler(samSites.OnAllKilled, function() Actor.Create("PowerProxy.AirSupport", { Owner = player }) end) diff --git a/mods/cnc/maps/gdi03/map.png b/mods/cnc/maps/gdi03/map.png index bed8513e57..aa595926ed 100644 Binary files a/mods/cnc/maps/gdi03/map.png and b/mods/cnc/maps/gdi03/map.png differ diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 858950a204..60fa5d3f1d 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -8,6 +8,8 @@ Title: Destroy The SAM Sites Description: Build up forces to destroy Nod base.\n\nOnce all Nod SAM sites are neutralized then air support will be provided to combat obstacles such as turrets.\n\nDestroy all units and structures to complete the mission objective. +PreviewVideo: gdi3.vqa + Author: Westwood Studios Tileset: TEMPERAT diff --git a/mods/cnc/maps/gdi04a/gdi04a.lua b/mods/cnc/maps/gdi04a/gdi04a.lua index c911c0ecdf..a9f733763e 100644 --- a/mods/cnc/maps/gdi04a/gdi04a.lua +++ b/mods/cnc/maps/gdi04a/gdi04a.lua @@ -111,7 +111,7 @@ SetupWorld = function() end WorldLoaded = function() - Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("gdi4b.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end) end) + Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end) player = OpenRA.GetPlayer("GDI") nod = OpenRA.GetPlayer("Nod") diff --git a/mods/cnc/maps/gdi04a/map.png b/mods/cnc/maps/gdi04a/map.png index ff6a235a34..078691db24 100644 Binary files a/mods/cnc/maps/gdi04a/map.png and b/mods/cnc/maps/gdi04a/map.png differ diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index 47c4e9ce7f..dc99884152 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -8,6 +8,8 @@ Title: Get the Rods back (a) Description: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces. +PreviewVideo: gdi4b.vqa + Author: Westwood Studios Tileset: TEMPERAT diff --git a/mods/cnc/maps/gdi04b/gdi04b.lua b/mods/cnc/maps/gdi04b/gdi04b.lua index ba071d47e7..8f539d2073 100644 --- a/mods/cnc/maps/gdi04b/gdi04b.lua +++ b/mods/cnc/maps/gdi04b/gdi04b.lua @@ -151,7 +151,7 @@ SetupWorld = function() end WorldLoaded = function() - Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("gdi4b.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end) end) + Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end) player = OpenRA.GetPlayer("GDI") nod = OpenRA.GetPlayer("Nod") diff --git a/mods/cnc/maps/gdi04b/map.png b/mods/cnc/maps/gdi04b/map.png index 2fd72f67a9..7884cb3264 100644 Binary files a/mods/cnc/maps/gdi04b/map.png and b/mods/cnc/maps/gdi04b/map.png differ diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index e20f86bfdc..6041dc7d15 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -10,6 +10,8 @@ Author: Westwood Studios Description: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces. +PreviewVideo: gdi4b.vqa + Tileset: TEMPERAT MapSize: 64,64 diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index d9372a1854..7be48e9aad 100644 --- a/mods/cnc/maps/gdi04c/gdi04c.lua +++ b/mods/cnc/maps/gdi04c/gdi04c.lua @@ -122,7 +122,7 @@ WorldLoaded = function() Camera.Position = Actor141.CenterPosition - Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("gdi4a.vqa", function() Media.PlayMovieFullscreen("nodsweep.vqa") end) end) + Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nodsweep.vqa") end) end Tick = function() diff --git a/mods/cnc/maps/gdi04c/map.png b/mods/cnc/maps/gdi04c/map.png index 54891042db..4c734350ee 100644 Binary files a/mods/cnc/maps/gdi04c/map.png and b/mods/cnc/maps/gdi04c/map.png differ diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 7863beb31c..608b51b8ce 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -10,6 +10,8 @@ Author: Westwood Studios Description: Nod is moving to capture and hold a civilian town.\n\nYour mission is to reach the town first and hold off invading Nod units until GDI reinforcements can arrive.\n\nAll invading Nod units must be destroyed. +PreviewVideo: gdi4a.vqa + Tileset: TEMPERAT MapSize: 64,64 diff --git a/mods/cnc/maps/nod01/map.png b/mods/cnc/maps/nod01/map.png index 0b920ef21d..d09050d776 100644 Binary files a/mods/cnc/maps/nod01/map.png and b/mods/cnc/maps/nod01/map.png differ diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index ff684131f0..0a49beab55 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -8,6 +8,8 @@ Title: Nikoomba's Demise Description: In order for the Brotherhood to gain a foothold, we must begin by eliminating certain elements.\n\nNikoomba, the nearby village's leader, is one such element.\n\nHis views and ours do not coincide.\n\nHe and his whole group must be eliminated. +PreviewVideo: nod1.vqa + Author: Westwood Studios Tileset: DESERT diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index 4ed638fae0..72a25292d7 100644 --- a/mods/cnc/maps/nod01/nod01.lua +++ b/mods/cnc/maps/nod01/nod01.lua @@ -56,8 +56,6 @@ WorldLoaded = function() Trigger.AfterDelay(Utils.Seconds(30), SendFirstInfantryReinforcements) Trigger.AfterDelay(Utils.Seconds(60), SendSecondInfantryReinforcements) - - Media.PlayMovieFullscreen("nod1pre.vqa", function() Media.PlayMovieFullscreen("nod1.vqa") end) end Tick = function() diff --git a/mods/cnc/maps/nod03a/map.png b/mods/cnc/maps/nod03a/map.png index 7ea08b2445..de09c696d3 100644 Binary files a/mods/cnc/maps/nod03a/map.png and b/mods/cnc/maps/nod03a/map.png differ diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index dea3bd2b6a..3622916d75 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -8,6 +8,8 @@ Title: Sudanese Prison Break (a) Description: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it. +PreviewVideo: nod3.vqa + Author: Westwood Studios Tileset: DESERT diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index 8f7e2eb9fd..d340c7c1bc 100644 --- a/mods/cnc/maps/nod03a/nod03a.lua +++ b/mods/cnc/maps/nod03a/nod03a.lua @@ -61,8 +61,6 @@ WorldLoaded = function() 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) - - Media.PlayMovieFullscreen("nod3.vqa") end Tick = function() diff --git a/mods/cnc/maps/nod03b/map.png b/mods/cnc/maps/nod03b/map.png index f1bf88f868..7c4d3077a3 100644 Binary files a/mods/cnc/maps/nod03b/map.png and b/mods/cnc/maps/nod03b/map.png differ diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 77d0b361fc..d2698f872a 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -8,6 +8,8 @@ Title: Sudanese Prison Break (b) Description: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it. +PreviewVideo: nod3.vqa + Author: Westwood Studios Tileset: DESERT diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index 37cc32c461..e9efa6fb7b 100644 --- a/mods/cnc/maps/nod03b/nod03b.lua +++ b/mods/cnc/maps/nod03b/nod03b.lua @@ -75,7 +75,6 @@ WorldLoaded = function() Trigger.AfterDelay(Utils.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end) Trigger.AfterDelay(Utils.Seconds(140), function() SendAttackWave(ThirdAttackWaveUnits, FirstAttackWave) end) - Media.PlayMovieFullscreen("nod3.vqa") end Tick = function() diff --git a/mods/cnc/missions.yaml b/mods/cnc/missions.yaml index 395b49e2c6..b36e7bb26f 100644 --- a/mods/cnc/missions.yaml +++ b/mods/cnc/missions.yaml @@ -1,10 +1,12 @@ -Missions: +GDI Campaign: ./mods/cnc/maps/gdi01 ./mods/cnc/maps/gdi02 ./mods/cnc/maps/gdi03 ./mods/cnc/maps/gdi04a ./mods/cnc/maps/gdi04b ./mods/cnc/maps/gdi04c + +Nod Campaign: ./mods/cnc/maps/nod01 ./mods/cnc/maps/nod03a ./mods/cnc/maps/nod03b