diff --git a/acs/swwmcomp.o b/acs/swwmcomp.o index 033d4c445..0814342af 100644 Binary files a/acs/swwmcomp.o and b/acs/swwmcomp.o differ diff --git a/fonts.wad b/fonts.wad index ba4928907..fc317e2bc 100644 Binary files a/fonts.wad and b/fonts.wad differ diff --git a/language.version b/language.version index 2b3ab4404..c89e05fa5 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.6 \cu(Thu 31 Mar 21:41:58 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.2.6 \cu(2022-03-31 21:41:58)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.7 \cu(Mon 4 Apr 14:26:12 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.2.7 \cu(2022-04-04 14:26:12)\c-"; diff --git a/menudef.txt b/menudef.txt index bb1ea6a24..53ae177b5 100644 --- a/menudef.txt +++ b/menudef.txt @@ -312,7 +312,7 @@ ListMenu "MainMenu" Size Clean Font "BigFont", "White", "Sapphire" Selector "graphics/DemoIcon.png", -24, 0 - LineSpacing 36 + LineSpacing 32 SWWMLogo Position 0, 56 SWWMTextItemM "$MNU_NEWGAME", "n", "PlayerclassMenu" @@ -327,7 +327,7 @@ ListMenu "MainMenuTextOnly" Size Clean Font "BigFont", "White", "Sapphire" Selector "graphics/DemoIcon.png", -24, 0 - LineSpacing 36 + LineSpacing 32 SWWMLogo Position 0, 56 SWWMTextItemM "$MNU_NEWGAME", "n", "PlayerclassMenu" @@ -342,7 +342,7 @@ ListMenu "GameFilesMenu" Size Clean Font "BigFont", "White", "Sapphire" Selector "graphics/DemoIcon.png", -24, 0 - LineSpacing 36 + LineSpacing 32 Position 0, 88 SWWMTextItemM "$MNU_LOADGAME", "l", "LoadGameMenu" SWWMTextItemM "$MNU_SAVEGAME", "s", "SaveGameMenu" diff --git a/swwmcomp.acs b/swwmcomp.acs index 98ee39a6f..0862d2fc4 100644 --- a/swwmcomp.acs +++ b/swwmcomp.acs @@ -154,9 +154,9 @@ SCRIPT "DUMP2_HUB" ( void ) } SetFont("BigFont"); int progress = mapstodo-lvent; - SetHudSize(640,480,0); - if ( progress > 0 ) HudMessageBold(d:progress,s:" more maps to go...";HUDMSG_PLAIN,1,CR_GOLD,320.0,40.0,0); - else HudMessageBold(s:"The final room is open...";HUDMSG_PLAIN,1,CR_GOLD,320.0,40.0,0); + SetHudSize(480,360,0); + if ( progress > 0 ) HudMessageBold(d:progress,s:" more maps to go...";HUDMSG_PLAIN,1,CR_GOLD,240.0,30.0,0); + else HudMessageBold(s:"The final room is open...";HUDMSG_PLAIN,1,CR_GOLD,240.0,30.0,0); Delay(1); } } @@ -214,10 +214,10 @@ SCRIPT "DUMP3_HUB" ( void ) } SetFont("BigFont"); int progress = mapstodo-lvent; - SetHudSize(640,480,0); - if ( progress > 1 ) HudMessageBold(d:progress,s:" more maps to go...";HUDMSG_PLAIN,1,CR_GOLD,320.0,40.0,0); - else if ( progress > 0 ) HudMessageBold(d:progress,s:" more map to go...";HUDMSG_PLAIN,1,CR_GOLD,320.0,40.0,0); - else HudMessageBold(s:"The final room is open...";HUDMSG_PLAIN,1,CR_GOLD,320.0,40.0,0); + SetHudSize(480,360,0); + if ( progress > 1 ) HudMessageBold(d:progress,s:" more maps to go...";HUDMSG_PLAIN,1,CR_GOLD,240.0,30.0,0); + else if ( progress > 0 ) HudMessageBold(d:progress,s:" more map to go...";HUDMSG_PLAIN,1,CR_GOLD,240.0,30.0,0); + else HudMessageBold(s:"The final room is open...";HUDMSG_PLAIN,1,CR_GOLD,240.0,30.0,0); Delay(1); } } @@ -304,9 +304,9 @@ str DUMP3MapNames[74][2] = SCRIPT "DUMP3_DISPLAY" ( int f1, int f2 ) { int fuck = (f1*10)+f2; - SetHudSize(640,480,0); + SetHudSize(480,360,0); SetFont("BigFont"); - HudMessage(s:DUMP3MapNames[fuck][0];HUDMSG_FADEINOUT,2,CR_WHITE,320.4,380.2,2.5,0.15,0.65); + HudMessage(s:DUMP3MapNames[fuck][0];HUDMSG_FADEINOUT,2,CR_WHITE,240.4,285.2,2.5,0.15,0.65); SetHudSize(320,240,0); SetFont("SmallFont"); HudMessage(s:DUMP3MapNames[fuck][1];HUDMSG_FADEINOUT,3,CR_GOLD,160.4,200.0,2.5,0.15,0.65); diff --git a/zscript/handler/swwm_handler_cheats.zsc b/zscript/handler/swwm_handler_cheats.zsc index 581be859a..1b885a069 100644 --- a/zscript/handler/swwm_handler_cheats.zsc +++ b/zscript/handler/swwm_handler_cheats.zsc @@ -511,7 +511,7 @@ extend Class SWWMHandler // cheat input if ( (kcode <= 4) && ((klinger < gametic) || (klingerstr == "")) ) return; - double hs = max(min(floor(Screen.GetWidth()/640.),floor(Screen.GetHeight()/266.)),1.); + double hs = max(floor(Screen.GetWidth()/480.),1.); Vector2 ss = (Screen.GetWidth(),Screen.GetHeight())/hs; String chstr = (kcode>4)?kstr.Mid(4):klingerstr.Mid(4); double alph = clamp((klinger-(gametic+e.fractic))/20.,0.,1.); diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index ace2e3834..6aedc3638 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/zscript/menu/swwm_credits.zsc @@ -123,7 +123,7 @@ Class SWWMCreditsMenu : GenericMenu bool oldloop; const ENTRY_PAD = 8; - const SECTION_PAD = 10; + const SECTION_PAD = 20; const SECTION_SHIFT = -4; double spos, speed; diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc index 66a4c9670..4ada61d2b 100644 --- a/zscript/menu/swwm_menus.zsc +++ b/zscript/menu/swwm_menus.zsc @@ -376,7 +376,7 @@ Class SWWMMainMenu : SWWMCleanMenu // skill/episode menu hack Class SWWMBigMenuHack : SWWMCleanMenu { - const BIGMENUSPACING = 36; + const BIGMENUSPACING = 32; bool longlist; // more than 10 entries, scrolls int ofs; @@ -474,18 +474,18 @@ Class SWWMBigMenuHack : SWWMCleanMenu } String str = "⌃ ⌃ ⌃"; double x = (w-smallfont.StringWidth(str))/2; - double y = (h-280)/2; + double y = (h-224)/2; if ( isclean ) SWWMUtility.AdjustClean_1(x,y); if ( ofs > 0 ) { - if ( isclean ) Screen.DrawText(smallfont,Font.CR_FIRE,x,y+30*CleanYFac_1,str,DTA_CleanNoMove_1,true); - else Screen.DrawText(smallfont,Font.CR_FIRE,x,y+30,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); + if ( isclean ) Screen.DrawText(smallfont,Font.CR_FIRE,x,y+16*CleanYFac_1,str,DTA_CleanNoMove_1,true); + else Screen.DrawText(smallfont,Font.CR_FIRE,x,y+16,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); } if ( ofs < (mDesc.mItems.Size()-8) ) { str = "⌄ ⌄ ⌄"; - if ( isclean ) Screen.DrawText(smallfont,Font.CR_FIRE,x,y+296*CleanYFac_1,str,DTA_CleanNoMove_1,true); - else Screen.DrawText(smallfont,Font.CR_FIRE,x,y+296,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); + if ( isclean ) Screen.DrawText(smallfont,Font.CR_FIRE,x,y+256*CleanYFac_1,str,DTA_CleanNoMove_1,true); + else Screen.DrawText(smallfont,Font.CR_FIRE,x,y+256,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); } for ( int i=0; i= 4) ) return; - Screen.DrawText(textfont,OptionMenuSettings.mFontColorSelection,(destWidth-2*textfont.StringWidth(messageSelection?strno:stryes))/2-72,y+fontheight*2*messageSelection,"►",DTA_VirtualWidth,destWidth,DTA_VirtualHeight,destHeight,DTA_KeepRatio,true,DTA_ScaleX,2.,DTA_ScaleY,2.); - Screen.DrawText(textfont,OptionMenuSettings.mFontColorSelection,(destWidth+2*textfont.StringWidth(messageSelection?strno:stryes))/2+24,y+fontheight*2*messageSelection,"◄",DTA_VirtualWidth,destWidth,DTA_VirtualHeight,destHeight,DTA_KeepRatio,true,DTA_ScaleX,2.,DTA_ScaleY,2.); + Screen.DrawText(textfont,OptionMenuSettings.mFontColorSelection,(destWidth-2*textfont.StringWidth(messageSelection?strno:stryes))/2-46,y+fontheight*2*messageSelection,"►",DTA_VirtualWidth,destWidth,DTA_VirtualHeight,destHeight,DTA_KeepRatio,true,DTA_ScaleX,2.,DTA_ScaleY,2.); + Screen.DrawText(textfont,OptionMenuSettings.mFontColorSelection,(destWidth+2*textfont.StringWidth(messageSelection?strno:stryes))/2+16,y+fontheight*2*messageSelection,"◄",DTA_VirtualWidth,destWidth,DTA_VirtualHeight,destHeight,DTA_KeepRatio,true,DTA_ScaleX,2.,DTA_ScaleY,2.); } }