Skip to content

Commit c92dbf0

Browse files
committed
add shockwave terrain sounds
1 parent bc4b865 commit c92dbf0

12 files changed

+93
-71
lines changed

Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/AI/BrowncoatBossAI.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ function Create(self)
6262
self.abilityShockwaveWhooshSound = CreateSoundContainer("Browncoat Boss Ability Shockwave Whoosh", "Browncoats.rte");
6363
self.abilityShockwaveLandSound = CreateSoundContainer("Browncoat Boss Ability Shockwave Land", "Browncoats.rte");
6464

65+
self.abilityShockwaveTerrainSounds = {};
66+
67+
self.abilityShockwaveTerrainSounds.Concrete = CreateSoundContainer("Browncoat Boss Ability Shockwave Concrete Add", "Browncoats.rte");
68+
self.abilityShockwaveTerrainSounds.Dirt = CreateSoundContainer("Browncoat Boss Ability Shockwave Dirt Add", "Browncoats.rte");
69+
self.abilityShockwaveTerrainSounds.Metal = CreateSoundContainer("Browncoat Boss Ability Shockwave Metal Add", "Browncoats.rte");
70+
6571
self.abilityShockwaveTimer = Timer();
6672
self.abilityShockwaveJumpPackDelay = 300;
6773

Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.ini

Lines changed: 53 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -362,113 +362,96 @@ AddSoundContainer = SoundContainer
362362
PresetName = Browncoat Boss DeathScriptedStart
363363
AttenuationStartDistance = 400
364364
SoundOverlapMode = 2
365-
AddSound = ContentFile
366-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Scripted/DeathScriptedStart.flac
365+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Scripted/DeathScriptedStart.flac
367366

368367
AddSoundContainer = SoundContainer
369368
PresetName = Browncoat Boss DeathScriptedMidBurn
370369
AttenuationStartDistance = 400
371370
SoundOverlapMode = 2
372-
AddSound = ContentFile
373-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Scripted/DeathScriptedMidBurn.flac
371+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Scripted/DeathScriptedMidBurn.flac
374372

375373
AddSoundContainer = SoundContainer
376374
PresetName = Browncoat Boss DeathScriptedExplode
377375
AttenuationStartDistance = 400
378376
SoundOverlapMode = 2
379-
AddSound = ContentFile
380-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Scripted/DeathScriptedExplode.flac
377+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Scripted/DeathScriptedExplode.flac
381378

382379
AddSoundContainer = SoundContainer
383380
PresetName = Browncoat Boss Jump Pack
384-
AttenuationStartDistance = 180
381+
AttenuationStartDistance = 400
385382
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/JumpPack1.flac
386383
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/JumpPack2.flac
387384
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/JumpPack3.flac
388385

389386
AddSoundContainer = SoundContainer
390387
PresetName = Browncoat Boss Ability Shockwave Whoosh
391-
AttenuationStartDistance = 150
392-
AddSound = ContentFile
393-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveWhoosh1.flac
394-
AddSound = ContentFile
395-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveWhoosh2.flac
396-
AddSound = ContentFile
397-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveWhoosh3.flac
388+
AttenuationStartDistance = 400
389+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveWhoosh1.flac
390+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveWhoosh2.flac
391+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveWhoosh3.flac
398392

399393
AddSoundContainer = SoundContainer
400394
PresetName = Browncoat Boss Ability Shockwave Land
401-
AttenuationStartDistance = 150
402-
AddSound = ContentFile
403-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveLand1.flac
404-
AddSound = ContentFile
405-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveLand2.flac
406-
AddSound = ContentFile
407-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveLand3.flac
395+
AttenuationStartDistance = 400
396+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveLand1.flac
397+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveLand2.flac
398+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveLand3.flac
399+
400+
AddSoundContainer = SoundContainer
401+
PresetName = Browncoat Boss Ability Shockwave Concrete Add
402+
AttenuationStartDistance = 200
403+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveConcreteAdd1.flac
404+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveConcreteAdd2.flac
405+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveConcreteAdd3.flac
408406

409407
AddSoundContainer = SoundContainer
410-
PresetName = Browncoat Boss JumpPack
411-
AttenuationStartDistance = 150
412-
AddSound = ContentFile
413-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/JumpPack1.flac
414-
AddSound = ContentFile
415-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/JumpPack2.flac
416-
AddSound = ContentFile
417-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/JumpPack3.flac
408+
PresetName = Browncoat Boss Ability Shockwave Dirt Add
409+
AttenuationStartDistance = 200
410+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveDirtAdd1.flac
411+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveDirtAdd2.flac
412+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveDirtAdd3.flac
413+
414+
AddSoundContainer = SoundContainer
415+
PresetName = Browncoat Boss Ability Shockwave Metal Add
416+
AttenuationStartDistance = 200
417+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveMetalAdd1.flac
418+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveMetalAdd2.flac
419+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Abilities/AbilityShockwaveMetalAdd3.flac
418420

419421
AddSoundContainer = SoundContainer
420422
PresetName = Browncoat Boss Jump
421423
AttenuationStartDistance = 110
422-
AddSound = ContentFile
423-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump1.flac
424-
AddSound = ContentFile
425-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump2.flac
426-
AddSound = ContentFile
427-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump3.flac
428-
AddSound = ContentFile
429-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump4.flac
424+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump1.flac
425+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump2.flac
426+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump3.flac
427+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Jump4.flac
430428

