From 65dc18ba16bdc4e8712f41181f0386af946f6a4a Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 19 May 2022 19:33:01 +0200 Subject: [PATCH] April Fools + Birthday events. --- language.def_dlg | 6 ++++ language.es_dlg | 6 ++++ language.version | 4 +-- maps/TITLEMAP.wad | Bin 1055 -> 2091 bytes zscript/handler/swwm_handler_uitick.zsc | 16 ++++++++++ zscript/menu/swwm_title.zsc | 37 ++++++++++++++++++++++-- zscript/swwm_statichandler.zsc | 15 ++++++++++ 7 files changed, 79 insertions(+), 5 deletions(-) diff --git a/language.def_dlg b/language.def_dlg index d7afa1853..4df658ca0 100644 --- a/language.def_dlg +++ b/language.def_dlg @@ -250,3 +250,9 @@ SWWM_SAYAWASTED1 = "It's almost like you're jerking it off, kinda..."; SWWM_SAYAWASTED2 = "Uh, forget I said that."; SWWM_SAYAWASTEE1 = "And still going... Rackin' it along."; SWWM_SAYAWASTEF1 = "OK, I promise I'll stop messaging you about it. You do you, I guess."; +// april fools +SWWM_SAYAFOOL1 = "Uh... What's that text doing there?"; +SWWM_SAYAFOOL2 = "Shit, wait... Did I seriously forget to activate a license?"; +SWWM_SAYAFOOL3 = "... ... Hold on... Just hold the fuck on... What even is Ultracam?"; +SWWM_SAYAFOOL4 = "Oh for fuck's sake. This has to be Taro-nii's doing. Can't believe I fell for it. Damn it all."; +SWWM_SAYAFOOL5 = "Well, I don't know how to get rid of it so... Just ignore it, I guess. I'll figure it out later."; diff --git a/language.es_dlg b/language.es_dlg index 4559c3ed1..b80c4d1ed 100644 --- a/language.es_dlg +++ b/language.es_dlg @@ -241,3 +241,9 @@ SWWM_SAYAWASTED1 = "Es casi como si le estuvieras haciendo una paja, o algo..."; SWWM_SAYAWASTED2 = "Ehm, olvida lo que he dicho."; SWWM_SAYAWASTEE1 = "Y sigue... Dándole a la manivela."; SWWM_SAYAWASTEF1 = "Vale, te prometo que voy a dejar de mensajearte ya con todo esto. Tú a lo tuyo, supongo."; +// april fools +SWWM_SAYAFOOL1 = "Eh... ¿Que hace el texto ese ahí?"; +SWWM_SAYAFOOL2 = "Mierda, espera... ¿En serio olvidé activar una licencia?"; +SWWM_SAYAFOOL3 = "... ... Un momento... Espera un puto momento... ¿Que puñetas es Ultracam?"; +SWWM_SAYAFOOL4 = "Ay la puta hostia. Esto tiene que ser cosa de Taro-nii. No me puedo creer que haya picado. Hostia puta."; +SWWM_SAYAFOOL5 = "Bueno, no sé como quitarlo así que... Tú haz como si nada, supongo. Ya veré que hacer."; diff --git a/language.version b/language.version index 214e6cfc1..55e807315 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.20 \cu(Fri 13 May 19:42:01 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.2.20 \cu(2022-05-13 19:42:01)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.20 \cu(Wed 1 Jun 18:30:15 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.2.20 \cu(2022-06-01 18:30:15)\c-"; diff --git a/maps/TITLEMAP.wad b/maps/TITLEMAP.wad index d44cf107e6b791058c2fe2870f51fe0f108a9703..a808c287ee5efed4cd17bab26be963a675eef4da 100644 GIT binary patch literal 2091 zcmWFtcXVN6U|=}S&cKkDn44N$keHmRV5^{1m6D&It7Oepl98F0&Q;A-p7Z4XwF~GgDI2it_VH6l@g?ththM@{_YO^U{$$gr?aLs@Vut zvmsHMji8#1Q8gP8rP&y&*#K3uF?P)$pF#XwoSIycUj*@BNoqw&X;Er!W=aY;1t{tI z`MdczhUh9;bJcQzgJUpj0{euknhWZUw48jf$B=yil}b*{%z;ECvSdbTW_m^mLe9|0 z!kQ}wB$ks}mYM?zBdBzGPJVfEeh%0I18XiMQHUuZ#gN1eRuvCb01^gey`21_c$oV@ z+Ce787Z(&|mZTOVt0_;+$w|sDDai-rPq;#mXbCv?8d!6sB<3cjr)DHpB^IS9*eawY z<`jc6G+4AGwWugDGcPqQEj1aGh+&dN`2~rfXb0H^6$85l%~x zSB~V4g8ZVA#2j#7$AfcgaeiqYQm7!yr(_l76e!)ll$y4}T@IjP_h3hI{f#FEsas{A~p2&m=aig5SwV_|>* zMg|535F3O+BLDyY|Ifg{01^f<85tOu7#J8pOeO{fW+)RxGcYhXItMefFfcG|U|{@^ z&vc2wUk=P+0&~n5!G;6}gamPb4P;~h(ZL}>J`Ny@7$C-hm=X*O4C)LF3`PtL48h^y zz9E?hW1A_|0{#1}dL0AD~5ELtC<|XHprlcw; zRVC-==H}<=B_SdE2e|riRdaFb>nmg=>VUDQdagoJQEDQ%OfOE( zF8~z@MWs2Z#fn^(osUVQ%O@nlZ%rRuWBT(C~1O< zQy!?xLp(!#Tzwq_Kzv;`28IyVh!9`L00v7o1_loX28Jjj>soGcz!RxJHEd rItDPbGcz!FFfcGg`T4uJ27|Oi)H}I)IEH!p2c2hz@Ll~}K*|{ae4-Q* diff --git a/zscript/handler/swwm_handler_uitick.zsc b/zscript/handler/swwm_handler_uitick.zsc index 24e159bf4..8551968fe 100644 --- a/zscript/handler/swwm_handler_uitick.zsc +++ b/zscript/handler/swwm_handler_uitick.zsc @@ -5,6 +5,8 @@ extend Class SWWMHandler ui bool didstartmsg; bool doextramsg; ui bool didextramsg; + // april fools special + ui bool didaprmsg; private ui void MapstartUITick() { @@ -27,6 +29,20 @@ extend Class SWWMHandler didstartmsg = true; return; } + if ( !didaprmsg && (gamestate == GS_LEVEL) ) + { + didaprmsg = true; + if ( SystemTime.Format("%d%m",SystemTime.Now()) == "0104" ) + { + let msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_SAYASNAME"),StringTable.Localize("$SWWM_SAYANAME"),"Saya"); + msg.seqname = "SAYAFOOL"; + msg.seqcnt = 5; + msg.delay = 120; + StatusBar.AttachMessage(msg,-1232); + didstartmsg = true; + return; + } + } int whichboss = WhichVanillaBossMap(); if ( bossmap == MAP_DE1M8 ) { diff --git a/zscript/menu/swwm_title.zsc b/zscript/menu/swwm_title.zsc index 024cba018..7f96ba724 100644 --- a/zscript/menu/swwm_title.zsc +++ b/zscript/menu/swwm_title.zsc @@ -12,7 +12,7 @@ Struct TitleExplosion Class SWWMTitleStuff : EventHandler { - ui TextureID tex[5]; + ui TextureID tex[6]; ui TextureID letters[13]; ui TextureID camtex; // must be drawn for shaders to actually use it ui BrokenLines stitle; @@ -85,7 +85,7 @@ Class SWWMTitleStuff : EventHandler if ( titletimer == -75 ) S_ChangeMusic(""); if ( titletimer == 0 ) S_ChangeMusic("music/TRAUMATI.XM"); titletimer++; - if ( menuactive && (titletimer < -80) ) titletimer = -80; + if ( menuactive && (titletimer < -80) && (titletimer >= -300) ) titletimer = -80; } override void WorldLoaded( WorldEvent e ) @@ -105,6 +105,17 @@ Class SWWMTitleStuff : EventHandler shnd.titlefirst = true; } + // GROSS HACK, GROSS HACK + static ui bool IsBirthday() + { + return (SystemTime.Format("%d%m",SystemTime.Now()) == "2001"); + } + static play void SetBirthday() + { + let hnd = SWWMTitleStuff(EventHandler.Find("SWWMTitleStuff")); + hnd.titletimer = -500; + } + override void UiTick() { if ( (titletimer > -80) && (titletimer < -20) ) TickExplosions(); @@ -143,8 +154,28 @@ Class SWWMTitleStuff : EventHandler if ( !camtex ) camtex = TexMan.CheckForTexture("LOGOFADE",TexMan.Type_Any); Screen.DrawTexture(camtex,false,0,0); if ( !tex[2] ) tex[2] = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any); - if ( !tex[3] ) tex[3] = TexMan.CheckForTexture((gameinfo.gametype&GAME_Raven)?"TITLE":"TITLEPIC",TexMan.Type_MiscPatch); + if ( !tex[5] ) tex[5] = TexMan.CheckForTexture("graphics/DemoIcon.png",TexMan.Type_Any); Vector2 tsize, vsize; + if ( titletimer < -300 ) + { + Screen.Dim("Black",1.,0,0,Screen.GetWidth(),Screen.GetHeight()); + double alf; + if ( titletimer < -420 ) alf = clamp((titletimer+450)/30.,0.,1.); + else if ( titletimer > -330 ) alf = clamp(1.-(titletimer+330)/30.,0.,1.); + else alf = 1.; + double xx, yy; + Screen.DrawTexture(tex[5],false,Screen.GetWidth()/2,Screen.GetHeight()/2,DTA_CleanNoMove_1,true,DTA_Alpha,alf); + String str = "2148-01-20"; + xx = int(Screen.GetWidth()-mBigFont.StringWidth(str)*CleanXFac_1*3.)/2; + yy = Screen.GetHeight()/2-(72.+mBigFont.GetHeight()*3.)*CleanYFac_1; + Screen.DrawText(mBigFont,Font.CR_WHITE,xx,yy,str,DTA_Alpha,alf,DTA_ScaleX,CleanXFac_1*3.,DTA_ScaleY,CleanYFac_1*3.); + str = "Happy Birthday, \cdDemo-chan\c-!"; + xx = int(Screen.GetWidth()-mBigFont.StringWidth(str)*CleanXFac_1*2.)/2; + yy = Screen.GetHeight()/2+72.*CleanYFac_1; + Screen.DrawText(mBigFont,Font.CR_WHITE,xx,yy,str,DTA_Alpha,alf,DTA_ScaleX,CleanXFac_1*2.,DTA_ScaleY,CleanYFac_1*2.); + return; + } + if ( !tex[3] ) tex[3] = TexMan.CheckForTexture((gameinfo.gametype&GAME_Raven)?"TITLE":"TITLEPIC",TexMan.Type_MiscPatch); if ( titletimer < 0 ) { Screen.Dim("Black",1.,0,0,Screen.GetWidth(),Screen.GetHeight()); diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc index fdec0b063..001d27557 100644 --- a/zscript/swwm_statichandler.zsc +++ b/zscript/swwm_statichandler.zsc @@ -26,6 +26,9 @@ Class SWWMStaticHandler : StaticEventHandler ThinkerIterator sti; // for intermissions, to prevent repetition ui Array lasttip, lastart; + // stupid dumb thing + ui int aprcheck; + ui Font aprfnt; override void NewGame() { @@ -175,6 +178,11 @@ Class SWWMStaticHandler : StaticEventHandler String str = "UNSUPPORTED RENDER MODE - PLEASE SWITCH TO HARDWARE RENDERING"; Screen.DrawText(newsmallfont,Font.CR_RED,(Screen.GetWidth()-newsmallfont.StringWidth(str)*CleanXFac_1)/2,yy,str,DTA_CleanNoMove_1,true); } + if ( (aprcheck == 2) && (gamestate == GS_LEVEL) ) + { + String str = "Unregistered Ultracam"; + Screen.DrawText(aprfnt,Font.CR_WHITE,(Screen.GetWidth()-aprfnt.StringWidth(str)*CleanXFac_1)/2,2*CleanYFac_1,str,DTA_CleanNoMove_1,true); + } } override void ConsoleProcess( ConsoleEvent e ) @@ -303,6 +311,13 @@ Class SWWMStaticHandler : StaticEventHandler override void PostUiTick() { + if ( !aprcheck && (gamestate == GS_LEVEL) ) + { + aprfnt = Font.GetFont("TewiFontOutline"); + aprcheck = 1; + if ( SystemTime.Format("%d%m",SystemTime.Now()) == "0104" ) + aprcheck = 2; + } if ( (gametic > 0) && !(gametic%GameTicRate) ) { let pt = CVar.FindCVar('swwm_playtime');