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

Commit 8808763

Browse files
fourZKfourZK
committed
Reverted "Fire Puff Small 1" to non-numbered variant, removed "2" variant for being widely unused, updated faction files to match, small tweaks
1 parent c5302d0 commit 8808763

File tree

12 files changed

+45
-115
lines changed

12 files changed

+45
-115
lines changed

‎Base.rte/Effects/Pyro.ini

Lines changed: 30 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -354,18 +354,19 @@ AddEffect = MOPixel
354354

355355

356356
AddEffect = MOSParticle
357-
PresetName = Fire Puff Small 1
357+
PresetName = Fire Puff Small
358358
Mass = 3
359359
GlobalAccScalar = -0.3
360-
AirResistance = 0.08
360+
AirResistance = 0.06
361+
AirThreshold = 2
361362
RestThreshold = -1
362363
LifeTime = 300
363364
Sharpness = 0.1
364365
HitsMOs = 1
365366
GetsHitByMOs = 0
366367
SpriteFile = ContentFile
367368
FilePath = Base.rte/Effects/Pyro/FirePuffSmall.bmp
368-
FrameCount = 6
369+
FrameCount = 7
369370
SpriteOffset = Vector
370371
X = -8
371372
Y = -8
@@ -382,47 +383,23 @@ AddEffect = MOSParticle
382383
EffectStopTime = 150
383384
EffectStartStrength = 0.75
384385
EffectStopStrength = 0.3
385-
*/
386-
387-
388-
AddEffect = MOSParticle
389-
PresetName = Fire Puff Small 2
390-
Mass = 6
391-
GlobalAccScalar = -0.3
392-
AirResistance = 0.08
393-
RestThreshold = -1
394-
LifeTime = 150
395-
AirResistance = 0.25
396-
Sharpness = 0.2
397-
HitsMOs = 1
398-
GetsHitByMOs = 0
399-
SpriteFile = ContentFile
400-
FilePath = Base.rte/Effects/Pyro/FirePuffSmall.bmp
401-
FrameCount = 6
402-
SpriteOffset = Vector
403-
X = -8
404-
Y = -8
405-
AngularVel = 0
406-
Atom = Atom
407-
Material = Material
408-
CopyOf = Air
409-
TrailLength = 0
410-
Framerate = 0
386+
*/
411387

412388

413389
AddEffect = MOSParticle
414390
PresetName = Fire Puff Medium
415391
Mass = 3
416392
GlobalAccScalar = -0.24
417393
AirResistance = 0.1
394+
AirThreshold = 2
418395
RestThreshold = -1
419396
LifeTime = 400
420397
Sharpness = 0.1
421398
HitsMOs = 1
422399
GetsHitByMOs = 0
423400
SpriteFile = ContentFile
424401
FilePath = Base.rte/Effects/Pyro/FirePuffMedium.bmp
425-
FrameCount = 6
402+
FrameCount = 7
426403
SpriteOffset = Vector
427404
X = -14
428405
Y = -14
@@ -444,15 +421,16 @@ AddEffect = MOSParticle
444421
PresetName = Fire Puff Large
445422
Mass = 3
446423
GlobalAccScalar = -0.2
447-
AirResistance = 0.2
424+
AirResistance = 0.14
425+
AirThreshold = 2
448426
RestThreshold = -1
449427
LifeTime = 500
450428
Sharpness = 0.1
451429
HitsMOs = 1
452430
GetsHitByMOs = 0
453431
SpriteFile = ContentFile
454432
FilePath = Base.rte/Effects/Pyro/FirePuffLarge.bmp
455-
FrameCount = 6
433+
FrameCount = 7
456434
SpriteOffset = Vector
457435
X = -18
458436
Y = -18
@@ -786,19 +764,8 @@ AddEffect = AEmitter
786764
MaxVelocity = 0
787765
MinVelocity = 0
788766
PushesEmitter = 0
789-
// EmissionSound = Sound
790-
// AddSample = ContentFile
791-
// FilePath = Base.rte/Sounds/Actors/JetpackLoop.wav
792-
// LoopSetting = -1 // Means loop infinitely until stopped
793-
// BurstSound = Sound
794-
// AddSample = ContentFile
795-
// FilePath = Base.rte/Sounds/Actors/JetpackStart.wav
796-
// EndSound = Sound
797-
// AddSample = ContentFile
798-
// FilePath = Base.rte/Sounds/Actors/JetpackEnd.wav
799767
EmissionEnabled = 1
800768
EmissionsIgnoreThis = 0
801-
// ParticlesPerMinute = 6500
802769
BurstSize = 1
803770
BurstScale = 2
804771
BurstTriggered = 1
@@ -807,93 +774,56 @@ AddEffect = AEmitter
807774
FlashOnlyOnBurst = 0
808775

