diff --git a/FuturePlans.md b/FuturePlans.md index 61d194c0a..4fb3886f3 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -20,6 +20,7 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after - **[Heretic]** Doomguy Action Figure *("Oh, he gets one too?")* - **[Hexen]** Obelisk of the Golden Vale *("I puked out my guts when I touched that fucking thing")* * ***(Maybe)* Fake livestream chat overlay, with dynamic reactions to all sorts of stuff** +* ***(Maybe)* Minigames for the Demolitionist Menu (pong, tetris, some sort of basic platformer or shmup)** * **Mothgirl summon for Lämp easter egg** * **Ibuki companion add-on *(w/ optional "stream friendly" clothing)*** * **Saya model, for scenes or something idk *(maybe a companion add-on too)*** diff --git a/TODO.md b/TODO.md index a3b33e26c..06e4dfb5e 100644 --- a/TODO.md +++ b/TODO.md @@ -2,7 +2,6 @@ - Collectibles - Achievements - - Minigames **Extra things after release:** @@ -13,6 +12,7 @@ - Mod trailer video (doubt I'd be able to, I might ask someone instead) - Rewrite the entire Demolitionist Menu code from the ground up to be more easily extensible and adapt to any window size - Hexen key and puzzle item models? + - Minigames? **Very extra things for the future:** diff --git a/language.def_menu b/language.def_menu index 65e0e186c..760e59c04 100644 --- a/language.def_menu +++ b/language.def_menu @@ -264,7 +264,6 @@ SWWM_STORETAB = "Store"; SWWM_STOREFULL = "You can't hold more of that"; SWWM_STOREMUNS = "You don't have enough money"; SWWM_NOSTORE = "(no items left to buy)"; -SWWM_GAMETAB = "Games"; SWWM_TRADETAB = "Trading"; SWWM_TRADEFULL = "They can't hold more of that"; SWWM_TRADEFAIL = "You can't trade this item"; diff --git a/language.es_menu b/language.es_menu index aa9c18c77..d91779d17 100644 --- a/language.es_menu +++ b/language.es_menu @@ -264,7 +264,6 @@ SWWM_STORETAB = "Tienda"; SWWM_STOREFULL = "No puedes llevar más de eso"; SWWM_STOREMUNS = "No tienes suficiente dinero"; SWWM_NOSTORE = "(no queda nada que comprar)"; -SWWM_GAMETAB = "Juegos"; SWWM_TRADETAB = "Intercambio"; SWWM_TRADEFULL = "No puede llevar más de eso"; SWWM_TRADEFAIL = "No puedes enviar este ítem"; diff --git a/language.version b/language.version index a61807f7d..33c825fc4 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r605 \cu(Thu 5 Nov 18:43:05 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r605 \cu(Fri 6 Nov 13:09:07 CET 2020)"; diff --git a/zscript/swwm_kbase.zsc b/zscript/swwm_kbase.zsc index c9fc83f5e..8ee81ef51 100644 --- a/zscript/swwm_kbase.zsc +++ b/zscript/swwm_kbase.zsc @@ -24,7 +24,6 @@ Class SWWMKnowledgeBaseMenu : GenericMenu TAB_KEYS, TAB_LIBRARY, TAB_STORE, - TAB_GAME, TAB_TRADING, TAB_CHAT, TAB_SECRET, @@ -127,7 +126,7 @@ Class SWWMKnowledgeBaseMenu : GenericMenu LoreSeparator = TexMan.CheckForTexture("graphics/KBase/LibraryTabSeparator.png",TexMan.Type_MiscPatch); LoreSeparatorW = TexMan.CheckForTexture("graphics/KBase/LibraryTabSeparatorJP.png",TexMan.Type_MiscPatch); curtab = CVar.GetCVar('swwm_lasttab',players[consoleplayer]).GetInt(); - int maxtab = multiplayer?TAB_CHAT:TAB_GAME; + int maxtab = multiplayer?TAB_CHAT:TAB_STORE; if ( (curtab < TAB_MISSION) || (curtab > maxtab) ) curtab = TAB_MISSION; if ( curtab == TAB_LIBRARY ) sel1 = CVar.GetCVar('swwm_lastloretab',players[consoleplayer]).GetInt(); else if ( curtab == TAB_STATS ) sel1 = CVar.GetCVar('swwm_laststattab',players[consoleplayer]).GetInt(); @@ -316,7 +315,7 @@ Class SWWMKnowledgeBaseMenu : GenericMenu kcode = 0; break; } - int maxtab = multiplayer?TAB_CHAT:TAB_GAME; + int maxtab = multiplayer?TAB_CHAT:TAB_STORE; switch ( mkey ) { case MKEY_BACK: @@ -766,11 +765,11 @@ Class SWWMKnowledgeBaseMenu : GenericMenu static const string tabnames[] = { "$SWWM_MISSTAB", "$SWWM_STATTAB", "$SWWM_INVTAB", "$SWWM_KEYTAB", - "$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_GAMETAB", "$SWWM_TRADETAB", - "$SWWM_CHATTAB", "$SWWM_SECRETTAB", "$SWWM_HELPTAB" + "$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_TRADETAB", "$SWWM_CHATTAB", + "$SWWM_SECRETTAB", "$SWWM_HELPTAB" }; xx = 0; - int maxtab = multiplayer?TAB_CHAT:TAB_GAME; + int maxtab = multiplayer?TAB_CHAT:TAB_STORE; for ( int i=TAB_MISSION; i<=maxtab; i++ ) { len = fnt.StringWidth(tabnames[i])+6; @@ -2415,8 +2414,8 @@ Class SWWMKnowledgeBaseMenu : GenericMenu static const string tabnames[] = { "$SWWM_MISSTAB", "$SWWM_STATTAB", "$SWWM_INVTAB", "$SWWM_KEYTAB", - "$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_GAMETAB", "$SWWM_TRADETAB", - "$SWWM_CHATTAB", "$SWWM_SECRETTAB", "$SWWM_HELPTAB" + "$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_TRADETAB", "$SWWM_CHATTAB", + "$SWWM_SECRETTAB", "$SWWM_HELPTAB" }; static const string ltabnames[] = { @@ -2426,7 +2425,7 @@ Class SWWMKnowledgeBaseMenu : GenericMenu { "$SWWM_STATTAB0", "$SWWM_STATTAB1", "$SWWM_STATTAB2", "$SWWM_STATTAB3" }; - int maxtab = multiplayer?TAB_CHAT:TAB_GAME; + int maxtab = multiplayer?TAB_CHAT:TAB_STORE; int mx = maxtab; if ( curtab > TAB_CHAT ) mx++; for ( int i=0; i<=mx; i++ ) @@ -2908,11 +2907,6 @@ Class SWWMKnowledgeBaseMenu : GenericMenu Screen.DrawTexture(WindowSeparatorH,false,origin.x,origin.y+377,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); } } - else if ( curtab == TAB_GAME ) - { - str = StringTable.Localize("$SWWM_COMINGSOON"); - Screen.DrawText(fnt,Font.CR_FIRE,(ss.x-fnt.StringWidth(str))/2.,(ss.y-fnt.GetHeight())/2.,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - } else if ( curtab == TAB_TRADING ) { if ( !sub )