Skip to content

Commit 01e34da

Browse files
pawnishoovypawnishoovy
committed
whole host of fixes and new VO
1 parent 734c6d4 commit 01e34da

File tree

97 files changed

+205
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+205
-83
lines changed

‎Data/Browncoats.rte/Activities/RefineryAssaultFunctions.lua

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,13 @@ function RefineryAssault:HandleMessage(message, object)
231231
self.saveTable.stage3DrillOverloaded = true;
232232

233233
MovableMan:SendGlobalMessage("RefineryAssault_DrillOverloadBegin");
234+
235+
elseif message == "Refinery_S3DrillExploded" then
236+
237+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
238+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S3 Drill", "Browncoats.rte");
239+
self.bossPALastPlayed:Play();
240+
end
234241

235242
elseif message == "Captured_RefineryS4FuelPipeConsole" then
236243

@@ -541,12 +548,17 @@ function RefineryAssault:HandleMessage(message, object)
541548
MovableMan:SendGlobalMessage("ActivateCapturable_RefineryS7AuxAuthConsole");
542549
self.Stage = 7;
543550

544-
self.HUDHandler:§reenText(self.humanTeam,
551+
self.HUDHandler:QueueScreenText(self.humanTeam,
545552
"You'll have to take yourself and the keycard to a physical authorization console, then get someone to hack into another computer and approve the authorization. We're almost there.",
546553
10000,
547554
0,
548555
true);
549556

557+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
558+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S4 Comm Dead", "Browncoats.rte");
559+
self.bossPALastPlayed:Play();
560+
end
561+
550562
for particle in MovableMan.Particles do
551563
if particle.PresetName == "Refinery Authorization Console" then
552564

@@ -1239,6 +1251,11 @@ function RefineryAssault:MonitorStage1()
12391251
0,
12401252
true);
12411253

1254+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
1255+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S1 Const Crew", "Browncoats.rte");
1256+
self.bossPALastPlayed:Play();
1257+
end
1258+
12421259
-- Start using buydoors
12431260

12441261
for k, v in pairs(self.saveTable.buyDoorTables.LC1) do
@@ -1357,6 +1374,11 @@ function RefineryAssault:MonitorStage2()
13571374
0,
13581375
true);
13591376

1377+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
1378+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S2 Logistics", "Browncoats.rte");
1379+
self.bossPALastPlayed:Play();
1380+
end
1381+
13601382
-- Capturable setup
13611383

13621384
MovableMan:SendGlobalMessage("DeactivateCapturable_RefineryLCHackConsole1");
@@ -1509,7 +1531,7 @@ function RefineryAssault:MonitorStage3()
15091531

15101532
for k, console in pairs(self.saveTable.stage3Consoles) do
15111533
if not console or not MovableMan:ValidMO(console) then
1512-
self.saveTable.stage3Consoles[k] = nil;
1534+
table.remove(self.saveTable.stage3Consoles, k);
15131535

15141536
self.tacticsHandler:RemoveTask("Defend Refinery Console " .. k, self.aiTeam);
15151537
self.tacticsHandler:RemoveTask("Attack Refinery Console " .. k, self.humanTeam);
@@ -1520,9 +1542,17 @@ function RefineryAssault:MonitorStage3()
15201542
end
15211543
end
15221544

1545+
print(#self.saveTable.stage3Consoles)
1546+
15231547
if #self.saveTable.stage3Consoles == 0 then
15241548
self.stage3AllConsolesBroken = true;
15251549
self.HUDHandler:RemoveObjective(self.humanTeam, "S3DestroyConsoles");
1550+
elseif #self.saveTable.stage3Consoles == 1 and not self.saveTable.consolesBossPAPlayed then
1551+
self.saveTable.consolesBossPAPlayed = true;
1552+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
1553+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S3 Broken Cons", "Browncoats.rte");
1554+
self.bossPALastPlayed:Play();
1555+
end
15261556
end
15271557

15281558
end
@@ -1603,6 +1633,11 @@ function RefineryAssault:MonitorStage3()
16031633
0,
16041634
true);
16051635

