From 64156a9fcf9c45b22ce42455eccfb83f2155c404 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 14 Sep 2022 21:43:16 +0200 Subject: [PATCH] Revert "Localize Mortal Rifle popups." This reverts commit a475af5e8bf4215020bbbe1917b5b77b8462c3d6. Due to the font used, these are not serializable. --- language.es_base | 2 -- language.version | 4 ++-- zscript/dlc1/swwm_dlcweapons_canvas.zsc | 10 ++-------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/language.es_base b/language.es_base index 880e3773f..aa1705a48 100644 --- a/language.es_base +++ b/language.es_base @@ -592,8 +592,6 @@ SWWM_MRMODE1 = "Disparo de Precisión"; SWWM_MRMODE2 = "Disparo en Clúster"; SWWM_MRMODE3 = "Disparo en Chorro"; SWWM_MRMODE4 = "Disparo de Presión"; -SWWM_MRLOW = "MUNICIÓN BAJA"; -SWWM_MRNONE = "RECARGA"; SWWM_SHEENREADY = "La Ametralladora Sheen se ha enfriado."; SWWM_DMRANK = "Posición:"; SWWM_DMSPREAD = "Distancia:"; diff --git a/language.version b/language.version index 3181f1562..4b1b331af 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r455 \cu(Wed 14 Sep 21:24:07 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r455 \cu(2022-09-14 21:24:07)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r454 \cu(Wed 14 Sep 20:51:05 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r454 \cu(2022-09-14 20:51:05)\c-"; diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc index 4451b69a3..c4e1e9aff 100644 --- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc +++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc @@ -221,11 +221,8 @@ extend Class MisterRifle str = StringTable.Localize("$SWWM_MRLOW"); fw = MortalFontMed.StringWidth(str); fh = MortalFontMed.GetHeight(); - double scl = min(1.,224./fw); - fw = int(fw*scl); - fh = int(fh*scl); DrawWindowFrame(128-fw/2,72-fh/2,fw,fh,2,-2,true); - TouchScreen.DrawText(MortalFontMed,Font.FindFontColor("MiniBrass"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%8>=4)?0x80000000:0x000000,DTA_ScaleX,scl,DTA_ScaleY,scl); + TouchScreen.DrawText(MortalFontMed,Font.FindFontColor("MiniBrass"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%8>=4)?0x80000000:0x000000); } if ( noammotic && (noammotic > gametic) ) { @@ -233,11 +230,8 @@ extend Class MisterRifle str = StringTable.Localize("$SWWM_MRNONE"); fw = MortalFontBig.StringWidth(str); fh = MortalFontBig.GetHeight(); - double scl = min(1.,224./fw); - fw = int(fw*scl); - fh = int(fh*scl); DrawWindowFrame(128-fw/2,72-fh/2,fw,fh,4,-4,true); - TouchScreen.DrawText(MortalFontBig,Font.FindFontColor("MiniRed"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%16>=8)?0x80000000:0x000000,DTA_ScaleX,scl,DTA_ScaleY,scl); + TouchScreen.DrawText(MortalFontBig,Font.FindFontColor("MiniRed"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%16>=8)?0x80000000:0x000000); } // Holo sub-screen if ( !AmmoLed ) AmmoLed = TexMan.GetCanvas("MORTLED2");