Updates all base mods with the MusicPlaylist trait.

This commit is contained in:
Zimmermann Gyula
2015-06-26 12:14:58 +02:00
parent 60fafaa5a7
commit e875f675b8
51 changed files with 52 additions and 180 deletions

View File

@@ -441,6 +441,8 @@ Rules:
Scripts: scj01ea.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: j1
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -32,12 +32,6 @@ ReinforceWithLandingCraft = function(units, transportStart, transportUnload, ral
Media.PlaySpeechNotification(player, "Reinforce")
end
initialSong = "j1"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
nod = Player.GetPlayer("Nod")
dinosaur = Player.GetPlayer("Dinosaur")
@@ -91,7 +85,6 @@ WorldLoaded = function()
end
Camera.Position = CameraStart.CenterPosition
PlayMusic()
end
Tick = function()

View File

@@ -56,12 +56,6 @@ CheckForBase = function()
return #baseBuildings >= 3
end
initialSong = "aoi"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
player = Player.GetPlayer("GDI")
enemy = Player.GetPlayer("Nod")
@@ -93,8 +87,6 @@ WorldLoaded = function()
ReinforceWithLandingCraft(MCVReinforcements, lstStart.Location + CVec.New(2, 0), lstEnd.Location + CVec.New(2, 0), mcvTarget.Location)
Reinforce(InfantryReinforcements)
PlayMusic()
Trigger.OnIdle(Gunboat, function() SetGunboatPath(Gunboat) end)
SendNodPatrol()

View File

@@ -428,6 +428,8 @@ Rules:
Scripts: gdi01.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: aoi
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -56,18 +56,10 @@ NodAttack = function()
end
end
initialSong = "befeared"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
player = Player.GetPlayer("GDI")
enemy = Player.GetPlayer("Nod")
PlayMusic()
Trigger.OnObjectiveAdded(player, function(p, id)
Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective")
end)

View File

@@ -655,6 +655,8 @@ Rules:
Scripts: gdi02.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: befeared
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -45,18 +45,10 @@ SendReinforcements = function()
Media.PlaySpeechNotification(player, "Reinforce")
end
initialSong = "crep226m"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
player = Player.GetPlayer("GDI")
enemy = Player.GetPlayer("Nod")
PlayMusic()
Trigger.OnObjectiveAdded(player, function(p, id)
Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective")
end)

View File

@@ -730,6 +730,8 @@ Rules:
Scripts: gdi03.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: crep226m
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -103,20 +103,12 @@ SetupWorld = function()
Trigger.OnRemovedFromWorld(crate, function() gdi.MarkCompletedObjective(gdiObjective) end)
end
initialSong = "fist226m"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
gdi = Player.GetPlayer("GDI")
nod = Player.GetPlayer("Nod")
SetupWorld()
PlayMusic()
Trigger.OnObjectiveAdded(gdi, function(p, id)
Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective")
end)

View File

@@ -489,6 +489,8 @@ Rules:
Scripts: gdi04a.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: fist226m
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -110,12 +110,6 @@ SetupWorld = function()
Trigger.OnRemovedFromWorld(crate, function() gdi.MarkCompletedObjective(gdiObjective) end)
end
initialSong = "fist226m"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
gdi = Player.GetPlayer("GDI")
nod = Player.GetPlayer("Nod")
@@ -144,8 +138,6 @@ WorldLoaded = function()
SetupWorld()
PlayMusic()
bhndTrigger = false
Trigger.OnExitedFootprint(BhndTrigger, function(a, id)
if not bhndTrigger and a.Owner == gdi then

View File

@@ -560,6 +560,8 @@ Rules:
Scripts: gdi04b.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: fist226m
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -61,18 +61,10 @@ SendGDIReinforcements = function()
end)
end
initialSong = "ind"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
player = Player.GetPlayer("GDI")
nod = Player.GetPlayer("Nod")
PlayMusic()
Trigger.OnObjectiveAdded(player, function(p, id)
Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective")
end)

View File

@@ -785,6 +785,8 @@ Rules:
Scripts: gdi04c.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: ind
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -183,12 +183,6 @@ SetupWorld = function()
Grd3Action()
end
initialSong = "rain"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
gdiBase = Player.GetPlayer("AbandonedBase")
gdi = Player.GetPlayer("GDI")
@@ -219,9 +213,6 @@ WorldLoaded = function()
SetupWorld()
Camera.Position = GdiTankRallyPoint.CenterPosition
PlayMusic()
end
Tick = function()

View File

@@ -797,6 +797,8 @@ Rules:
Scripts: gdi05a.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: rain
Player:
-ConquestVictoryConditions:
MissionObjectives:

View File

@@ -118,12 +118,6 @@ IdleHunt = function(unit)
end
end
initialSong = "rain"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
gdi = Player.GetPlayer("GDI")
gdiBase = Player.GetPlayer("AbandonedBase")
@@ -185,8 +179,6 @@ WorldLoaded = function()
end)
Camera.Position = UnitsRally.CenterPosition
PlayMusic()
InsertGdiUnits()
end

View File