809776

810-
AddEffect = AEmitter
777+
AddEffect = PEmitter
811778
PresetName = Fuel Fire Trace Black
812779
LifeTime = 150
780+
AirResistance = 0.01
813781
Mass = 0.1
814782
HitsMOs = 0
815783
GetsHitByMOs = 0
816784
SpriteFile = ContentFile
817-
FilePath = Base.rte/Actors/Shared/JetpackNozzle.bmp
785+
FilePath = Base.rte/Null.bmp
818786
FrameCount = 1
819-
SpriteOffset = Vector
820-
X = -6
821-
Y = -4
822-
AtomGroup = AtomGroup
823-
AutoGenerate = 1
787+
Atom = Atom
824788
Material = Material
825789
CopyOf = Air
826-
Resolution = 0
827-
Depth = 5
828-
ScreenEffect = ContentFile
829-
FilePath = Base.rte/Effects/Glows/YellowHuge.bmp
830-
EffectStartTime = 0
831-
EffectStopTime = 55
832-
EffectStartStrength = 1.0
833-
EffectStopStrength = 0
834-
EffectAlwaysShows = 1
835-
BurstTriggered = 1
790+
TrailLength = 0
836791
AddEmission = Emission
837792
EmittedParticle = MOSParticle
838-
CopyOf = Fire Puff Small 1
839-
ParticlesPerMinute = 2500
840-
BurstSize = 1
841-
Spread = 1.57
842-
MaxVelocity = 3
793+
CopyOf = Fire Puff Small
794+
ParticlesPerMinute = 4000
795+
LifeVariation = 0.20
796+
BurstSize = 2
797+
Spread = 3.14
798+
MaxVelocity = 5
843799
MinVelocity = 0
844800
PushesEmitter = 0
845801
AddEmission = Emission
846802
EmittedParticle = MOSParticle
847803
CopyOf = Fire Puff Medium
848-
ParticlesPerMinute = 2500
849-
BurstSize = 1
850-
Spread = 1.57
851-
MaxVelocity = 2
804+
ParticlesPerMinute = 2000
805+
LifeVariation = 0.20
806+
BurstSize = 2
807+
Spread = 3.14
808+
MaxVelocity = 4
852809
MinVelocity = 0
853810
PushesEmitter = 0
854811
AddEmission = Emission
855812
EmittedParticle = MOSParticle
856813
CopyOf = Fire Puff Large
857814
ParticlesPerMinute = 1000
815+
LifeVariation = 0.20
858816
BurstSize = 2
859-
Spread = 1.57
860-
MaxVelocity = 2
861-
MinVelocity = 0
862-
PushesEmitter = 0
863-
AddEmission = Emission
864-
EmittedParticle = MOPixel
865-
CopyOf = Glow Particle Yellow Huge
866-
PresetName = Explosion Flash Glow
867-
EffectStartTime = 0
868-
EffectStopTime = 100
869-
EffectStartStrength = 1.0
870-
EffectStopStrength = 0
871-
EffectAlwaysShows = 1
872-
ParticlesPerMinute = 0
873-
BurstSize = 1
874-
Spread = 1.57
875-
MaxVelocity = 0
817+
Spread = 3.14
818+
MaxVelocity = 3
876819
MinVelocity = 0
877820
PushesEmitter = 0
878-
// EmissionSound = Sound
879-
// AddSample = ContentFile
880-
// FilePath = Base.rte/Sounds/Actors/JetpackLoop.wav
881-
// LoopSetting = -1 // Means loop infinitely until stopped
882-
// BurstSound = Sound
883-
// AddSample = ContentFile
884-
// FilePath = Base.rte/Sounds/Actors/JetpackStart.wav
885-
// EndSound = Sound
886-
// AddSample = ContentFile
887-
// FilePath = Base.rte/Sounds/Actors/JetpackEnd.wav
821+
BurstTriggered = 1
888822
EmissionEnabled = 1
889823
EmissionsIgnoreThis = 0
890-
// ParticlesPerMinute = 6500
891824
BurstSize = 1
892825
BurstScale = 2
893826
BurstTriggered = 1
894-
BurstSpacing = 500
895-
EmissionDamage = 0
896-
FlashOnlyOnBurst = 0
897827

898828

899829
///////////////////////////////////////////////////////////////////////

‎Base.rte/Effects/Pyro/FirePuffLarge006.bmp

