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

Commit c4a4a5c

Browse files
MaximDudeMaximDude
authored
Merge pull request #31 from cortex-command-community/FMOD-Followup
Fmod followup
2 parents df3f960 + 414b1ef commit c4a4a5c

File tree

158 files changed

+1690
-1735
lines changed

Some content is hidden

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

158 files changed

+1690
-1735
lines changed

‎Base.rte/Activities/NetworkTest.lua

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,9 @@ function NetworkTest:UpdateActivity()
141141
end--]]--
142142

143143
if self.SoundTimer:IsPastSimMS(1000) then
144-
--local snd = AudioMan:PlaySound("Base.rte/Sounds/HeavySniper.wav", math.random(), true, -1);
145-
local snd = AudioMan:PlaySound("Dummy.rte/Effects/Sounds/BlasterFire.wav", math.random(), false, true, -1);
146-
--print ("Sound")
147-
--if (snd:IsPlaying()) then
148-
-- snd:Stop(-1);
149-
--end
150-
--AudioMan:PlaySound(nil, math.random(), true, -1);
144+
local snd = AudioMan:PlaySound("Dummy.rte/Effects/Sounds/BlasterFire.wav", Vector(math.random(), math.random()));
151145
self.SoundTimer:Reset();
152-
end--]]--
146+
end
153147

154148
FrameMan:DrawBoxPrimitive(0, Vector(10,410), Vector(100,449), 5)
155149
FrameMan:DrawBoxPrimitive(1, Vector(10,450), Vector(100,500), 10)

‎Base.rte/Actors/Brains/Brainbot/Brainbot.ini

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ AddActor = Attachable
4040
X = 0.5
4141
Y = 7
4242
DrawAfterParent = 1
43-
GibSound = Sound
44-
AddSample = ContentFile
43+
GibSound = SoundContainer
44+
AddSound = ContentFile
4545
FilePath = Base.rte/Actors/Brains/Case/Sounds/BrainPop.wav
46-
Priority = 2
4746
AddGib = Gib
4847
GibParticle = MOPixel
4948
CopyOf = Drop Brain Fluid
@@ -582,15 +581,14 @@ AddActor = AHuman
582581
Resolution = 6
583582
Depth = 3
584583
DeepCheck = 0
585-
BodyHitSound = Sound
584+
BodyHitSound = SoundContainer
586585
CopyOf = Metal Body Blunt Hit
587-
PainSound = Sound
586+
PainSound = SoundContainer
588587
CopyOf = Robot Pain
589-
DeathSound = Sound
590-
AddSample = ContentFile
588+
DeathSound = SoundContainer
589+
AddSound = ContentFile
591590
FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.wav
592-
Priority = 2
593-
DeviceSwitchSound = Sound
591+
DeviceSwitchSound = SoundContainer
594592
CopyOf = Device Switch
595593
Status = 0
596594
Health = 100
@@ -641,7 +639,7 @@ AddActor = AHuman
641639
CopyOf = Human Foot
642640
BGFootGroup = AtomGroup
643641
CopyOf = Human Foot
644-
StrideSound = Sound
642+
StrideSound = SoundContainer
645643
CopyOf = Robot Stride
646644
StandLimbPath = LimbPath
647645
PresetName = Brainbot Stand Path

‎Base.rte/Actors/Brains/Case/BrainCase.ini

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,15 @@ AddActor = Actor
8484
Resolution = 4
8585
Depth = 6
8686
DeepCheck = 1
87-
// PainSound = Sound
88-
// AddSample = ContentFile
87+
// PainSound = SoundContainer
88+
// AddSound = ContentFile
8989
// FilePath = Base.rte/Actors/Brains/Case/
90-
DeathSound = Sound
91-
AddSample = ContentFile
90+
DeathSound = SoundContainer
91+
AddSound = ContentFile
9292
FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.wav
93-
Priority = 2
94-
GibSound = Sound
95-
AddSample = ContentFile
93+
GibSound = SoundContainer
94+
AddSound = ContentFile
9695
FilePath = Base.rte/Actors/Brains/Case/Sounds/BrainPop.wav
97-
Priority = 2
9896
Status = 0
9997
Health = 100
10098
Team = 0

