Skip to content

Commit 656d39e

Browse files
CauselessCauseless
committed
Merge branch 'lifetime-variation' of https://github.com/cortex-command-community/Cortex-Command-Community-Project into lifetime-variation
2 parents 0c6da7c + 6407d3c commit 656d39e

File tree

44 files changed

+0
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+0
-61
lines changed

‎Data/Base.rte/Devices/Shared.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ AddAmmo = Round
7171
WoundDamageMultiplier = 1.1
7272
RestThreshold = 500
7373
LifeTime = 1500
74-
LifeVariation = 0.1
7574
Sharpness = 350
7675
HitsMOs = 1
7776
GetsHitByMOs = 0
@@ -122,7 +121,6 @@ AddAmmo = Round
122121
Mass = 0.044
123122
RestThreshold = 500
124123
LifeTime = 1500
125-
LifeVariation = 0.1
126124
Sharpness = 55
127125
HitsMOs = 1
128126
GetsHitByMOs = 0
@@ -178,7 +176,6 @@ AddAmmo = Round
178176
Mass = 0.03
179177
RestThreshold = 500
180178
LifeTime = 400
181-
LifeVariation = 0.1
182179
AirResistance = 0.015
183180
Sharpness = 55
184181
HitsMOs = 1

‎Data/Base.rte/Effects.ini

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ AddEffect = MOPixel
218218
PresetName = Grenade Fragment Gray
219219
Mass = 0.15
220220
LifeTime = 250
221-
LifeVariation = 0.1
222221
Sharpness = 15
223222
AirResistance = 0.05
224223
WoundDamageMultiplier = 1.3
@@ -242,7 +241,6 @@ AddEffect = MOPixel
242241
PresetName = Grenade Fragment Yellow
243242
Mass = 0.15
244243
LifeTime = 200
245-
LifeVariation = 0.1
246244
Sharpness = 30
247245
AirResistance = 0.075
248246
WoundDamageMultiplier = 1.2
@@ -268,7 +266,6 @@ AddEffect = MOPixel
268266
ScriptPath = Base.rte/Scripts/GrenadeFragment.lua
269267
Mass = 0.15
270268
LifeTime = 100
271-
LifeVariation = 0.1
272269
Sharpness = 25
273270
AirResistance = 0.025
274271
WoundDamageMultiplier = 1.1
@@ -305,7 +302,6 @@ AddEffect = MOPixel
305302
Mass = 3
306303
RestThreshold = -1
307304
LifeTime = 125
308-
LifeVariation = 0.1
309305
Sharpness = 0
310306
GlobalAccScalar = 0
311307
AirResistance = 0.01
@@ -374,7 +370,6 @@ AddEffect = MOPixel
374370
PresetName = Spark Yellow 1
375371
Mass = 0.001
376372
LifeTime = 75
377-
LifeVariation = 0.1
378373
HitsMOs = 0
379374
GetsHitByMOs = 0
380375
AirResistance = 0.1
@@ -399,7 +394,6 @@ AddEffect = MOPixel
399394
PresetName = Spark Yellow 2
400395
Mass = 0.001
401396
LifeTime = 120
402-
LifeVariation = 0.1
403397
HitsMOs = 0
404398
GetsHitByMOs = 0
405399
AirResistance = 0.05
@@ -422,7 +416,6 @@ AddEffect = MOPixel
422416
PresetName = Spark Blue 1
423417
Mass = 0.001
424418
LifeTime = 100
425-
LifeVariation = 0.1
426419
HitsMOs = 0
427420
GetsHitByMOs = 0
428421
AirResistance = 0.1
@@ -485,7 +478,6 @@ AddEffect = MOPixel
485478
PresetName = Jetpack Blast 1
486479
Mass = 1.25
487480
LifeTime = 50
488-
LifeVariation = 0.1
489481
Sharpness = 0.3
490482
AirResistance = 0.1
491483
HitsMOs = 1
@@ -508,7 +500,6 @@ AddEffect = MOPixel
508500
PresetName = Jetpack Blast 2
509501
Mass = 1.25
510502
LifeTime = 75
511-
LifeVariation = 0.1
512503
Sharpness = 0.3
513504
AirResistance = 0.1
514505
HitsMOs = 1
@@ -531,7 +522,6 @@ AddEffect = MOPixel
531522
PresetName = Side Thruster Blast 1
532523
Mass = 2
533524
LifeTime = 50
534-
LifeVariation = 0.1
535525
Sharpness = 0.3
536526
HitsMOs = 1
537527
GetsHitByMOs = 0
@@ -553,7 +543,6 @@ AddEffect = MOPixel
553543
PresetName = Side Thruster Blast 2
554544
Mass = 2
555545
LifeTime = 75
556-
LifeVariation = 0.1
557546
Sharpness = 0.3
558547
HitsMOs = 1
559548
GetsHitByMOs = 0
@@ -575,7 +564,6 @@ AddEffect = MOPixel
575564
PresetName = Jet Air Blast
576565
Mass = 7.5
577566
LifeTime = 45
578-
LifeVariation = 0.1
579567
Sharpness = 0.4
580568
HitsMOs = 1
581569
GetsHitByMOs = 0
@@ -610,7 +598,6 @@ AddEffect = MOPixel
610598
PresetName = Main Thruster Blast Spark
611599
Mass = 5
612600
LifeTime = 200
613-
LifeVariation = 0.1
614601
Sharpness = 0.3
615602
HitsMOs = 1
616603
GetsHitByMOs = 0

