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

Commit a7c1d4c

Browse files
committed
Misc changes
1 parent 72c1f04 commit a7c1d4c

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

Base.rte/Craft/DropShips/DropshipMK1.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ AddActor = ACDropShip
15321532
Y = 28
15331533
Velocity = Vector
15341534
X = 0
1535-
Y = 6
1535+
Y = 5
15361536
Radius = 22
15371537
Range = 45
15381538
CrashSound = SoundContainer
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
function Create(self)
2-
self.setAngle = 0;
3-
self.tilt = 1/math.sqrt(self.Radius);
2+
self.setRecoilAngle = 0;
3+
self.recoilTilt = 1/math.sqrt(self.Radius);
44
end
55
function Update(self)
6-
if self.setAngle > 0 then
7-
self.setAngle = self.setAngle - (0.003 * (10 + math.sqrt(self.RateOfFire) * self.setAngle));
8-
if self.setAngle < 0 then
9-
self.setAngle = 0;
6+
if self.setRecoilAngle > 0 then
7+
self.setRecoilAngle = self.setRecoilAngle - (0.003 * (10 + math.sqrt(self.RateOfFire) * self.setRecoilAngle));
8+
if self.setRecoilAngle < 0 then
9+
self.setRecoilAngle = 0;
1010
end
1111
end
1212
if self.FiredFrame then
13-
self.setAngle = self.setAngle + (self.tilt * RangeRand(0.1, 1))/(1 + self.setAngle);
13+
self.setRecoilAngle = self.setRecoilAngle + (self.recoilTilt * RangeRand(0.1, 1))/(1 + self.setRecoilAngle);
1414
end
15-
self.RotAngle = self.RotAngle + (self.setAngle * self.FlipFactor);
15+
self.RotAngle = self.RotAngle + (self.setRecoilAngle * self.FlipFactor);
1616
local jointOffset = Vector(self.JointOffset.X * self.FlipFactor, self.JointOffset.Y):RadRotate(self.RotAngle);
17-
self.Pos = self.Pos - jointOffset + Vector(jointOffset.X, jointOffset.Y):RadRotate(-self.setAngle * self.FlipFactor);
17+
self.Pos = self.Pos - jointOffset + Vector(jointOffset.X, jointOffset.Y):RadRotate(-self.setRecoilAngle * self.FlipFactor);
1818
end

Base.rte/Devices/Shared/Scripts/ShotgunReload.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function Create(self)
33
self.loadedShell = false;
44
self.reloadCycle = false;
55

6-
self.reloadDelay = 100;
6+
self.reloadDelay = 75;
77

88
self.ammoCounter = self.RoundInMagCount;
99
end

Base.rte/Devices/Special/Medikit/Medikit.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,7 @@ AddDevice = HDFirearm
150150
Spread = 2.25
151151
MaxVelocity = 10
152152
MinVelocity = 1
153+
AddGib = Gib
154+
GibParticle = MOSRotating
155+
CopyOf = Gib Panel White Small D
153156
GibWoundLimit = 3

Base.rte/Devices/Weapons/BattleRifle/BattleRifle.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ AddDevice = HDFirearm
6767
CopyOf = Dent Metal
6868
ExitWound = AEmitter
6969
CopyOf = Dent Metal
70-
GoldValue = 50
70+
GoldValue = 40
7171
AtomGroup = AtomGroup
7272
AutoGenerate = 1
7373
Material = Material

Base.rte/Effects/Pyro/Flame/Flame.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ function Update(self)
2222
if math.random() < (self.strength * self.target.DamageMultiplier) / (actor.Mass + self.target.Material.StructuralIntegrity) then
2323
actor.Health = actor.Health - 1;
2424
end
25-
-- Stop, drop and roll!
25+
--Stop, drop and roll!
2626
self.Lifetime = self.Lifetime - math.abs(actor.AngularVel);
2727
end
2828
else
2929
self.target = nil;
3030
if self.checkTimer:IsPastSimMS(self.checkDelay) then
3131
self.checkTimer:Reset();
32-
self.checkDelay = self.checkDelay + 3; -- Gradually extend the delay for optimization reasons
32+
self.checkDelay = self.checkDelay + 3; --Gradually extend the delay for optimization reasons
3333
local checkPos = self.Pos + self.Vel * rte.PxTravelledPerFrame * math.random();
3434
local moCheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
3535
if moCheck ~= rte.NoMOID then
@@ -52,15 +52,15 @@ function Update(self)
5252
end
5353
end
5454
end
55-
local age = (self.Age * 0.0001) + 1; -- Have age slightly affect particle settings relative to 10 seconds
55+
local age = (self.Age * 0.0001) + 1; --Have age slightly affect particle settings relative to 10 seconds
5656
local chance = math.random();
5757
local particle;
5858
if chance < (0.1/age) then
5959
particle = CreateMOPixel("Ground Fire Burn Particle");
6060
particle.Vel = self.Vel + Vector(RangeRand(-15, 15), -math.random(-10, 20));
6161
particle.Sharpness = particle.Sharpness * RangeRand(0.5, 1.0);
6262
elseif chance < (0.5/age) then
63-
-- Spawn another, shorter flame particle occasionally
63+
--Spawn another, shorter flame particle occasionally
6464
if not self.isShort and math.random() < 0.05 then
6565
particle = CreateMOSParticle("Flame Hurt Short Float");
6666
particle.Lifetime = 4000/age;
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
--Use this script to display a different sprite frame when facing left, instead of the same sprite mirrored
2-
function Create(self)
3-
end
42
function Update(self)
53
self.Frame = self.HFlipped and 1 or 0;
64
end

0 commit comments

Comments
 (0)