OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Use a less grating crash sound, relegate older one to BD punishment.

Browse source
This commit is contained in:
Mari the Deer 2020-08-22 15:18:03 +02:00
commit 383e170ae0
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default] [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)";

1
sndinfo.txt
View file

@ -1,5 +1,6 @@
$pitchshiftrange 0 $pitchshiftrange 0
crash/crash sounds/DUCK.ogg
crash/glass sounds/GLASSCRK.ogg crash/glass sounds/GLASSCRK.ogg
crash/curb sounds/CURB.ogg crash/curb sounds/CURB.ogg
brutal/ezmodo sounds/EASYMODO.ogg brutal/ezmodo sounds/EASYMODO.ogg

BIN
sounds/DUCK.ogg Normal file
View file

Binary file not shown.

10
zscript/swwm_common.zsc
View file

@ -4371,8 +4371,13 @@ Class SWWMCrashHandler : StaticEventHandler
if ( timer == 1 ) if ( timer == 1 )
{ {
Console.Printf(TEXTCOLOR_GOLD.."Oopsie Woopsie!"..TEXTCOLOR_NORMAL); Console.Printf(TEXTCOLOR_GOLD.."Oopsie Woopsie!"..TEXTCOLOR_NORMAL);
S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler"));
S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); 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 ) else if ( timer == 140 )
{ {
@ -4384,6 +4389,7 @@ Class SWWMCrashHandler : StaticEventHandler
let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler")); 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); 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); 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++; timer++;
} }