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

Commit 0b797ba

Browse files
committed
Misc stuff I missed
1 parent 76c4319 commit 0b797ba

File tree

7 files changed

+12
-14
lines changed

7 files changed

+12
-14
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,11 @@ AddActor = AtomGroup
6969
AddEffect = AEmitter
7070
PresetName = Grapple Gun Sound Crank
7171
PinStrength = 1000
72-
Mass = 1
73-
RestThreshold = 500
7472
SpriteFile = ContentFile
7573
FilePath = Base.rte/Null.png
7674
AtomGroup = AtomGroup
7775
CopyOf = Grapple Gun AtomGroup
7876
DeepCheck = 0
79-
JointStrength = 10000
80-
JointStiffness = 1
81-
DrawAfterParent = 1
8277
EmissionSound = SoundContainer
8378
CopyOf = Grapple Gun Crank
8479
BurstTriggered = 1
@@ -126,7 +121,7 @@ AddAmmo = Round
126121

127122
AddAmmo = Magazine
128123
PresetName = Magazine Grapple Gun
129-
Mass = 0
124+
Mass = 1
130125
HitsMOs = 0
131126
GetsHitByMOs = 0
132127
CollidesWithTerrainWhileAttached = 1
987 Bytes
Loading
987 Bytes
Loading
1010 Bytes
Loading

Base.rte/Scripts/Shared/NoTeam.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
function Create(self)
2+
self.Team = Activity.NOTEAM;
3+
self.IgnoresTeamHits = false;
4+
end

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@ function Update(self)
4545
if self.partList[i] and MovableMan:IsParticle(self.partList[i]) and self.partList[i].PresetName == "Browncoat Fuel Bomb Fuel" then
4646
if self.explodeTimer:IsPastSimMS(self.explodeTime + self.partList[i].queue) then
4747
local fire = CreatePEmitter("Flame ".. math.random(2) .." Hurt");
48-
fire.Pos = Vector(self.partList[i].Pos.X, self.partList[i].Pos.Y);
49-
fire.Vel = self.Vel;
5048
if self.partList[i].target and self.partList[i].target.ID ~= rte.NoMOID and not self.partList[i].target.ToDelete then
51-
fire.Pos = self.partList[i].target.Pos + self.partList[i].stickPos;
52-
fire.Vel = Vector(-self.partList[i].stickPos.X, -self.partList[i].stickPos.Y);
53-
fire.Sharpness = self.partList[i].target.ID * 0.001;
49+
fire.Pos = self.partList[i].target.Pos + self.partList[i].stickOffset;
50+
fire.Vel = Vector(-self.partList[i].stickOffset.X, -self.partList[i].stickOffset.Y):SetMagnitude(3);
5451
else
52+
fire.Pos = Vector(self.partList[i].Pos.X, self.partList[i].Pos.Y);
53+
fire.Vel = self.Vel;
5554
fire.Lifetime = math.random(1500, 3000);
5655
end
5756
MovableMan:AddParticle(fire);
@@ -87,7 +86,7 @@ function Update(self)
8786

8887
if math.random() < 0.01 then
8988
self.partList[i].Vel = self.partList[i].target.Vel;
90-
self.partList[i].Pos = self.partList[i].target.Pos - Vector(self.partList[i].stickPos.X, self.partList[i].stickPos.Y):RadRotate(self.partList[i].target.RotAngle - self.partList[i].targetStickAngle);
89+
self.partList[i].Pos = self.partList[i].target.Pos + Vector(self.partList[i].stickOffset.X, self.partList[i].stickOffset.Y):RadRotate(self.partList[i].target.RotAngle - self.partList[i].targetStickAngle);
9190
end
9291
else
9392
self.partList[i].target = nil;
@@ -102,7 +101,7 @@ function Update(self)
102101

103102
self.partList[i].targetStickAngle = mo.RotAngle;
104103

105-
self.partList[i].stickPos = SceneMan:ShortestDistance(self.partList[i].Pos, mo.Pos, SceneMan.SceneWrapsX) * 0.8;
104+
self.partList[i].stickOffset = SceneMan:ShortestDistance(mo.Pos, self.partList[i].Pos, SceneMan.SceneWrapsX) * 0.8;
106105
end
107106
end
108107
end

Browncoats.rte/Devices/Tools/Blowtorch/Blowtorch.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ AddDevice = HDFirearm
168168
CopyOf = Magazine DG-1000
169169
Flash = Attachable
170170
CopyOf = Jet Flame B
171-
FireSound = SoundContainer //To-do: add custom sounds
171+
FireSound = SoundContainer
172172
AttenuationStartDistance = 150
173173
AddSound = ContentFile
174174
FilePath = Browncoats.rte/Devices/Tools/Blowtorch/Sounds/Loop.flac

0 commit comments

Comments
 (0)