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

Commit 94864de

Browse files
committed
Review changes
1 parent 4332ddf commit 94864de

File tree

7 files changed

+23
-5
lines changed

7 files changed

+23
-5
lines changed

Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ AddAmmo = Magazine
106106
SpriteOffset = Vector
107107
X = -2
108108
Y = -7
109-
ParentOffset = Vector
110-
X = 4
111-
Y = 0
112109
EntryWound = AEmitter
113110
CopyOf = Dent Metal
114111
ExitWound = AEmitter
@@ -128,6 +125,12 @@ AddAmmo = Magazine
128125
DeepCheck = 0
129126
JointStrength = 200
130127
JointStiffness = 1
128+
JointOffset = Vector
129+
X = 0
130+
Y = 0
131+
ParentOffset = Vector
132+
X = 4
133+
Y = 0
131134
DrawAfterParent = 0
132135
RoundCount = -1
133136
Discardable = 0

Base.rte/Scripts/Shared/SmokeTrail.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ function Update(self)
1212
for i = 1, trailLength do
1313
local effect = CreateMOSParticle("Tiny Smoke Trail 1", "Base.rte");
1414
if effect then
15-
effect.Pos = self.Pos - offset * (i/trailLength) + Vector(RangeRand(-1, 1), RangeRand(-1, 1)) * self.smokeTrailRadius;
15+
effect.Pos = self.Pos - (offset * i/trailLength) + Vector(RangeRand(-1, 1), RangeRand(-1, 1)) * self.smokeTrailRadius;
1616
effect.Vel = self.Vel * RangeRand(0.75, 1);
1717
effect.Lifetime = self.smokeTrailLifeTime * RangeRand(0.5, 1);
1818

1919
if self.smokeTrailTwirl > 0 then
2020
effect.AirResistance = effect.AirResistance * RangeRand(0.9, 1);
2121
effect.GlobalAccScalar = effect.GlobalAccScalar * math.random();
2222

23-
effect.Pos = self.Pos - offset + offset * i/trailLength;
23+
effect.Pos = self.Pos - offset + (offset * i/trailLength);
2424
effect.Vel = self.Vel + Vector(0, math.sin(self.smokeTwirlCounter) * self.smokeTrailTwirl + RangeRand(-0.1, 0.1)):RadRotate(self.Vel.AbsRadAngle);
2525

2626
self.smokeTwirlCounter = self.smokeTwirlCounter + RangeRand(-0.2, 0.4);

Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ AddEffect = Attachable
9898
DeepCheck = 0
9999
JointStrength = 50
100100
JointStiffness = 0.6
101+
JointOffset = Vector
102+
X = 0
103+
Y = 0
101104
GibImpulseLimit = 1500
102105
GibWoundLimit = 5
103106
GibSound = SoundContainer

Browncoats.rte/Devices/Weapons/Longshot/Longshot.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ AddAmmo = Magazine
6565
DeepCheck = 0
6666
JointStrength = 200
6767
JointStiffness = 1
68+
JointOffset = Vector
69+
X = 0
70+
Y = 0
6871
ParentOffset = Vector
6972
X = -7
7073
Y = 4

Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ AddAmmo = Magazine
6767
DeepCheck = 0
6868
JointStrength = 200
6969
JointStiffness = 1
70+
JointOffset = Vector
71+
X = 0
72+
Y = 0
7073
ParentOffset = Vector
7174
X = 0
7275
Y = 2

Imperatus.rte/Devices/Weapons/Mauler/Mauler.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ AddAmmo = Magazine
167167
DeepCheck = 0
168168
JointStrength = 200
169169
JointStiffness = 1
170+
JointOffset = Vector
171+
X = 0
172+
Y = 0
170173
ParentOffset = Vector
171174
X = 0
172175
Y = 3

Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ AddAmmo = Magazine
6262
DeepCheck = 0
6363
JointStrength = 200
6464
JointStiffness = 1
65+
JointOffset = Vector
66+
X = 0
67+
Y = 0
6568
ParentOffset = Vector
6669
X = -2
6770
Y = 1

0 commit comments

Comments
 (0)