‎Base.rte/Actors/Mecha/Medic/MedicDrone.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ AddEffect = Attachable
104104
Y = -2.5
105105
GibImpulseLimit = 4000
106106
GibWoundLimit = 14
107-
// GibSound = Sound
107+
// GibSound = SoundContainer
108108
// CopyOf = Bone Crack
109109

110110

@@ -157,7 +157,7 @@ AddActor = Leg
157157
Y = 0
158158
GibImpulseLimit = 2200
159159
GibWoundLimit = 5
160-
GibSound = Sound
160+
GibSound = SoundContainer
161161
CopyOf = Bone Crack
162162

163163

@@ -198,13 +198,13 @@ AddActor = ACrab
198198
Resolution = 4
199199
Depth = 0
200200
DeepCheck = 0
201-
BodyHitSound = Sound
201+
BodyHitSound = SoundContainer
202202
CopyOf = Metal Body Blunt Hit
203-
PainSound = Sound
203+
PainSound = SoundContainer
204204
CopyOf = Bone Crack
205-
DeathSound = Sound
205+
DeathSound = SoundContainer
206206
CopyOf = Bone Crack
207-
DeviceSwitchSound = Sound
207+
DeviceSwitchSound = SoundContainer
208208
CopyOf = Device Switch
209209
Status = 0
210210
Health = 100
@@ -251,7 +251,7 @@ AddActor = ACrab
251251
CopyOf = Crab Foot
252252
RFootGroup = AtomGroup
253253
CopyOf = Crab Foot
254-
StrideSound = Sound
254+
StrideSound = SoundContainer
255255
CopyOf = Robot Stride
256256
LStandLimbPath = LimbPath
257257
PresetName = Medic Drone Stand Path Left
@@ -339,5 +339,5 @@ AddActor = ACrab
339339
Y = -3
340340
GibImpulseLimit = 8000
341341
GibWoundLimit = 10
342-
GibSound = Sound
342+
GibSound = SoundContainer
343343
CopyOf = Bone Crack

‎Base.rte/Actors/Shared.ini

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,15 @@ AddEffect = AEmitter
322322
Spread = 0.15
323323
MaxVelocity = 25
324324
MinVelocity = 13
325-
EmissionSound = Sound
326-
AddSample = ContentFile
325+
EmissionSound = SoundContainer
326+
AddSound = ContentFile
327327
FilePath = Base.rte/Sounds/Actors/JetpackLoop.wav
328328
LoopSetting = -1 // Means loop infinitely until stopped
329-
BurstSound = Sound
330-
AddSample = ContentFile
329+
BurstSound = SoundContainer
330+
AddSound = ContentFile
331331
FilePath = Base.rte/Sounds/Actors/JetpackStart.wav
332-
EndSound = Sound
333-
AddSample = ContentFile
332+
EndSound = SoundContainer
333+
AddSound = ContentFile
334334
FilePath = Base.rte/Sounds/Actors/JetpackEnd.wav
335335
EmissionEnabled = 1
336336
EmissionsIgnoreThis = 1
@@ -432,15 +432,15 @@ AddEffect = AEmitter
432432
Spread = 0.15
433433
MaxVelocity = 25
434434
MinVelocity = 5
435-
EmissionSound = Sound
436-
AddSample = ContentFile
435+
EmissionSound = SoundContainer
436+
AddSound = ContentFile
437437
FilePath = Base.rte/Sounds/Actors/JetpackLoop.wav
438438
LoopSetting = -1 // Means loop infinitely until stopped
439-
BurstSound = Sound
440-
AddSample = ContentFile
439+
BurstSound = SoundContainer
440+
AddSound = ContentFile
441441
FilePath = Base.rte/Sounds/Actors/JetpackStart.wav
442-
EndSound = Sound
443-
AddSample = ContentFile
442+
EndSound = SoundContainer
443+
AddSound = ContentFile
444444
FilePath = Base.rte/Sounds/Actors/JetpackEnd.wav
445445
EmissionEnabled = 1
446446
EmissionsIgnoreThis = 1

