Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 9e7954d

Browse files
committed
Misc cleanup and stuff
1 parent e0146fd commit 9e7954d

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosiveDeploy.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function Update(self)
1010
self.user = ToAHuman(parent);
1111
elseif self:IsActivated() then
1212

13-
local explosive = CreateMOSRotating("Remote Explosive Active");
13+
local explosive = CreateMOSRotating(self.PresetName .. " Active");
1414
explosive.Pos = self.Pos;
1515
explosive.Vel = self.Vel;
1616
explosive.RotAngle = self.Vel.AbsRadAngle;

Ronin.rte/Actors/Shared/RoninSoldier.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ function Create(self)
2222
local firearms = {unit["Primary"], unit["Secondary"], unit["Tertiary"]};
2323
for class = 1, #firearms do
2424
if firearms[class] then
25-
self:AddInventoryItem(CreateHDFirearm(firearms[class][math.random(#firearms[class])]));
25+
self:AddInventoryItem(CreateHDFirearm(firearms[class][math.random(#firearms[class])], "Ronin.rte"));
2626
end
2727
end
2828
if unit["Throwable"] then
29-
self:AddInventoryItem(CreateTDExplosive(unit["Throwable"][math.random(#unit["Throwable"])]));
29+
self:AddInventoryItem(CreateTDExplosive(unit["Throwable"][math.random(#unit["Throwable"])], "Ronin.rte"));
3030
end
3131
if unit["Headgear"] and self.Head then
3232
self.Head:AddAttachable(CreateAttachable("Ronin ".. unit["Headgear"][math.random(#unit["Headgear"])]));
@@ -60,7 +60,7 @@ function Update(self)
6060
self.aggressive = self.Health < (self.MaxHealth * 0.5);
6161
if self.Head then
6262
self.Head.Frame = self.face;
63-
if self.controller and self.controller:IsState(Controller.WEAPON_FIRE) or self.aggressive then
63+
if self.aggressive or (self.controller and self.controller:IsState(Controller.WEAPON_FIRE)) then
6464
self.Head.Frame = self.face + (self.Head.FrameCount * 0.5);
6565
end
6666
end

Ronin.rte/Devices/Special/Scrambler/Scrambler.ini

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ AddEffect = MOPixel
1616
Atom = Atom
1717
Material = Material
1818
CopyOf = Air
19-
TrailColor = Color
20-
R = 255
21-
G = 0
22-
B = 255
23-
TrailLength = 0
2419
ScreenEffect = ContentFile
2520
FilePath = Base.rte/Effects/Glows/RedTiny.bmp
2621
EffectAlwaysShows = 1
@@ -77,18 +72,8 @@ AddDevice = MOSRotating
7772
SpriteFile = ContentFile
7873
FilePath = Base.rte/Null.bmp
7974
FrameCount = 1
80-
SpriteOffset = Vector
81-
X = -1
82-
Y = -1
8375
AtomGroup = AtomGroup
84-
AutoGenerate = 0
85-
AddAtom = Atom
86-
Offset = Vector
87-
X = 0
88-
Y = 0
89-
Material = Material
90-
CopyOf = Air
91-
DeepCheck = 0
76+
CopyOf = Null AtomGroup
9277
GibSound = SoundContainer
9378
AddSound = ContentFile
9479
FilePath = Ronin.rte/Devices/Special/Scrambler/Sounds/Explosion01.wav
@@ -200,7 +185,7 @@ AddDevice = TDExplosive
200185
DeepCheck = 0
201186
JointStrength = 100
202187
JointStiffness = 0.5
203-
DrawAfterParent = 1
188+
DrawAfterParent = 0
204189
GibSound = SoundContainer
205190
CopyOf = Metal Penetration Hit
206191
ActivationSound = SoundContainer

Techion.rte/Devices/Shared/Scripts/PulseShot.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ end
2727
function PulsarDissipate(self, inverted)
2828

2929
local trace = inverted and Vector(-self.Vel.X, -self.Vel.Y):SetMagnitude(GetPPM()) or Vector(self.Vel.X, self.Vel.Y):SetMagnitude(self.Vel.Magnitude * rte.PxTravelledPerFrame + 1);
30-
local hit, hitPos, skipPx = nil, Vector(), math.sqrt(self.Vel.Magnitude) * 0.5;
30+
local hit;
31+
local hitPos = Vector();
32+
local skipPx = math.sqrt(self.Vel.Magnitude) * 0.5;
3133

3234
local ray = SceneMan:CastObstacleRay(self.Pos, trace, hitPos, Vector(), self.ID, self.Team, rte.airID, skipPx);
3335
if ray >= 0 then

0 commit comments

Comments
 (0)