diff --git a/gldefs.misc b/gldefs.misc index b989f4d39..16e76b2f7 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -228,6 +228,10 @@ HardwareShader Texture "graphics/Fanart/Marisa16.jpg" { Shader "shaders/glsl/Bilinear.fp" } +HardwareShader Texture "graphics/Fanart/Marisa17.jpg" +{ + Shader "shaders/glsl/Bilinear.fp" +} HardwareShader Texture "graphics/Fanart/Monsoon.jpg" { Shader "shaders/glsl/Bilinear.fp" diff --git a/language.def_base b/language.def_base index 3286a9bf0..e93b7c4e7 100644 --- a/language.def_base +++ b/language.def_base @@ -1097,7 +1097,7 @@ SWWM_INTERTIP188 = "The Rafan-Kos can prepare a delicious cyberdemon roast in a SWWM_INTERTIP189 = "The Mortal Rifle allegedly uses \"mutating ammunition\", whatever the hell that's supposed to mean."; SWWM_INTERTIP190 = "Hellblazer warheads will continuously toast things good as their shockwave expands. Get Redeemed, sucker."; SWWM_INTERTIP191 = "Hellblazer ravagers are best used in enclosed spaces, it keeps all the scorching hot plasma nicely contained."; -SWWM_INTERTIP192 = "The Demolitionist can directly interface with the Hellblazer to mark targets for seeking. This even works on grenades"; +SWWM_INTERTIP192 = "The Demolitionist can directly interface with the Hellblazer to mark targets for seeking. This even works on grenades."; SWWM_INTERTIP193 = "The Quadravol can be held with one hand. This has no tactical advantage, but you can do the cool spin and that's all that matters."; SWWM_INTERTIP194 = "Xekkian weapons are very big, but so are the people who use them."; SWWM_INTERTIP195 = "A legendary weapon known as the K-79D was going to be featured, but it was unfortunately erased from history. It's still in the mod, technically."; diff --git a/language.def_lore b/language.def_lore index 76cd32dfb..9c0571439 100644 --- a/language.def_lore +++ b/language.def_lore @@ -1168,7 +1168,7 @@ SWWM_LORETXT_FROGGYCHAIR = "\n" "\cfAnyway, I have to do this, I have to say it or they won't leave me alone:\c-\n" "\n" -"\cfWelcome to the \cfFroggy Gang\cf, Demo-chan.\c-"; +"\cfWelcome to the \cdFroggy Gang\cf, Demo-chan.\c-"; SWWM_LORETAG_GCSANDWICH = "Sandwich"; SWWM_LORETAB_GCSANDWICH = "Item"; SWWM_LOREREL_GCSANDWICH = "NosKora;Saya"; diff --git a/language.es_lore b/language.es_lore index e762703af..baa96c33e 100644 --- a/language.es_lore +++ b/language.es_lore @@ -1084,7 +1084,7 @@ SWWM_LORETXT_FROGGYCHAIR = "\n" "\cfEn fin, tengo que hacer esto, tengo que decirlo o no me dejarán en paz:\c-\n" "\n" -"\cfBienvenida a la \cfFroggy Gang\c-, Demo-chan.\c-"; +"\cfBienvenida a la \cdFroggy Gang\cf, Demo-chan.\c-"; SWWM_LORETXT_GCSANDWICH = "\cxDesignación:\c-\n" "\cf Sandwich de Queso a la Plancha\c-\n" diff --git a/language.es_voice b/language.es_voice index 16ca4287d..8e1be47ad 100644 --- a/language.es_voice +++ b/language.es_voice @@ -123,7 +123,7 @@ SWWM_SUBS_DEFAULT_SCOREKILL24 = "Aquí tienes tu ración especial de MUERE."; SWWM_SUBS_DEFAULT_SCOREKILL25 = "¿Quieres más?"; SWWM_SUBS_DEFAULT_SCOREKILL26 = "A joderse."; SWWM_SUBS_DEFAULT_SCOREKILL27 = "Eso si que lo llamo un momento BRUH."; -SWWM_SUBS_DEFAULT_SCOREKILL27 = "Muerto!"; +SWWM_SUBS_DEFAULT_SCOREKILL28 = "¡Muerto!"; // oopsies SWWM_SUBS_DEFAULT_FRIENDKILL1 = "¡Oh no! ¡No no no no lo siento oh dios mío!"; SWWM_SUBS_DEFAULT_FRIENDKILL2 = "¡Oh dios mío! Lo siento mucho..."; diff --git a/language.version b/language.version index 8796c90d7..a211ffe3f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r240 \cu(Sat 30 Jul 16:55:11 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r240 \cu(2022-07-30 16:55:11)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r241 \cu(Sun 31 Jul 21:14:35 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r241 \cu(2022-07-31 21:14:35)\c-"; diff --git a/lore/default/froggychair.txt b/lore/default/froggychair.txt index 660b5bedc..aec1373ff 100644 --- a/lore/default/froggychair.txt +++ b/lore/default/froggychair.txt @@ -25,4 +25,4 @@ A small price to pay... \cfAnyway, I have to do this, I have to say it or they won't leave me alone:\c- -\cfWelcome to the \cfFroggy Gang\cf, Demo-chan.\c- +\cfWelcome to the \cdFroggy Gang\cf, Demo-chan.\c- diff --git a/lore/es/froggychair.txt b/lore/es/froggychair.txt index d158c55e4..67ee82daa 100644 --- a/lore/es/froggychair.txt +++ b/lore/es/froggychair.txt @@ -21,4 +21,4 @@ Un pequeño precio a pagar... \cfEn fin, tengo que hacer esto, tengo que decirlo o no me dejarán en paz:\c- -\cfBienvenida a la \cfFroggy Gang\c-, Demo-chan.\c- +\cfBienvenida a la \cdFroggy Gang\cf, Demo-chan.\c- diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc index b6364297c..f5eacac09 100644 --- a/zscript/dlc1/swwm_heavymahsheengun.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun.zsc @@ -3,7 +3,7 @@ Class HeavyMahSheenGun : SWWMWeapon { - int fired; + transient int fired; int firespeed; double barrelheat, aimerror, vibrate; bool incooldown, stopfire, firstshot; diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 60b46b7eb..9a92c0556 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -3006,7 +3006,7 @@ Class SWWMStatusBar : BaseStatusBar Screen.DrawTexture(HealthTex[7],false,margin+2+ox,ss.y-(margin+20+oy),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,bhw,DTA_LegacyRenderStyle,STYLE_Add,DTA_Alpha,alph); Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_FLASH],margin+107+ox,ss.y-(margin+20+oy),str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_LegacyRenderStyle,STYLE_Add,DTA_Alpha,alph); } - if ( (CPlayer.health > 0) && (CPlayer.health <= 25) && (PulsePhase <= 15) ) + if ( (CPlayer.health > 0) && (CPlayer.health <= 25) && (PulsePhase <= 15) && (hcolor != MCR_WHITE) ) { double alph = clamp(sin((PulsePhase-FracTic)*12.),0.,1.); Screen.DrawTexture(HealthTex[6],false,margin+2+ox,ss.y-(margin+20+oy),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_Alpha,alph);