‎Data/Browncoats.rte/Devices/Weapons/Extinction/Extinction.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ AddEffect = MOPixel
9292
AirResistance = 0.015
9393
AirThreshold = 70
9494
LifeTime = 550
95-
LifeVariation = 0.1
9695
Sharpness = 13
9796
HitsMOs = 1
9897
GetsHitByMOs = 0

‎Data/Browncoats.rte/Devices/Weapons/Jackhammer/Jackhammer.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ AddParticle = MOPixel
2929
Mass = 0.3
3030
AirResistance = 0.04
3131
LifeTime = 300
32-
LifeVariation = 0.1
3332
Sharpness = 4
3433
HitsMOs = 1
3534
GetsHitByMOs = 0

‎Data/Browncoats.rte/Devices/Weapons/Manbreaker/Manbreaker.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ AddEffect = MOPixel
106106
AirResistance = 0.015
107107
AirThreshold = 70
108108
LifeTime = 550
109-
LifeVariation = 0.1
110109
Sharpness = 13
111110
HitsMOs = 1
112111
GetsHitByMOs = 0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ AddAmmo = Round
3636
AirResistance = 0.013
3737
AirThreshold = 50
3838
LifeTime = 500
39-
LifeVariation = 0.1
4039
Sharpness = 15
4140
HitsMOs = 1
4241
GetsHitByMOs = 0

‎Data/Browncoats.rte/Devices/Weapons/Stormbringer/Stormbringer.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ AddAmmo = Round
1414
AirResistance = 0.08
1515
AirThreshold = 25
1616
LifeTime = 450
17-
LifeVariation = 0.1
1817
Sharpness = 10
1918
HitsMOs = 1
2019
GetsHitByMOs = 0

‎Data/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ AddAmmo = Round
3939
AirResistance = 0.01
4040
AirThreshold = 70
4141
LifeTime = 700
42-
LifeVariation = 0.1
4342
Sharpness = 10
4443
HitsMOs = 1
4544
GetsHitByMOs = 0

‎Data/Coalition.rte/Devices/Weapons/CompactAssaultRifle/CompactAssaultRifle.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ AddAmmo = Round
1212
AirResistance = 0.01
1313
AirThreshold = 80
1414
LifeTime = 800
15-
LifeVariation = 0.1
1615
HitsMOs = 1
1716
GetsHitByMOs = 0
1817
WoundDamageMultiplier = 1.2

‎Data/Coalition.rte/Devices/Weapons/GatlingGun/GatlingGun.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ AddAmmo = Round
3737
AirResistance = 0.02
3838
AirThreshold = 95
3939
LifeTime = 600
40-
LifeVariation = 0.1
4140
Sharpness = 20
4241
HitsMOs = 1
4342
GetsHitByMOs = 0

0 commit comments

Comments
 (0)