Skip to content

Commit afae122

Browse files
pawnishoovypawnishoovy
committed
fix and actually commit half the activities
1 parent aeae6d6 commit afae122

File tree

7 files changed

+46
-61
lines changed

7 files changed

+46
-61
lines changed

‎Data/Base.rte/Activities/BunkerBreach.lua

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ function BunkerBreach:StartActivity(isNewGame)
253253
FrameMan:ClearScreenText(self:ScreenOfPlayer(player));
254254
end
255255
end
256+
257+
MusicMan:PlayDynamicSong("Generic Battle Music");
256258

257259
if isNewGame then
258260
-- Because of game oddities, we need to set funds to match starting gold manually.
@@ -326,15 +328,11 @@ function BunkerBreach:EndActivity()
326328
-- Temp fix so music doesn't start playing if ending the Activity when changing resolution through the ingame settings.
327329
if not self:IsPaused() then
328330
if self.WinnerTeam == self.CPUTeam then
329-
AudioMan:ClearMusicQueue();
330-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
331-
AudioMan:QueueSilence(10);
332-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
331+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
332+
MusicMan:PlayDynamicSong("Generic Ambient Music");
333333
else
334-
AudioMan:ClearMusicQueue();
335-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/uwinfinal.ogg", 2, -1.0);
336-
AudioMan:QueueSilence(10);
337-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
334+
MusicMan:PlayDynamicSong("Generic Victory Music", "Default", true);
335+
MusicMan:PlayDynamicSong("Generic Ambient Music");
338336
end
339337
end
340338
end

‎Data/Base.rte/Activities/Massacre.lua

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ function Massacre:SetupHumanPlayerBrains()
8080
-- If we can't find an unassigned brain in the scene to give each player, then force to go into editing mode to place one
8181
if not foundBrain then
8282
self.ActivityState = Activity.EDITING;
83-
AudioMan:ClearMusicQueue();
84-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/ccambient4.ogg", -1, -1);
83+
MusicMan:PlayDynamicSong("Generic Ambient Music");
8584
else
85+
MusicMan:PlayDynamicSong("Generic Battle Music");
8686
-- Set the found brain to be the selected actor at start
8787
self:SetPlayerBrain(foundBrain, player);
8888
self:SwitchToActor(foundBrain, player, self:GetTeamOfPlayer(player));
@@ -129,22 +129,22 @@ function Massacre:EndActivity()
129129
if not self:IsPaused() then
130130
-- Play sad music if no humans are left
131131
if self:HumanBrainCount() == 0 then
132-
AudioMan:ClearMusicQueue();
133-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
134-
AudioMan:QueueSilence(10);
135-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
132+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
133+
MusicMan:PlayDynamicSong("Generic Ambient Music");
136134
else
137135
-- But if humans are left, then play happy music!
138-
AudioMan:ClearMusicQueue();
139-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/uwinfinal.ogg", 2, -1.0);
140-
AudioMan:QueueSilence(10);
141-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
136+
MusicMan:PlayDynamicSong("Generic Victory Music", "Default", true);
137+
MusicMan:PlayDynamicSong("Generic Ambient Music");
142138
end
143139
end
144140
end
145141

146142
function Massacre:UpdateActivity()
147143
if self.ActivityState ~= Activity.OVER and self.ActivityState ~= Activity.EDITING then
144+
if not self.musicStarted then
145+
self.musicStarted = true;
146+
MusicMan:PlayDynamicSong("Generic Battle Music", "Default", true);
147+
end
148148
for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
149149
if self:PlayerActive(player) and self:PlayerHuman(player) then
150150
--Display messages.
@@ -340,5 +340,6 @@ function Massacre:UpdateActivity()
340340
end
341341
else
342342
self.startMessageTimer:Reset();
343+
self.musicStarted = false;
343344
end
344345
end

‎Data/Base.rte/Activities/MetaFight.lua

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,7 @@ function MetaFight:StartActivity()
503503

