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

Commit a0dfebc

Browse files
fourZKfourZK
committed
Data followup to AEmitter and Jetpack changes
1 parent b3fc836 commit a0dfebc

File tree

8 files changed

+57
-41
lines changed

8 files changed

+57
-41
lines changed

‎Base.rte/Actors/Shared.ini

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,13 @@ AddEffect = AEmitter
461461
FilePath = Base.rte/Sounds/Actors/JetpackEnd.flac
462462
EmissionEnabled = 1
463463
EmissionsIgnoreThis = 1
464+
MinThrottleRange = 0.2
465+
MaxThrottleRange = 0.2
464466
ParticlesPerMinute = 7200
465467
BurstSize = 15
466468
BurstScale = 3
467469
BurstTriggered = 1
468-
BurstSpacing = 600
470+
BurstSpacing = 500
469471
Flash = Attachable
470472
CopyOf = Muzzle Flash Pistol
471473
FlashOnlyOnBurst = 0
@@ -524,9 +526,11 @@ AddEffect = AEmitter
524526
PushesEmitter = 1
525527
EmissionEnabled = 1
526528
EmissionsIgnoreThis = 1
529+
MinThrottleRange = 0.5
530+
MaxThrottleRange = 0.5
527531
ParticlesPerMinute = 1
528532
BurstSize = 12
529-
BurstSpacing = 920
533+
BurstSpacing = 750
530534
BurstScale = 1
531535
BurstTriggered = 1
532536
LoudnessOnEmit = 0.1
@@ -599,9 +603,11 @@ AddEffect = AEmitter
599603
FilePath = Base.rte/Sounds/Actors/JetpackEnd.flac
600604
EmissionEnabled = 1
601605
EmissionsIgnoreThis = 1
606+
MinThrottleRange = 0.3
607+
MaxThrottleRange = 0.3
602608
ParticlesPerMinute = 7200
603609
BurstSize = 5
604-
BurstSpacing = 85
610+
BurstSpacing = 70
605611
BurstScale = 2
606612
BurstTriggered = 1
607613
Flash = Attachable
@@ -631,9 +637,11 @@ AddEffect = AEmitter
631637
Spread = 0.25
632638
MaxVelocity = 26
633639
MinVelocity = 10
640+
MinThrottleRange = 0.4
641+
MaxThrottleRange = 0.4
634642
ParticlesPerMinute = 10800
635643
BurstSize = 8
636-
BurstSpacing = 200
644+
BurstSpacing = 160
637645

638646

639647
AddEffect = AEmitter
@@ -645,6 +653,8 @@ AddEffect = AEmitter
645653
Spread = 0.25
646654
MaxVelocity = 25
647655
MinVelocity = 10
656+
MinThrottleRange = 0.5
657+
MaxThrottleRange = 0.5
648658
ParticlesPerMinute = 7200
649659
BurstSize = 12
650660

‎Base.rte/Effects/Wounds.ini

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ AddEffect = AEmitter
227227
EmissionEnabled = 1
228228
EmissionsIgnoreThis = 1
229229
BurstTriggered = 1
230-
EmissionDamage = 0.06
230+
EmissionDamage = 0.05
231231

232232

233233
AddEffect = AEmitter
@@ -331,7 +331,7 @@ AddEffect = AEmitter
331331
BurstSize = 9
332332
BurstScale = 3
333333
BurstDamage = 30
334-
EmissionDamage = 0.25
334+
EmissionDamage = 0.2
335335

336336

337337
AddEffect = AEmitter
@@ -348,7 +348,7 @@ AddEffect = AEmitter
348348
CopyOf = Wound Flesh Exit
349349
PresetName = Wound Flesh Exit Strong
350350
EmissionCountLimit = 100
351-
BurstDamage = 0
351+
BurstDamage = -0.5
352352

353353

354354
AddEffect = AEmitter
@@ -372,7 +372,7 @@ AddEffect = AEmitter
372372
PresetName = Wound Flesh Exit Super
373373
EmissionCountLimit = 120
374374
ParticlesPerMinute = 240
375-
BurstDamage = -0.5
375+
BurstDamage = -1
376376

