Skip to content

Commit 26c5601

Browse files
authored
Merge pull request #184 from cortex-command-community/browncoat-mission
Merge browncoat mission stuff
2 parents 4c5c4eb + 3b5def1 commit 26c5601

File tree

206 files changed

+10949
-2313
lines changed

Some content is hidden

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

206 files changed

+10949
-2313
lines changed

Data/Browncoats.rte/Actors.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ IncludeFile = Browncoats.rte/Actors/Shared.ini
1111

1212
IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatLight/BrowncoatLight.ini
1313
IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini
14-
IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.ini
14+
//IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.ini
1515

1616

1717
///////////////////////////////////////////////////////////////////////
1818
// Turrets
1919

20-
IncludeFile = Browncoats.rte/Actors/Turrets/Hearthkeeper/Hearthkeeper.ini
21-
IncludeFile = Browncoats.rte/Actors/Turrets/Thunderer/Thunderer.ini
20+
//IncludeFile = Browncoats.rte/Actors/Turrets/Hearthkeeper/Hearthkeeper.ini
21+
//IncludeFile = Browncoats.rte/Actors/Turrets/Thunderer/Thunderer.ini

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function Create(self)
9292
BrowncoatBossFunctions.createVoiceSoundEffect(self, self.voiceSounds.MonologueOutro, 11, true);
9393
end
9494

95-
function Update(self)
95+
function ThreadedUpdate(self)
9696
self.abilityShockwaveWhooshSound.Pos = self.Pos;
9797
self.jumpPackSound.Pos = self.Pos;
9898

@@ -243,7 +243,7 @@ function Update(self)
243243
end
244244
end
245245

246-
function UpdateAI(self)
246+
function ThreadedUpdateAI(self)
247247
-- Quick throw AI trigger on a timer
248248
if not self:IsPlayerControlled() then -- just in case
249249
if self.quickThrowTimer:IsPastSimMS(self.quickThrowDelay) then

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ AddActor = AHuman
16211621
AddActor = AHuman
16221622
CopyOf = Browncoat Boss Template
16231623
PresetName = Browncoat Boss Scripted
1624-
Buyable = 1
1624+
Buyable = 0
16251625
BuyableMode = 0
16261626
AddToGroup = Actors - Boss
16271627
ScriptPath = Browncoats.rte/Actors/Infantry/BrowncoatBoss/AI/BrowncoatBossAI.lua

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function OnMessage(self, message, context)
112112
end
113113
end
114114

115-
function Update(self)
115+
function ThreadedUpdate(self)
116116
self.voiceSound.Pos = self.Pos;
117117

118118
self.controller = self:GetController();

Data/Browncoats.rte/Devices/Explosives/BossOilBomb/BossOilBomb.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Create(self)
1414
self.HUDVisible = false;
1515
end
1616

17-
function Update(self)
17+
function ThreadedUpdate(self)
1818
self.thrownSound.Pos = self.Pos;
1919

2020
if self:IsAttached() then

Data/Browncoats.rte/Devices/Explosives/BossOilBomb/BossOilBombIgniter.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function Create(self)
3030
end
3131
end
3232

33-
function Update(self)
33+
function ThreadedUpdate(self)
3434
self.ToSettle = false;
3535
self.ToDelete = false;
3636

Data/Browncoats.rte/Devices/Explosives/BossOilBomb/BossOilBombSecondary.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function Update(self)
1+
function ThreadedUpdate(self)
22
if self.Age > self.Lifetime - 100 then
33
self:GibThis();
44
local igniter = CreateMOSRotating("Browncoat Boss Oil Bomb Igniter", "Browncoats.rte");

Data/Browncoats.rte/Devices/Explosives/FireBomb/FireBomb.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function Create(self)
1111
self.angleList = {};
1212
end
1313

14-
function Update(self)
14+
function ThreadedUpdate(self)
1515
if MovableMan:IsParticle(self) and self.lifeTimer:IsPastSimMS(self.detonationDelay) then
1616
self:GibThis();
1717
else

Data/Browncoats.rte/Devices/Explosives/FuelBomb/FuelBomb.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Create(self)
2626
self.soundCount = 0;
2727
end
2828

29-
function Update(self)
29+
function ThreadedUpdate(self)
3030
self.ToSettle = false;
3131
self.ToDelete = false;
3232

Data/Browncoats.rte/Devices/Shared/IncendiaryBulletCQC.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function Create(self)
1717
self.trailAcc = 0;
1818
end
1919

20-
function Update(self)
20+
function ThreadedUpdate(self)
2121
local velFactor = math.floor(1 + math.sqrt(self.Vel.Magnitude)/(1 + self.Age * 0.01));
2222

2323
local particle = CreateMOPixel("Fire Burn Particle");

0 commit comments

Comments
 (0)