Skip to content

Commit 9ddeaec

Browse files
committed
misc script improvements
1 parent feba820 commit 9ddeaec

File tree

12 files changed

+35
-33
lines changed

12 files changed

+35
-33
lines changed

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/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");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function Create(self)
33
self.smokeTwirlCounter = math.random() < 0.5 and math.pi or 0;
44
end
55

6-
function Update(self)
6+
function ThreadedUpdate(self)
77
local velFactor = math.floor(1 + math.sqrt(self.Vel.Magnitude)/(1 + self.Age * 0.01));
88

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

Data/Browncoats.rte/Devices/Weapons/Extinction/Extinction.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function Create(self)
7373
self.cockDelay = 300;
7474
end
7575

76-
function Update(self)
76+
function ThreadedUpdate(self)
7777
self.fanFireSound.Pos = self.Pos;
7878
self.cockSound.Pos = self.Pos;
7979
self.preSound.Pos = self.Pos;

Data/Browncoats.rte/Devices/Weapons/Flash/Flash.lua

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,30 @@ function Create(self)
1111

1212
self.targetLockSound = CreateSoundContainer("Mine Activate", "Base.rte");
1313
end
14-
function Update(self)
14+
15+
function OnFire(self)
16+
local rocketNumber = self.RoundInMagCount + 1;
17+
18+
local rocket = CreateAEmitter("Particle Browncoat Rocket", "Browncoats.rte");
19+
if #self.targets > 0 then
20+
if self.targets[rocketNumber] and self.targets[rocketNumber].actor.ID ~= rte.NoMOID then
21+
rocket:SetNumberValue("TargetID", self.targets[rocketNumber].actor.ID);
22+
self.targets[rocketNumber].topLeft = self.targets[rocketNumber].topLeft * 1.5;
23+
self.targets[rocketNumber].bottomRight = self.targets[rocketNumber].bottomRight * 1.5;
24+
elseif rocketNumber > #self.targets then
25+
rocket:SetNumberValue("TargetID", self.targets[math.random(#self.targets)].actor.ID);
26+
end
27+
end
28+
rocket.Pos = self.MuzzlePos + Vector(0, (rocketNumber - self.RoundInMagCapacity * 0.5)):RadRotate(self.RotAngle);
29+
rocket.Vel = self.Vel + Vector(self.fireVel * RangeRand(0.9, 1.1) * self.FlipFactor, 0):RadRotate(self.RotAngle - ((self.spread * 0.5) - (rocketNumber/self.RoundInMagCapacity) * self.spread) * self.FlipFactor);
30+
rocket.RotAngle = rocket.Vel.AbsRadAngle;
31+
rocket.AngularVel = math.cos(rocket.Vel.AbsRadAngle) * 5;
32+
rocket.Team = self.Team;
33+
rocket.IgnoresTeamHits = true;
34+
MovableMan:AddParticle(rocket);
35+
end
36+
37+
function ThreadedUpdate(self)
1538
local parent = self:GetRootParent();
1639
if IsActor(parent) then
1740
parent = ToActor(parent);
@@ -91,25 +114,4 @@ function Update(self)
91114
parent = nil;
92115
self.targets = {};
93116
end
94-
if self.FiredFrame then
95-
local rocketNumber = self.RoundInMagCount + 1;
96-
97-
local rocket = CreateAEmitter("Particle Browncoat Rocket", "Browncoats.rte");
98-
if #self.targets > 0 then
99-
if self.targets[rocketNumber] and self.targets[rocketNumber].actor.ID ~= rte.NoMOID then
100-
rocket:SetNumberValue("TargetID", self.targets[rocketNumber].actor.ID);
101-
self.targets[rocketNumber].topLeft = self.targets[rocketNumber].topLeft * 1.5;
102-
self.targets[rocketNumber].bottomRight = self.targets[rocketNumber].bottomRight * 1.5;
103-
elseif rocketNumber > #self.targets then
104-
rocket:SetNumberValue("TargetID", self.targets[math.random(#self.targets)].actor.ID);
105-
end
106-
end
107-
rocket.Pos = self.MuzzlePos + Vector(0, (rocketNumber - self.RoundInMagCapacity * 0.5)):RadRotate(self.RotAngle);
108-
rocket.Vel = self.Vel + Vector(self.fireVel * RangeRand(0.9, 1.1) * self.FlipFactor, 0):RadRotate(self.RotAngle - ((self.spread * 0.5) - (rocketNumber/self.RoundInMagCapacity) * self.spread) * self.FlipFactor);
109-
rocket.RotAngle = rocket.Vel.AbsRadAngle;
110-
rocket.AngularVel = math.cos(rocket.Vel.AbsRadAngle) * 5;
111-
rocket.Team = self.Team;
112-
rocket.IgnoresTeamHits = true;
113-
MovableMan:AddParticle(rocket);
114-
end
115117
end

0 commit comments

Comments
 (0)