‎Base.rte/Actors/Wildlife/Crabs/Crabs.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ AddEffect = Leg
4545
MoveSpeed = 0.4
4646
GibImpulseLimit = 2200
4747
GibWoundLimit = 3
48-
GibSound = Sound
48+
GibSound = SoundContainer
4949
CopyOf = Bone Crack
5050
AddGib = Gib
5151
GibParticle = MOSParticle
@@ -131,11 +131,11 @@ AddEffect = ACrab
131131
Resolution = 4
132132
Depth = 0
133133
DeepCheck = 0
134-
BodyHitSound = Sound
134+
BodyHitSound = SoundContainer
135135
CopyOf = Bone Crack
136-
PainSound = Sound
136+
PainSound = SoundContainer
137137
CopyOf = Bone Crack
138-
DeathSound = Sound
138+
DeathSound = SoundContainer
139139
CopyOf = Bone Crack
140140
Status = 0
141141
Health = 100
@@ -242,7 +242,7 @@ AddEffect = ACrab
242242
Y = -10
243243
GibImpulseLimit = 5500
244244
GibWoundLimit = 6
245-
GibSound = Sound
245+
GibSound = SoundContainer
246246
CopyOf = Bone Crack
247247
AddGib = Gib
248248
GibParticle = MOSRotating

‎Base.rte/Actors/Wildlife/Jumper/Jumper.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ AddActor = Leg
8787
Y = 2
8888
GibImpulseLimit = 50
8989
GibWoundLimit = 3
90-
GibSound = Sound
90+
GibSound = SoundContainer
9191
CopyOf = Bone Crack
9292

9393

@@ -129,7 +129,7 @@ AddEffect = Attachable
129129
Y = -1
130130
GibImpulseLimit = 500
131131
GibWoundLimit = 3
132-
GibSound = Sound
132+
GibSound = SoundContainer
133133
CopyOf = Flesh Body Blunt Hit
134134
AddGib = Gib
135135
GibParticle = MOSRotating
@@ -205,11 +205,11 @@ AddActor = AHuman
205205
FilePath = Base.rte/Null.bmp
206206
AtomGroup = AtomGroup
207207
CopyOf = Null AtomGroup
208-
BodyHitSound = Sound
208+
BodyHitSound = SoundContainer
209209
CopyOf = Flesh Body Blunt Hit
210-
PainSound = Sound
210+
PainSound = SoundContainer
211211
CopyOf = Bone Crack
212-
// DeathSound = Sound
212+
// DeathSound = SoundContainer
213213
// CopyOf = Wildlife Chirp
214214
Status = 0
215215
Health = 100

