OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Add option to disable death exits.

Browse source
This commit is contained in:
Mari the Deer 2022-02-26 20:33:58 +01:00
commit 1a15ebf911
6 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cvarinfo.base
View file

@ -126,6 +126,7 @@ nosave bool swwm_oldlogo = false; // restores the old SWWM GZ logo and intro
nosave string swwm_menuposehistory = ""; // stores currently seen poses for the main menu, for shuffling
nosave string swwm_titlesubhistory = ""; // stores currently seen subtitles for the title screen, for shuffling
nosave noarchive int swwm_profstart = 0; // starts profiling as soon as handler is registered for specified >0 tics
server bool swwm_nodeathexit = false; // completely sidesteps the inventory resetting of death exits, if you hate those
// minimap settings
nosave bool swwm_mm_enable = true; // show a minimap below the score counter

2
language.def_menu
View file

@ -217,6 +217,7 @@ SWWM_BEEPBOOP = "Switch Emoting";
SWWM_VOICEAMP = "Voice Amplification";
SWWM_CLEARFX = "Clear All Effects";
SWWM_OLDLOGO = "Old Branding";
SWWM_NODEATHEXIT = "Disable Death Exits";
SWWM_MMTITLE = "Minimap Settings";
SWWM_MM_ENABLE = "Show Minimap";
SWWM_MM_ROTATE = "Rotate Minimap";
@ -381,6 +382,7 @@ TOOLTIP_SWWM_BEEPBOOP = "The Demolitionist will make cute noises whenever pressi
TOOLTIP_SWWM_VOICEAMP = "At their default volume, the Demolitionist's voice lines might be drowned out by in-game audio. This sets an additional amplification level so they're louder than other sounds.";
TOOLTIP_NETEVENT_SWWMCLEAREFFECTS = "Fades out any active blood, gore, debris and casings.";
TOOLTIP_SWWM_OLDLOGO = "For those who miss the days of SWWM GZ, you can restore the old title screen and main menu with this.";
TOOLTIP_SWWM_NODEATHEXIT = "This option completely negates the effects of death exits, if you don't like losing all your stuff.";
TOOLTIP_SWWMMINIMAPMENU = "Configure the minimap.";
TOOLTIP_SWWMACHIEVEMENTMENU = "View your achievements.";
TOOLTIP_SWWM_MM_ENABLE = "Displays a minimap under the score counter.";

2
language.es_menu
View file

@ -216,6 +216,7 @@ SWWM_BEEPBOOP = "Ruiditos de Activación";
SWWM_VOICEAMP = "Amplificación de Voz";
SWWM_CLEARFX = "Limpiar todos los Efectos";
SWWM_OLDLOGO = "Marca Antigua";
SWWM_NODEATHEXIT = "Desactivar Salidas de Muerte";
SWWM_MMTITLE = "Opciones de Minimapa";
SWWM_MM_ENABLE = "Mostrar Minimapa";
SWWM_MM_ROTATE = "Rotar Minimapa";
@ -380,6 +381,7 @@ TOOLTIP_SWWM_BEEPBOOP = "La Demolicionista hará ruiditos adorables cuando pulse
TOOLTIP_SWWM_VOICEAMP = "A su volumen normal, las voces de la Demolicionista pueden ser ahogadas por el audio del juego. Con esto se le dá un nivel de amplificación extra para que sean más estridentes que otros sonidos.";
TOOLTIP_NETEVENT_SWWMCLEAREFFECTS = "Desvanece cualquier sangre, vísceras, escombros y casquillos activos.";
TOOLTIP_SWWM_OLDLOGO = "Para quienes echan de menos los viejos tiempos de SWWM GZ, podeis restaurar la antigua pantalla de inicio y menú principal con esto.";
TOOLTIP_SWWM_NODEATHEXIT = "Esta opción invalida completamente los efectos de las salidas de muerte, si no te gusta perder todas tus cosas.";
TOOLTIP_SWWMMINIMAPMENU = "Configura el minimapa.";
TOOLTIP_SWWMACHIEVEMENTMENU = "Revisa tus logros.";
TOOLTIP_SWWM_MM_ENABLE = "Muestra un minimapa bajo el contador de puntuación.";

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r172 \cu(Fri 25 Feb 16:51:20 CET 2022)\c-";
SWWM_SHORTVER="\cw1.2pre r172 \cu(2022-02-25 16:51:20)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r173 \cu(Sat 26 Feb 20:33:58 CET 2022)\c-";
SWWM_SHORTVER="\cw1.2pre r173 \cu(2022-02-26 20:33:58)\c-";

1
menudef.txt
View file

@ -200,6 +200,7 @@ OptionMenu "SWWMOptionMenu"
Option "$SWWM_PS_RESETAMMO", "swwm_ps_resetammo", "SWWMPistolStart"
Option "$SWWM_PS_RESETITEMS", "swwm_ps_resetitems", "SWWMPistolStart"
Option "$SWWM_PS_RESETHEALTH", "swwm_ps_resethealth", "SWWMPistolStart"
Option "$SWWM_NODEATHEXIT", "swwm_nodeathexit", "YesNo"
Option "$SWWM_ENEMYDROPS", "swwm_enemydrops", "SWWMEnemyDropType"
Option "$SWWM_ONDEMANDAMMO", "swwm_ondemandammo", "YesNo"
Option "$SWWM_RESETSCORE", "swwm_resetscore", "YesNo"

10
zscript/swwm_player.zsc
View file

@ -2959,6 +2959,16 @@ Class Demolitionist : PlayerPawn
{
// clean up attached actors
if ( selflight ) selflight.Destroy();
// disable death exits
if ( player && (player.playerstate == PST_DEAD) && swwm_nodeathexit )
{
player.Resurrect();
player.damagecount = 0;
player.bonuscount = 0;
player.poisoncount = 0;
roll = 0;
if ( special1 > 2 ) special1 = 0;
}
// inventory wipes
if ( invwipe && (player.playerstate != PST_DEAD) )
{