1636+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
1637+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S4 Blast Door", "Browncoats.rte");
1638+
self.bossPALastPlayed:Play();
1639+
end
1640+
16061641
self.HUDHandler:SetCameraMinimumAndMaximumX(self.humanTeam, 0, 14500);
16071642
self.HUDHandler:RemoveAllObjectives(self.humanTeam);
16081643
self.HUDHandler:AddObjective(self.humanTeam,
@@ -1666,6 +1701,11 @@ function RefineryAssault:MonitorStage5()
16661701

16671702
self.HUDHandler:RemoveAllObjectives(self.humanTeam);
16681703

1704+
if not (self.bossPALastPlayed and self.bossPALastPlayed:IsBeingPlayed()) then
1705+
self.bossPALastPlayed = CreateSoundContainer("Yskely Refinery Boss PA S4 Comm Arrived", "Browncoats.rte");
1706+
self.bossPALastPlayed:Play();
1707+
end
1708+
16691709
-- Subcommander door spawn
16701710

16711711
local squadTypeTable = {"Heavy", "CQB", "Heavy", "Sniper"};

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require("AI/NativeHumanAI");
22

33
function Create(self)
4-
54
self.activity = ToGameActivity(ActivityMan:GetActivity())
65

76
-- AI Overrides
@@ -83,8 +82,6 @@ function Create(self)
8382
self.deathScriptedStartSound = CreateSoundContainer("Browncoat Boss DeathScriptedStart", "Browncoats.rte");
8483
self.deathScriptedMidBurnSound = CreateSoundContainer("Browncoat Boss DeathScriptedMidBurn", "Browncoats.rte");
8584
self.deathScriptedExplodeSound = CreateSoundContainer("Browncoat Boss DeathScriptedExplode", "Browncoats.rte");
86-
87-
8885
end
8986

9087
function Update(self)
@@ -227,17 +224,23 @@ function Update(self)
227224
end
228225
end
229226
end
227+
228+
-- Random taunting
229+
if self.tauntVoiceLineTimer:IsPastSimMS(self.tauntVoiceLineDelay) then
230+
BrowncoatBossFunctions.createVoiceSoundEffect(self, self.voiceSounds.Taunt, 10, false);
231+
self.tauntVoiceLineTimer:Reset();
232+
self.tauntVoiceLineDelay = math.random(40000, 70000);
233+
end
230234
end
231235

232236
function UpdateAI(self)
233237
-- Quick throw AI trigger on a timer
234-
235238
if not self:IsPlayerControlled() then -- just in case
236239
if self.quickThrowTimer:IsPastSimMS(self.quickThrowDelay) then
237-
if not (self.EquippedItem and self.EquippedItem:IsReloading() or self.EquippedItem:NumberValueExists("Busy")) then
240+
if (self.EquippedItem) and not (self.EquippedItem and self.EquippedItem:IsReloading() or self.EquippedItem:NumberValueExists("Busy")) then
238241
if self.AI:CreateQuickthrowBehavior(self) then
239242
self.quickThrowTimer:Reset();
240-
BrowncoatBossFunctions.createVoiceSoundEffect(self, self.voiceSounds.OilThrowTaunt, 10, true);
243+
BrowncoatBossFunctions.createVoiceSoundEffect(self, self.voiceSounds.OilThrowTaunt, 10, false);
241244
end
242245
end
243246
end

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

Lines changed: 81 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -620,51 +620,90 @@ AddSoundContainer = SoundContainer
620620
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Land14.flac
621621

622622
AddSoundContainer = SoundContainer
623-
PresetName = Browncoat Boss VO JumpAttack
623+
PresetName = Browncoat Boss VO Squad Lead
624624
AttenuationStartDistance = 200
625-
AddSound = ContentFile
626-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack1.flac
627-
AddSound = ContentFile
628-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack2.flac
629-
AddSound = ContentFile
630-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack3.flac
631-
AddSound = ContentFile
632-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack4.flac
633-
AddSound = ContentFile
634-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack5.flac
635-
AddSound = ContentFile
636-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack6.flac
637-
AddSound = ContentFile
638-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack7.flac
639-
AddSound = ContentFile
640-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/JumpAttack8.flac
641-
625+
SoundOverlapMode = 2
626+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead1.flac
627+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead2.flac
628+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead3.flac
629+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead4.flac
630+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead5.flac
631+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead6.flac
632+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead7.flac
633+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead8.flac
634+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead9.flac
635+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead10.flac
636+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead11.flac
637+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead12.flac
638+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead13.flac
639+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead14.flac
640+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead15.flac
641+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead16.flac
642+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead17.flac
643+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead18.flac
644+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead19.flac
645+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead20.flac
646+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead21.flac
647+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead22.flac
648+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead23.flac
649+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead24.flac
650+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/SquadLead25.flac
651+
642652
AddSoundContainer = SoundContainer
643-
PresetName = Browncoat Boss VO OilThrowTaunt
653+
PresetName = Browncoat Boss VO Taunt
644654
AttenuationStartDistance = 200
645-
AddSound = ContentFile
646-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt1.flac
647-
AddSound = ContentFile
648-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt2.flac
649-
AddSound = ContentFile
650-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt3.flac
651-
AddSound = ContentFile
652-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt4.flac
653-
AddSound = ContentFile
654-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt5.flac
655-
AddSound = ContentFile
656-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt6.flac
657-
AddSound = ContentFile
658-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt7.flac
659-
AddSound = ContentFile
660-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt8.flac
661-
AddSound = ContentFile
662-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt9.flac
663-
AddSound = ContentFile
664-
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/OilThrowTaunt10.flac
655+
SoundOverlapMode = 2
656+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt1.flac
657+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt2.flac
658+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt3.flac
659+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt4.flac
660+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt5.flac
661+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt6.flac
662+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt7.flac
663+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt8.flac
664+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt9.flac
665+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt10.flac
666+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/Taunt11.flac
667+
668+
AddSoundContainer = SoundContainer
669+
PresetName = Browncoat Boss VO Ability Jump Attack
670+
AttenuationStartDistance = 300
671+
SoundOverlapMode = 2
672+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack1.flac
673+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack2.flac
674+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack3.flac
675+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack4.flac
676+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack5.flac
677+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack6.flac
678+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack7.flac
679+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack8.flac
680+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityJumpAttack9.flac
681+
682+
AddSoundContainer = SoundContainer
683+
PresetName = Browncoat Boss VO Ability Oil Throw
684+
AttenuationStartDistance = 300
685+
SoundOverlapMode = 2
686+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow1.flac
687+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow2.flac
688+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow3.flac
689+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow4.flac
690+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow5.flac
691+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow6.flac
692+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow7.flac
693+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow8.flac
694+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow9.flac
695+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow10.flac
696+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow11.flac
697+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow12.flac
698+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow13.flac
699+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow14.flac
700+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow15.flac
701+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow16.flac
702+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow17.flac
703+
AddSound = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/AbilityOilThrow18.flac
665704

666705
AddSoundContainer = SoundContainer
667-
PresetName = Browncoat Boss VO DeathScripted
706+
PresetName = Browncoat Boss VO Death Scripted
668707
AttenuationStartDistance = 400
669708
AddSound = ContentFile
670709
FilePath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/Sounds/VO/DeathScripted1.flac
@@ -1409,13 +1448,13 @@ AddActor = AHuman
14091448
Depth = 3
14101449
DeepCheck = 0
14111450
BodyHitSound = SoundContainer
1412-
CopyOf = Flesh Body Blunt Hit
1451+
CopyOf = Foley Heavy Cloth Impact
14131452
// PainSound = SoundContainer
14141453
// CopyOf = Browncoat Boss VO Pain
14151454
// DeathSound = SoundContainer
14161455
// CopyOf = Browncoat Boss VO Death
14171456
DeviceSwitchSound = SoundContainer
1418-
CopyOf = Device Switch
1457+
CopyOf = Foley Heavy Cloth Light
14191458
Health = 100
14201459
Organic = 1
14211460
ImpulseDamageThreshold = 3900

0 commit comments

Comments
 (0)