diff --git a/CVARINFO b/CVARINFO index 7a460e428a..311cdc9709 100644 --- a/CVARINFO +++ b/CVARINFO @@ -81,10 +81,10 @@ server int nodoomguytalk = 0; server bool pb_disable_sergeant_prone = false; //disable "prone" attacks from zombie sergeants server bool pb_disabledynamicavoid = false; //disables the more dynamic avoids on monsters -server int pb_grenadeshrapnel = 0; -server int pb_mineshrapnel = 0; -server int pb_rocketshrapnel = 0; -server int pb_wallpenetration = 0; +server bool pb_grenadeshrapnel = false; +server bool pb_mineshrapnel = false; +server bool pb_rocketshrapnel = false; +server bool pb_wallpenetration = false; //Weapon Recoil server float pb_weapon_recoil_mod_vertical = 1.0; @@ -505,9 +505,9 @@ user bool pb_showammolist = true; user float pb_messagesize = 1.0; nosave user bool pb_newmugshot = true; user bool pb_showblooddrops = true; -user float pb_blooddropsalpha = 0.5; +user float pb_blooddropsalpha = 0.8; user bool pb_showglasscracks = true; -user float pb_glasscracksalpha = 0.5; +user float pb_glasscracksalpha = 0.2; nosave server bool pbcv_inter = true; diff --git a/SNDINFO b/SNDINFO index 0b9320e558..05d660048e 100644 --- a/SNDINFO +++ b/SNDINFO @@ -434,8 +434,24 @@ misc/N_HP_pickup N_HEALTH misc/hbonus_pickup S_HEALTH $volume misc/hbonus_pickup 0.8 //Ricochets +world/impact1 "SOUNDS/COMBAT/Impact/bulletimpact1.ogg" +world/impact2 "SOUNDS/COMBAT/Impact/bulletimpact2.ogg" +world/impact3 "SOUNDS/COMBAT/Impact/bulletimpact3.ogg" +world/impact4 "SOUNDS/COMBAT/Impact/bulletimpact4.ogg" +world/impact5 "SOUNDS/COMBAT/Impact/bulletimpact5.ogg" +world/impact6 "SOUNDS/COMBAT/Impact/bulletimpact6.ogg" +world/impact7 "SOUNDS/COMBAT/Impact/bulletimpact7.ogg" +world/impact8 "SOUNDS/COMBAT/Impact/bulletimpact8.ogg" +world/impact9 "SOUNDS/COMBAT/Impact/bulletimpact9.ogg" +world/impact10 "SOUNDS/COMBAT/Impact/bulletimpact10.ogg" +world/impact11 "SOUNDS/COMBAT/Impact/bulletimpact11.ogg" + +$random bulletimpact { world/impact1 world/impact2 world/impact3 world/impact4 world/impact5 world/impact6 world/impact7 world/impact8 world/impact9 world/impact10 world/impact11 } +$limit bulletimpact 1 + + $random world/ricochet { ricochet/hit } -$random ricochet/hit { world/ricochet1 world/ricochet2 world/ricochet3 world/ricochet4 world/ricochet5 world/ricochet6 world/ricochet7 world/ricochet8 world/ricochet9 world/ricochet10 world/ricochet11 world/ricochet12 world/ricochet13 world/ricochet14 world/ricochet15 world/ricochet16 } +$random ricochet/hit { world/ricochet1 world/ricochet2 world/ricochet3 world/ricochet4 world/ricochet5 world/ricochet6 world/ricochet7 world/ricochet8 world/ricochet9 world/ricochet10 world/ricochet11 world/ricochet12 world/ricochet13 world/ricochet14 world/ricochet15 } world/ricochet1 ricoche1 world/ricochet2 ricoche2 world/ricochet3 ricoche3 @@ -451,7 +467,6 @@ world/ricochet12 ricoche12 world/ricochet13 ricoche13 world/ricochet14 ricoche14 world/ricochet15 ricoche15 -world/ricochet16 ricoche16 $limit world/ricochet1 1 $limit world/ricochet2 1 $limit world/ricochet3 1 @@ -467,7 +482,6 @@ $limit world/ricochet12 1 $limit world/ricochet13 1 $limit world/ricochet14 1 $limit world/ricochet15 1 -$limit world/ricochet16 1 $limit ricochet/hit 1 $limit world/ricochet 1 $rolloff world/ricochet1 200 700 @@ -485,7 +499,6 @@ $rolloff world/ricochet12 200 700 $rolloff world/ricochet13 200 700 $rolloff world/ricochet14 200 700 $rolloff world/ricochet15 200 700 -$rolloff world/ricochet16 200 700 $rolloff world/ricochet 200 700 $volume ricochet/hit 0.7 $random world/ricochet { ricochet/hit world/blank1 } diff --git a/SNDINFO.PBDoomguy and Marines b/SNDINFO.PBDoomguy and Marines index aa8ba69cf4..6f8b6e7696 100644 --- a/SNDINFO.PBDoomguy and Marines +++ b/SNDINFO.PBDoomguy and Marines @@ -181,4 +181,13 @@ HUBLDRS6 HUBLDRS6 $random visor/blooddrop { HUBLDRS1 HUBLDRS2 HUBLDRS3 HUBLDRS4 HUBLDRS5 HUBLDRS6 } -visor/glasscrack HUGLSCRK \ No newline at end of file +visor/bulletimpact_1 "SOUNDS/HUD Sounds/impact_helmet_shatter_01.ogg" +visor/bulletimpact_2 "SOUNDS/HUD Sounds/impact_helmet_shatter_02.ogg" +visor/bulletimpact_3 "SOUNDS/HUD Sounds/impact_helmet_shatter_03.ogg" +visor/bulletimpact_4 "SOUNDS/HUD Sounds/impact_helmet_shatter_04.ogg" +visor/bulletimpact_5 "SOUNDS/HUD Sounds/impact_helmet_shatter_05.ogg" +visor/bulletimpact_6 "SOUNDS/HUD Sounds/impact_helmet_shatter_06.ogg" +visor/bulletimpact_7 "SOUNDS/HUD Sounds/impact_helmet_shatter_07.ogg" +visor/bulletimpact_8 "SOUNDS/HUD Sounds/impact_helmet_shatter_08.ogg" + +$random visor/glasscrack { visor/bulletimpact_1 visor/bulletimpact_2 visor/bulletimpact_3 visor/bulletimpact_4 visor/bulletimpact_5 visor/bulletimpact_6 visor/bulletimpact_7 visor/bulletimpact_8 } \ No newline at end of file diff --git a/SNDINFO.PBWeapons b/SNDINFO.PBWeapons index 31804db075..ad88a1c42e 100644 --- a/SNDINFO.PBWeapons +++ b/SNDINFO.PBWeapons @@ -1150,7 +1150,8 @@ lowammo2a "SOUNDS/COMBAT/Weapons/Misc/LowAmmo/lowammo2a.ogg" lowammo2b "SOUNDS/COMBAT/Weapons/Misc/LowAmmo/lowammo2b.ogg" lowammo2c "SOUNDS/COMBAT/Weapons/Misc/LowAmmo/lowammo2c.ogg" -$random weapons/lowammo/default { lowammo1a lowammo1b lowammo1c lowammo1d } +// $random weapons/lowammo/default { lowammo1a lowammo1b lowammo1c lowammo1d } +weapons/lowammo/default lowammo1 $random weapons/lowammo/shotgun { lowammo2a lowammo2b lowammo2c } weapons/lowammo/sniper lowammo3 weapons/lowammo/revolver lowammo4 @@ -1161,57 +1162,4 @@ weapons/lowammo/pistol lowammo8 weapons/lowammo/nailgun lowammo9 // used when completely out of ammo -weapons/LowAmmo/sweetener loaclick - -$random env/whizby -{ - env/whizby1 - env/whizby2 - env/whizby3 - env/whizby4 - env/whizby5 - env/whizby6 - env/whizby7 - env/whizby8 - env/whizby9 - env/whizby10 - env/whizby11 - env/whizby12 - env/whizby13 - env/whizby14 - env/whizby15 - env/whizby16 - env/whizby17 - env/whizby18 - env/whizby19 - env/whizby20 - env/whizby21 - env/whizby22 - env/whizby23 - env/whizby24 -} - -env/whizby1 "Sounds/combat/whizby/bullets/Whizby1.wav" -env/whizby2 "Sounds/combat/whizby/bullets/Whizby2.wav" -env/whizby3 "Sounds/combat/whizby/bullets/Whizby3.wav" -env/whizby4 "Sounds/combat/whizby/bullets/Whizby4.wav" -env/whizby5 "Sounds/combat/whizby/bullets/Whizby5.wav" -env/whizby6 "Sounds/combat/whizby/bullets/Whizby6.wav" -env/whizby7 "Sounds/combat/whizby/bullets/Whizby7.wav" -env/whizby8 "Sounds/combat/whizby/bullets/Whizby8.wav" -env/whizby9 "Sounds/combat/whizby/bullets/Whizby9.wav" -env/whizby10 "Sounds/combat/whizby/bullets/Whizby10.wav" -env/whizby11 "Sounds/combat/whizby/bullets/Whizby11.wav" -env/whizby12 "Sounds/combat/whizby/bullets/Whizby12.wav" -env/whizby13 "Sounds/combat/whizby/bullets/Whizby13.wav" -env/whizby14 "Sounds/combat/whizby/bullets/Whizby14.wav" -env/whizby15 "Sounds/combat/whizby/bullets/Whizby15.wav" -env/whizby16 "Sounds/combat/whizby/bullets/Whizby16.wav" -env/whizby17 "Sounds/combat/whizby/bullets/Whizby17.wav" -env/whizby18 "Sounds/combat/whizby/bullets/Whizby18.wav" -env/whizby19 "Sounds/combat/whizby/bullets/Whizby19.wav" -env/whizby20 "Sounds/combat/whizby/bullets/Whizby20.wav" -env/whizby21 "Sounds/combat/whizby/bullets/Whizby21.wav" -env/whizby22 "Sounds/combat/whizby/bullets/Whizby22.wav" -env/whizby23 "Sounds/combat/whizby/bullets/Whizby23.wav" -env/whizby24 "Sounds/combat/whizby/bullets/Whizby24.wav" \ No newline at end of file +weapons/LowAmmo/sweetener loaclick \ No newline at end of file diff --git a/SNDINFO.Whizby b/SNDINFO.Whizby new file mode 100644 index 0000000000..87b8655ac9 --- /dev/null +++ b/SNDINFO.Whizby @@ -0,0 +1,191 @@ +// jesus christ almighty + + /////////////////////////////////////////////// + // Whiz /////////////////////////////////////// +/////////////////////////////////////////////// + +// format: whiz/// + +whiz/far/far/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_01.ogg" +whiz/far/far/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_02.ogg" +whiz/far/far/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_03.ogg" +whiz/far/far/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_04.ogg" +whiz/far/far/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_05.ogg" +whiz/far/far/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_06.ogg" +whiz/far/far/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_07.ogg" +whiz/far/far/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_far_in_08.ogg" +$random whiz/far/far/in { whiz/far/far/in_1 whiz/far/far/in_2 whiz/far/far/in_3 whiz/far/far/in_4 whiz/far/far/in_5 whiz/far/far/in_6 whiz/far/far/in_7 whiz/far/far/in_8 } + +whiz/far/med/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_01.ogg" +whiz/far/med/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_02.ogg" +whiz/far/med/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_03.ogg" +whiz/far/med/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_04.ogg" +whiz/far/med/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_05.ogg" +whiz/far/med/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_06.ogg" +whiz/far/med/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_07.ogg" +whiz/far/med/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_08.ogg" +whiz/far/med/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_09.ogg" +whiz/far/med/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_10.ogg" +whiz/far/med/in_11 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_11.ogg" +whiz/far/med/in_12 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_12.ogg" +whiz/far/med/in_13 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_med_in_13.ogg" +$random whiz/far/med/in { whiz/far/med/in_1 whiz/far/med/in_2 whiz/far/med/in_3 whiz/far/med/in_4 whiz/far/med/in_5 whiz/far/med/in_6 whiz/far/med/in_7 whiz/far/med/in_8 whiz/far/med/in_9 whiz/far/med/in_10 whiz/far/med/in_11 whiz/far/med/in_12 whiz/far/med/in_13 } + +whiz/far/near/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_01.ogg" +whiz/far/near/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_02.ogg" +whiz/far/near/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_03.ogg" +whiz/far/near/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_04.ogg" +whiz/far/near/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_05.ogg" +whiz/far/near/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_06.ogg" +whiz/far/near/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_07.ogg" +whiz/far/near/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_08.ogg" +whiz/far/near/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_09.ogg" +whiz/far/near/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_10.ogg" +whiz/far/near/in_11 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_11.ogg" +whiz/far/near/in_12 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_far_near_in_12.ogg" +$random whiz/far/near/in { whiz/far/near/in_1 whiz/far/near/in_2 whiz/far/near/in_3 whiz/far/near/in_4 whiz/far/near/in_5 whiz/far/near/in_6 whiz/far/near/in_7 whiz/far/near/in_8 whiz/far/near/in_9 whiz/far/near/in_10 whiz/far/near/in_11 whiz/far/near/in_12 } + +whiz/med/far/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_01.ogg" +whiz/med/far/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_02.ogg" +whiz/med/far/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_03.ogg" +whiz/med/far/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_04.ogg" +whiz/med/far/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_05.ogg" +whiz/med/far/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_06.ogg" +whiz/med/far/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_07.ogg" +whiz/med/far/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_08.ogg" +whiz/med/far/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_09.ogg" +whiz/med/far/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_10.ogg" +whiz/med/far/in_11 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_far_in_11.ogg" +$random whiz/med/far/in { whiz/med/far/in_1 whiz/med/far/in_2 whiz/med/far/in_3 whiz/med/far/in_4 whiz/med/far/in_5 whiz/med/far/in_6 whiz/med/far/in_7 whiz/med/far/in_8 whiz/med/far/in_9 whiz/med/far/in_10 whiz/med/far/in_11 } + +whiz/med/med/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_01.ogg" +whiz/med/med/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_02.ogg" +whiz/med/med/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_03.ogg" +whiz/med/med/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_04.ogg" +whiz/med/med/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_05.ogg" +whiz/med/med/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_06.ogg" +whiz/med/med/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_07.ogg" +whiz/med/med/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_08.ogg" +whiz/med/med/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_09.ogg" +whiz/med/med/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_10.ogg" +whiz/med/med/in_11 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_11.ogg" +whiz/med/med/in_12 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_12.ogg" +whiz/med/med/in_13 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_13.ogg" +whiz/med/med/in_14 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_14.ogg" +whiz/med/med/in_15 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_med_in_15.ogg" +$random whiz/med/med/in { whiz/med/med/in_1 whiz/med/med/in_2 whiz/med/med/in_3 whiz/med/med/in_4 whiz/med/med/in_5 whiz/med/med/in_6 whiz/med/med/in_7 whiz/med/med/in_8 whiz/med/med/in_9 whiz/med/med/in_10 whiz/med/med/in_11 whiz/med/med/in_12 whiz/med/med/in_13 whiz/med/med/in_14 whiz/med/med/in_15 } + +whiz/med/near/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_01.ogg" +whiz/med/near/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_02.ogg" +whiz/med/near/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_03.ogg" +whiz/med/near/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_04.ogg" +whiz/med/near/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_05.ogg" +whiz/med/near/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_06.ogg" +whiz/med/near/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_07.ogg" +whiz/med/near/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_08.ogg" +whiz/med/near/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_09.ogg" +whiz/med/near/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_10.ogg" +whiz/med/near/in_11 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_11.ogg" +whiz/med/near/in_12 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_12.ogg" +whiz/med/near/in_13 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_med_near_in_13.ogg" +$random whiz/med/near/in { whiz/med/near/in_1 whiz/med/near/in_2 whiz/med/near/in_3 whiz/med/near/in_4 whiz/med/near/in_5 whiz/med/near/in_6 whiz/med/near/in_7 whiz/med/near/in_8 whiz/med/near/in_9 whiz/med/near/in_10 whiz/med/near/in_11 whiz/med/near/in_12 whiz/med/near/in_13 } + +whiz/near/far/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_01.ogg" +whiz/near/far/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_02.ogg" +whiz/near/far/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_03.ogg" +whiz/near/far/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_04.ogg" +whiz/near/far/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_05.ogg" +whiz/near/far/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_06.ogg" +whiz/near/far/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_07.ogg" +whiz/near/far/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_08.ogg" +whiz/near/far/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_09.ogg" +whiz/near/far/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_far_in_10.ogg" + +whiz/near/med/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_01.ogg" +whiz/near/med/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_02.ogg" +whiz/near/med/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_03.ogg" +whiz/near/med/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_04.ogg" +whiz/near/med/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_05.ogg" +whiz/near/med/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_06.ogg" +whiz/near/med/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_07.ogg" +whiz/near/med/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_08.ogg" +whiz/near/med/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_09.ogg" +whiz/near/med/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_med_in_10.ogg" +$random whiz/near/med/in { whiz/near/med/in_1 whiz/near/med/in_2 whiz/near/med/in_3 whiz/near/med/in_4 whiz/near/med/in_5 whiz/near/med/in_6 whiz/near/med/in_7 whiz/near/med/in_8 whiz/near/med/in_9 whiz/near/med/in_10 } + +whiz/near/near/in_1 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_01.ogg" +whiz/near/near/in_2 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_02.ogg" +whiz/near/near/in_3 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_03.ogg" +whiz/near/near/in_4 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_04.ogg" +whiz/near/near/in_5 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_05.ogg" +whiz/near/near/in_6 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_06.ogg" +whiz/near/near/in_7 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_07.ogg" +whiz/near/near/in_8 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_08.ogg" +whiz/near/near/in_9 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_09.ogg" +whiz/near/near/in_10 "SOUNDS/Combat/Whizby/Normal/Fly In/whiz_near_near_in_10.ogg" +$random whiz/near/near/in { whiz/near/near/in_1 whiz/near/near/in_2 whiz/near/near/in_3 whiz/near/near/in_4 whiz/near/near/in_5 whiz/near/near/in_6 whiz/near/near/in_7 whiz/near/near/in_8 whiz/near/near/in_9 whiz/near/near/in_10 } +$rolloff whiz/near/near/in linear 0 10 + +whiz/far/out_1 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_01.ogg" +whiz/far/out_2 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_02.ogg" +whiz/far/out_3 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_03.ogg" +whiz/far/out_4 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_04.ogg" +whiz/far/out_5 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_05.ogg" +whiz/far/out_6 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_06.ogg" +whiz/far/out_7 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_07.ogg" +whiz/far/out_8 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_far_out_08.ogg" +$random whiz/far/out { whiz/far/out_1 whiz/far/out_2 whiz/far/out_3 whiz/far/out_4 whiz/far/out_5 whiz/far/out_6 whiz/far/out_7 whiz/far/out_8 } + +whiz/med/out_1 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_01.ogg" +whiz/med/out_2 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_02.ogg" +whiz/med/out_3 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_03.ogg" +whiz/med/out_4 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_04.ogg" +whiz/med/out_5 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_05.ogg" +whiz/med/out_6 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_06.ogg" +whiz/med/out_7 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_07.ogg" +whiz/med/out_8 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_medium_out_08.ogg" +$random whiz/med/out { whiz/med/out_1 whiz/med/out_2 whiz/med/out_3 whiz/med/out_4 whiz/med/out_5 whiz/med/out_6 whiz/med/out_7 whiz/med/out_8 } + +whiz/close/out_1 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_01.ogg" +whiz/close/out_2 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_02.ogg" +whiz/close/out_3 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_03.ogg" +whiz/close/out_4 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_04.ogg" +whiz/close/out_5 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_05.ogg" +whiz/close/out_6 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_06.ogg" +whiz/close/out_7 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_07.ogg" +whiz/close/out_8 "SOUNDS/Combat/Whizby/Normal/Fly Out/whiz_close_out_08.ogg" +$random whiz/near/out { whiz/close/out_1 whiz/close/out_2 whiz/close/out_3 whiz/close/out_4 whiz/close/out_5 whiz/close/out_6 whiz/close/out_7 whiz/close/out_8 } + + /////////////////////////////////////////////// + // Cracks ///////////////////////////////////// +/////////////////////////////////////////////// + +bulletcrack/far_1 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_01.ogg" +bulletcrack/far_2 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_02.ogg" +bulletcrack/far_3 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_03.ogg" +bulletcrack/far_4 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_04.ogg" +bulletcrack/far_5 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_05.ogg" +bulletcrack/far_6 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_06.ogg" +bulletcrack/far_7 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_07.ogg" +bulletcrack/far_8 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_far_08.ogg" +$random bulletcrack/far { bulletcrack/far_1 bulletcrack/far_2 bulletcrack/far_3 bulletcrack/far_4 bulletcrack/far_5 bulletcrack/far_6 bulletcrack/far_7 bulletcrack/far_8 } + +bulletcrack/med_1 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_01.ogg" +bulletcrack/med_2 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_02.ogg" +bulletcrack/med_3 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_03.ogg" +bulletcrack/med_4 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_04.ogg" +bulletcrack/med_5 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_05.ogg" +bulletcrack/med_6 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_06.ogg" +bulletcrack/med_7 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_07.ogg" +bulletcrack/med_8 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_med_08.ogg" +$random bulletcrack/med { bulletcrack/med_1 bulletcrack/med_2 bulletcrack/med_3 bulletcrack/med_4 bulletcrack/med_5 bulletcrack/med_6 bulletcrack/med_7 bulletcrack/med_8 } + +bulletcrack/near_1 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_01.ogg" +bulletcrack/near_2 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_02.ogg" +bulletcrack/near_3 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_03.ogg" +bulletcrack/near_4 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_04.ogg" +bulletcrack/near_5 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_05.ogg" +bulletcrack/near_6 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_06.ogg" +bulletcrack/near_7 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_07.ogg" +bulletcrack/near_8 "SOUNDS/Combat/Whizby/Normal/Cracks/bullet_crack_near_08.ogg" +$random bulletcrack/near { bulletcrack/near_1 bulletcrack/near_2 bulletcrack/near_3 bulletcrack/near_4 bulletcrack/near_5 bulletcrack/near_6 bulletcrack/near_7 bulletcrack/near_8 } \ No newline at end of file diff --git a/SOUNDS/COMBAT/Impact/bulletimpact1.ogg b/SOUNDS/COMBAT/Impact/bulletimpact1.ogg new file mode 100644 index 0000000000..1a15ef9440 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact1.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact10.ogg b/SOUNDS/COMBAT/Impact/bulletimpact10.ogg new file mode 100644 index 0000000000..0266e5237b Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact10.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact11.ogg b/SOUNDS/COMBAT/Impact/bulletimpact11.ogg new file mode 100644 index 0000000000..ece70ecb13 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact11.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact2.ogg b/SOUNDS/COMBAT/Impact/bulletimpact2.ogg new file mode 100644 index 0000000000..e3bd6c3a89 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact2.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact3.ogg b/SOUNDS/COMBAT/Impact/bulletimpact3.ogg new file mode 100644 index 0000000000..5e81cb2f39 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact3.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact4.ogg b/SOUNDS/COMBAT/Impact/bulletimpact4.ogg new file mode 100644 index 0000000000..341250fc37 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact4.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact5.ogg b/SOUNDS/COMBAT/Impact/bulletimpact5.ogg new file mode 100644 index 0000000000..66ecd3e7e0 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact5.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact6.ogg b/SOUNDS/COMBAT/Impact/bulletimpact6.ogg new file mode 100644 index 0000000000..b8659d0981 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact6.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact7.ogg b/SOUNDS/COMBAT/Impact/bulletimpact7.ogg new file mode 100644 index 0000000000..cc095ce3ef Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact7.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact8.ogg b/SOUNDS/COMBAT/Impact/bulletimpact8.ogg new file mode 100644 index 0000000000..9f66e4bc9f Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact8.ogg differ diff --git a/SOUNDS/COMBAT/Impact/bulletimpact9.ogg b/SOUNDS/COMBAT/Impact/bulletimpact9.ogg new file mode 100644 index 0000000000..bc1c12ecd9 Binary files /dev/null and b/SOUNDS/COMBAT/Impact/bulletimpact9.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE1.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE1.ogg index 4f60730cea..220eaa5207 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE1.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE1.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE10.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE10.ogg index 2ba21f0076..6c510d2fd2 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE10.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE10.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE11.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE11.ogg index 48805ee9e1..972cc1b74f 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE11.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE11.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE12.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE12.ogg index 9b575ff5c1..6f401e77c5 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE12.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE12.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE13.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE13.ogg index b19f3f5a7b..60ae68ced3 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE13.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE13.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE14.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE14.ogg index af556b28b5..c3c6c1ff3a 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE14.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE14.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE15.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE15.ogg index 669e74648d..e830d91c51 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE15.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE15.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE2.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE2.ogg index f0c97c2d90..d1b4945abd 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE2.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE2.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE3.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE3.ogg index a08e08d434..a7f3e8f8be 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE3.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE3.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE4.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE4.ogg index c2c00af0e5..5b7fa74585 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE4.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE4.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE5.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE5.ogg index ccdde14883..9b57e260bb 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE5.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE5.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE6.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE6.ogg index 0dfa6ce29f..5729c74828 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE6.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE6.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE7.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE7.ogg index 8184693fc1..699a9dafa9 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE7.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE7.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE8.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE8.ogg index 0641eb8ab6..454d66a5dd 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE8.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE8.ogg differ diff --git a/SOUNDS/COMBAT/Ricochet/RICOCHE9.ogg b/SOUNDS/COMBAT/Ricochet/RICOCHE9.ogg index dcd0164826..0d547bd87a 100644 Binary files a/SOUNDS/COMBAT/Ricochet/RICOCHE9.ogg and b/SOUNDS/COMBAT/Ricochet/RICOCHE9.ogg differ diff --git a/SOUNDS/COMBAT/WEAPONS/Misc/LowAmmo/lowammo1.ogg b/SOUNDS/COMBAT/WEAPONS/Misc/LowAmmo/lowammo1.ogg index c03ec73e9e..e7a29f4450 100644 Binary files a/SOUNDS/COMBAT/WEAPONS/Misc/LowAmmo/lowammo1.ogg and b/SOUNDS/COMBAT/WEAPONS/Misc/LowAmmo/lowammo1.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_01.ogg new file mode 100644 index 0000000000..81bef1fe3c Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_02.ogg new file mode 100644 index 0000000000..dd2fe1df34 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_03.ogg new file mode 100644 index 0000000000..3eb02e2f8a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_04.ogg new file mode 100644 index 0000000000..e4b582b4ae Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_05.ogg new file mode 100644 index 0000000000..e0548b710b Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_06.ogg new file mode 100644 index 0000000000..8f4c767e86 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_07.ogg new file mode 100644 index 0000000000..45db74f866 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_08.ogg new file mode 100644 index 0000000000..d891678b1c Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_far_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_01.ogg new file mode 100644 index 0000000000..3c4ce9277f Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_02.ogg new file mode 100644 index 0000000000..d43944ff8f Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_03.ogg new file mode 100644 index 0000000000..6cd5dc3aa4 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_04.ogg new file mode 100644 index 0000000000..c194590bc3 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_05.ogg new file mode 100644 index 0000000000..7b2c35e98a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_06.ogg new file mode 100644 index 0000000000..5e4bdb97ba Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_07.ogg new file mode 100644 index 0000000000..99725f62d0 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_08.ogg new file mode 100644 index 0000000000..355fef8840 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_med_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_01.ogg new file mode 100644 index 0000000000..4a447cadfc Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_02.ogg new file mode 100644 index 0000000000..86ae4f845d Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_03.ogg new file mode 100644 index 0000000000..cd94816203 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_04.ogg new file mode 100644 index 0000000000..4e617ba688 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_05.ogg new file mode 100644 index 0000000000..ecbe626469 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_06.ogg new file mode 100644 index 0000000000..14220ababb Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_07.ogg new file mode 100644 index 0000000000..95550ae64b Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_08.ogg new file mode 100644 index 0000000000..65dca63b40 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Cracks/bullet_crack_near_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_01.ogg new file mode 100644 index 0000000000..f21a50bc0d Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_02.ogg new file mode 100644 index 0000000000..39e871b11a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_03.ogg new file mode 100644 index 0000000000..4ba10dc93f Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_04.ogg new file mode 100644 index 0000000000..b660a04f22 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_05.ogg new file mode 100644 index 0000000000..8524aff5f6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_06.ogg new file mode 100644 index 0000000000..35267871ab Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_07.ogg new file mode 100644 index 0000000000..12995fc4c3 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_08.ogg new file mode 100644 index 0000000000..4eb4e423e4 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_far_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_01.ogg new file mode 100644 index 0000000000..fed7390b62 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_02.ogg new file mode 100644 index 0000000000..5a55386616 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_03.ogg new file mode 100644 index 0000000000..4fc0c2a103 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_04.ogg new file mode 100644 index 0000000000..d2e687a65b Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_05.ogg new file mode 100644 index 0000000000..b3b54c5299 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_06.ogg new file mode 100644 index 0000000000..9dd9039d6e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_07.ogg new file mode 100644 index 0000000000..95c949cd8e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_08.ogg new file mode 100644 index 0000000000..fcaf03462c Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_09.ogg new file mode 100644 index 0000000000..708c34efda Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_10.ogg new file mode 100644 index 0000000000..2160e85ccb Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_11.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_11.ogg new file mode 100644 index 0000000000..daade97777 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_11.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_12.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_12.ogg new file mode 100644 index 0000000000..76e84f9eaf Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_12.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_13.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_13.ogg new file mode 100644 index 0000000000..04a320617e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_med_in_13.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_01.ogg new file mode 100644 index 0000000000..6d53bd79be Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_02.ogg new file mode 100644 index 0000000000..d17f283c43 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_03.ogg new file mode 100644 index 0000000000..703f511aee Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_04.ogg new file mode 100644 index 0000000000..dd93c1b7ef Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_05.ogg new file mode 100644 index 0000000000..6726a9f363 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_06.ogg new file mode 100644 index 0000000000..d92b825812 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_07.ogg new file mode 100644 index 0000000000..38ddab8949 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_08.ogg new file mode 100644 index 0000000000..6f04b6067d Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_09.ogg new file mode 100644 index 0000000000..eb6a7401d9 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_10.ogg new file mode 100644 index 0000000000..b5d62f129e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_11.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_11.ogg new file mode 100644 index 0000000000..ab124f0cc2 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_11.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_12.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_12.ogg new file mode 100644 index 0000000000..5aec8998f5 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_far_near_in_12.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_01.ogg new file mode 100644 index 0000000000..2072d04d0a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_02.ogg new file mode 100644 index 0000000000..c78f9eb6f9 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_03.ogg new file mode 100644 index 0000000000..1224c53b94 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_04.ogg new file mode 100644 index 0000000000..a5a8e188cf Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_05.ogg new file mode 100644 index 0000000000..c3b80b2806 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_06.ogg new file mode 100644 index 0000000000..f4252365df Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_07.ogg new file mode 100644 index 0000000000..b72d46fa73 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_08.ogg new file mode 100644 index 0000000000..6c5222d5f4 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_09.ogg new file mode 100644 index 0000000000..0bd4086a31 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_10.ogg new file mode 100644 index 0000000000..8f62999a23 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_11.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_11.ogg new file mode 100644 index 0000000000..fcf3f53344 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_far_in_11.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_01.ogg new file mode 100644 index 0000000000..4215522710 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_02.ogg new file mode 100644 index 0000000000..891319f0ff Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_03.ogg new file mode 100644 index 0000000000..55f18396b0 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_04.ogg new file mode 100644 index 0000000000..78e4ebefc2 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_05.ogg new file mode 100644 index 0000000000..f900397528 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_06.ogg new file mode 100644 index 0000000000..a9971e7028 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_07.ogg new file mode 100644 index 0000000000..46e062050a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_08.ogg new file mode 100644 index 0000000000..0f07560c4c Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_09.ogg new file mode 100644 index 0000000000..e342623264 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_10.ogg new file mode 100644 index 0000000000..35facfe6c6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_11.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_11.ogg new file mode 100644 index 0000000000..6bbe11e5ef Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_11.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_12.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_12.ogg new file mode 100644 index 0000000000..3778fcc4c4 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_12.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_13.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_13.ogg new file mode 100644 index 0000000000..afd95c737a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_13.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_14.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_14.ogg new file mode 100644 index 0000000000..59459a9a1c Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_14.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_15.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_15.ogg new file mode 100644 index 0000000000..66e8c515ae Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_med_in_15.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_01.ogg new file mode 100644 index 0000000000..9ef25b2b55 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_02.ogg new file mode 100644 index 0000000000..0105d40b3b Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_03.ogg new file mode 100644 index 0000000000..ef05bf8a84 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_04.ogg new file mode 100644 index 0000000000..7ce221c2b6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_05.ogg new file mode 100644 index 0000000000..2dbf3c26a1 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_06.ogg new file mode 100644 index 0000000000..2343970bcb Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_07.ogg new file mode 100644 index 0000000000..61547b7fc9 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_08.ogg new file mode 100644 index 0000000000..b8068188be Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_09.ogg new file mode 100644 index 0000000000..b7fac21bf0 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_10.ogg new file mode 100644 index 0000000000..2a57dffdbc Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_11.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_11.ogg new file mode 100644 index 0000000000..83832aba6e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_11.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_12.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_12.ogg new file mode 100644 index 0000000000..af3de5b07e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_12.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_13.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_13.ogg new file mode 100644 index 0000000000..078b066518 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_med_near_in_13.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_01.ogg new file mode 100644 index 0000000000..261bcfdafb Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_02.ogg new file mode 100644 index 0000000000..1082696fa8 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_03.ogg new file mode 100644 index 0000000000..c10a680e0d Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_04.ogg new file mode 100644 index 0000000000..01e885ca65 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_05.ogg new file mode 100644 index 0000000000..1fd7d6b18e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_06.ogg new file mode 100644 index 0000000000..9563901373 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_07.ogg new file mode 100644 index 0000000000..c0d4b43a1c Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_08.ogg new file mode 100644 index 0000000000..111729dee6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_09.ogg new file mode 100644 index 0000000000..e44dc2acb8 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_10.ogg new file mode 100644 index 0000000000..3766cc29f1 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_far_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_01.ogg new file mode 100644 index 0000000000..902dd624af Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_02.ogg new file mode 100644 index 0000000000..5912e24bbd Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_03.ogg new file mode 100644 index 0000000000..ee759a200e Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_04.ogg new file mode 100644 index 0000000000..e2a5bf9b92 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_05.ogg new file mode 100644 index 0000000000..192720fc94 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_06.ogg new file mode 100644 index 0000000000..6d03e870bc Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_07.ogg new file mode 100644 index 0000000000..0670e53220 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_08.ogg new file mode 100644 index 0000000000..70a3a0d274 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_09.ogg new file mode 100644 index 0000000000..0a615da96a Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_10.ogg new file mode 100644 index 0000000000..6a3671952d Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_med_in_10.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_01.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_01.ogg new file mode 100644 index 0000000000..10c23345c6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_01.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_02.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_02.ogg new file mode 100644 index 0000000000..a12ef2f77d Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_02.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_03.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_03.ogg new file mode 100644 index 0000000000..2c94806ca6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_03.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_04.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_04.ogg new file mode 100644 index 0000000000..ac48a26a6f Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_04.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_05.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_05.ogg new file mode 100644 index 0000000000..90d5a62c04 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_05.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_06.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_06.ogg new file mode 100644 index 0000000000..fe39a8a8c6 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_06.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_07.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_07.ogg new file mode 100644 index 0000000000..ab027e20e5 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_07.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_08.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_08.ogg new file mode 100644 index 0000000000..a4e4307c6f Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_08.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_09.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_09.ogg new file mode 100644 index 0000000000..ba88b4ede0 Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_09.ogg differ diff --git a/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_10.ogg b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_10.ogg new file mode 100644 index 0000000000..6b47c8fcaa Binary files /dev/null and b/SOUNDS/COMBAT/whizby/Normal/Fly In/whiz_near_near_in_10.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_01.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_01.ogg new file mode 100644 index 0000000000..0ca70e33a1 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_01.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_02.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_02.ogg new file mode 100644 index 0000000000..57036d809f Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_02.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_03.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_03.ogg new file mode 100644 index 0000000000..eb6b3d9a08 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_03.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_04.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_04.ogg new file mode 100644 index 0000000000..c134e16c08 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_04.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_05.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_05.ogg new file mode 100644 index 0000000000..f44558d1b3 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_05.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_06.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_06.ogg new file mode 100644 index 0000000000..db4be79ee9 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_06.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_07.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_07.ogg new file mode 100644 index 0000000000..b0e0b40570 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_07.ogg differ diff --git a/SOUNDS/HUD Sounds/impact_helmet_shatter_08.ogg b/SOUNDS/HUD Sounds/impact_helmet_shatter_08.ogg new file mode 100644 index 0000000000..a1da922412 Binary files /dev/null and b/SOUNDS/HUD Sounds/impact_helmet_shatter_08.ogg differ diff --git a/zscript/PB_Hud_FX.zs b/zscript/PB_Hud_FX.zs index 2307d6b2e5..48ed855311 100644 --- a/zscript/PB_Hud_FX.zs +++ b/zscript/PB_Hud_FX.zs @@ -155,7 +155,7 @@ class PB_CrackFXStorage : PB_GenericHudEffect cls.graphic = TexMan.CheckForTexture(gfxname); - float randscale = frandom[hud](0.3, 0.5); + float randscale = frandom[hud](0.5, 0.8); cls.scale.x = randscale; cls.scale.y = randscale; cls.scalenomod = cls.scale; @@ -263,10 +263,9 @@ class PB_HUDFXHandler : EventHandler if(sb.CheckInventory("sae_extcam")) return; - if(e.name == "PB_HUDBloodDroplet") + if(e.name == "PB_HUDBloodDroplet") sb.CreateBloodDrop(e.args[0]); - - if(e.name == "PB_HUDGlassBreak") + else if(e.name == "PB_HUDGlassBreak") sb.CreateCrack(); } @@ -276,7 +275,7 @@ class PB_HUDFXHandler : EventHandler return; PB_PlayerPawn pmo = PB_PlayerPawn(players[consoleplayer].mo); - if(e.Thing == pmo && random[hud](0, 10) > 8) + if(e.Thing == pmo && random(0, 10) > 8) { EventHandler.SendInterfaceEvent(pmo.PlayerNumber(), "PB_HUDGlassBreak"); } diff --git a/zscript/Weapons/Projectiles/BulletDef.EnemyProjectiles.zsc b/zscript/Weapons/Projectiles/BulletDef.EnemyProjectiles.zsc index c1ebfc8022..31520cde48 100644 --- a/zscript/Weapons/Projectiles/BulletDef.EnemyProjectiles.zsc +++ b/zscript/Weapons/Projectiles/BulletDef.EnemyProjectiles.zsc @@ -6,6 +6,7 @@ class PB_RifleBullet : PB_Projectile PB_Projectile.RipperCount 1; Speed 60; Gravity 0.1; + +PB_Projectile.WHIZCRACK; } } @@ -85,6 +86,7 @@ class PB_MonsterMinigunTracer : PB_Projectile Speed 60; Gravity 0.1; DamageType "Cutless"; + +PB_Projectile.WHIZCRACK; } } diff --git a/zscript/Weapons/Projectiles/BulletProjectile.zsc b/zscript/Weapons/Projectiles/BulletProjectile.zsc index 483c942c59..bd691ea578 100644 --- a/zscript/Weapons/Projectiles/BulletProjectile.zsc +++ b/zscript/Weapons/Projectiles/BulletProjectile.zsc @@ -14,6 +14,8 @@ class PB_Projectile : FastProjectile abstract } array alreadyWhizzedBy; + double distanceTraveled; + string playerDist; virtual int Handle_MissileHit(Actor victim) { @@ -244,6 +246,8 @@ class PB_Projectile : FastProjectile abstract { VelFromAngle(MinVel); } + + distanceTraveled = Level.Vec3Diff( pos, startPos ).Length(); Vector3 frac = Vel / count; int changexy = frac.X != 0 || frac.Y != 0; @@ -257,7 +261,7 @@ class PB_Projectile : FastProjectile abstract tm.ClearLastRipped(); // [RH] Do rip damage each step, like Hexen } - if( bRANGED && Level.Vec3Diff( pos, startPos ).Length() > destroyRange ) + if( bRANGED && distanceTraveled > destroyRange ) { self.Destroy(); return; @@ -428,6 +432,12 @@ class PB_Projectile : FastProjectile abstract FallAndSink(GetGravity(),OldZ); //[inkoalawetrust] It's as shrimple as that. if(bNOWHIZBY) return; + + /*if(playOutOnNextTic) + { + A_StartSound("whiz/"..playerDist.."/out", CHAN_AUTO); + playOutOnNextTic = false; + }*/ BlockThingsIterator it = BlockThingsIterator.Create(self, radius + 10); PlayerPawnBase plr; @@ -440,14 +450,37 @@ class PB_Projectile : FastProjectile abstract if(alreadyWhizzedBy.Find(plr) != alreadyWhizzedBy.Size()) continue; + + string whizDist; + + if(distanceTraveled > 750) + whizDist = "far"; + else if(distanceTraveled > 370.5) + whizDist = "med"; + else + whizDist = "near"; + + float disttoplayer = Distance2D(it.Thing); + + if(disttoplayer > 100) + playerDist = "med"; + else + playerDist = "near"; + + console.printf("whizzed %s the player, bullet traveled a %s distance", playerDist, whizDist); - double angtoplr = AbsAngle(self.Angle, AngleTo(plr)); + double angtoplr = AbsAngle(self.Angle, AngleTo(it.thing)); if(angtoplr > 37.5 && angtoplr < 142.5) { - A_StartSound("env/whizby", CHAN_AUTO, pitch: frandom(0.9, 1.1)); + + A_StartSound("whiz/"..whizDist.."/"..playerDist.."/in", CHAN_AUTO, pitch: frandom(0.9, 1.1)); + + if(bWHIZCRACK) + A_StartSound("bulletcrack/"..playerDist, CHAN_AUTO, volume: 0.8); + alreadyWhizzedBy.Push(plr); - // console.printf("whizzed by %s, %f° angle", plr.player.GetUserName(), angtoplr); + // playOutOnNextTic = true; } } } @@ -501,6 +534,7 @@ class PB_Projectile : FastProjectile abstract flagdef RipOnce: BehaviorFlags, 3; flagdef RANGED: BehaviorFlags, 4; flagdef NOWHIZBY: BehaviorFlags, 5; + flagdef WHIZCRACK: BehaviorFlags, 6; vector3 startPos; int noActivation; @@ -546,6 +580,9 @@ class PB_Projectile : FastProjectile abstract CallOwnerDied(); OnExplode(EType_Geometry); A_SpawnProjectile("PB_BulletPuff",0,0,0,0); + + // [gng] todo: make this texture specific, gotta rush it for 0.1.1 + A_StartSound("bulletimpact", CHAN_AUTO, pitch: random(0.9, 1.1)); if(random(0, 100) < 25) { A_StartSound("ricochet/hit");