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

Commit c93378d

Browse files
committed
Misc edits e.g. TrailLength lua explosal followup
1 parent 8066b27 commit c93378d

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

Dummy.rte/Devices/Weapons/BlasterRifle/BlasterShot.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
function Create(self)
22
self.AirResistance = self.AirResistance * RangeRand(1.0, 1.5);
3-
self.trailLength = 15;
43

54
self.trailPar = CreateMOPixel("Dummy Blaster Trail Glow");
65
self.trailPar.Pos = self.Pos;
@@ -14,7 +13,7 @@ function Create(self)
1413
end
1514
function Update(self)
1615
if not self.ToDelete and self.trailPar and MovableMan:IsParticle(self.trailPar) then
17-
self.trailPar.Pos = self.Pos - Vector(self.lastVel.X, self.lastVel.Y):SetMagnitude(math.min(self.lastVel.Magnitude * rte.PxTravelledPerFrame, self.trailLength) * 0.5);
16+
self.trailPar.Pos = self.Pos - Vector(self.lastVel.X, self.lastVel.Y):SetMagnitude(math.min(self.lastVel.Magnitude * rte.PxTravelledPerFrame, self.TrailLength) * 0.5);
1817
self.trailPar.Vel = self.lastVel * 0.5;
1918
self.trailPar.Lifetime = self.Age + TimerMan.DeltaTimeMS;
2019
end
84 Bytes
Loading
85 Bytes
Loading

Ronin.rte/Actors/Infantry/RoninLight/RoninLight.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,13 +611,13 @@ AddActor = AHuman
611611
ParentOffset = Vector
612612
X = -1
613613
Y = -5
614-
FGArmFlailScalar = 0.3
614+
FGArmFlailScalar = 0.35
615615
BGArm = Arm
616616
CopyOf = Ronin Soldier Arm BG A
617617
ParentOffset = Vector
618618
X = 4
619619
Y = -7
620-
BGArmFlailScalar = -0.6
620+
BGArmFlailScalar = -0.7
621621
FGLeg = Leg
622622
CopyOf = Ronin Soldier Leg FG A
623623
ParentOffset = Vector

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
function Create(self)
22
self.disintegrationStrength = 50;
33
self.EffectRotAngle = self.Vel.AbsRadAngle;
4+
self.lastVel = Vector(self.Vel.X, self.Vel.Y);
45
--Check backward (second argument) on the first frame as the projectile might be bouncing off something immediately
56
PulsarDissipate(self, true);
67

@@ -31,9 +32,11 @@ function PulsarDissipate(self, inverted)
3132
local hitPos = Vector();
3233
local skipPx = math.sqrt(self.Vel.Magnitude) * 0.5;
3334

34-
local ray = SceneMan:CastObstacleRay(self.Pos, trace, hitPos, Vector(), self.ID, self.Team, rte.airID, skipPx);
35-
if ray >= 0 then
36-
local mo = MovableMan:GetMOFromID(SceneMan:GetMOIDPixel(hitPos.X, hitPos.Y));
35+
local moid = SceneMan:CastObstacleRay(self.Pos, trace, hitPos, Vector(), self.ID, self.Team, rte.airID, skipPx) >= 0
36+
and SceneMan:GetMOIDPixel(hitPos.X, hitPos.Y) or self.HitWhatMOID;
37+
38+
if moid ~= rte.NoMOID then
39+
local mo = MovableMan:GetMOFromID(moid);
3740
if mo then
3841
hit = true;
3942

@@ -43,14 +46,14 @@ function PulsarDissipate(self, inverted)
4346
melt.Sharpness = mo.RootID;
4447
melt.PinStrength = self.disintegrationStrength;
4548
MovableMan:AddMO(melt);
46-
else
47-
local penetration = self.Mass * self.Sharpness * self.Vel.Magnitude;
48-
if SceneMan:GetMaterialFromID(SceneMan:GetTerrMatter(hitPos.X, hitPos.Y)).StructuralIntegrity > penetration then
49-
hit = true;
50-
end
49+
end
50+
else
51+
local penetration = self.Mass * self.Sharpness * self.Vel.Magnitude;
52+
if SceneMan:GetMaterialFromID(SceneMan:GetTerrMatter(hitPos.X, hitPos.Y)).StructuralIntegrity > penetration then
53+
hit = true;
5154
end
5255
end
53-
if hit or self.Vel.Magnitude < 5 then
56+
if hit or math.abs(self.Vel.AbsRadAngle - self.lastVel.AbsRadAngle) > 0.1 or self.Vel.Magnitude < self.lastVel.Magnitude * 0.5 then
5457
local offset = Vector(self.Vel.X, self.Vel.Y):SetMagnitude(skipPx);
5558
self.explosion = CreateAEmitter("Techion.rte/Laser Dissipate Effect");
5659
self.explosion.Pos = hitPos - offset;
@@ -59,6 +62,7 @@ function PulsarDissipate(self, inverted)
5962
self.explosion.Vel = offset;
6063
MovableMan:AddParticle(self.explosion);
6164
end
65+
self.lastVel = Vector(self.Vel.X, self.Vel.Y);
6266
end
6367
--[[ To-do: Use this system instead
6468
function OnCollideWithMO(self, mo, parentMO)

Techion.rte/Devices/Weapons/NanoRifle/NanoRifle.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ AddDevice = HDFirearm
260260
FilePath = Techion.rte/Devices/Weapons/NanoRifle/NanoRifle.png
261261
FrameCount = 2
262262
SpriteOffset = Vector
263-
X = -12
264-
Y = -3
263+
X = -13
264+
Y = -4
265265
EntryWound = AEmitter
266266
CopyOf = Dent Metal
267267
ExitWound = AEmitter
@@ -283,8 +283,8 @@ AddDevice = HDFirearm
283283
JointStrength = 100
284284
JointStiffness = 0.5
285285
JointOffset = Vector
286-
X = -7
287-
Y = 3
286+
X = -6
287+
Y = 4
288288
DrawAfterParent = 0
289289
StanceOffset = Vector
290290
X = 3
@@ -330,7 +330,7 @@ AddDevice = HDFirearm
330330
ShellSpreadRange = 8
331331
ShellAngVelRange = 2
332332
MuzzleOffset = Vector
333-
X = 18
333+
X = 17
334334
Y = 0
335335
EjectionOffset = Vector
336336
X = -1

0 commit comments

Comments
 (0)