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

Commit 4765d35

Browse files
fourZKfourZK
authored
Merge branch 'development' into 4zK-content
2 parents cd195df + 5e0c32d commit 4765d35

File tree

764 files changed

+3757
-1786
lines changed

Some content is hidden

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

764 files changed

+3757
-1786
lines changed

‎.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Linker output
2+
*.ilk
3+
14
# Compiled Lua sources
25
luac.out
36

@@ -41,7 +44,6 @@ luac.out
4144

4245
.vs/
4346
Base.rte/Settings.ini
44-
Base.rte/Tools/
4547
Benchmark.rte/
4648
Scenes.rte/
4749
Metagames.rte/
@@ -60,4 +62,5 @@ LogPublish.txt
6062
LogLoading.txt
6163
LogConsole.txt
6264
Console.dump.log
63-
Console.input.log
65+
Console.input.log
66+
Base.rte/LoadoutsP1.ini

‎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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -335,16 +335,16 @@ AddEffect = AEmitter
335335
LifeVariation = 0.50
336336
Spread = 0.15
337337
MaxVelocity = 25
338-
MinVelocity = 5
339-
EmissionSound = Sound
340-
AddSample = ContentFile
338+
MinVelocity = 10
339+
EmissionSound = SoundContainer
340+
AddSound = ContentFile
341341
FilePath = Base.rte/Sounds/Actors/JetpackLoop.wav
342342
LoopSetting = -1 // Means loop infinitely until stopped
343-
BurstSound = Sound
344-
AddSample = ContentFile
343+
BurstSound = SoundContainer
344+
AddSound = ContentFile
345345
FilePath = Base.rte/Sounds/Actors/JetpackStart.wav
346-
EndSound = Sound
347-
AddSample = ContentFile
346+
EndSound = SoundContainer
347+
AddSound = ContentFile
348348
FilePath = Base.rte/Sounds/Actors/JetpackEnd.wav
349349
EmissionEnabled = 1
350350
EmissionsIgnoreThis = 1
@@ -462,15 +462,15 @@ AddEffect = AEmitter
462462
Spread = 0.15
463463
MaxVelocity = 25
464464
MinVelocity = 5
465-
EmissionSound = Sound
466-
AddSample = ContentFile
465+
EmissionSound = SoundContainer
466+
AddSound = ContentFile
467467
FilePath = Base.rte/Sounds/Actors/JetpackLoop.wav
468468
LoopSetting = -1 // Means loop infinitely until stopped
469-
BurstSound = Sound
470-
AddSample = ContentFile
469+
BurstSound = SoundContainer
470+
AddSound = ContentFile
471471
FilePath = Base.rte/Sounds/Actors/JetpackStart.wav
472-
EndSound = Sound
473-
AddSample = ContentFile
472+
EndSound = SoundContainer
473+
AddSound = ContentFile
474474
FilePath = Base.rte/Sounds/Actors/JetpackEnd.wav
475475
EmissionEnabled = 1
476476
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/BigCrabPincerLeft000.bmp

1.38 KB
Binary file not shown.

‎Base.rte/Actors/Wildlife/MegaCrab/BigCrabPincerLeft001.bmp

1.38 KB
Binary file not shown.

0 commit comments

Comments
 (0)