diff --git a/Data/Base.rte/Actors/Mecha/AADrone/Drone.ini b/Data/Base.rte/Actors/Mecha/AADrone/Drone.ini index ed33a6510c..2291767f5f 100644 --- a/Data/Base.rte/Actors/Mecha/AADrone/Drone.ini +++ b/Data/Base.rte/Actors/Mecha/AADrone/Drone.ini @@ -85,8 +85,21 @@ AddDevice = HDFirearm Flash = Attachable CopyOf = Muzzle Flash SMG FireSound = SoundContainer - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac + AttenuationStartDistance = 165 + SoundSelectionCycleMode = All + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac EmptySound = SoundContainer AddSound = ContentFile FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac diff --git a/Data/Ronin.rte/Devices/Shared.ini b/Data/Ronin.rte/Devices/Shared.ini index 1db3ede7a6..a2b049525c 100644 --- a/Data/Ronin.rte/Devices/Shared.ini +++ b/Data/Ronin.rte/Devices/Shared.ini @@ -1,6 +1,13 @@ /////////////////////////////////////////////////////////////////////// // Devices Shared Assets +AddSoundContainer = SoundContainer + PresetName = Last Round Ronin + AddSound = Ronin.rte/Devices/Shared/Sounds/LastRound1.flac + AddSound = Ronin.rte/Devices/Shared/Sounds/LastRound2.flac + AddSound = Ronin.rte/Devices/Shared/Sounds/LastRound3.flac + AttenuationStartDistance = 140 + AddSoundContainer = SoundContainer PresetName = Bottle Break diff --git a/Data/Ronin.rte/Devices/Shared/Sounds/LastRound1.flac b/Data/Ronin.rte/Devices/Shared/Sounds/LastRound1.flac new file mode 100644 index 0000000000..bfdefe78df Binary files /dev/null and b/Data/Ronin.rte/Devices/Shared/Sounds/LastRound1.flac differ diff --git a/Data/Ronin.rte/Devices/Shared/Sounds/LastRound2.flac b/Data/Ronin.rte/Devices/Shared/Sounds/LastRound2.flac new file mode 100644 index 0000000000..f86f04bb4b Binary files /dev/null and b/Data/Ronin.rte/Devices/Shared/Sounds/LastRound2.flac differ diff --git a/Data/Ronin.rte/Devices/Shared/Sounds/LastRound3.flac b/Data/Ronin.rte/Devices/Shared/Sounds/LastRound3.flac new file mode 100644 index 0000000000..3d3a33b79a Binary files /dev/null and b/Data/Ronin.rte/Devices/Shared/Sounds/LastRound3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/AK47.ini b/Data/Ronin.rte/Devices/Weapons/AK47/AK47.ini index 27fc3c74d3..2f363cad81 100644 --- a/Data/Ronin.rte/Devices/Weapons/AK47/AK47.ini +++ b/Data/Ronin.rte/Devices/Weapons/AK47/AK47.ini @@ -1,3 +1,22 @@ +/////////////////////////////////////////////////////////////////////// +// AK47 Sounds + +AddSoundContainer = SoundContainer + PresetName = Mech Ronin AK-47 + Volume = 0.75 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Mech1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Mech2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Mech3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Mech4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Mech5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Mech6.flac + /////////////////////////////////////////////////////////////////////// // AK47 Ammo @@ -112,6 +131,7 @@ AddDevice = HDFirearm HitsMOs = 0 GetsHitByMOs = 1 ScriptPath = Base.rte/Devices/Shared/Scripts/RecoilTilt.lua + ScriptPath = Ronin.rte/Devices/Weapons/AK47/AK47.lua SpriteFile = ContentFile FilePath = Ronin.rte/Devices/Weapons/AK47/AK47.png IconFile = ContentFile @@ -159,25 +179,63 @@ AddDevice = HDFirearm Flash = Attachable CopyOf = Muzzle Flash Pistol FireSound = SoundContainer - AttenuationStartDistance = 175 - PitchVariation = 0.05 - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac + AttenuationStartDistance = 165 + SoundSelectionCycleMode = All + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac FireEchoSound = SoundContainer - AttenuationStartDistance = 200 - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Echo.flac + AttenuationStartDistance = 250 + SoundOverlapMode = Restart + Volume = 0.35 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Tail1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Tail2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Tail3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Tail4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Tail5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Tail6.flac EmptySound = SoundContainer - AddSound = ContentFile - FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac + AttenuationStartDistance = 125 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick3.flac ReloadStartSound = SoundContainer - AttenuationStartDistance = 115 + AttenuationStartDistance = 120 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart2.flac AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart.flac + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart3.flac ReloadEndSound = SoundContainer - AttenuationStartDistance = 125 + AttenuationStartDistance = 140 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd2.flac AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd.flac + FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd3.flac RateOfFire = 650 ReloadTime = 1920 FullAuto = 1 diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/AK47.lua b/Data/Ronin.rte/Devices/Weapons/AK47/AK47.lua new file mode 100644 index 0000000000..1632723e41 --- /dev/null +++ b/Data/Ronin.rte/Devices/Weapons/AK47/AK47.lua @@ -0,0 +1,25 @@ +function OnFire(self) + -- Higher pitch and volume as you approach empty + self.mechSound.Pitch = 1; + self.mechSound.Volume = 1; + + local parent = self:GetRootParent(); + if IsActor(parent) and ToActor(parent):IsPlayerControlled() then + if self.RoundInMagCount < 11 then + self.mechSound.Pitch = 1.1 + (11 - self.RoundInMagCount)/100; + self.mechSound.Volume = 1.3 + (11 - self.RoundInMagCount)/25; + end + end + + self.mechSound:Play(self.Pos); + + if self.RoundInMagCount == 0 then + self.lastRoundSound:Play(self.Pos); + end +end + +function Create(self) + self.mechSound = CreateSoundContainer("Mech Ronin AK-47", "Ronin.rte"); + self.lastRoundSound = CreateSoundContainer("Last Round Ronin", "Ronin.rte"); + self.lastRoundSound.Pitch = 0.75; +end \ No newline at end of file diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber1.flac new file mode 100644 index 0000000000..b50b395f67 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber2.flac new file mode 100644 index 0000000000..f3a719b8e7 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber3.flac new file mode 100644 index 0000000000..4ce869d247 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Chamber3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Echo.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Echo.flac deleted file mode 100644 index 387cd7cf01..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Echo.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick1.flac new file mode 100644 index 0000000000..d9267bf5fc Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick2.flac new file mode 100644 index 0000000000..7f10df07ef Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick3.flac new file mode 100644 index 0000000000..cd2f946a19 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/EmptyClick3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac deleted file mode 100644 index c7c90bd667..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech1.flac new file mode 100644 index 0000000000..d6ed17cfdc Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech2.flac new file mode 100644 index 0000000000..23a34102e0 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech3.flac new file mode 100644 index 0000000000..fb6c1faf9b Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech4.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech4.flac new file mode 100644 index 0000000000..47d190022c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech5.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech5.flac new file mode 100644 index 0000000000..ba06fe681c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech6.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech6.flac new file mode 100644 index 0000000000..d3a15dbf8b Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Mech6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd.flac deleted file mode 100644 index 92b7cc6422..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd1.flac new file mode 100644 index 0000000000..03365b053a Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd2.flac new file mode 100644 index 0000000000..535a2f02d1 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd3.flac new file mode 100644 index 0000000000..5184a54f09 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadEnd3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart.flac deleted file mode 100644 index 78734f54c2..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart1.flac new file mode 100644 index 0000000000..68e04b1fdd Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart2.flac new file mode 100644 index 0000000000..5edb177dbf Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart3.flac new file mode 100644 index 0000000000..bbf050ec77 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/ReloadStart3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac new file mode 100644 index 0000000000..c08e3785ca Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac new file mode 100644 index 0000000000..c87f17c133 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac new file mode 100644 index 0000000000..589df24583 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac new file mode 100644 index 0000000000..406bc91aae Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac new file mode 100644 index 0000000000..4720b95f31 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac new file mode 100644 index 0000000000..35900e0ae2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail1.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail1.flac new file mode 100644 index 0000000000..aa13a85cf7 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail2.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail2.flac new file mode 100644 index 0000000000..b8b994cce1 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail3.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail3.flac new file mode 100644 index 0000000000..8785bcd924 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail4.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail4.flac new file mode 100644 index 0000000000..1be8173e0e Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail5.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail5.flac new file mode 100644 index 0000000000..8cf2b9c3f0 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail6.flac b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail6.flac new file mode 100644 index 0000000000..573e129d12 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/AK47/Sounds/Tail6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/K98K.ini b/Data/Ronin.rte/Devices/Weapons/K98K/K98K.ini index 21eafeb153..3cb7a299f0 100644 --- a/Data/Ronin.rte/Devices/Weapons/K98K/K98K.ini +++ b/Data/Ronin.rte/Devices/Weapons/K98K/K98K.ini @@ -1,12 +1,48 @@ /////////////////////////////////////////////////////////////////////// // K98K Sounds - AddSoundContainer = SoundContainer - PresetName = Ronin Kar98 Bolt Pull Sound + PresetName = Bolt Back Ronin Kar98 + AttenuationStartDistance = 120 + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack1.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack2.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack3.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack4.flac + +AddSoundContainer = SoundContainer + PresetName = Bolt Forward Ronin Kar98 + AttenuationStartDistance = 120 + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward1.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward2.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward3.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward4.flac + +AddSoundContainer = SoundContainer + PresetName = Round In Ronin Kar98 AttenuationStartDistance = 120 - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber.flac + Volume = 0.75 + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn1.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn2.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn3.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn4.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn5.flac + +AddSoundContainer = SoundContainer + PresetName = Chamber Ronin Kar98 + AttenuationStartDistance = 120 + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber1.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber2.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber3.flac + +AddSoundContainer = SoundContainer + PresetName = Pre Ronin Kar98 + AttenuationStartDistance = 120 + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Pre1.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Pre2.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Pre3.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Pre4.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Pre5.flac + AddSound = Ronin.rte/Devices/Weapons/K98K/Sounds/Pre6.flac /////////////////////////////////////////////////////////////////////// @@ -74,10 +110,6 @@ AddDevice = HDFirearm Mass = 12 HitsMOs = 0 GetsHitByMOs = 1 - ScriptPath = Base.rte/Devices/Shared/Scripts/ShotgunReload.lua - ScriptPath = Base.rte/Devices/Shared/Scripts/RecoilTilt.lua - AddCustomValue = NumberValue - RecoilAngleVariation = 0.1 ScriptPath = Ronin.rte/Devices/Weapons/K98K/K98K.lua SpriteFile = ContentFile FilePath = Ronin.rte/Devices/Weapons/K98K/K98K.png @@ -125,12 +157,77 @@ AddDevice = HDFirearm Magazine = Magazine CopyOf = Magazine Ronin Kar98 Flash = Attachable - CopyOf = Muzzle Flash Pistol + CopyOf = Muzzle Flash Shotgun FireSound = SoundContainer AttenuationStartDistance = 200 - PitchVariation = 0.05 - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Fire1.flac + SoundSelectionCycleMode = All + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot6.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot7.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot8.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot9.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Shot10.flac + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech6.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech7.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech8.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech9.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Mech10.flac + FireEchoSound = SoundContainer + AttenuationStartDistance = 250 + SoundOverlapMode = Restart + Volume = 0.45 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail6.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail7.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail8.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail9.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/K98K/Sounds/Tail10.flac EmptySound = SoundContainer AddSound = ContentFile FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/K98K.lua b/Data/Ronin.rte/Devices/Weapons/K98K/K98K.lua index 4d0cac4d28..cb4793a5cd 100644 --- a/Data/Ronin.rte/Devices/Weapons/K98K/K98K.lua +++ b/Data/Ronin.rte/Devices/Weapons/K98K/K98K.lua @@ -1,64 +1,291 @@ +function OnFire(self) + self.InheritedRotAngleTarget = self.recoilAngleSize * RangeRand(self.recoilAngleVariation, 1) + self.rotationSpeed = 0.4; + if self.RoundInMagCount == 0 then + self.Reloadable = false; + end +end + +function OnReload(self) + self.chamberSound:Stop(-1); + if self.needsChamber then + local shell = CreateMOSParticle("Casing Long"); + + shell.Pos = self.Pos; + shell.Vel = self.Vel + Vector(-6 * self.FlipFactor, -4):RadRotate(self.RotAngle); + shell.Team = self.Team; + MovableMan:AddParticle(shell); + end + self.needsChamber = false; +end + function Create(self) - self.pullTimer = Timer(); - self.rotFactor = math.pi; + self.chamberSound = CreateSoundContainer("Chamber Ronin Kar98", "Browncoats.rte"); + self.boltBackSound = CreateSoundContainer("Bolt Back Ronin Kar98", "Browncoats.rte"); + self.boltForwardSound = CreateSoundContainer("Bolt Forward Ronin Kar98", "Browncoats.rte"); + self.preSound = CreateSoundContainer("Pre Ronin Kar98", "Browncoats.rte"); + self.roundInSound = CreateSoundContainer("Round In Ronin Kar98", "Browncoats.rte"); + + self.reloadTimer = Timer(); + self.loadedShell = false; + self.reloadCycle = false; - self.boltPullSound = CreateSoundContainer("Ronin Kar98 Bolt Pull Sound", "Ronin.rte"); + self.reloadDelay = 300; + self.origReloadTime = 900; + + -- for some reason if this is added to sim while facing leftwards, StanceOffset will actually be flipped. + -- but not sharpstanceoffset............... + + + self.origStanceOffset = Vector(self.StanceOffset.X*self.FlipFactor, self.StanceOffset.Y); + self.origSharpStanceOffset = Vector(self.SharpStanceOffset.X, self.SharpStanceOffset.Y); + + self.origSupportOffset = Vector(self.SupportOffset.X, self.SupportOffset.Y); + + self.origShakeRange = self.ShakeRange; + self.origSharpShakeRange = self.SharpShakeRange; + + self.origSharpLength = self.SharpLength; + + self.origReloadAngle = self.ReloadAngle + + self.ammoCounter = self:NumberValueExists("ammoCounter") and self:GetNumberValue("ammoCounter") or self.RoundInMagCount; + self:RemoveNumberValue("ammoCounter"); + self.maxAmmoCount = self.Magazine and self.Magazine.Capacity or 5; -- loading a game might mess this up, so... fall-back + + self.delayedFire = false + self.delayedFireTimer = Timer(); + self.delayedFireTimeMS = 75; + self.delayedFireEnabled = true; + self.fireDelayTimer = Timer(); + self.activated = false; + self.delayedFirstShot = true; + + self.InheritedRotAngleTarget = 0; + self.InheritedRotAngleOffset = 0; + self.recoilAngleSize = 0.5; + self.recoilAngleVariation = 0.01; + self.rotationSpeed = 0.1; + self.rotFactor = math.pi; + + self.chamberTimer = Timer(); + self.chamberDelay = 300; end function ThreadedUpdate(self) - local parent; - local actor = self:GetRootParent(); - if actor and IsAHuman(actor) then - parent = ToAHuman(actor); - end + self.chamberSound.Pos = self.Pos; + self.preSound.Pos = self.Pos; if self.FiredFrame then - self.shell = CreateMOSParticle("Casing Long"); - self.loaded = false; - self.playedSound = false; + self.ammoCounter = self.ammoCounter - 1; + self.ReloadStartSound = self.boltBackSound; + self.chamberTimer:Reset(); + self.chamberDelay = 300; + self.needsChamber = true; self.rotFactor = math.pi; end + + if IsAHuman(self:GetRootParent()) then + self.parent = ToAHuman(self:GetRootParent()) + else + self.parent = nil; + end - if parent and not self.loaded and self.RoundInMagCount > 0 and not self.reloadCycle then - if self.pullTimer:IsPastSimMS(15000/self.RateOfFire) then - if not self.playedSound then - parent:GetController():SetState(Controller.AIM_SHARP, false); - --self.boltPullSound:Play(self.Pos); --TODO: Separate the bolt pull sound from FireSound - self.playedSound = true; - end - if self.shell then - self.shell.Pos = self.Pos; - self.shell.Vel = self.Vel + Vector(-6 * self.FlipFactor, -4):RadRotate(self.RotAngle); - self.shell.Team = self.Team; - self.RequestSyncedUpdate(); + if self.Magazine then + if not self.reloadCycle and self.needsChamber then + self:Deactivate(); + self.delayedFire = false; + + if self.chamberTimer:IsPastSimMS(self.chamberDelay) then + + self.Reloadable = true; + + if self.ammoCounter == 0 then + self:Reload(); + else + self.chamberSound:Play(self.Pos); + self.rotateAnim = true; + + self.chamberTimer:Reset(); + self.rotateAnim = true; + self.needsChamber = false; + self.InheritedRotAngleTarget = 0; + self.rotationSpeed = 0.1; + + local shell = CreateMOSParticle("Casing Long"); + + shell.Pos = self.Pos; + shell.Vel = self.Vel + Vector(-6 * self.FlipFactor, -4):RadRotate(self.RotAngle); + shell.Team = self.Team; + MovableMan:AddParticle(shell); + + self.chamberAnim = true; + end + end + end + + if self.loadedShell then + self.ReloadAngle = -0.15; + self.BaseReloadTime = self.reloadDelay * 1.5; + self.ammoCounter = math.min(self.Magazine.Capacity, self.ammoCounter + 1); + self.Magazine.RoundCount = self.ammoCounter; + self.loadedShell = false; + end - --Animate the gun to signify the bolt being pulled - local balance = 5 + math.abs(math.sin(actor.RotAngle) * 5); --Laying down horizontally reduces swaying when pulling bolt - self.Frame = 1; - self.SupportOffset = Vector(-5, -1); - local rotTotal = math.sin(self.rotFactor)/balance; + if self.reloadCycleEndNext == true then + self.Magazine.RoundCount = self.ammoCounter; + self.prematureCycleEnd = false; + self.ReloadStartSound = self.boltBackSound; + self.reloadCycleEndNext = false; + self.BaseReloadTime = self.origReloadTime; + self.ReloadAngle = self.origReloadAngle + self.reloadCycle = false; + end - local jointOffset = Vector(self.JointOffset.X * self.FlipFactor, self.JointOffset.Y):RadRotate(self.RotAngle); - self.InheritedRotAngleOffset = rotTotal; + if self:IsActivated() then + if self.reloadCycle then + self.prematureCycleEnd = true; + end + end - self.rotFactor = self.rotFactor - (math.pi * 0.0005 * self.RateOfFire); + if self.reloadCycle and self.reloadTimer:IsPastSimMS(self.reloadDelay) then + if self.parent then + self:Reload(); + end + end + + if self.rotateAnim then + local minTime = 0; + local maxTime = self.chamberDelay * 0.75; + + local factor = math.min(math.max(self.chamberTimer.ElapsedSimTimeMS - minTime, 0) / (maxTime - minTime), 1); + + end + else + self.chamberTimer:Reset(); + + if self.reloadCycle ~= true then + --self.chamberDelay = 300; + if not self.Frame == 1 then + self.openAnim = true; + end + self.InheritedRotAngleTarget = 0.1; -- not respected by the game currently + self.ReloadEndSound = self.roundInSound; + self.ReloadStartSound = nil; + self.reloadCycle = true; end + self.loadedShell = true; + + if self.ammoCounter == self.maxAmmoCount or self.prematureCycleEnd then + self.closeAnim = true; + self.ReloadAngle = 0.1; + self.loadedShell = false; + self.ReloadEndSound = self.boltForwardSound; + self.reloadCycleEndNext = true; + self.BaseReloadTime = self.reloadDelay * 2; + end + end + + if self.chamberAnim then + local balance = 5 + math.abs(math.sin(self.parent.RotAngle) * 5); --Laying down horizontally reduces swaying when pulling bolt + self.Frame = 1; + self.SupportOffset = Vector(-5, -1); + local rotTotal = math.sin(self.rotFactor)/balance; + + local jointOffset = Vector(self.JointOffset.X * self.FlipFactor, self.JointOffset.Y):RadRotate(self.RotAngle); + self.InheritedRotAngleTarget = rotTotal; + + self.rotFactor = self.rotFactor - (math.pi * 0.05); if self.rotFactor <= 0 then - self.loaded = true; self.Frame = 0; - self.SupportOffset = Vector(0.1, 4); + self.chamberAnim = false; + self.SupportOffset = self.origSupportOffset; self.rotFactor = 0; end - else - self.pullTimer:Reset(); + end + + if self.openAnim then + local minTime = 0; + local maxTime = 300; + + local factor = math.min(math.max(self.reloadTimer.ElapsedSimTimeMS - minTime, 0) / (maxTime - minTime), 1); + + self.Frame = 0 + math.floor(factor * (1) + 0.5) + self.SupportOffset = Vector(-5, -1); + if self.Frame == 1 then + self.openAnim = false; + self.SupportOffset = self.origSupportOffset; + end + end + + if self.closeAnim then + local minTime = 0; + local maxTime = 600; + + local factor = math.min(math.max(self.chamberTimer.ElapsedSimTimeMS - minTime, 0) / (maxTime - minTime), 1); + + self.Frame = 1 - math.floor(factor * (1) + 0.5) + self.SupportOffset = Vector(-5, -1); + if self.Frame == 0 then + self.closeAnim = false; + self.SupportOffset = self.origSupportOffset; + end + end + + if self:DoneReloading() then + self.reloadTimer:Reset(); + self.fireDelayTimer:Reset(); + self.activated = false; + self.delayedFire = false; + end + + if self.delayedFire and self.delayedFireTimer:IsPastSimMS(self.delayedFireTimeMS) then + self:Activate(); + self.delayedFire = false + self.delayedFirstShot = false; + end + + local fire = self:IsActivated() and self.RoundInMagCount > 0 and not self.needsChamber; + + if self.delayedFirstShot == true then + if self.RoundInMagCount > 0 then + self:Deactivate() + end + + if fire and self.CanFire and not self:IsReloading() then + if not self.Magazine or self.RoundInMagCount < 1 then + --self:Activate() + elseif not self.activated and not self.delayedFire and self.fireDelayTimer:IsPastSimMS(1 / (self.RateOfFire / 60) * 1000) then + self.activated = true + + self.preSound:Play(self.Pos); + + self.fireDelayTimer:Reset() + + self.delayedFire = true + self.delayedFireTimer:Reset() + end + else + if self.activated then + self.activated = false + end + end + elseif fire == false then + self.firstShot = true; + self.delayedFirstShot = true; + end + + if self.InheritedRotAngleOffset ~= self.InheritedRotAngleTarget then + self.InheritedRotAngleOffset = self.InheritedRotAngleOffset - (self.rotationSpeed * (self.InheritedRotAngleOffset - self.InheritedRotAngleTarget)) + end + + if self.InheritedRotAngleTarget > 0 then + self.InheritedRotAngleTarget = math.max(self.InheritedRotAngleTarget - TimerMan.DeltaTimeSecs, 0); end end -function SyncedUpdate(self) - if self.shell then - MovableMan:AddParticle(self.shell); - self.shell = nil; - end; +function OnSave(self) + self:SetNumberValue("ammoCounter", self.ammoCounter); end \ No newline at end of file diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/K98KOld.lua b/Data/Ronin.rte/Devices/Weapons/K98K/K98KOld.lua new file mode 100644 index 0000000000..b3ac597d22 --- /dev/null +++ b/Data/Ronin.rte/Devices/Weapons/K98K/K98KOld.lua @@ -0,0 +1,58 @@ +function Create(self) + self.pullTimer = Timer(); + self.rotFactor = math.pi; + + self.boltPullSound = CreateSoundContainer("Chamber Ronin Kar98", "Ronin.rte"); +end + +function Update(self) + local parent; + local actor = self:GetRootParent(); + if actor and IsAHuman(actor) then + parent = ToAHuman(actor); + end + + if self.FiredFrame then + self.shell = CreateMOSParticle("Casing Long"); + self.loaded = false; + self.playedSound = false; + self.rotFactor = math.pi; + end + + if parent and not self.loaded and self.RoundInMagCount > 0 and not self.reloadCycle then + if self.pullTimer:IsPastSimMS(15000/self.RateOfFire) then + if not self.playedSound then + parent:GetController():SetState(Controller.AIM_SHARP, false); + --self.boltPullSound:Play(self.Pos); --TODO: Separate the bolt pull sound from FireSound + self.playedSound = true; + end + if self.shell then + self.shell.Pos = self.Pos; + self.shell.Vel = self.Vel + Vector(-6 * self.FlipFactor, -4):RadRotate(self.RotAngle); + self.shell.Team = self.Team; + MovableMan:AddParticle(self.shell); + self.shell = nil; + end + + --Animate the gun to signify the bolt being pulled + local balance = 5 + math.abs(math.sin(actor.RotAngle) * 5); --Laying down horizontally reduces swaying when pulling bolt + self.Frame = 1; + self.SupportOffset = Vector(-5, -1); + local rotTotal = math.sin(self.rotFactor)/balance; + + local jointOffset = Vector(self.JointOffset.X * self.FlipFactor, self.JointOffset.Y):RadRotate(self.RotAngle); + self.InheritedRotAngleOffset = rotTotal; + + self.rotFactor = self.rotFactor - (math.pi * 0.0005 * self.RateOfFire); + end + + if self.rotFactor <= 0 then + self.loaded = true; + self.Frame = 0; + self.SupportOffset = Vector(0.1, 4); + self.rotFactor = 0; + end + else + self.pullTimer:Reset(); + end +end \ No newline at end of file diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack1.flac new file mode 100644 index 0000000000..682072d3c6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack2.flac new file mode 100644 index 0000000000..45749acce6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack3.flac new file mode 100644 index 0000000000..eff0e0c949 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack4.flac new file mode 100644 index 0000000000..117b783e0f Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltBack4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward1.flac new file mode 100644 index 0000000000..e8080c56fa Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward2.flac new file mode 100644 index 0000000000..24810bddcc Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward3.flac new file mode 100644 index 0000000000..678a42b2cc Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward4.flac new file mode 100644 index 0000000000..81e9d33c06 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/BoltForward4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber.flac deleted file mode 100644 index cce64d719d..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber1.flac new file mode 100644 index 0000000000..40e96d2621 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber2.flac new file mode 100644 index 0000000000..b4197c42c4 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber3.flac new file mode 100644 index 0000000000..7b4f328c72 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Chamber3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Fire1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Fire1.flac deleted file mode 100644 index 9529ae5621..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Fire1.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech1.flac new file mode 100644 index 0000000000..1b5baa698e Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech10.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech10.flac new file mode 100644 index 0000000000..0733e1d7ae Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech10.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech2.flac new file mode 100644 index 0000000000..8f9c5fb8c5 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech3.flac new file mode 100644 index 0000000000..d62daa3679 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech4.flac new file mode 100644 index 0000000000..5d2715c80c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech5.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech5.flac new file mode 100644 index 0000000000..7587aa0c72 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech6.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech6.flac new file mode 100644 index 0000000000..2685217721 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech7.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech7.flac new file mode 100644 index 0000000000..75a6976f4f Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech7.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech8.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech8.flac new file mode 100644 index 0000000000..712212ba18 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech8.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech9.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech9.flac new file mode 100644 index 0000000000..367597a048 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Mech9.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre1.flac new file mode 100644 index 0000000000..3ffc51df1c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre2.flac new file mode 100644 index 0000000000..3ce0011c39 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre3.flac new file mode 100644 index 0000000000..fe0cdf2534 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre4.flac new file mode 100644 index 0000000000..c3ab03cc32 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre5.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre5.flac new file mode 100644 index 0000000000..a0db0d6d20 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre6.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre6.flac new file mode 100644 index 0000000000..50ab5e0e5a Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Pre6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn1.flac new file mode 100644 index 0000000000..8616ed4165 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn2.flac new file mode 100644 index 0000000000..dc0bed42d5 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn3.flac new file mode 100644 index 0000000000..1ba9e776f9 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn4.flac new file mode 100644 index 0000000000..a732940933 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn5.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn5.flac new file mode 100644 index 0000000000..2716f8293f Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn6.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn6.flac new file mode 100644 index 0000000000..a897bd1391 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/RoundIn6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot1.flac new file mode 100644 index 0000000000..508c51f0d4 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot10.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot10.flac new file mode 100644 index 0000000000..20a2dd022c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot10.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot2.flac new file mode 100644 index 0000000000..28a6a9031f Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot3.flac new file mode 100644 index 0000000000..957c430a7a Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot4.flac new file mode 100644 index 0000000000..a2b3818d80 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot5.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot5.flac new file mode 100644 index 0000000000..b2e70a6e9c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot6.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot6.flac new file mode 100644 index 0000000000..e05bf93959 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot7.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot7.flac new file mode 100644 index 0000000000..6810285049 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot7.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot8.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot8.flac new file mode 100644 index 0000000000..16688131af Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot8.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot9.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot9.flac new file mode 100644 index 0000000000..1ce6942a06 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Shot9.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail1.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail1.flac new file mode 100644 index 0000000000..b3b31c84d3 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail10.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail10.flac new file mode 100644 index 0000000000..a2d3957894 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail10.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail2.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail2.flac new file mode 100644 index 0000000000..1682b07c47 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail3.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail3.flac new file mode 100644 index 0000000000..c6458ce89c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail4.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail4.flac new file mode 100644 index 0000000000..2fb7032a28 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail5.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail5.flac new file mode 100644 index 0000000000..522f4d7bbc Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail6.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail6.flac new file mode 100644 index 0000000000..97704e46bf Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail7.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail7.flac new file mode 100644 index 0000000000..260de2f7ba Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail7.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail8.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail8.flac new file mode 100644 index 0000000000..0f5c0f406c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail8.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail9.flac b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail9.flac new file mode 100644 index 0000000000..d9ca07aeef Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/K98K/Sounds/Tail9.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.ini b/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.ini index f53486d0f2..9e050d5871 100644 --- a/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.ini +++ b/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.ini @@ -1,3 +1,22 @@ +/////////////////////////////////////////////////////////////////////// +// M16A2 Sounds + +AddSoundContainer = SoundContainer + PresetName = Mech Ronin M16A2 + Volume = 0.75 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech6.flac + /////////////////////////////////////////////////////////////////////// // M16A2 Ammo @@ -111,6 +130,7 @@ AddDevice = HDFirearm Mass = 9 HitsMOs = 0 GetsHitByMOs = 1 + ScriptPath = Ronin.rte/Devices/Weapons/M16A2/M16A2.lua SpriteFile = ContentFile FilePath = Ronin.rte/Devices/Weapons/M16A2/M16A2.png IconFile = ContentFile @@ -158,21 +178,69 @@ AddDevice = HDFirearm Flash = Attachable CopyOf = Muzzle Flash SMG FireSound = SoundContainer - AttenuationStartDistance = 170 - PitchVariation = 0.05 - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Fire1.flac + AttenuationStartDistance = 165 + SoundSelectionCycleMode = All + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot6.flac + FireEchoSound = SoundContainer + AttenuationStartDistance = 250 + SoundOverlapMode = Restart + Volume = 0.35 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail6.flac EmptySound = SoundContainer - AddSound = ContentFile - FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac + AttenuationStartDistance = 125 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick6.flac ReloadStartSound = SoundContainer - AttenuationStartDistance = 115 + AttenuationStartDistance = 120 AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart.flac + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart3.flac ReloadEndSound = SoundContainer - AttenuationStartDistance = 125 + AttenuationStartDistance = 140 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd2.flac AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd.flac + FilePath = Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd3.flac RateOfFire = 800 ReloadTime = 2100 FullAuto = 1 diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.lua b/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.lua new file mode 100644 index 0000000000..9afde62870 --- /dev/null +++ b/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.lua @@ -0,0 +1,25 @@ +function OnFire(self) + -- Higher pitch and volume as you approach empty + self.mechSound.Pitch = 1; + self.mechSound.Volume = 1; + + local parent = self:GetRootParent(); + if IsActor(parent) and ToActor(parent):IsPlayerControlled() then + if self.RoundInMagCount < 11 then + self.mechSound.Pitch = 1.1 + (11 - self.RoundInMagCount)/100; + self.mechSound.Volume = 1.3 + (11 - self.RoundInMagCount)/25; + end + end + + self.mechSound:Play(self.Pos); + + if self.RoundInMagCount == 0 then + self.lastRoundSound:Play(self.Pos); + end +end + +function Create(self) + self.mechSound = CreateSoundContainer("Mech Ronin M16A2", "Ronin.rte"); + self.lastRoundSound = CreateSoundContainer("Last Round Ronin", "Ronin.rte"); + self.lastRoundSound.Pitch = 1.0; +end \ No newline at end of file diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber1.flac new file mode 100644 index 0000000000..5b143261d7 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber2.flac new file mode 100644 index 0000000000..90b4aa7ad8 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber3.flac new file mode 100644 index 0000000000..4fadd84576 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Chamber3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick1.flac new file mode 100644 index 0000000000..e56c2898fd Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick2.flac new file mode 100644 index 0000000000..336fa5ba2e Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick3.flac new file mode 100644 index 0000000000..24e9e30591 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick4.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick4.flac new file mode 100644 index 0000000000..157afe551f Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick5.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick5.flac new file mode 100644 index 0000000000..298dbcb325 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick6.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick6.flac new file mode 100644 index 0000000000..98e6ab8853 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/EmptyClick6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Fire1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Fire1.flac deleted file mode 100644 index cb317cd13f..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Fire1.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech1.flac new file mode 100644 index 0000000000..f2e3ca42f6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech2.flac new file mode 100644 index 0000000000..4cdc596ee7 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech3.flac new file mode 100644 index 0000000000..00362690f5 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech4.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech4.flac new file mode 100644 index 0000000000..66723c8e04 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech5.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech5.flac new file mode 100644 index 0000000000..39d6dc74d2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech6.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech6.flac new file mode 100644 index 0000000000..e2a5d8f417 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Mech6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd.flac deleted file mode 100644 index 188cea4478..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd1.flac new file mode 100644 index 0000000000..9c34b27be2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd2.flac new file mode 100644 index 0000000000..253390dbc7 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd3.flac new file mode 100644 index 0000000000..14036973b9 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadEnd3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart.flac deleted file mode 100644 index f7583267ee..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart1.flac new file mode 100644 index 0000000000..adab5f5daa Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart2.flac new file mode 100644 index 0000000000..f75510f164 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart3.flac new file mode 100644 index 0000000000..285cc529f2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/ReloadStart3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot1.flac new file mode 100644 index 0000000000..3c99be0fb0 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot2.flac new file mode 100644 index 0000000000..38f37efdcd Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot3.flac new file mode 100644 index 0000000000..e78439a47b Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot4.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot4.flac new file mode 100644 index 0000000000..f2fc6b61e6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot5.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot5.flac new file mode 100644 index 0000000000..988a69c116 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot6.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot6.flac new file mode 100644 index 0000000000..45aa295fbb Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Shot6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail1.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail1.flac new file mode 100644 index 0000000000..a8ad7bf93a Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail2.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail2.flac new file mode 100644 index 0000000000..88b7e616c4 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail3.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail3.flac new file mode 100644 index 0000000000..d67f62e92e Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail4.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail4.flac new file mode 100644 index 0000000000..d51769ce29 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail5.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail5.flac new file mode 100644 index 0000000000..816e3cdfb2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail6.flac b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail6.flac new file mode 100644 index 0000000000..14f48af290 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M16A2/Sounds/Tail6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/GarandMagazine.lua b/Data/Ronin.rte/Devices/Weapons/M1Garand/GarandMagazine.lua index 6a4b0978f0..a3d1ebbe36 100644 --- a/Data/Ronin.rte/Devices/Weapons/M1Garand/GarandMagazine.lua +++ b/Data/Ronin.rte/Devices/Weapons/M1Garand/GarandMagazine.lua @@ -7,4 +7,8 @@ function OnDetach(self, exParent) self.Vel = self.Vel + Vector(0, -7):RadRotate(exParent.RotAngle); self.pingSound:Play(self.Pos); end +end + +function Update(self) + self.pingSound.Pos = self.Pos; end \ No newline at end of file diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini b/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini index a9c964ed10..5e8c6bfec4 100644 --- a/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini +++ b/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini @@ -4,11 +4,51 @@ AddSoundContainer = SoundContainer PresetName = Ronin M1 Garand Ping - AttenuationStartDistance = 125 AddSound = ContentFile FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping1.flac AddSound = ContentFile FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping2.flac + +AddSoundContainer = SoundContainer + PresetName = Last Round Ronin M1 Garand + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound2.flac + +AddSoundContainer = SoundContainer + PresetName = Full Reload Start Ronin M1 Garand + AttenuationStartDistance = 130 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart3.flac + +AddSoundContainer = SoundContainer + PresetName = Mech Ronin M1 Garand + Volume = 0.4 + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech6.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech7.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech8.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech9.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech10.flac /////////////////////////////////////////////////////////////////////// @@ -97,6 +137,7 @@ AddDevice = HDFirearm HitsMOs = 0 GetsHitByMOs = 1 ScriptPath = Base.rte/Devices/Shared/Scripts/RecoilTilt.lua + ScriptPath = Ronin.rte/Devices/Weapons/M1Garand/M1Garand.lua AddCustomValue = NumberValue RecoilAngleVariation = 0.3 AddCustomValue = NumberValue @@ -148,25 +189,75 @@ AddDevice = HDFirearm Flash = Attachable CopyOf = Muzzle Flash Pistol FireSound = SoundContainer - AttenuationStartDistance = 190 - PitchVariation = 0.05 - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire1.flac - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire2.flac - AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire3.flac + AttenuationStartDistance = 175 + SoundSelectionCycleMode = All + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot6.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot7.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot8.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot9.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot10.flac + FireEchoSound = SoundContainer + AttenuationStartDistance = 250 + SoundOverlapMode = Restart + Volume = 0.35 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail5.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail6.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail7.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail8.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail9.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail10.flac EmptySound = SoundContainer + AttenuationStartDistance = 125 + AddSoundSet = SoundSet + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick1.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick2.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick3.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick4.flac + AddSound = ContentFile + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick5.flac + ReloadEndSound = SoundContainer + AttenuationStartDistance = 140 AddSound = ContentFile - FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac - ReloadStartSound = SoundContainer - AttenuationStartDistance = 115 + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd1.flac AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadStart.flac - ReloadEndSound = SoundContainer - AttenuationStartDistance = 125 + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd2.flac AddSound = ContentFile - FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd.flac + FilePath = Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd3.flac RateOfFire = 300 ReloadTime = 1500 FullAuto = 0 diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.lua b/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.lua new file mode 100644 index 0000000000..4a91865251 --- /dev/null +++ b/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.lua @@ -0,0 +1,21 @@ +function OnFire(self) + if self.RoundInMagCount == 0 then + self.lastRoundSound:Play(self.Pos); + self.Empty = true; + else + self.mechSound:Play(self.Pos); + end +end + +function OnReload(self) + if not self.Empty then + self.fullReloadStartSound:Play(self.Pos); + end + self.Empty = false; +end + +function Create(self) + self.mechSound = CreateSoundContainer("Mech Ronin M1 Garand", "Ronin.rte"); + self.lastRoundSound = CreateSoundContainer("Last Round Ronin M1 Garand", "Ronin.rte"); + self.fullReloadStartSound = CreateSoundContainer("Full Reload Start Ronin M1 Garand", "Ronin.rte"); +end \ No newline at end of file diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick1.flac new file mode 100644 index 0000000000..82a854cdc6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick2.flac new file mode 100644 index 0000000000..162c025a29 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick3.flac new file mode 100644 index 0000000000..f9f7934a27 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick4.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick4.flac new file mode 100644 index 0000000000..9074abe3e2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick5.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick5.flac new file mode 100644 index 0000000000..f609c06ab5 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/EmptyClick5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire1.flac deleted file mode 100644 index bd2d47ee84..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire1.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire2.flac deleted file mode 100644 index e834d304af..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire2.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire3.flac deleted file mode 100644 index ae49f6cc48..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Fire3.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart1.flac new file mode 100644 index 0000000000..07eef027bc Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart2.flac new file mode 100644 index 0000000000..79f6e6e389 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart3.flac new file mode 100644 index 0000000000..fccba4b872 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/FullReloadStart3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound1.flac new file mode 100644 index 0000000000..bc9b655e6c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound2.flac new file mode 100644 index 0000000000..cbbfd98ea2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/LastRound2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech1.flac new file mode 100644 index 0000000000..5fa10221cb Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech10.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech10.flac new file mode 100644 index 0000000000..74953f0332 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech10.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech2.flac new file mode 100644 index 0000000000..93a2260fdf Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech3.flac new file mode 100644 index 0000000000..32b67e5cd6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech4.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech4.flac new file mode 100644 index 0000000000..24186727ba Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech5.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech5.flac new file mode 100644 index 0000000000..d85aa9ce4f Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech6.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech6.flac new file mode 100644 index 0000000000..9b64fdb31c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech7.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech7.flac new file mode 100644 index 0000000000..48c8cf69eb Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech7.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech8.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech8.flac new file mode 100644 index 0000000000..6e1d2549f2 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech8.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech9.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech9.flac new file mode 100644 index 0000000000..5cf68a5658 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Mech9.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping1.flac index 528b227599..cb32f9b54e 100644 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping1.flac and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping2.flac index 12a443b66b..1f9dc167f6 100644 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping2.flac and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Ping2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd.flac deleted file mode 100644 index 08d491af34..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd1.flac new file mode 100644 index 0000000000..b900d095c0 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd2.flac new file mode 100644 index 0000000000..c8862edaa6 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd3.flac new file mode 100644 index 0000000000..56efad6ada Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadEnd3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadStart.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadStart.flac deleted file mode 100644 index b662e24340..0000000000 Binary files a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/ReloadStart.flac and /dev/null differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot1.flac new file mode 100644 index 0000000000..7efac7d454 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot10.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot10.flac new file mode 100644 index 0000000000..2470595864 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot10.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot2.flac new file mode 100644 index 0000000000..b89cf08a29 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot3.flac new file mode 100644 index 0000000000..82ccc059a3 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot4.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot4.flac new file mode 100644 index 0000000000..cb00b4e3be Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot5.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot5.flac new file mode 100644 index 0000000000..151f91de8a Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot6.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot6.flac new file mode 100644 index 0000000000..1f38b3f9e3 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot7.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot7.flac new file mode 100644 index 0000000000..82f0158c35 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot7.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot8.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot8.flac new file mode 100644 index 0000000000..d0be0bf4c7 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot8.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot9.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot9.flac new file mode 100644 index 0000000000..0b3eb8b50c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Shot9.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail1.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail1.flac new file mode 100644 index 0000000000..6710a1cb61 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail1.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail10.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail10.flac new file mode 100644 index 0000000000..8b1b3f69a0 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail10.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail2.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail2.flac new file mode 100644 index 0000000000..7fadba53cb Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail2.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail3.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail3.flac new file mode 100644 index 0000000000..4262497490 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail3.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail4.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail4.flac new file mode 100644 index 0000000000..d1256cc57c Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail4.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail5.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail5.flac new file mode 100644 index 0000000000..d4454ce4be Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail5.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail6.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail6.flac new file mode 100644 index 0000000000..2f6bfd52b4 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail6.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail7.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail7.flac new file mode 100644 index 0000000000..5c6121aa2e Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail7.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail8.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail8.flac new file mode 100644 index 0000000000..978bf72cf0 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail8.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail9.flac b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail9.flac new file mode 100644 index 0000000000..baddbcd898 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/Tail9.flac differ diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/peaks/Ping2.flac.reapeaks b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/peaks/Ping2.flac.reapeaks new file mode 100644 index 0000000000..cda6fbec69 Binary files /dev/null and b/Data/Ronin.rte/Devices/Weapons/M1Garand/Sounds/peaks/Ping2.flac.reapeaks differ