@@ -639,6 +639,8 @@ Rules:
MissionObjectives:
EarlyGameOver: true
EnemyWatcher:
MusicPlaylist:
StartingMusic: rain
World:
-CrateSpawner:
-SpawnMPUnits:

View File

@@ -289,6 +289,8 @@ Rules:
Scripts: nod01.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: nomercy
C10:
Tooltip:
Name: Nikoomba

View File

@@ -31,12 +31,6 @@ SendLastInfantryReinforcements = function()
end)
end
initialSong = "nomercy"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
nod = Player.GetPlayer("Nod")
gdi = Player.GetPlayer("GDI")
@@ -74,8 +68,6 @@ WorldLoaded = function()
Camera.Position = StartRallyPoint.CenterPosition
PlayMusic()
SendInitialForces()
Trigger.AfterDelay(DateTime.Seconds(30), SendFirstInfantryReinforcements)
Trigger.AfterDelay(DateTime.Seconds(60), SendSecondInfantryReinforcements)

View File

@@ -226,6 +226,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod02a.lua
MusicPlaylist:
StartingMusic: ind2
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -159,12 +159,6 @@ Pat1Movement = function(unit)
IdleHunt(unit)
end
initialSong = "ind2"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -222,8 +216,6 @@ WorldLoaded = function()
end
end)
PlayMusic()
Trigger.AfterDelay(0, getStartUnits)
InsertNodUnits()
end

View File

@@ -268,6 +268,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod02b.lua
MusicPlaylist:
StartingMusic: ind2
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -96,12 +96,6 @@ Gdi3Movement = function(unit)
IdleHunt(unit)
end
initialSong = "ind2"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -141,8 +135,6 @@ WorldLoaded = function()
Trigger.AfterDelay(0, getStartUnits)
Harvester.FindResources()
PlayMusic()
InsertNodUnits()
end

View File

@@ -467,6 +467,8 @@ Rules:
Scripts: nod03a.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: chrg226m
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -16,12 +16,6 @@ InsertNodUnits = function()
end)
end
initialSong = "chrg226m"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
player = Player.GetPlayer("Nod")
enemy = Player.GetPlayer("GDI")
@@ -58,8 +52,6 @@ WorldLoaded = function()
player.MarkFailedObjective(nodObjective1)
end)
PlayMusic()
InsertNodUnits()
Trigger.AfterDelay(DateTime.Seconds(20), function() SendAttackWave(FirstAttackWave, AttackWaveSpawnA.Location) end)
Trigger.AfterDelay(DateTime.Seconds(50), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnB.Location) end)

View File

@@ -511,6 +511,8 @@ Rules:
Scripts: nod03b.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: chrg226m
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -33,12 +33,6 @@ InsertNodUnits = function()
end)
end
initialSong = "chrg226m"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
player = Player.GetPlayer("Nod")
enemy = Player.GetPlayer("GDI")
@@ -72,8 +66,6 @@ WorldLoaded = function()
end)
end)
PlayMusic()
InsertNodUnits()
Trigger.AfterDelay(DateTime.Seconds(40), function() SendAttackWave(FirstAttackWaveUnits, FirstAttackWave) end)
Trigger.AfterDelay(DateTime.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end)

View File

@@ -568,6 +568,8 @@ Rules:
Scripts: nod04a.lua
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MusicPlaylist:
StartingMusic: valkyrie
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -171,12 +171,6 @@ CreateCivilians = function(actor, discoverer)
end)
end
initialSong = "valkyrie"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
NodSupporter = Player.GetPlayer("NodSupporter")
Nod = Player.GetPlayer("Nod")
@@ -290,8 +284,6 @@ WorldLoaded = function()
GDIObjective = GDI.AddPrimaryObjective("Eliminate all Nod forces in the area.")
NodObjective1 = Nod.AddPrimaryObjective("Kill all civilian GDI supporters.")
PlayMusic()
InsertNodUnits()
Camera.Position = waypoint6.CenterPosition
end

View File

@@ -507,6 +507,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod04b.lua
MusicPlaylist:
StartingMusic: warfare
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -74,12 +74,6 @@ InsertNodUnits = function()
Reinforcements.ReinforceWithTransport(Nod, 'tran', NodUnitsGunner, { EntryPointGunner.Location, RallyPointGunner.Location }, { EntryPointGunner.Location }, nil, nil)
end
initialSong = "warfare"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -147,8 +141,6 @@ WorldLoaded = function()
NodObjective1 = Nod.AddPrimaryObjective("Destroy the village and kill all civilians.")
NodObjective2 = Nod.AddSecondaryObjective("Kill all GDI units in the area.")
PlayMusic()
InsertNodUnits()
end

View File

@@ -402,6 +402,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod05.lua
MusicPlaylist:
StartingMusic: airstrik
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -163,12 +163,6 @@ InsertNodUnits = function()
end)
end
initialSong = "airstrik"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -247,9 +241,6 @@ WorldLoaded = function()
end)
Trigger.AfterDelay(0, getStartUnits)
PlayMusic()
end
Tick = function()

View File

