From 383e170ae0e73f1b5861cf0f79069fc8d5c11972 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 22 Aug 2020 15:18:03 +0200 Subject: [PATCH] Use a less grating crash sound, relegate older one to BD punishment. --- language.version | 2 +- sndinfo.txt | 1 + sounds/DUCK.ogg | Bin 0 -> 6478 bytes zscript/swwm_common.zsc | 10 ++++++++-- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 sounds/DUCK.ogg diff --git a/language.version b/language.version index 4ad7ff177..1d6e4f16f 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r502 (Sat 22 Aug 15:17:23 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r503 (Sat 22 Aug 15:18:03 CEST 2020)"; diff --git a/sndinfo.txt b/sndinfo.txt index f9132db29..44535b12f 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -1,5 +1,6 @@ $pitchshiftrange 0 +crash/crash sounds/DUCK.ogg crash/glass sounds/GLASSCRK.ogg crash/curb sounds/CURB.ogg brutal/ezmodo sounds/EASYMODO.ogg diff --git a/sounds/DUCK.ogg b/sounds/DUCK.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e217f54084aad3e4c3499916d022bb1e29aabb12 GIT binary patch literal 6478 zcmeZIPY-5bVt|7CZUhhglgto>6@!obEWcq$kf7#SFt8<;3)1f`~w zCTHfQE4b#BWftY<<)-G9XoAdVWQCZa>Es;7$iTtCz+mX3aJ1pVgirU~8E zEHnKqmMgG#1wOFkJoHs9Id9pPW!ZV>G*vlxBUu?3m>3*96kA1tKtxi9Vw*%#hhn=- z(Fw)nbBegMRxD`ZGCHBq>|^wD$z(sPmn#0pPcgrO&AH%C*$?NvA#nu#` zvwS`WN^pYxp}@ev;>0GIBH+XUGQLA|*^DACqZ1HsDKIpEeC|F`#B-y_>5VdHFRJ)| z(g_qcy=d$j9O4@q8X8&}8(x-ry{z z*y{?63=5Pkr#;qOq$IWIk>w)hmbNua3@M->QQ(}Uq&aD^=d!e{b(yobWvt$odwP@3 z=}kOfB@B!V;FQ6zAam9-43ri*EtN2G$T*?J;K0P-aJ*3Fc%h1Gkjn8Q9d>XCpI~6% zU~mZ1Ia*}mUTku_*yeb#jeCj9$tgZ(zxeQjl`t@Yqn&}l!BFOCq0GsPD*i#bmy1lp zi*2tL`(7`N4F`n?e%uI7FDwiUigVMZWi@aZPe=p@3n-u^7IHZAKx|@RVCY!*L}Av2 zS)b2Z^38g>V5P|H%Lh9{W~=X9Ib$|B26N6yKAuy2PV>~vqYGwUm{okvlV{da2&+

q3=AxZHzbbDZBnT1V@ncI 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 literal 0 HcmV?d00001 diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index cef2793fe..669ac0f26 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -4371,8 +4371,13 @@ Class SWWMCrashHandler : StaticEventHandler if ( timer == 1 ) { Console.Printf(TEXTCOLOR_GOLD.."Oopsie Woopsie!"..TEXTCOLOR_NORMAL); - S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); - S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler")); + if ( hnd && hnd.detected ) + { + S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + } + else S_StartSound("crash/crash",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } else if ( timer == 140 ) { @@ -4384,6 +4389,7 @@ Class SWWMCrashHandler : StaticEventHandler let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler")); if ( hnd && hnd.detected ) Console.Printf(TEXTCOLOR_GOLD.."Don't blame me. Shouldn't have tried running this with Brutal Doom."..TEXTCOLOR_NORMAL); else Console.Printf(TEXTCOLOR_GOLD.."If you didn't trigger it manually, it's best if you take a screenshot and show it to Marisa."..TEXTCOLOR_NORMAL); + Console.Printf(TEXTCOLOR_GOLD.."Version Information: %s"..TEXTCOLOR_NORMAL,StringTable.Localize("SWWM_MODVER")); } timer++; }