377377

378378
AddEffect = AEmitter
@@ -392,7 +392,7 @@ AddEffect = AEmitter
392392
BurstScale = 3
393393
BurstDamage = 1
394394
BurstTriggered = 1
395-
EmissionDamage = 0.02
395+
EmissionDamage = 0.01
396396

397397

398398
AddEffect = AEmitter
@@ -406,7 +406,7 @@ AddEffect = AEmitter
406406
BurstScale = 3
407407
BurstDamage = 1
408408
BurstTriggered = 1
409-
EmissionDamage = 0.04
409+
EmissionDamage = 0.02
410410

411411

412412
AddEffect = AEmitter
@@ -420,7 +420,7 @@ AddEffect = AEmitter
420420
BurstScale = 3
421421
BurstDamage = 1
422422
BurstTriggered = 1
423-
EmissionDamage = 0.04
423+
EmissionDamage = 0.03
424424

425425

426426
AddEffect = AEmitter
@@ -633,9 +633,9 @@ AddEffect = AEmitter
633633
ParticlesPerMinute = 200
634634
BurstSize = 8
635635
BurstScale = 2
636-
BurstDamage = 3
636+
BurstDamage = 2
637637
BurstTriggered = 1
638-
EmissionDamage = 0.005
638+
EmissionDamage = 0.002
639639

640640

641641
AddEffect = AEmitter
@@ -708,7 +708,7 @@ AddEffect = AEmitter
708708
BurstScale = 2
709709
BurstDamage = 4
710710
BurstTriggered = 1
711-
EmissionDamage = 0.005
711+
EmissionDamage = 0.001
712712

713713

714714
AddEffect = AEmitter
@@ -752,20 +752,13 @@ AddEffect = AEmitter
752752
Spread = 0.2
753753
MaxVelocity = 12
754754
MinVelocity = 6
755-
AddEmission = Emission
756-
EmittedParticle = MOPixel
757-
CopyOf = Spark Yellow 1
758-
LifeVariation = 0.20
759-
Spread = 0.3
760-
MaxVelocity = 12
761-
MinVelocity = 6
762755
AddEmission = Emission
763756
EmittedParticle = MOPixel
764757
CopyOf = Spark Yellow 2
765-
LifeVariation = 0.20
766-
Spread = 0.4
767-
MaxVelocity = 12
768-
MinVelocity = 6
758+
LifeVariation = 0.40
759+
Spread = 0.3
760+
MaxVelocity = 15
761+
MinVelocity = 3
769762
AddEmission = Emission
770763
EmittedParticle = MOPixel
771764
CopyOf = Drop Oil
@@ -785,7 +778,7 @@ AddEffect = AEmitter
785778
BurstScale = 2
786779
BurstDamage = 2
787780
BurstTriggered = 1
788-
EmissionDamage = 0.02
781+
EmissionDamage = 0.01
789782

790783

791784
AddEffect = AEmitter
@@ -799,7 +792,7 @@ AddEffect = AEmitter
799792
AddEffect = AEmitter
800793
CopyOf = Leaking Machinery Partial
801794
PresetName = Leaking Machinery Light
802-
EmissionDamage = 0.001
795+
EmissionDamage = 0.0003
803796

804797

805798
AddEffect = AEmitter
@@ -999,7 +992,7 @@ AddEffect = AEmitter
999992
BurstScale = 2
1000993
BurstDamage = 1.5
1001994
BurstTriggered = 1
1002-
EmissionDamage = 0.03
995+
EmissionDamage = 0.01
1003996

1004997

1005998
AddEffect = AEmitter
@@ -1067,7 +1060,7 @@ AddEffect = AEmitter
10671060
BurstScale = 2
10681061
BurstDamage = 1.5
10691062
BurstTriggered = 1
1070-
EmissionDamage = 0.08
1063+
EmissionDamage = 0.05
10711064
Flash = Attachable
10721065
CopyOf = Muzzle Flash SMG
10731066
FlashOnlyOnBurst = 1

