Revert "Старые добрые звуки выстрелов из 1.6 (старые х2, ибо старый б…

…илд)" This reverts commit 454ceed.
space-sunrise · Jul 31, 2024 · 8af769e · 8af769e
1 parent 35d35e3
commit 8af769e
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 92 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -51,10 +51,7 @@
     delay: 10
     delayOptions: [10, 30, 60, 120, 300]
     initialBeepDelay: 0
-    beepSound:
-      path: /Audio/_Sunrise/c4_beep1.ogg # Sunrise-Edit
-      params:
-        volume: 20
+    beepSound: /Audio/Machines/Nuke/general_beep.ogg
     startOnStick: true
     canToggleStartOnStick: true
   - type: TriggerOnSignal

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
@@ -16,10 +16,7 @@
     delay: 10
     delayOptions: [5, 10, 30, 60]
     initialBeepDelay: 0
-    beepSound:
-      path: /Audio/_Sunrise/c4_beep1.ogg # Sunrise-Edit
-      params:
-        volume: 20
+    beepSound: /Audio/Machines/Nuke/general_beep.ogg
     startOnStick: true
   - type: AutomatedTimer
   - type: Sticky

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -14,9 +14,7 @@
     availableModes:
     - FullAuto
     soundGunshot:
-      collection: m249 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
   - type: StaticPrice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -28,9 +28,7 @@
     availableModes:
       - FullAuto
     soundGunshot:
-      collection: m249 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
   - type: ChamberMagazineAmmoProvider
@@ -99,9 +97,7 @@
       availableModes:
         - FullAuto
       soundGunshot:
-        collection: m249 # Sunrise-Edit
-        params:
-          volume: 10
+        path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
       soundEmpty:
         path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
     - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -156,9 +156,9 @@
   - type: Gun
     fireRate: 4
     soundGunshot:
-      collection: usp # Sunrise-Edit
+      path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
       params:
-        volume: 10
+        volume: -14
     availableModes:
     - SemiAuto
   - type: ItemSlots
@@ -205,9 +205,7 @@
     availableModes:
     - SemiAuto
     soundGunshot:
-      collection: glock18 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
 
 - type: entity
   name: N1984

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -67,9 +67,7 @@
   - type: Gun
     fireRate: 5
     soundGunshot:
-      collection: ak47 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -163,9 +161,7 @@
     sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
   - type: Gun
     soundGunshot:
-      collection: galil # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
   - type: ItemSlots
     slots:
       gun_magazine:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -72,9 +72,7 @@
   - type: Gun
     fireRate: 10
     soundGunshot:
-      collection: ump45 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -110,9 +108,7 @@
     - Burst
     - FullAuto
     soundGunshot:
-      collection: aug # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: MagazineVisuals
@@ -147,9 +143,7 @@
       fireRate: 6
       selectedMode: FullAuto
       soundGunshot:
-        collection: famas # Sunrise-Edit
-        params:
-          volume: 10
+        path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
     - type: ItemSlots
@@ -197,9 +191,7 @@
     fireRate: 6
     selectedMode: FullAuto
     soundGunshot:
-      collection: mp5 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
   - type: ItemSlots

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -25,9 +25,7 @@
     availableModes:
     - SemiAuto
     soundGunshot:
-      collection: xm1014 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
   - type: BallisticAmmoProvider
@@ -75,9 +73,7 @@
     availableModes:
     - FullAuto
     soundGunshot:
-      collection: xm1014 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/_Sunrise/Weapons/Guns/Gunshots/shotgun_auto.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
   - type: ItemSlots
@@ -121,10 +117,6 @@
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
-    soundGunshot:
-      collection: m3 # Sunrise-Edit
-      params:
-        volume: 10
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -158,9 +150,7 @@
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     soundGunshot:
-      collection: xm1014 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/_Sunrise/Weapons/Guns/Gunshots/shotgun_metal.ogg
 
 - type: entity
   parent: WeaponShotgunEnforcer
@@ -171,9 +161,7 @@
     proto: ShellShotgunBeanbag
   - type: Gun
     soundGunshot:
-      collection: xm1014 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/_Sunrise/Weapons/Guns/Gunshots/shotgun_metal.ogg
 
 - type: entity
   name: Kammerer
@@ -198,9 +186,7 @@
     - WeaponShotgunKammerer
   - type: Gun
     soundGunshot:
-      collection: m3 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/_Sunrise/Weapons/Guns/Gunshots/shotgun_alt.ogg
 
 - type: entity
   name: sawn-off shotgun
@@ -218,9 +204,7 @@
   - type: Gun
     fireRate: 4
     soundGunshot:
-      collection: m3 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/_Sunrise/Weapons/Guns/Gunshots/shotgun_sawed.ogg
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -258,9 +242,7 @@
   - type: Gun
     fireRate: 4
     soundGunshot:
-      collection: m3 # Sunrise-Edit
-      params:
-        volume: 10
+      path: /Audio/_Sunrise/Weapons/Guns/Gunshots/shotgun_pipe.ogg
   - type: BallisticAmmoProvider
     capacity: 1
   - type: Construction
@@ -309,10 +291,6 @@
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
-    soundGunshot:
-      collection: m3 # Sunrise-Edit
-      params:
-        volume: 10
   - type: BallisticAmmoProvider
     capacity: 1
     proto: null

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -63,17 +63,6 @@
       - CartridgeAntiMateriel
     capacity: 5
     proto: CartridgeAntiMateriel
-  # Sunrise-Start
-  - type: Gun
-    fireRate: 0.75
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      collection: awp
-      params:
-        volume: 10
-    # Sunrise-End
 
 - type: entity
   name: musket

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -69,9 +69,7 @@
     range: 7
   - type: SoundOnTrigger
     sound:
-      path: "/Audio/_Sunrise/flashbang.ogg" # Sunrise-Edit
-      params:
-        volume: 20
+      path: "/Audio/Effects/flash_bang.ogg"
   - type: DeleteOnTrigger
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
@@ -382,13 +380,10 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/smoke.rsi
   - type: SmokeOnTrigger
-    duration: 45 # Sunrise-Edit
+    duration: 30
     spreadAmount: 50
   - type: SoundOnTrigger
-    sound:
-      path: /Audio/_Sunrise/sg_explode.ogg # Sunrise-Edit
-      params:
-        volume: 15
+    sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: DeleteOnTrigger
   - type: TimerTriggerVisuals
     primingSound:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -29,10 +29,7 @@
       delay: 180
       delayOptions: [180, 240, 300, 600, 900]
       initialBeepDelay: 0
-      beepSound:
-        path: /Audio/_Sunrise/c4_beep1.ogg # Sunrise-Edit
-        params:
-          volume: 20
+      beepSound: /Audio/Machines/timer.ogg
     - type: Anchorable
       delay: 5
     - type: Fixtures