diff --git a/SNDINFO.PBWeapons b/SNDINFO.PBWeapons index ad8366ccca..0b8444719a 100644 --- a/SNDINFO.PBWeapons +++ b/SNDINFO.PBWeapons @@ -281,11 +281,11 @@ DEAGF1 DEAGF1 DEAGF2 DEAGF2 DEAGF3 DEAGF3 DEAGF4 DEAGF4 -$random weapons/deagle/afire { aDEAGF1 aDEAGF2 aDEAGF3 aDEAGF4 } -aDEAGF1 aDEAGF1 -aDEAGF2 aDEAGF2 -aDEAGF3 aDEAGF3 -aDEAGF4 aDEAGF4 +$random weapons/deagle/afire { DEAGG1 DEAGG2 DEAGG3 DEAGG4 } +DEAGG1 DEAGG1 +DEAGG2 DEAGG2 +DEAGG3 DEAGG3 +DEAGG4 DEAGG4 //REVOLVER REVOUP REVOUP diff --git a/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg1.ogg b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg1.ogg new file mode 100644 index 0000000000..167d9c991f Binary files /dev/null and b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg1.ogg differ diff --git a/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg2.ogg b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg2.ogg new file mode 100644 index 0000000000..167d9c991f Binary files /dev/null and b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg2.ogg differ diff --git a/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg3.ogg b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg3.ogg new file mode 100644 index 0000000000..167d9c991f Binary files /dev/null and b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg3.ogg differ diff --git a/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg4.ogg b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg4.ogg new file mode 100644 index 0000000000..167d9c991f Binary files /dev/null and b/SOUNDS/COMBAT/WEAPONS/Pistol caliber weapons/Deagle/deagg4.ogg differ diff --git a/zscript/Weapons/Slot2/Deagle.zs b/zscript/Weapons/Slot2/Deagle.zs index 1e73214b1a..925c31d003 100644 --- a/zscript/Weapons/Slot2/Deagle.zs +++ b/zscript/Weapons/Slot2/Deagle.zs @@ -122,7 +122,8 @@ class PB_Deagle : PB_WeaponBase TNT1 A 0 A_JumpIfInventory("Zoomed",1,"Fire2"); TNT1 A 0 PB_jumpIfNoAmmo("Reload",1); D2E0 A 1 BRIGHT { - A_StartSound("weapons/deagle/fire", CHAN_Weapon, CHANF_DEFAULT, 1.0); + A_StartSound("weapons/deagle/fire", 0, CHANF_OVERLAP, 1.0); + A_StartSound("weapons/deagle/afire", 0, CHANF_OVERLAP, 0.70); PB_DynamicTail("shotgun", "pistol_mag"); PB_LowAmmoSoundWarning("pistol"); A_FireProjectile("PB_50AE", frandom(-0.1,0.1),0,0,0, FPF_NOAUTOAIM, frandom(-0.1,0.1)); @@ -680,7 +681,8 @@ class PB_Deagle : PB_WeaponBase TNT1 A 0 PB_jumpIfNoAmmo("Reload",1); D3E0 B 1 BRIGHT { PB_IncrementHeat(); - A_StartSound("weapons/deagle/fire", CHAN_Weapon, CHANF_DEFAULT, 1.0); + A_StartSound("weapons/deagle/fire", 0, CHANF_OVERLAP, 1.0); + A_StartSound("weapons/deagle/afire", 0, CHANF_OVERLAP, 0.70); PB_DynamicTail("shotgun", "pistol_mag"); PB_LowAmmoSoundWarning("pistol"); A_FireProjectile("PB_50AE", frandom(-0.1,0.1),0,0,0, FPF_NOAUTOAIM, frandom(-0.1,0.1));