From bc111626e425e884dbbf6ac97d92657a731dfe63 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 24 Jun 2021 21:53:38 +0200 Subject: [PATCH] Crash message variety. --- language.def_base | 17 +++++++++++++++++ language.version | 4 ++-- zscript/swwm_statichandler.zsc | 11 ++++++----- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/language.def_base b/language.def_base index d1ce7cdc8..06677b9bb 100644 --- a/language.def_base +++ b/language.def_base @@ -204,6 +204,23 @@ STARTUP2 = ""; STARTUP3 = ""; STARTUP4 = ""; STARTUP5 = ""; +// crashout (don't localize) +CRASHMSG1A = "Oopsie Woopsie!"; +CRASHMSG1B = "Looks like GZDoom made a fucky wucky! owo"; +CRASHMSG2A = "Oh snap!"; +CRASHMSG2B = "GZDoom just went kaboom!"; +CRASHMSG3A = "Crash to console?"; +CRASHMSG3B = "Golly gee that sure sounds like a problem."; +CRASHMSG4A = ""; +CRASHMSG4B = "What a shame."; +CRASHMSG5A = "Welp..."; +CRASHMSG5B = "There it goes."; +CRASHMSG6A = "Oh no!"; +CRASHMSG6B = "That doesn't look good."; +CRASHMSG7A = "Hey, guess what?"; +CRASHMSG7B = "GZDoom just crashed."; +CRASHMSG8A = "Uhhh..."; +CRASHMSG8B = "That sure wasn't supposed to happen."; // Re-tagged monsters FN_ZOMBIE_FUNN = "5"; FN_ZOMBIE_FUN1 = "Zomb"; diff --git a/language.version b/language.version index 8db12912d..26d1aad16 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r556 \cu(Thu 24 Jun 19:20:48 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r556 \cu(2021-06-24 19:20:48)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r556 \cu(Thu 24 Jun 21:53:38 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r556 \cu(2021-06-24 21:53:38)\c-"; diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc index 547dd26d2..e549886b6 100644 --- a/zscript/swwm_statichandler.zsc +++ b/zscript/swwm_statichandler.zsc @@ -10,7 +10,7 @@ Class SWWMStaticHandler : StaticEventHandler { // crash handler ui bool wasinmap; - ui int timer; + ui int timer, msgpick; // versioning bool tainted; String taintver; @@ -338,7 +338,8 @@ Class SWWMStaticHandler : StaticEventHandler wasinmap = false; if ( timer == 1 ) { - Console.Printf("\cfOopsie Woopsie!\c-"); + msgpick = Random[UIStuff](1,8); + Console.Printf("\cf%s\c-",StringTable.Localize("$CRASHMSG"..msgpick.."A")); let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler")); if ( hnd && hnd.detected ) { @@ -349,14 +350,14 @@ Class SWWMStaticHandler : StaticEventHandler } else if ( timer == 70 ) { - Console.Printf("\cfLooks like GZDoom made a fucky wucky! owo\c-"); + Console.Printf("\cf%s\c-",StringTable.Localize("$CRASHMSG"..msgpick.."B")); S_StartSound("crash/curb",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } else if ( timer == 140 ) { let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler")); - if ( hnd && hnd.detected ) Console.Printf("\cfDon't blame me. Shouldn't have tried running this with Brutal Doom.\c-"); - else Console.Printf("\cfIf you didn't trigger it manually, it's best if you take a screenshot and show it to Marisa.\c-"); + if ( hnd && hnd.detected ) Console.Printf("\cfYou shouldn't have tried running this with Brutal Doom.\c-"); + else Console.Printf("\cfYou should probably screenshot this error and show it to Marisa.\c-"); Console.Printf("\cfLoaded Version:\n \cj%s\c-",StringTable.Localize("$SWWM_SHORTVER")); if ( tainted ) Console.Printf("\cfSavegame Version:\n \cj%s\c-",taintver); }