431429
AddSoundContainer = SoundContainer
432430
PresetName = Browncoat Boss Land
433431
AttenuationStartDistance = 130
434-
AddSound = ContentFile
435-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land1.flac
436-
AddSound = ContentFile
437-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land2.flac
438-
AddSound = ContentFile
439-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land3.flac
440-
AddSound = ContentFile
441-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land4.flac
432+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land1.flac
433+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land2.flac
434+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land3.flac
435+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Land4.flac
442436

443437
AddSoundContainer = SoundContainer
444438
PresetName = Browncoat Boss Stride
445439
AttenuationStartDistance = 110
446-
AddSound = ContentFile
447-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step1.flac
448-
AddSound = ContentFile
449-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step2.flac
450-
AddSound = ContentFile
451-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step3.flac
452-
AddSound = ContentFile
453-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step4.flac
454-
AddSound = ContentFile
455-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step5.flac
456-
AddSound = ContentFile
457-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step6.flac
458-
AddSound = ContentFile
459-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step7.flac
460-
AddSound = ContentFile
461-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step8.flac
440+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step1.flac
441+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step2.flac
442+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step3.flac
443+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step4.flac
444+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step5.flac
445+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step6.flac
446+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step7.flac
447+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/Step8.flac
462448

463449
AddSoundContainer = SoundContainer
464450
PresetName = Browncoat Boss ThrowFoley
465451
AttenuationStartDistance = 150
466-
AddSound = ContentFile
467-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/ThrowFoley1.flac
468-
AddSound = ContentFile
469-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/ThrowFoley2.flac
470-
AddSound = ContentFile
471-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/ThrowFoley3.flac
452+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/ThrowFoley1.flac
453+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/ThrowFoley2.flac
454+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/ThrowFoley3.flac
472455

473456
///////////////////////////////////////////////////////////////////////
474457
// Browncoat Boss VO Sounds
@@ -1735,5 +1718,6 @@ AddActor = AHuman
17351718
Jetpack = AEJetpack
17361719
CopyOf = Browncoat Boss Jetpack
17371720
DrawAfterParent = 0
1738-
JumpTime = 4.0
1739-
JumpReplenishRate = 2
1721+
JumpTime = 10.0
1722+
JumpReplenishRate = 4
1723+
ParticlesPerMinute = 50000

Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.lua

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ function Create(self)
1717
JumpAttack = CreateSoundContainer("Browncoat Boss VO Ability Jump Attack", "Browncoats.rte"),
1818
OilThrowTaunt = CreateSoundContainer("Browncoat Boss VO Ability Oil Throw", "Browncoats.rte")}
1919

20-
self.voiceSound = CreateSoundContainer("Browncoat Boss JumpPack", "Browncoats.rte");
20+
self.voiceSound = CreateSoundContainer("Browncoat Boss Jump Pack", "Browncoats.rte");
2121
-- MEANINGLESS! this is just so we can do voiceSound.Pos without an if check first! it will be overwritten first actual VO play
2222

23-
self.jumpPackSound = CreateSoundContainer("Browncoat Boss JumpPack", "Browncoats.rte");
23+
self.jumpPackSound = CreateSoundContainer("Browncoat Boss Jump Pack", "Browncoats.rte");
2424

2525
self.stepSound = CreateSoundContainer("Browncoat Boss Stride", "Browncoats.rte");
2626
self.jumpSound = CreateSoundContainer("Browncoat Boss Jump", "Browncoats.rte");
@@ -219,6 +219,38 @@ function Update(self)
219219
self.abilityShockwaveWhooshSound:Stop(-1);
220220
self.voiceSound:FadeOut(90);
221221

222+
-- it's stupid that this is here in force, but the rest of the game has nothing like this yet and so it isn't standardized.
223+
local terrainIDs = {
224+
[12] = "Concrete",
225+
[164] = "Concrete",
226+
[176] = "Concrete",
227+
[177] = "Concrete",
228+
[9] = "Dirt",
229+
[10] = "Dirt",
230+
[11] = "Dirt",
231+
[128] = "Dirt",
232+
[6] = "Dirt",
233+
[8] = "Dirt",
234+
[178] = "Metal",
235+
[179] = "Metal",
236+
[180] = "Metal",
237+
[181] = "Metal",
238+
[182] = "Metal"};
239+
240+
local hitPos = Vector(0, 0);
241+
local ray = SceneMan:CastObstacleRay(self.Pos, Vector(0, 50), hitPos, Vector(0, 0), self.ID, self.Team, 0, 3);
242+
if ray ~= -1 then
243+
terrainID = SceneMan:GetTerrMatter(hitPos.X, hitPos.Y)
244+
245+
if terrainID ~= -1 then
246+
if terrainIDs[terrainID] then
247+
if self.abilityShockwaveTerrainSounds[terrainIDs[terrainID]] ~= nil then
248+
self.abilityShockwaveTerrainSounds[terrainIDs[terrainID]]:Play(self.Pos);
249+
end
250+
end
251+
end
252+
end
253+
222254
self.abilityShockwaveLandSound:Play(self.Pos);
223255

224256
BrowncoatBossFunctions.abilityShockwaveLanding(self);

0 commit comments

Comments
 (0)