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

Commit 05b4db9

Browse files
GacyrGacyr
Gacyr
authored and
Gacyr
committed
Merge branch 'development' into cf-143-data-version
2 parents 4922ba8 + df90036 commit 05b4db9

File tree

39 files changed

+601
-245
lines changed

39 files changed

+601
-245
lines changed

‎Base.rte/Activities/OneManArmy.lua

Lines changed: 94 additions & 99 deletions
Large diffs are not rendered by default.

‎Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,7 @@ AddActor = AHuman
724724
Description = TradeStar's factory worker unit. Agile, but not fit for warfare!
725725
AddToGroup = Actors
726726
AddToGroup = Actors - Light
727+
AddToGroup = Actors - Heavy
727728
Mass = 35
728729
GoldValue = 45
729730
HitsMOs = 1

‎Base.rte/Craft/Dropships/DropshipMK1.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ AddEffect = AEmitter
872872
GibImpulseLimit = 5000
873873
GibWoundLimit = 30
874874
GibSound = SoundContainer
875-
CopyOf = Crash Woosh
875+
CopyOf = Craft Engine Gib
876876
AddGib = Gib
877877
GibParticle = AEmitter
878878
CopyOf = Fuel Fire Trace Gray
@@ -1112,7 +1112,7 @@ AddEffect = AEmitter
11121112
GibImpulseLimit = 5000
11131113
GibWoundLimit = 30
11141114
GibSound = SoundContainer
1115-
CopyOf = Crash Woosh
1115+
CopyOf = Craft Engine Gib
11161116
AddGib = Gib
11171117
GibParticle = AEmitter
11181118
CopyOf = Fuel Fire Trace Gray
@@ -1391,7 +1391,7 @@ AddActor = Attachable
13911391
X = -18
13921392
Y = -16
13931393
EntryWound = AEmitter
1394-
CopyOf = Dent Metal Light
1394+
CopyOf = Dent Metal Door
13951395
ExitWound = AEmitter
13961396
CopyOf = Dent Metal
13971397
AtomGroup = AtomGroup
@@ -1539,7 +1539,7 @@ AddActor = ACDropShip
15391539
GibBlastStrength = 50
15401540
GibWoundLimit = 75
15411541
GibSound = SoundContainer
1542-
CopyOf = Ship Explosion
1542+
CopyOf = Craft Body Gib
15431543
AddGib = Gib
15441544
GibParticle = AEmitter
15451545
CopyOf = Ship Explosion

‎Base.rte/Craft/Shared/Turrets.ini

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,25 @@ AddEffect = AEmitter
9292
GibImpulseLimit = 1000
9393
GibWoundLimit = 4
9494
GibSound = SoundContainer
95-
CopyOf = Metal Body Blunt Hit
95+
CopyOf = Metal Body Blunt Hit
96+
AddGib = Gib
97+
GibParticle = MOPixel
98+
CopyOf = Spark Yellow 1
99+
Count = 3
100+
Spread = 3.14
101+
MaxVelocity = 20
102+
MinVelocity = 8
103+
AddGib = Gib
104+
GibParticle = MOPixel
105+
CopyOf = Spark Yellow 2
106+
Count = 3
107+
Spread = 3.14
108+
MaxVelocity = 20
109+
MinVelocity = 8
110+
AddGib = Gib
111+
GibParticle = MOSParticle
112+
CopyOf = Gib Metal Grey Tiny A
113+
Count = 3
114+
Spread = 3.14
115+
MaxVelocity = 15
116+
MinVelocity = 5

‎Base.rte/Effects/Wounds.ini

Lines changed: 60 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,7 @@ AddEffect = AEmitter
256256
MaxVelocity = 10
257257
MinVelocity = 0
258258
BurstSound = SoundContainer
259-
PresetName = Flesh Impact Exit Sweetener
260-
AttenuationStartDistance = 120
261-
AddSound = ContentFile
262-
FilePath = Base.rte/Sounds/Penetration/Flesh/ExitSweetener1.wav
263-
AddSound = ContentFile
264-
FilePath = Base.rte/Sounds/Penetration/Flesh/ExitSweetener2.wav
265-
AddSound = ContentFile
266-
FilePath = Base.rte/Sounds/Penetration/Flesh/ExitSweetener3.wav
259+
CopyOf = Flesh Impact Exit Sweetener
267260
EmissionCountLimit = 80
268261
ParticlesPerMinute = 120
269262
BurstSize = 9
@@ -332,12 +325,13 @@ AddEffect = AEmitter
332325
Spread = 0.3
333326
MaxVelocity = 8
334327
MinVelocity = 2
328+
BurstSound = SoundContainer
329+
CopyOf = Flesh Impact Exit Sweetener
335330
EmissionCountLimit = 480
336331
BurstSize = 9
337332
BurstScale = 3
338-
BurstDamage = 25
339-
EmissionDamage = 0.12
340-
// Note: AHuman BreakWounds are always a static 35 pts of BurstDamage and 0.5 pts of EmissionDamage, with infinite count
333+
BurstDamage = 30
334+
EmissionDamage = 0.25
341335