504504
-- Starting in pregame, so play some appropriate music
505505
if self.ActivityState == Activity.PREGAME then
506-
AudioMan:ClearMusicQueue();
507-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/ccambient4.ogg", -1, -1);
506+
MusicMan:PlayDynamicSong("Generic Ambient Music");
508507
end
509508

510509
-- Disable AI if we are editing pregame
@@ -561,23 +560,17 @@ function MetaFight:EndActivity()
561560
-- Should not clear blueprints because this wipes all placed loadouts info
562561
--SceneMan.Scene:ClearPlacedObjectSet(Scene.BLUEPRINT);
563562
-- Sad music
564-
AudioMan:ClearMusicQueue();
565-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
566-
AudioMan:QueueSilence(10);
567-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
563+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
564+
MusicMan:PlayDynamicSong("Generic Ambient Music");
568565
-- Also play sad music if no humans are left
569566
elseif self:HumanBrainCount() == 0 then
570-
AudioMan:ClearMusicQueue();
571-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
572-
AudioMan:QueueSilence(10);
573-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
567+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
568+
MusicMan:PlayDynamicSong("Generic Ambient Music");
574569
-- But if humans are left, then play happy music!
575570
else
576571
-- Win music!
577-
AudioMan:ClearMusicQueue();
578-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/uwinfinal.ogg", 2, -1.0);
579-
AudioMan:QueueSilence(10);
580-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
572+
MusicMan:PlayDynamicSong("Generic Victory Music", "Default", true);
573+
MusicMan:PlayDynamicSong("Generic Ambient Music");
581574
end
582575
end
583576

@@ -851,12 +844,7 @@ function MetaFight:UpdateActivity()
851844
UInputMan:SetMouseValueMagnitude(0, -1);
852845
SceneMan.Scene:ResetPathFinding();
853846
-- Start the in-game music track
854-
AudioMan:ClearMusicQueue();
855-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/cc2g.ogg", 0, -1.0);
856-
AudioMan:QueueSilence(30);
857-
AudioMan:QueueMusicStream("Base.rte/Music/Watts/Last Man.ogg");
858-
AudioMan:QueueSilence(30);
859-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/cc2g.ogg");
847+
MusicMan:PlayDynamicSong("Generic Battle Music");
860848

861849
-- Find LZs for the AI teams
862850
self:DesignateLZs();

‎Data/Base.rte/Activities/OneManArmy.lua

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ function OneManArmy:StartNewGame()
7676
secondaryGroup = "Weapons - Secondary";
7777
end
7878
self.enemySpawnTimeLimit = 500;
79+
80+
MusicMan:PlayDynamicSong("Generic Battle Music");
7981

8082
MovableMan:OpenAllDoors(true, -1);
8183
for actor in MovableMan.AddedActors do
@@ -239,16 +241,12 @@ function OneManArmy:EndActivity()
239241
if not self:IsPaused() then
240242
--Play sad music if no humans are left
241243
if self:HumanBrainCount() == 0 then
242-
AudioMan:ClearMusicQueue();
243-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
244-
AudioMan:QueueSilence(10);
245-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
244+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
245+
MusicMan:PlayDynamicSong("Generic Ambient Music");
246246
else
247247
--But if humans are left, play happy music!
248-
AudioMan:ClearMusicQueue();
249-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/uwinfinal.ogg", 2, -1.0);
250-
AudioMan:QueueSilence(10);
251-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
248+
MusicMan:PlayDynamicSong("Generic Victory Music", "Default", true);
249+
MusicMan:PlayDynamicSong("Generic Ambient Music");
252250
end
253251
end
254252
end

‎Data/Base.rte/Activities/OneManArmyDiggers.lua

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ function OneManArmy:StartNewGame()
8080
secondaryGroup = "Tools";
8181
end
8282
self.enemySpawnTimeLimit = 500;
83+
84+
MusicMan:PlayDynamicSong("Generic Battle Music");
8385

