add: new fancy casing sounds with unique sound for shotgun shells

space-sunrise · Jan 11, 2025 · c230ae5 · c230ae5
1 parent 5e28b9e
commit c230ae5
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 2 deletions.
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall1.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall1.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall2.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall2.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall3.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/Empty/fall3.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall1.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall1.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall2.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall2.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall3.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/Shell/fall3.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall1.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall1.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall10.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall10.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall2.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall2.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall3.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall3.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall4.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall4.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall5.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall5.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall6.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall6.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall7.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall7.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall8.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall8.ogg
diff --git a/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall9.ogg b/Resources/Audio/_Sunrise/Weapons/Guns/Casings/fall9.ogg
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
@@ -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
@@ -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
@@ -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
diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/casings.yml 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