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 000000000..e217f5408 Binary files /dev/null and b/sounds/DUCK.ogg differ 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++; }