342336

343337
AddEffect = AEmitter
@@ -346,6 +340,8 @@ AddEffect = AEmitter
346340
EmissionCountLimit = 50
347341
BurstSize = 6
348342
BurstDamage = 2
343+
BurstSound = SoundContainer
344+
CopyOf = Armored Flesh Limb Impact
349345

350346

351347
AddEffect = AEmitter
@@ -363,6 +359,8 @@ AddEffect = AEmitter
363359
AddEffect = AEmitter
364360
CopyOf = Wound Flesh Entry
365361
PresetName = Wound Flesh Entry Super
362+
BurstSound = SoundContainer
363+
CopyOf = Armored Flesh Limb Impact
366364
EmissionCountLimit = 60
367365
ParticlesPerMinute = 60
368366
BurstSize = 5
@@ -395,8 +393,6 @@ AddEffect = AEmitter
395393
BurstDamage = 1
396394
BurstTriggered = 1
397395
EmissionDamage = 0.02
398-
Flash = None
399-
FlashOnlyOnBurst = 0
400396

401397

402398
AddEffect = AEmitter
@@ -411,8 +407,6 @@ AddEffect = AEmitter
411407
BurstDamage = 1
412408
BurstTriggered = 1
413409
EmissionDamage = 0.04
414-
Flash = None
415-
FlashOnlyOnBurst = 0
416410

417411

418412
AddEffect = AEmitter
@@ -427,8 +421,27 @@ AddEffect = AEmitter
427421
BurstDamage = 1
428422
BurstTriggered = 1
429423
EmissionDamage = 0.04
430-
Flash = None
431-
FlashOnlyOnBurst = 0
424+
425+
426+
AddEffect = AEmitter
427+
CopyOf = Wound Flesh Entry
428+
PresetName = Wound Clothed Flesh Head
429+
BurstSound = SoundContainer
430+
CopyOf = Clothed Flesh Head Impact
431+
432+
433+
AddEffect = AEmitter
434+
CopyOf = Wound Flesh Entry
435+
PresetName = Wound Clothed Flesh Limb
436+
BurstSound = SoundContainer
437+
CopyOf = Clothed Flesh Limb Impact
438+
439+
440+
AddEffect = AEmitter
441+
CopyOf = Wound Flesh Entry
442+
PresetName = Wound Clothed Flesh Torso
443+
BurstSound = SoundContainer
444+
CopyOf = Clothed Flesh Torso Impact
432445

433446

434447
AddEffect = AEmitter
@@ -610,14 +623,10 @@ AddEffect = AEmitter
610623
MaxVelocity = 6
611624
MinVelocity = 3
612625
// EmissionSound = SoundContainer
613-
// AddSound = ContentFile
614-
// FilePath = Base.rte/
626+
// CopyOf = Brain Pod Leak
615627
// LoopSetting = -1 // Means loop infinitely until stopped
616628
BurstSound = SoundContainer
617629
CopyOf = Brain Pod Hit
618-
// EndSound = SoundContainer
619-
// AddSound = ContentFile
620-
// FilePath = Base.rte/
621630
EmissionEnabled = 1
622631
EmissionCountLimit = 80
623632
EmissionsIgnoreThis = 1
@@ -627,8 +636,6 @@ AddEffect = AEmitter
627636
BurstDamage = 3
628637
BurstTriggered = 1
629638
EmissionDamage = 0.005
630-
Flash = None
631-
FlashOnlyOnBurst = 0
632639

633640