2.32 KB
Binary file not shown.

‎Base.rte/Effects/Pyro/FirePuffMedium006.bmp

1.82 KB
Binary file not shown.

‎Base.rte/Effects/Pyro/FirePuffSmall006.bmp

1.3 KB
Binary file not shown.

‎Browncoats.rte/Devices/Weapons/Flash/Flash.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ AddEffect = AEmitter
7777
PushesEmitter = 0
7878
AddEmission = Emission
7979
EmittedParticle = MOSParticle
80-
CopyOf = Fire Puff Small 1
80+
CopyOf = Fire Puff Small
8181
BurstSize = 15
8282
Spread = 0.1
8383
MaxVelocity = 30
8484
MinVelocity = 20
8585
PushesEmitter = 0
8686
AddEmission = Emission
8787
EmittedParticle = MOSParticle
88-
CopyOf = Fire Puff Small 1
88+
CopyOf = Fire Puff Small
8989
BurstSize = 25
9090
Spread = 0.6
9191
MaxVelocity = 25
@@ -136,15 +136,15 @@ AddEffect = AEmitter
136136
PushesEmitter = 0
137137
AddEmission = Emission
138138
EmittedParticle = MOSParticle
139-
CopyOf = Fire Puff Small 1
139+
CopyOf = Fire Puff Small
140140
BurstSize = 5
141141
Spread = 0.1
142142
MaxVelocity = 20
143143
MinVelocity = 5
144144
PushesEmitter = 0
145145
AddEmission = Emission
146146
EmittedParticle = MOSParticle
147-
CopyOf = Fire Puff Small 1
147+
CopyOf = Fire Puff Small
148148
BurstSize = 10
149149
Spread = 0.2
150150
MaxVelocity = 15
@@ -226,7 +226,7 @@ AddAmmo = AEmitter
226226
PushesEmitter = 0
227227
AddEmission = Emission
228228
EmittedParticle = MOSParticle
229-
CopyOf = Fire Puff Small 1
229+
CopyOf = Fire Puff Small
230230
ParticlesPerMinute = 0
231231
BurstSize = 5
232232
Spread = 1
@@ -343,7 +343,7 @@ AddAmmo = AEmitter
343343
LifeVariation = 0.10
344344
AddGib = Gib
345345
GibParticle = MOSParticle
346-
CopyOf = Fire Puff Small 1
346+
CopyOf = Fire Puff Small
347347
Count = 24
348348
Spread = 3.14
349349
MaxVelocity = 15

‎Coalition.rte/Devices/Explosives/IncendiaryGrenade/IncendiaryGrenade.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ AddDevice = TDExplosive
8686
LifeVariation = 0.30
8787
AddGib = Gib
8888
GibParticle = MOSParticle
89-
CopyOf = Fire Puff Small 1
89+
CopyOf = Fire Puff Small
9090
Count = 14
9191
MinVelocity = 19
9292
MaxVelocity = 40

‎Coalition.rte/Devices/Weapons/AutoCannon/AutoCannon.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ AddAmmo = AEmitter
4949
BurstTriggered = 1
5050
AddGib = Gib
5151
GibParticle = MOSParticle
52-
CopyOf = Fire Puff Small 1
52+
CopyOf = Fire Puff Small
5353
Count = 4
5454
MinVelocity = 1
5555
MaxVelocity = 3

‎Coalition.rte/Devices/Weapons/UberCannon/UberCannon.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ AddAmmo = AEmitter
162162
PushesEmitter = 0
163163
AddEmission = Emission
164164
EmittedParticle = MOSParticle
165-
CopyOf = Fire Puff Small 1
165+
CopyOf = Fire Puff Small
166166
ParticlesPerMinute = 1
167167
BurstSize = 3
168168
Spread = 0.2

‎Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ AddAmmo = AEmitter
5454
EmissionsIgnoreThis = 0
5555
AddGib = Gib
5656
GibParticle = MOSParticle
57-
CopyOf = Fire Puff Small 1
57+
CopyOf = Fire Puff Small
5858
Count = 15
5959
MinVelocity = 1
6060
MaxVelocity = 3

‎Ronin.rte/Devices/Explosives/M24/M24.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ AddDevice = TDExplosive
118118
LifeVariation = 0.30
119119
AddGib = Gib
120120
GibParticle = MOSParticle
121-
CopyOf = Fire Puff Small 1
121+
CopyOf = Fire Puff Small
122122
Count = 7
123123
MinVelocity = 19
124124
MaxVelocity = 40

0 commit comments

Comments
 (0)