diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall1.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall1.ogg new file mode 100644 index 00000000000..627cae21b7e Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall1.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall2.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall2.ogg new file mode 100644 index 00000000000..a955073f9ed Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall2.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall3.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall3.ogg new file mode 100644 index 00000000000..a150e81aa75 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall3.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall1.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall1.ogg new file mode 100644 index 00000000000..37d1d0bbccc Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall1.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall2.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall2.ogg new file mode 100644 index 00000000000..73f7c999868 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall2.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall3.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall3.ogg new file mode 100644 index 00000000000..d051a55b001 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall3.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall1.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall1.ogg new file mode 100644 index 00000000000..184f19cda93 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall1.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall10.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall10.ogg new file mode 100644 index 00000000000..6f163a22fd9 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall10.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall2.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall2.ogg new file mode 100644 index 00000000000..32a1281bdb1 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall2.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall3.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall3.ogg new file mode 100644 index 00000000000..d401056bfb2 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall3.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall4.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall4.ogg new file mode 100644 index 00000000000..9436d182c6e Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall4.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall5.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall5.ogg new file mode 100644 index 00000000000..414e05899cb Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall5.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall6.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall6.ogg new file mode 100644 index 00000000000..a4017276b15 Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall6.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall7.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall7.ogg new file mode 100644 index 00000000000..0a3a886c23d Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall7.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall8.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall8.ogg new file mode 100644 index 00000000000..057249c659c Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall8.ogg differ diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall9.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall9.ogg new file mode 100644 index 00000000000..5d387826d0b Binary files /dev/null and b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall9.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml index 98f8c6402d7..da063a11d64 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml @@ -35,7 +35,7 @@ - type: SpaceGarbage - type: EmitSoundOnLand sound: - path: /Audio/Weapons/Guns/Casings/casing_fall_2.ogg + collection: CasingFall # Sunrise edit params: volume: -1 - type: StaticPrice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index b0a87e8359e..d375a2feea3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -39,6 +39,13 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: Appearance - type: SpentAmmoVisuals + # Sunrise start + - type: EmitSoundOnLand + sound: + collection: ShellEmptyFall + params: + volume: -1 + # Sunrise end - type: entity id: ShellShotgunBeanbag diff --git a/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml b/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml index 718c62d2970..5f32825ef9d 100644 --- a/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml +++ b/Resources/Prototypes/_Sunrise/Sound/sound_helpers.yml @@ -55,4 +55,4 @@ path: /Audio/_Sunrise/Items/Handling/ammobox_drop.ogg - type: EmitSoundOnCollide sound: - path: /Audio/_Sunrise/Items/Handling/ammobox_drop.ogg + path: /Audio/_Sunrise/Items/Handling/ammobox_drop.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/casings.yml b/Resources/Prototypes/_Sunrise/SoundCollections/casings.yml new file mode 100644 index 00000000000..c77ae834303 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/SoundCollections/casings.yml @@ -0,0 +1,29 @@ +- type: soundCollection + id: CasingFall + files: + - /Audio/_Sunrise/Weapons/Guns/Casings/fall1.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall2.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall3.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall4.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall5.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall6.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall7.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall8.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall9.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/fall10.ogg + +# TODO: Менять звук в зависимости от того, пустая ли хуйня из под дробовика или нет + +- type: soundCollection + id: ShellFall + files: + - /Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall1.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall2.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall3.ogg + +- type: soundCollection + id: ShellEmptyFall + files: + - /Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall1.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall2.ogg + - /Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall3.ogg