634641
AddEffect = AEmitter
@@ -689,14 +696,10 @@ AddEffect = AEmitter
689696
MaxVelocity = 6
690697
MinVelocity = 3
691698
// EmissionSound = SoundContainer
692-
// AddSound = ContentFile
693-
// FilePath = Base.rte/
699+
// CopyOf = Brain Pod Leak
694700
// LoopSetting = -1 // Means loop infinitely until stopped
695701
BurstSound = SoundContainer
696702
CopyOf = Brain Pod Hit
697-
// EndSound = SoundContainer
698-
// AddSound = ContentFile
699-
// FilePath = Base.rte/
700703
EmissionEnabled = 1
701704
EmissionCountLimit = 100
702705
EmissionsIgnoreThis = 1
@@ -706,8 +709,6 @@ AddEffect = AEmitter
706709
BurstDamage = 4
707710
BurstTriggered = 1
708711
EmissionDamage = 0.005
709-
Flash = None
710-
FlashOnlyOnBurst = 0
711712

712713

713714
AddEffect = AEmitter
@@ -772,14 +773,10 @@ AddEffect = AEmitter
772773
MaxVelocity = 4
773774
MinVelocity = 2
774775
// EmissionSound = SoundContainer
775-
// AddSound = ContentFile
776-
// FilePath = Base.rte/
776+
// CopyOf = Leaking Machinery
777777
// LoopSetting = -1 // Means loop infinitely until stopped
778778
BurstSound = SoundContainer
779779
CopyOf = Metal Penetration Hit
780-
// EndSound = SoundContainer
781-
// AddSound = ContentFile
782-
// FilePath = Base.rte/
783780
EmissionEnabled = 1
784781
EmissionCountLimit = 60
785782
EmissionsIgnoreThis = 1
@@ -789,8 +786,6 @@ AddEffect = AEmitter
789786
BurstDamage = 2
790787
BurstTriggered = 1
791788
EmissionDamage = 0.02
792-
Flash = None
793-
FlashOnlyOnBurst = 0
794789

795790

796791
AddEffect = AEmitter
@@ -824,7 +819,7 @@ AddEffect = AEmitter
824819
Spread = 0.3
825820
MaxVelocity = 6
826821
MinVelocity = 3
827-
EmissionCountLimit = 160
822+
EmissionCountLimit = 240
828823
EmissionDamage = 0.08
829824
BurstDamage = 3
830825

@@ -901,6 +896,27 @@ AddEffect = AEmitter
901896
EmissionCountLimit = 4
902897

903898

899+
AddEffect = AEmitter
900+
CopyOf = Dent Metal Light
901+
PresetName = Dent Metal Helmet
902+
BurstSound = SoundContainer
903+
CopyOf = Steel Helmet Impact
904+
905+
906+
AddEffect = AEmitter
907+
CopyOf = Dent Metal Light
908+
PresetName = Dent Metal Chest Plate
909+
BurstSound = SoundContainer
910+
CopyOf = Chest Plate Impact
911+
912+
913+
AddEffect = AEmitter
914+
CopyOf = Dent Metal Light
915+
PresetName = Dent Metal Door
916+
BurstSound = SoundContainer
917+
CopyOf = Metal Door Impact
918+
919+
904920
AddEffect = AEmitter
905921
PresetName = Fire Leak
906922
Mass = 0.0001
@@ -967,14 +983,12 @@ AddEffect = AEmitter
967983
MinVelocity = 2
968984
PushesEmitter = 0
969985
// EmissionSound = SoundContainer
970-
// AddSound = ContentFile
971-
// FilePath = Base.rte/
986+
// CopyOf = Fire Leak Loop
972987
// LoopSetting = -1 // Means loop infinitely until stopped
973988
BurstSound = SoundContainer
974-
CopyOf = Metal Penetration Hit
989+
CopyOf = Craft Generic Impact
975990
// EndSound = SoundContainer
976-
// AddSound = ContentFile
977-
// FilePath = Base.rte/
991+
// CopyOf = Fire Leak End
978992
EmissionEnabled = 1
979993
EmissionCountLimit = 400
980994
EmissionsIgnoreThis = 1
@@ -1039,14 +1053,12 @@ AddEffect = AEmitter
10391053
MaxVelocity = 20
10401054
MinVelocity = 10
10411055
// EmissionSound = SoundContainer
1042-
// AddSound = ContentFile
1043-
// FilePath = Base.rte/
1056+
// CopyOf = Gas Leak Loop
10441057
// LoopSetting = -1 // Means loop infinitely until stopped
10451058
BurstSound = SoundContainer
10461059
CopyOf = Metal Penetration Hit
10471060
// EndSound = SoundContainer
1048-
// AddSound = ContentFile
1049-
// FilePath = Base.rte/
1061+
// CopyOf = Gas Leak End
10501062
EmissionEnabled = 1
10511063
EmissionCountLimit = 400
10521064
EmissionsIgnoreThis = 1

0 commit comments

Comments
 (0)