From b4fe4769d1afd156e8b7a9c8a31b0640386e0858 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 23 Oct 2020 20:00:22 +0200 Subject: [PATCH] Skill and episode menu changes --- language.def_menu | 7 +++++++ language.es_menu | 7 +++++++ language.version | 2 +- menudef.txt | 42 ++++++++++++++++++++++++++++++------- zmapinfo.txt | 44 +++++++++++++++++++++++++++++++++++++++ zscript/swwm_funstuff.zsc | 2 +- zscript/swwm_options.zsc | 2 +- 7 files changed, 96 insertions(+), 10 deletions(-) diff --git a/language.def_menu b/language.def_menu index 0fadf1eff..009ba4ca6 100644 --- a/language.def_menu +++ b/language.def_menu @@ -14,6 +14,13 @@ SWWM_GESTURE2 = "Thumbs Up"; SWWM_GESTURE3 = "Victory"; SWWM_GESTURE4 = "Blow Kiss"; SWWM_KBASE = "Demolitionist Menu"; +// skills +SWWM_SKCHILL = "Just Chillin'"; +SWWM_SKEASY = "Taking It Easy~"; +SWWM_SKNORMAL = "Adequate Adventure"; +SWWM_SKHARD = "I'm A Masochist"; +SWWM_SKLUNATIC = "Ｉ ＷＡＮＴ ＤＩＥ"; +SWWM_SKLUNATICCONFIRM = "You will die, you will suffer.\nThat, I can guarantee."; // mod menu SWWM_MTITLE = "SWWM GZ Options"; SWWM_PTITLE = "Player Options"; diff --git a/language.es_menu b/language.es_menu index 3f25685bd..40a2cf7c2 100644 --- a/language.es_menu +++ b/language.es_menu @@ -14,6 +14,13 @@ SWWM_GESTURE2 = "Pulgar Arriba"; SWWM_GESTURE3 = "Victoria"; SWWM_GESTURE4 = "Soplar Beso"; SWWM_KBASE = "Menú de Demolicionista"; +// skills +SWWM_SKCHILL = "De Relax"; +SWWM_SKEASY = "Con Calmita~"; +SWWM_SKNORMAL = "Aventura Adecuada"; +SWWM_SKHARD = "Soy Masoca"; +SWWM_SKLUNATIC = "INTENTA MUERTE"; +SWWM_SKLUNATICCONFIRM = "Vas a morir, vas a sufrir.\nEso te lo puedo garantizar."; // mod menu SWWM_MTITLE = "Opciones de SWWM GZ"; SWWM_PTITLE = "Opciones de Jugador"; diff --git a/language.version b/language.version index f16d7663f..be100b206 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r568 \cu(Thu 22 Oct 19:05:45 CEST 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r569 \cu(Fri 23 Oct 20:00:22 CEST 2020)"; diff --git a/menudef.txt b/menudef.txt index 889a352e9..889f14a54 100644 --- a/menudef.txt +++ b/menudef.txt @@ -236,7 +236,7 @@ AddOptionMenu "OptionsMenu" ListMenu "MainMenu" { Class "SWWMMainMenu" - Font "SWWMBigFont", "Untranslated" + Font "SWWMBigFont", "White", "Sapphire" Selector "graphics/DemoIcon.png", -24, 10 LineSpacing 28 SWWMLogo "M_SWWM" @@ -250,14 +250,42 @@ ListMenu "MainMenu" ListMenu "MainMenuTextOnly" { Class "SWWMMainMenu" - Font "SWWMBigFont", "Untranslated" + Font "SWWMBigFont", "White", "Sapphire" Selector "graphics/DemoIcon.png", -24, 10 LineSpacing 28 SWWMLogo "M_SWWM" Position 0, 56 - TextItem "$MNU_NEWGAME", "n", "PlayerclassMenu" - TextItem "$MNU_OPTIONS", "o", "OptionsMenu" - TextItem "$MNU_LOADGAME", "l", "LoadGameMenu" - TextItem "$MNU_SAVEGAME", "s", "SaveGameMenu" - TextItem "$MNU_QUITGAME", "q", "QuitMenu" + SWWMTextItemM "$MNU_NEWGAME", "n", "PlayerclassMenu" + SWWMTextItemM "$MNU_OPTIONS", "o", "OptionsMenu" + SWWMTextItemM "$MNU_LOADGAME", "l", "LoadGameMenu" + SWWMTextItemM "$MNU_SAVEGAME", "s", "SaveGameMenu" + SWWMTextItemM "$MNU_QUITGAME", "q", "QuitMenu" +} +ListMenu "EpisodeMenu" +{ + IfGame(Doom, Heretic, Hexen, Strife) + { + NetgameMessage "$NEWGAME" + } + IfGame(Chex) + { + NetgameMessage "$CNEWGAME" + } + Font "SWWMBigFont", "White", "Sapphire" + Selector "graphics/DemoIcon.png", -32, 10 + LineSpacing 28 + StaticText 56, 24, "$MNU_EPISODE" + Position 90, 64 +} + +ListMenu "SkillMenu" +{ + Font "SWWMBigFont", "White", "Sapphire" + Selector "graphics/DemoIcon.png", -32, 10 + LineSpacing 28 + StaticText 24, 4, "$MNU_CHOOSESKILL" + Position 0, 40 + CenterMenu + // the menu building code for this does not give a single goddamn fuck about positioning so it looks completely off-center + // thanks to whoever decided that, hope you step on a LEGO } diff --git a/zmapinfo.txt b/zmapinfo.txt index 385c087d1..ef302c497 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -31,6 +31,7 @@ GameInfo MessageBoxClass = "SWWMMessageBox" BorderFlat = "graphics/bord_flat.png" Border = 2, 0, "graphics/bord_tr.png", "graphics/bord_t.png", "graphics/bord_tl.png", "graphics/bord_r.png", "graphics/bord_l.png", "graphics/bord_br.png", "graphics/bord_b.png", "graphics/bord_bl.png" + ForceTextInMenus = true // precaching of frame-heavy objects PrecacheClasses = "Demolitionist", "DeepImpact", @@ -50,6 +51,49 @@ GameInfo "wallbuster/cbt" } +ClearSkills + +Skill chill +{ + AutoUseHealth + DamageFactor = 0.5 + EasyBossBrain + SpawnFilter = baby + ACSReturn = 0 + Name = "$SWWM_SKCHILL" +} +Skill easy +{ + SpawnFilter = easy + ACSReturn = 1 + Name = "$SWWM_SKEASY" +} +Skill normal +{ + SpawnFilter = normal + ACSReturn = 2 + Name = "$SWWM_SKNORMAL" + DefaultSkill +} +Skill hard +{ + SpawnFilter = hard + ACSReturn = 3 + Name = "$SWWM_SKHARD" +} +Skill lunatic +{ + FastMonsters + DisableCheats + Aggressiveness = 1.0 + MonsterHealth = 2.0 + DamageFactor = 2.0 + SpawnFilter = nightmare + ACSReturn = 4 + Name = "$SWWM_SKLUNATIC" + MustConfirm = "$SWWM_SKLUNATICCONFIRM" +} + Map TITLEMAP "SWWM GZ - Title Map" { Music = "" diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index 03fc2b7cf..3e5307d52 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -201,7 +201,7 @@ Class MothPlushy : SWWMCollectible if ( Owner && Owner.CheckLocalView() ) { if ( cdown == 105 ) - A_StartSound("mashiro/giggle",CHAN_ITEMEXTRA,CHANF_OVERLAP|CHANF_UI,1.,0.); + A_StartSound("mashiro/appear",CHAN_ITEMEXTRA,CHANF_OVERLAP|CHANF_UI,1.,0.); if ( cdown == 35 ) Console.MidPrint(newsmallfont,"$D_MASHIRO"); } diff --git a/zscript/swwm_options.zsc b/zscript/swwm_options.zsc index 70e57f385..0edca413a 100644 --- a/zscript/swwm_options.zsc +++ b/zscript/swwm_options.zsc @@ -258,7 +258,7 @@ Class SWWMMessageBox : MessageBoxMenu int mr1 = 170+textFont.StringWidth(Stringtable.Localize("$TXT_YES")); int mr2 = 170+textFont.StringWidth(Stringtable.Localize("$TXT_NO")); mMouseRight = max(mr1,mr2); - mMessage = textFont.BreakLines(Stringtable.Localize(message), 300); + mMessage = textFont.BreakLines(Stringtable.Localize(message),600); } override void Drawer()