8486
MovableMan:OpenAllDoors(true, -1);
8587
for actor in MovableMan.AddedActors do
@@ -203,16 +205,12 @@ function OneManArmy:EndActivity()
203205
if not self:IsPaused() then
204206
-- Play sad music if no humans are left
205207
if self:HumanBrainCount() == 0 then
206-
AudioMan:ClearMusicQueue();
207-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
208-
AudioMan:QueueSilence(10);
209-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
208+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
209+
MusicMan:PlayDynamicSong("Generic Ambient Music");
210210
else
211211
-- But if humans are left, then play happy music!
212-
AudioMan:ClearMusicQueue();
213-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/uwinfinal.ogg", 2, -1.0);
214-
AudioMan:QueueSilence(10);
215-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
212+
MusicMan:PlayDynamicSong("Generic Victory Music", "Default", true);
213+
MusicMan:PlayDynamicSong("Generic Ambient Music");
216214
end
217215
end
218216
end

‎Data/Base.rte/Activities/WaveDefense.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function WaveDefense:CheckBrains()
77
-- If we can't find an unassigned brain in the scene to give each player, then force to go into editing mode to place one
88
if not foundBrain then
99
self.ActivityState = Activity.EDITING;
10-
MusicMan:PlayDynamicSong("Generic Ambient Music");
10+
MusicMan:PlayDynamicSong("Generic Ambient Music", "Default", true);
1111
self:SetLandingZone(Vector(player*SceneMan.SceneWidth/4, 0), player);
1212
else
1313
MusicMan:PlayDynamicSong("Generic Battle Music");
@@ -24,6 +24,7 @@ function WaveDefense:CheckBrains()
2424
end
2525

2626
function WaveDefense:StartActivity(isNewGame)
27+
2728
-- Get player team
2829
self.playerTeam = Activity.TEAM_2;
2930
for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
@@ -140,6 +141,9 @@ function WaveDefense:ResumeLoadedGame()
140141
end
141142

142143
function WaveDefense:InitWave()
144+
145+
MusicMan:PlayDynamicSong("Generic Battle Music", "Default", true);
146+
143147
self.AI.SpawnTimer:Reset();
144148
self.AI.BombTimer:Reset();
145149
self.AI.HuntTimer:Reset();
@@ -218,7 +222,7 @@ function WaveDefense:UpdateActivity()
218222
if UInputMan:KeyPressed(Key.SPACE) then
219223
self.prepareForNextWave = false;
220224
self.ActivityState = Activity.EDITING;
221-
MusicMan:PlayDynamicSong("Generic Ambient Music", true);
225+
MusicMan:PlayDynamicSong("Generic Ambient Music", "Default", true);
222226

223227
-- Remove control of the actors during edit mode
224228
for Act in MovableMan.Actors do
@@ -384,10 +388,8 @@ function WaveDefense:UpdateActivity()
384388

385389
-- Temp fix so music doesn't start playing if ending the Activity when changing resolution through the ingame settings.
386390
if not self:IsPaused() then
387-
AudioMan:ClearMusicQueue();
388-
AudioMan:PlayMusic("Base.rte/Music/dBSoundworks/udiedfinal.ogg", 2, -1.0);
389-
AudioMan:QueueSilence(10);
390-
AudioMan:QueueMusicStream("Base.rte/Music/dBSoundworks/ccambient4.ogg");
391+
MusicMan:PlayDynamicSong("Generic Defeat Music", "Default", true);
392+
MusicMan:PlayDynamicSong("Generic Ambient Music");
391393
end
392394
return;
393395
end

‎Data/Missions.rte/Activities/Doainar.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ function DoainarMission:UpdateActivity()
264264
self:ResetMessageTimer(player);
265265
FrameMan:ClearScreenText(self:ScreenOfPlayer(player));
266266
FrameMan:SetScreenText("That was a close one. Go finish off their den!", self:ScreenOfPlayer(player), 0, 7500, true);
267-
MusicMan:PlayDynamicSong("Generic Battle Music", true);
267+
MusicMan:PlayDynamicSong("Generic Ambient Music", "Default", true);
268268
end
269269

270270
if MovableMan:IsParticle(self.eggSac) == false and self.sacDestroyed == false then

0 commit comments

Comments
 (0)