@@ -675,6 +675,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod06a.lua
MusicPlaylist:
StartingMusic: rout
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -118,12 +118,6 @@ InsertNodUnits = function()
Reinforcements.Reinforce(Nod, NodStartUnitsRight, { UnitsEntryRight.Location, UnitsRallyRight.Location }, 15)
end
initialSong = "rout"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -153,8 +147,6 @@ WorldLoaded = function()
GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator.")
PlayMusic()
InsertNodUnits()
Trigger.AfterDelay(Grd1TriggerFunctionTime, Grd1TriggerFunction)

View File

@@ -617,6 +617,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod06b.lua
MusicPlaylist:
StartingMusic: rout
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -94,12 +94,6 @@ InsertNodUnits = function()
Reinforcements.Reinforce(Nod, NodUnitsRocket, { UnitsEntryRocket.Location, UnitsRallyRocket.Location }, 25)
end
initialSong = "rout"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -127,8 +121,6 @@ WorldLoaded = function()
NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI nuclear detonator.")
GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator.")
PlayMusic()
InsertNodUnits()
Trigger.OnEnteredFootprint(HuntCellTriggerActivator, function(a, id)

View File

@@ -503,6 +503,8 @@ Rules:
PanelName: MISSION_OBJECTIVES
LuaScript:
Scripts: nod06c.lua
MusicPlaylist:
StartingMusic: rout
^Vehicle:
Tooltip:
GenericVisibility: Enemy

View File

@@ -82,12 +82,6 @@ InsertNodUnits = function()
Reinforcements.Reinforce(Nod, NodStartUnitsRight, { UnitsEntryRight.Location, UnitsRallyRight.Location }, 15)
end
initialSong = "rout"
PlayMusic = function()
Media.PlayMusic(initialSong, PlayMusic)
initialSong = nil
end
WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
@@ -116,8 +110,6 @@ WorldLoaded = function()
NodObjective3 = Nod.AddSecondaryObjective("Infiltrate the barracks, weapon factory and \nthe construction yard.")
GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator.")
PlayMusic()
InsertNodUnits()
Trigger.AfterDelay(Atk1TriggerFunctionTime, Atk1TriggerFunction)

View File

@@ -994,6 +994,9 @@ Rules:
Effect: Desaturated
LuaScript:
Scripts: shellmap.lua
MusicPlaylist:
StartingMusic: map1
LoopStartingMusic: True
LST:
Mobile:
Speed: 42

View File

@@ -17,7 +17,6 @@ WorldLoaded = function()
for i, unit in ipairs(units) do
LoopTrack(unit, CPos.New(8, unit.Location.Y), CPos.New(87, unit.Location.Y))
end
PlayMusic()
end
LoopTrack = function(actor, left, right)
@@ -26,10 +25,6 @@ LoopTrack = function(actor, left, right)
actor.CallFunc(function() LoopTrack(actor, left, right) end)
end
PlayMusic = function()
Media.PlayMusic("map1", PlayMusic)
end
LoadTransport = function(transport, passenger)
transport.LoadPassenger(Actor.Create(passenger, false, { Owner = transport.Owner, Facing = transport.Facing }))
end

View File

@@ -3,6 +3,7 @@
Inherits: ^Palettes
ScreenMap:
ActorMap:
MusicPlaylist:
TerrainGeometryOverlay:
ShroudRenderer:
ShroudVariants: typea, typeb, typec, typed

View File

@@ -125,6 +125,8 @@ Rules:
Maximum: 1
LuaScript:
Scripts: shellmap.lua
MusicPlaylist:
StartingMusic: score
rockettower:
Power:
Amount: 100

View File

@@ -1,3 +0,0 @@
WorldLoaded = function()
Media.PlayMusic("score")
end

View File

@@ -3,6 +3,7 @@
AlwaysVisible:
ScreenMap:
ActorMap:
MusicPlaylist:
TerrainGeometryOverlay:
ShroudRenderer:
ShroudVariants: typea, typeb, typec, typed

View File

@@ -162,6 +162,4 @@ WorldLoaded = function()
SendSovietUnits(Entry5.Location, UnitTypes, 50)
SendSovietUnits(Entry6.Location, UnitTypes, 50)
SendSovietUnits(Entry7.Location, BeachUnitTypes, 15)
Media.PlayMusic()
end

View File

@@ -3,6 +3,7 @@
AlwaysVisible:
ActorMap:
ScreenMap:
MusicPlaylist:
TerrainGeometryOverlay:
LoadWidgetAtGameStart:
ShroudRenderer:

View File

@@ -40,8 +40,9 @@ Rules:
-StartGameNotification:
-SpawnMPUnits:
-MPStartLocations:
LuaScript:
Scripts: shellmap.lua
MusicPlaylist:
StartingMusic: intro
LoopStartingMusic: True
Sequences:

View File

@@ -1,7 +0,0 @@
PlayMusic = function()
Media.PlayMusic("intro", PlayMusic)
end
WorldLoaded = function()
PlayMusic()
end

View File

@@ -3,6 +3,7 @@
AlwaysVisible:
ScreenMap:
ActorMap:
MusicPlaylist:
LoadWidgetAtGameStart:
ShroudRenderer:
Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255