diff --git a/graphics/KBase/Drawing_Ibuki.png b/graphics/KBase/Drawing_Ibuki.png new file mode 100644 index 000000000..cf9e5e47a Binary files /dev/null and b/graphics/KBase/Drawing_Ibuki.png differ diff --git a/graphics/KBase/Drawing_Kirin.png b/graphics/KBase/Drawing_Kirin.png new file mode 100644 index 000000000..dd4c05fc5 Binary files /dev/null and b/graphics/KBase/Drawing_Kirin.png differ diff --git a/graphics/KBase/Drawing.png b/graphics/KBase/Drawing_Saya.png similarity index 100% rename from graphics/KBase/Drawing.png rename to graphics/KBase/Drawing_Saya.png diff --git a/language.def_menu b/language.def_menu index b6ef01191..abab1eded 100644 --- a/language.def_menu +++ b/language.def_menu @@ -349,7 +349,31 @@ SWWM_MSGRECV = "%s sent you %dx %s."; SWWM_CHATTAB = "Chat Log"; SWWM_NOCHAT = "(chat history is empty)"; SWWM_SECRETTAB = "Secret"; -SWWM_TODEMO = "To Demo-chan, from Ibuki and Saya \cg♥\c-"; +SWWM_TODEMO = "\cx\"Fight for justice, Demo-chan! You can do it!\"\c- \cg♥\c- Ibuki & Saya"; +SWWM_CUTIECLUB = "\cx\"Never lose hope, Demo-chan! We're all with you!\"\c- \cg♥\c- Cutie Club"; +SWWM_FROMKIRIN = "\cx\"Kirin-kun wrote this poem for you. Hope you like it~\"\c- \cg♥\c- Saya"; +SWWM_KIRINPOEM = +"A machine born, of loving heart,\n" +"a valiant soul, protector of all.\n" +"With you standing at our side,\n" +"our faith shall never fall.\n" +"\n" +"Against evil you fight,\n" +"for freedom you do battle.\n" +"Unwavering you are, in all,\n" +"even if swarmed by vile rabble.\n" +"\n" +"To many worlds your eyes do take me,\n" +"where fires wage of death and war.\n" +"When you're there, in distant lands,\n" +"I stand close, even if you're so far.\n" +"\n" +"From my love take this blessing,\n" +"o brave Demolitionist, my hero.\n" +"May your strength never fail,\n" +"may their numbers fall to zero.\n" +"\n" +"— \cgKirin Xanai\c-"; SWWM_MAINCONTROLS = "Press F1 to see controls"; SWWM_LOREUNSEL = "(no entry chosen)"; SWWM_LORETAB0 = "Items"; @@ -371,7 +395,7 @@ SWWM_HELPTXT = "\cfLeft/Right:\c- Switch through entries\n" "\n" "\cxStats Tab - Controls\c-\n" -"\cx--------------------\c-\n" +"\cx------------------\c-\n" "\n" "\cfUp/Down:\c- Scroll\n" "\cfLeft/Right:\c- Switch section\n" @@ -402,14 +426,14 @@ SWWM_HELPTXT = "\cfBackspace:\c- Return to entry list\n" "\n" "\cxStore Tab - Controls (Buying)\c-\n" -"\cx------------------\c-\n" +"\cx---------------------------\c-\n" "\n" "\cfArrow Keys:\c- Navigate\n" "\cfEnter/Left Click:\c- Buy\n" "\cfBackspace/Right Click:\c- Switch to selling\n" "\n" "\cxStore Tab - Controls (Selling)\c-\n" -"\cx------------------\c-\n" +"\cx----------------------------\c-\n" "\n" "\cfArrow Keys:\c- Navigate\n" "\cfEnter/Left Click:\c- Sell\n" diff --git a/language.es_menu b/language.es_menu index 7a150a775..45b8ca96a 100644 --- a/language.es_menu +++ b/language.es_menu @@ -346,7 +346,31 @@ SWWM_MSGRECV = "%s te ha enviado %dx %s."; SWWM_CHATTAB = "Hist. de Chat"; SWWM_NOCHAT = "(historial de chat vacío)"; SWWM_SECRETTAB = "Secreto"; -SWWM_TODEMO = "Para Demo-chan, de parte de Ibuki y Saya \cg♥\c-"; +SWWM_TODEMO = "\cx\"¡Lucha por la justicia, Demo-chan! ¡Tú puedes!\"\c- \cg♥\c- Ibuki y Saya"; +SWWM_CUTIECLUB = "\cx\"¡Jamás pierdas la esperanza, Demo-chan! ¡Estamos todas contigo!\"\c- \cg♥\c- Club Cuqui"; +SWWM_FROMKIRIN = "\cx\"Kirin-kun escribió este poema para ti. Espero que te guste~\"\c- \cg♥\c- Saya"; +SWWM_KIRINPOEM = +"Máquina nacida, de amado corazón,\n" +"alma fiel, protegiendo a la gente.\n" +"Contigo siempre de nuestro lado,\n" +"nuestra fe es clara y evidente.\n" +"\n" +"Contra el mal te enfrentas,\n" +"por la paz haces batalla,\n" +"Firme siempre, ante todo,\n" +"aun acosada por el más canalla.\n" +"\n" +"A tantos mundos me llevan tus ojos,\n" +"guerra y muerte, de fuego todo bañado.\n" +"Estando ahí, en tierras distantes,\n" +"Contigo voy, no me siento alejado.\n" +"\n" +"Por mi amor te doy bendición,\n" +"Demolicionista, sé valiente.\n" +"Que tu enemigo sea conquistado,\n" +"que se consuma en fuego ardiente.\n" +"\n" +"— \cgKirin Xanai\c-"; SWWM_MAINCONTROLS = "Pulsa F1 para ver controles"; SWWM_LOREUNSEL = "(ninguna entrada elegida)"; SWWM_LORETAB0 = "Ítems"; @@ -368,7 +392,7 @@ SWWM_HELPTXT = "\cfIzquierda/Derecha:\c- Cambiar entre entradas\n" "\n" "\cxPestaña de Estadísticas - Controles\c-\n" -"\cx---------------------------\c-\n" +"\cx---------------------------------\c-\n" "\n" "\cfArriba/Abajo:\c- Scroll\n" "\cfIzquierda/Derecha:\c- Cambiar sección\n" @@ -399,14 +423,14 @@ SWWM_HELPTXT = "\cfRetroceso:\c- Volver a lista de entradas\n" "\n" "\cxPestaña de Tienda - Controles (Compra)\c-\n" -"\cx---------------------------\c-\n" +"\cx------------------------------------\c-\n" "\n" "\cfFlechas:\c- Navegar\n" "\cfEnter/Click Izdo.:\c- Comprar\n" "\cfRetroceso/Click Dcho.:\c- Cambiar a venta\n" "\n" "\cxPestaña de Tienda - Controles (Venta)\c-\n" -"\cx---------------------------\c-\n" +"\cx-----------------------------------\c-\n" "\n" "\cfFlechas:\c- Navegar\n" "\cfEnter/Click Izdo.:\c- Vender\n" @@ -421,21 +445,21 @@ SWWM_HELPTXT_TRADING = "\cfRetroceso/Click Dcho.:\c- Historial\n" "\n" "\cxPestaña de Intercambio - Controles (Intercambio)\c-\n" -"\cx----------------------------\c-\n" +"\cx-----------------------------------------------\c-\n" "\n" "\cfFlechas:\c- Navegar\n" "\cfEnter/Click Izdo.:\c- Enviar ítem\n" "\cfRetroceso/Click Dcho.:\c- Volver\n" "\n" "\cxPestaña de Intercambio - Controles (Historial)\c-\n" -"\cx------------------------------\c-\n" +"\cx--------------------------------------------\c-\n" "\n" "\cfArriba/Abajo:\c- Scroll\n" "\cfRetroceso/Click Dcho.:\c- Volver"; SWWM_HELPTXT_CHAT = "\n\n" "\cxPestaña de Historial de Chat - Controles\c-\n" -"\cx---------------------\c-\n" +"\cx--------------------------------------\c-\n" "\n" "\cfArriba/Abajo:\c- Scroll"; // Wallbuster menu diff --git a/language.version b/language.version index 162dd56d6..24c84ad1b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r267 \cu(Sat 13 Feb 12:50:56 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r267 \cu(2021-02-13 12:50:56)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r268 \cu(Sat 13 Feb 22:13:59 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r268 \cu(2021-02-13 22:13:59)\c-"; diff --git a/zscript/swwm_kbase.zsc b/zscript/swwm_kbase.zsc index 7c9cda0e0..d04cac7bc 100644 --- a/zscript/swwm_kbase.zsc +++ b/zscript/swwm_kbase.zsc @@ -39,7 +39,7 @@ Class DemolitionistMenu : GenericMenu }; TextureID MainWindow, TabSeparator, WindowSeparator, WindowSeparatorH, - FancyBg, EasterEgg, LoreSeparator, LoreSeparatorW; + FancyBg, Drawing[3], LoreSeparator, LoreSeparatorW; transient CVar lang, fuzz, pauseme; transient Font TewiFont, MPlusFont, MiniwiFont, k6x8Font; Array tabs; @@ -126,7 +126,9 @@ Class DemolitionistMenu : GenericMenu TabSeparator = TexMan.CheckForTexture("graphics/KBase/TabSeparator.png",TexMan.Type_MiscPatch); WindowSeparator = TexMan.CheckForTexture("graphics/KBase/WindowSeparator.png",TexMan.Type_MiscPatch); WindowSeparatorH = TexMan.CheckForTexture("graphics/KBase/WindowSeparatorH.png",TexMan.Type_MiscPatch); - EasterEgg = TexMan.CheckForTexture("graphics/KBase/Drawing.png",TexMan.Type_MiscPatch); + Drawing[0] = TexMan.CheckForTexture("graphics/KBase/Drawing_Saya.png",TexMan.Type_MiscPatch); + Drawing[1] = TexMan.CheckForTexture("graphics/KBase/Drawing_Ibuki.png",TexMan.Type_MiscPatch); + Drawing[2] = TexMan.CheckForTexture("graphics/KBase/Drawing_Kirin.png",TexMan.Type_MiscPatch); LoreSeparator = TexMan.CheckForTexture("graphics/KBase/LibraryTabSeparator.png",TexMan.Type_MiscPatch); LoreSeparatorW = TexMan.CheckForTexture("graphics/KBase/LibraryTabSeparatorJP.png",TexMan.Type_MiscPatch); MenuSound("menu/demoopen"); @@ -3407,9 +3409,33 @@ Class DemolitionistMenu : GenericMenu } else if ( tabs[curtab] == TAB_SECRET ) { - Screen.DrawTexture(EasterEgg,false,origin.x+20,origin.y+40,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - str = StringTable.Localize("$SWWM_TODEMO"); - Screen.DrawText(fnt,Font.CR_FIRE,origin.x+(640-fnt.StringWidth(str))/2,origin.y+350,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + if ( gameinfo.gametype&(GAME_Strife|GAME_Hexen) ) + { + Screen.DrawTexture(Drawing[2],false,origin.x+20,origin.y+40,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + str = StringTable.Localize("$SWWM_KIRINPOEM"); + BrokenLines l = fnt.BreakLines(str,300); + int mxlen = 0; + for ( int i=0; i mxlen ) mxlen = l.StringWidth(i); + xx = (i