‎Base.rte/Actors/Wildlife/MegaCrab/MegaCrab.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ AddEffect = Leg
4545
MoveSpeed = 0.4
4646
GibImpulseLimit = 10000
4747
GibWoundLimit = 30
48-
GibSound = Sound
48+
GibSound = SoundContainer
4949
CopyOf = Bone Crack
5050
AddGib = Gib
5151
GibParticle = MOSParticle
@@ -129,11 +129,11 @@ AddEffect = ACrab
129129
Resolution = 4
130130
Depth = 0
131131
DeepCheck = 0
132-
BodyHitSound = Sound
132+
BodyHitSound = SoundContainer
133133
CopyOf = Bone Crack
134-
PainSound = Sound
134+
PainSound = SoundContainer
135135
CopyOf = Bone Crack
136-
DeathSound = Sound
136+
DeathSound = SoundContainer
137137
CopyOf = Bone Crack
138138
Status = 0
139139
Health = 100

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -838,15 +838,15 @@ AddEffect = AEmitter
838838
Spread = 0.25
839839
MaxVelocity = 40
840840
MinVelocity = 30
841-
EmissionSound = Sound
842-
AddSample = ContentFile
841+
EmissionSound = SoundContainer
842+
AddSound = ContentFile
843843
FilePath = Base.rte/Sounds/Craft/JetLoop.wav
844844
LoopSetting = -1
845-
BurstSound = Sound
846-
AddSample = ContentFile
845+
BurstSound = SoundContainer
846+
AddSound = ContentFile
847847
FilePath = Base.rte/Sounds/Craft/JetStart.wav
848-
EndSound = Sound
849-
AddSample = ContentFile
848+
EndSound = SoundContainer
849+
AddSound = ContentFile
850850
FilePath = Base.rte/Sounds/Craft/JetEnd.wav
851851
EmissionEnabled = 0
852852
EmissionsIgnoreThis = 1
@@ -868,7 +868,7 @@ AddEffect = AEmitter
868868
FlashOnlyOnBurst = 0
869869
GibImpulseLimit = 2100
870870
GibWoundLimit = 30
871-
GibSound = Sound
871+
GibSound = SoundContainer
872872
CopyOf = Crash Woosh
873873
AddGib = Gib
874874
GibParticle = AEmitter
@@ -1075,15 +1075,15 @@ AddEffect = AEmitter
10751075
Spread = 0.25
10761076
MaxVelocity = 40
10771077
MinVelocity = 30
1078-
EmissionSound = Sound
1079-
AddSample = ContentFile
1078+
EmissionSound = SoundContainer
1079+
AddSound = ContentFile
10801080
FilePath = Base.rte/Sounds/Craft/JetLoop.wav
10811081
LoopSetting = -1
1082-
BurstSound = Sound
1083-
AddSample = ContentFile
1082+
BurstSound = SoundContainer
1083+
AddSound = ContentFile
10841084
FilePath = Base.rte/Sounds/Craft/JetStart.wav
1085-
EndSound = Sound
1086-
AddSample = ContentFile
1085+
EndSound = SoundContainer
1086+
AddSound = ContentFile
10871087
FilePath = Base.rte/Sounds/Craft/JetEnd.wav
10881088
EmissionEnabled = 0
10891089
EmissionsIgnoreThis = 1
@@ -1105,7 +1105,7 @@ AddEffect = AEmitter
11051105
FlashOnlyOnBurst = 0
11061106
GibImpulseLimit = 2100
11071107
GibWoundLimit = 30
1108-
GibSound = Sound
1108+
GibSound = SoundContainer
11091109
CopyOf = Crash Woosh
11101110
AddGib = Gib
11111111
GibParticle = AEmitter
@@ -1343,15 +1343,15 @@ AddEffect = AEmitter
13431343
Spread = 0.2
13441344
MaxVelocity = 24
13451345
MinVelocity = 12
1346-
EmissionSound = Sound
1347-
AddSample = ContentFile
1346+
EmissionSound = SoundContainer
1347+
AddSound = ContentFile
13481348
FilePath = Base.rte/Sounds/Craft/ThrusterLoop.wav
13491349
LoopSetting = -1
1350-
BurstSound = Sound
1351-
AddSample = ContentFile
1350+
BurstSound = SoundContainer
1351+
AddSound = ContentFile
13521352
FilePath = Base.rte/Sounds/Craft/ThrusterStart.wav
1353-
EndSound = Sound
1354-
AddSample = ContentFile
1353+
EndSound = SoundContainer
1354+
AddSound = ContentFile
13551355
FilePath = Base.rte/Sounds/Craft/ThrusterEnd.wav
13561356
EmissionEnabled = 1
13571357
EmissionsIgnoreThis = 1
@@ -1466,7 +1466,7 @@ AddActor = ACDropShip
14661466
Resolution = 20
14671467
Depth = 4
14681468
DeepCheck = 1
1469-
BodyHitSound = Sound
1469+
BodyHitSound = SoundContainer
14701470
CopyOf = Metal Body Blunt Hit
14711471
Status = 2
14721472
Health = 100
@@ -1520,8 +1520,8 @@ AddActor = ACDropShip
15201520
HatchDoorSwingRange = Matrix
15211521
AngleDegrees = 28
15221522
HatchDelay = 250
1523-
HatchOpenSound = Sound
1524-
AddSample = ContentFile
1523+
HatchOpenSound = SoundContainer
1524+
AddSound = ContentFile
15251525
Path = Base.rte/Sounds/Craft/HatchOpen.wav
15261526
AddExit = Exit
15271527
Offset = Vector
@@ -1532,12 +1532,12 @@ AddActor = ACDropShip
15321532
Y = 6
15331533
Radius = 22
15341534
Range = 45
1535-
CrashSound = Sound
1535+
CrashSound = SoundContainer
15361536
CopyOf = Metal Body Blunt Hit Large
15371537
CanLand = 0
15381538
GibImpulseLimit = 18000
15391539
GibWoundLimit = 60
1540-
GibSound = Sound
1540+
GibSound = SoundContainer
15411541
CopyOf = Ship Explosion
15421542
AddGib = Gib
15431543
GibParticle = AEmitter

0 commit comments

Comments
 (0)