‎Browncoats.rte/Actors/Shared.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ AddEffect = AEmitter
7373
FilePath = Base.rte/Sounds/Actors/JetpackEnd.flac
7474
EmissionEnabled = 1
7575
EmissionsIgnoreThis = 1
76+
MinThrottleRange = 0.5
77+
MaxThrottleRange = 0.5
7678
ParticlesPerMinute = 11000
7779
BurstSize = 7
78-
BurstSpacing = 85
80+
BurstSpacing = 180
7981
BurstScale = 2
8082
BurstTriggered = 1
8183
Flash = Attachable

‎Dummy.rte/Actors/Shared.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ AddEffect = AEmitter
7171
FilePath = Base.rte/Sounds/Actors/JetpackEnd.flac
7272
EmissionEnabled = 1
7373
EmissionsIgnoreThis = 1
74+
MinThrottleRange = 0.2
75+
MaxThrottleRange = 0.2
7476
ParticlesPerMinute = 7200
7577
BurstSize = 5
76-
BurstSpacing = 85
78+
BurstSpacing = 150
7779
BurstScale = 2
7880
BurstTriggered = 1
7981
Flash = Attachable

‎Imperatus.rte/Actors/Shared.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ AddEffect = AEmitter
2222
MaxVelocity = 20
2323
MinVelocity = 10
2424
LifeVariation = 0.20
25+
MinThrottleRange = 0.7
26+
MaxThrottleRange = 0.7
2527
ParticlesPerMinute = 7200
2628
BurstSize = 8
2729
BurstSpacing = 200

‎Imperatus.rte/Actors/Shared/Robot.lua

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ function Create(self)
44
self.stopTimer = Timer();
55
end
66
function Update(self)
7-
local walkSpeedScalar = 2.3;
8-
local legs = {self.FGLeg, self.BGLeg};
9-
for _, leg in pairs(legs) do
10-
walkSpeedScalar = walkSpeedScalar - (leg and leg.Frame/leg.FrameCount or 1.1);
11-
end
12-
self:SetLimbPathSpeed(1, self.walkSpeed * walkSpeedScalar);
13-
if self.Jetpack then
14-
self.Jetpack.Throttle = self.JetTimeLeft/self.JetTimeTotal - 0.5;
15-
self.Jetpack.FlashScale = 1 + self.Jetpack.Throttle;
7+
if self.Health > 0 then
8+
local walkSpeedScalar = 2.3;
9+
local legs = {self.FGLeg, self.BGLeg};
10+
for _, leg in pairs(legs) do
11+
walkSpeedScalar = walkSpeedScalar - (leg and leg.Frame/leg.FrameCount or 1.1);
12+
end
13+
self:SetLimbPathSpeed(1, self.walkSpeed * walkSpeedScalar);
14+
15+
if self.Head and (self.FGArm or self.BGArm or self.FGLeg or self.BGLeg) then
16+
local limbs = {self.Head, self.FGArm, self.BGArm, self.FGLeg, self.BGLeg};
17+
self.Health = self.MaxHealth * (1 - self.WoundCount/self:GetGibWoundLimit(true, false, false)) * #limbs/5;
18+
end
1619
end
1720
end

‎Ronin.rte/Actors/Shared.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ AddEffect = AEmitter
4343
EmissionOffset = Vector
4444
X = -2
4545
Y = -0
46+
MinThrottleRange = 0.3
47+
MaxThrottleRange = 0.3
4648

4749

4850
///////////////////////////////////////////////////////////////////////

‎Techion.rte/Actors/Shared.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,11 @@ AddEffect = AEmitter
129129
FilePath = Base.rte/Sounds/Actors/JetpackEnd.flac
130130
EmissionEnabled = 1
131131
EmissionsIgnoreThis = 1
132+
MinThrottleRange = 0.3
133+
MaxThrottleRange = 0.3
132134
ParticlesPerMinute = 9400
133135
BurstSize = 10
134-
BurstSpacing = 85
136+
BurstSpacing = 160
135137
BurstScale = 1
136138
BurstTriggered = 1
137139
Flash = Attachable

0 commit comments

Comments
 (0)