OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove first person key gestures.

Browse source
This commit is contained in:
Mari the Deer 2022-11-26 03:42:35 +01:00
commit 4ad26239d4
30 changed files with 11 additions and 1889 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.def_base
View file

@ -898,7 +898,7 @@ SWWM_INTERTIP16 = "Finding secrets, important items, and achieving certain miles
SWWM_INTERTIP17 = "The Demolitionist Menu is very helpful, do not forget to bind a key to open it.";
SWWM_INTERTIP18 = "All weapons have a quick melee attack available through a dedicated button. With one-handed weapons you will perform a punch, and with two-handed ones a bash.";
SWWM_INTERTIP19 = "With the right combination of boosting and wall jumping, it is perfectly possible to remain in the air for extended periods of time.";
SWWM_INTERTIP20 = "Keys and collectibles will play a first-person animation when picked up. If you feel this gets in the way, it can be disabled in the mod options.";
SWWM_INTERTIP20 = "Special collectibles will play a first-person animation when picked up. If you feel this gets in the way, it can be disabled in the mod options.";
SWWM_INTERTIP21 = "Aim for a high score! The more enemies you kill the better. Don't forget to put that cash to use at the in-game store when you can.";
SWWM_INTERTIP22 = "With proper timing, you can use your quick melee attack to deflect projectiles. It is even possible to return these to the sender, with increased damage if you're under the effects of a Ragekit.";
SWWM_INTERTIP23 = "Did you know that Saya really hates the UAC?\n\nWhat? You already knew that? Geez, then I have no idea what else to tell you.";
@ -997,7 +997,7 @@ SWWM_INTERTIP115 = "There was a tip here, but it's gone now.";
SWWM_INTERTIP116 = "Over thirteen billion devices run Java. It is already too late, we're all doomed.";
SWWM_INTERTIP117 = "Food tastes best when you make it yourself.";
SWWM_INTERTIP118 = "This tip mesage contains a typo.";
SWWM_INTERTIP119 = "If enemies are getting in your way while you're admiring the shiny new key you just found, you can punch them with your free hand.";
SWWM_INTERTIP119 = "Keyhunts bothering you? Get yourself a Wallbuster of a Combat Hammer and start tearing down those pesky locked doors.";
SWWM_INTERTIP120 = "I find that if you just talk, your mouth comes up with stuff.";
SWWM_INTERTIP121 = "Saya claims to enjoy black coffee, but she secretly adds sugar to it when no one's looking.";
SWWM_INTERTIP122 = "From personal experience, Saya believes that there isn't a single arms manufacturer in the world who is straight.";

2
language.def_menu
View file

@ -85,7 +85,6 @@ SWWM_MCTITLE = "Mod Compatibility Options";
SWWM_LDSPOIL = "Always Show Legendaries";
SWWM_ETITLE = "Effect Options";
SWWM_UNCAPALERT = "Uncap Alert Range";
SWWM_COLLECTANIMKEY = "Key Animations";
SWWM_STRICTUNTOUCHABLE = "Untouchable Bonus Strictness";
SWWM_UNTOUCHABLE_HEALTH = "Health Decrease";
SWWM_UNTOUCHABLE_ARMOR = "Armor Decrease";
@ -235,7 +234,6 @@ TOOLTIP_SWWM_COLLECTANIM = "Play special first person animations when picking up
TOOLTIP_SWWM_PRECISECROSSHAIR = "Projects crosshair onto the spot the weapon will actually hit, rather than staying in the center of the screen. (\"Always\" will draw the crosshair even if it's normally toggled off, useful if you regularly switch to other mods where it's recommended to be disabled)";
TOOLTIP_SWWM_LDSPOIL = "[LegenDoom] Always show the \"Legendary\" prefix on healthbar tags, rather than after the monster has transformed. Disable if you'd rather not spoil the surprise.";
TOOLTIP_SWWM_UNCAPALERT = "If enabled, all weapons and projectiles will have infinite noise radius. May fix maps that employ vanilla-style teleport traps.";
TOOLTIP_SWWM_COLLECTANIMKEY = "Play special first person animations when picking up keys.";
TOOLTIP_SWWM_STRICTUNTOUCHABLE = "By default, the \"Untouchable\" bonus is active until you take direct damage. If you feel this isn't strict enough, you can also make it end if armor absorbs the damage, or, for extra strictness, on ANY hit, even while invulnerable.";
TOOLTIP_SWWM_SWAPWEAPONS = "Allow only one weapon per slot (excluding Deep Impact). Disable if you'd rather throw balance out the window.";
TOOLTIP_SWWM_FORCESTATS = "Shows map statistics in the HUD even when the automap isn't open.";

4
language.es_base
View file

@ -787,7 +787,7 @@ SWWM_INTERTIP16 = "Encontrar secretos, ítems importantes, y conseguir ciertos l
SWWM_INTERTIP17 = "El Menú de Demolicionista es muy útil, no te olvides de asignar una tecla para abrirlo.";
SWWM_INTERTIP18 = "Todas las armas tienen un ataque rápido a melé disponible a través de un botón dedicado. Con armas a una mano darás un puñetazo, con armas a dos manos golpearás con ellas.";
SWWM_INTERTIP19 = "Con la combinación adecuada de impulsar y saltar por las paredes, es perfectamente posible mantenerse en el aire durante largos periodos de tiempo.";
SWWM_INTERTIP20 = "Las llaves y coleccionables tienen animaciones en primera persona al recogerse. Si esto resulta molesto puedes desactivarlo en las opciones del mod.";
SWWM_INTERTIP20 = "Los coleccionables especiales tienen animaciones en primera persona al recogerse. Si esto resulta molesto puedes desactivarlo en las opciones del mod.";
SWWM_INTERTIP21 = "¡Aumenta tu puntuación! Cuantos más enemigos elimines, mejor. No te olvides de hacer uso de esos puntos en la tienda in-game cuando puedas.";
SWWM_INTERTIP22 = "Con el ritmo adecuado, puedes usar el ataque rápido a melé para desviar proyectiles. Incluso es posible mandarlos de vuelta a su dueño, con daño incrementado si te encuentras bajo los efectos de un Ragekit.";
SWWM_INTERTIP23 = "¿Sabías que Saya realmente odia la UAC?\n\n¿Que? ¿Ya sabías eso? Vaya, pues entonces ya no se me ocurre que otra cosa contarte.";
@ -883,7 +883,7 @@ SWWM_INTERTIP115 = "Había un consejo aquí, pero se ha ido ahora.";
SWWM_INTERTIP116 = "Más de trece mil millones de dispositivos ejecutan Java. Ya es demasiado tarde, estamos todos condenados.";
SWWM_INTERTIP117 = "La comida sabe mejor cuando te la preparas tú.";
SWWM_INTERTIP118 = "Este mesaje de consejo tiene una errata.";
SWWM_INTERTIP119 = "Si los enemigos se entrometen mientras estás admirando la brillante llave nueva que acabas de encontrar, puedes darles un puñetazo con tu mano libre.";
SWWM_INTERTIP119 = "¿Aborreces las cazas de llaves? Consigue una Wallbuster o un Mazo de Combate y empieza a echar abajo esas dichosas puertas bloqueadas.";
SWWM_INTERTIP120 = "Me he dado cuenta de que si te pones a hablar, a tu boca se le van ocurriendo cosas.";
SWWM_INTERTIP121 = "Saya afirma disfrutar el café solo, pero le echa azúcar en secreto cuando nadie mira.";
SWWM_INTERTIP122 = "En base a experiencias personales, Saya cree que no hay ningún fabricante de armas en el mundo que sea hetero.";

2
language.es_menu
View file

@ -84,7 +84,6 @@ SWWM_MCTITLE = "Opciones de Compatibilidad con Mods";
SWWM_LDSPOIL = "Mostrar Siempre Legendarios";
SWWM_ETITLE = "Opciones de Efectos";
SWWM_UNCAPALERT = "Rango de Alerta Ilimitado";
SWWM_COLLECTANIMKEY = "Animaciones de Llaves";
SWWM_STRICTUNTOUCHABLE = "Rigurosidad de Bonus Intocable";
SWWM_UNTOUCHABLE_HEALTH = "Baja de Salud";
SWWM_UNTOUCHABLE_ARMOR = "Baja de Armadura";
@ -233,7 +232,6 @@ TOOLTIP_SWWM_COLLECTANIM = "Muestra animaciones especiales en primera persona al
TOOLTIP_SWWM_PRECISECROSSHAIR = "Proyecta la mira en el punto que el arma alcanzará, en vez de quedarse en el centro de la pantalla. (\"Siempre\" dibuja la mira aunque esté normalmente desactivada, útil si alternas regularmente con jugar mods en los que se recomienda desactivarla)";
TOOLTIP_SWWM_LDSPOIL = "[LegenDoom] Muestra siempre el sufijo de \"Legendario\" en las etiquetas de barra de vida, en lugar de despues de que el enemigo se haya transformado. Desactiva si prefieres no estropear la sorpresa.";
TOOLTIP_SWWM_UNCAPALERT = "Si se activa, todas las armas y proyectiles tendrán un rango de ruido ilimitado. Puede arreglar mapas que usan trampas de teletransporte estilo vanilla.";
TOOLTIP_SWWM_COLLECTANIMKEY = "Muestra animaciones especiales en primera persona al recoger llaves.";
TOOLTIP_SWWM_STRICTUNTOUCHABLE = "Por defecto, el bonus \"Intocable\" permanece activo hasta que recibas daño directo. Si sientes que esto no es suficientemente estricto, también puedes hacer que termine si la armadura absorbe el daño, o, para mayor severidad, con CUALQUIER golpe, incluso siendo invulnerable.";
TOOLTIP_SWWM_SWAPWEAPONS = "Permite solo un arma por puesto (excluyendo Deep Impact). Desactiva si prefieres tirar el balance por la ventana.";
TOOLTIP_SWWM_FORCESTATS = "Muestra estadísticas de mapa en el HUD incluso cuando el automapa no está abierto.";

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r635 \cu(Sat 26 Nov 03:28:40 CET 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r635 \cu(2022-11-26 03:28:40)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r636 \cu(Sat 26 Nov 03:42:35 CET 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r636 \cu(2022-11-26 03:42:35)\c-";

1
menudef.txt
View file

@ -214,7 +214,6 @@ OptionMenu "SWWMOptionMenu"
Option "$SWWM_USETOPICKUP", "swwm_usetopickup", "YesNo"
Option "$SWWM_SINGLEFIRST", "swwm_singlefirst", "YesNo"
Option "$SWWM_COLLECTANIM", "swwm_collectanim", "YesNo"
Option "$SWWM_COLLECTANIMKEY", "swwm_collectanimkey", "YesNo"
Option "$SWWM_WEAPONTOOLTIPS", "swwm_weapontooltips", "YesNo"
SafeCommand "$SWWM_RESETTOOLTIPS", "event swwmresettooltips"
StaticText " "

1700
modeldef.keygesture
View file

File diff suppressed because it is too large Load diff

BIN
models/DoomCard1st.blend
View file

Binary file not shown.

BIN
models/DoomCard1st_a.3d
View file

Binary file not shown.

BIN
models/DoomCard1st_d.3d
View file

Binary file not shown.

BIN
models/DoomSkull1st.blend
View file

Binary file not shown.

BIN
models/DoomSkull1st_a.3d
View file

Binary file not shown.

BIN
models/DoomSkull1st_d.3d
View file

Binary file not shown.

BIN
models/HereticBlue1st.blend
View file

Binary file not shown.

BIN
models/HereticBlue1st_a.3d
View file

Binary file not shown.

BIN
models/HereticBlue1st_d.3d
View file

Binary file not shown.

BIN
models/HereticGreen1st.blend
View file

Binary file not shown.

BIN
models/HereticGreen1st_a.3d
View file

Binary file not shown.

BIN
models/HereticGreen1st_d.3d
View file

Binary file not shown.

BIN
models/HereticRed1st.blend
View file

Binary file not shown.

BIN
models/HereticRed1st_a.3d
View file

Binary file not shown.

BIN
models/HereticRed1st_d.3d
View file

Binary file not shown.

BIN
models/HereticYellow1st.blend
View file

Binary file not shown.

BIN
models/HereticYellow1st_a.3d
View file

Binary file not shown.

BIN
models/HereticYellow1st_d.3d
View file

Binary file not shown.

4
models/modelnotes.txt
View file

@ -62,6 +62,10 @@ New stuff:
- Ballsy Bomb
- Battle-Boi Sentry
Extra models:
- Hexen keys
- Hexen puzzle items
# Final Update
Character models:

1
zscript.txt
View file

@ -96,7 +96,6 @@ version "4.9"
#include "zscript/items/swwm_collectibles.zsc"
#include "zscript/items/swwm_collectibles_gesture.zsc"
#include "zscript/items/swwm_keys.zsc"
#include "zscript/items/swwm_keys_gesture.zsc"
// weapons
#include "zscript/weapons/swwm_baseweapon.zsc"
#include "zscript/weapons/swwm_baseweapon_fx.zsc"

20
zscript/items/swwm_keys.zsc
View file

@ -6,9 +6,6 @@ Class SWWMKey : Key abstract
Mixin SWWMUseToPickup;
bool propagated;
meta Class<SWWMItemGesture> gesture;
Property GestureWeapon : gesture;
override bool TryPickup( in out Actor toucher )
{
@ -18,8 +15,6 @@ Class SWWMKey : Key abstract
Class<Key> pc = Species;
if ( pc && !rt.FindInventory(pc) )
{
if ( rt.player && !deathmatch && !propagated && CVar.GetCVar('swwm_collectanimkey',rt.player).GetBool() )
SWWMGesture.SetSpecialGesture(rt.player.mo,gesture);
let p = Inventory(Spawn(pc));
SWWMHandler.KeyTagFix(p);
p.AttachToOwner(rt);
@ -46,7 +41,6 @@ Class SWWMRedCard : SWWMKey
Species "RedCard";
Inventory.PickupMessage "$T_REDCARD";
Inventory.PickupFlash "SWWMRedPickupFlash";
SWWMKey.GestureWeapon "SWWMRedCardGesture";
}
States
{
@ -63,7 +57,6 @@ Class SWWMYellowCard : SWWMKey
Species "YellowCard";
Inventory.PickupMessage "$T_YELLOWCARD";
Inventory.PickupFlash "SWWMPickupFlash";
SWWMKey.GestureWeapon "SWWMYellowCardGesture";
}
States
{
@ -80,7 +73,6 @@ Class SWWMBlueCard : SWWMKey
Species "BlueCard";
Inventory.PickupMessage "$T_BLUECARD";
Inventory.PickupFlash "SWWMBluePickupFlash";
SWWMKey.GestureWeapon "SWWMBlueCardGesture";
}
States
{
@ -97,7 +89,6 @@ Class SWWMSilverCardKDiZD : SWWMKey
Species "BlueSkull";
Inventory.PickupMessage "$T_SILVERCARD";
Inventory.PickupFlash "SWWMWhitePickupFlash";
SWWMKey.GestureWeapon "SWWMSilverCardGesture";
}
States
{
@ -114,7 +105,6 @@ Class SWWMGreenCardKDiZD : SWWMKey
Species "YellowSkull";
Inventory.PickupMessage "$T_GREENCARD";
Inventory.PickupFlash "SWWMGreenPickupFlash";
SWWMKey.GestureWeapon "SWWMGreenCardGesture";
}
States
{
@ -131,7 +121,6 @@ Class SWWMOrangeCardKDiZD : SWWMKey
Species "RedSkull";
Inventory.PickupMessage "$T_ORANGECARD";
Inventory.PickupFlash "SWWMPickupFlash";
SWWMKey.GestureWeapon "SWWMOrangeCardGesture";
}
States
{
@ -148,7 +137,6 @@ Class SWWMGreenCard : SWWMKey
Species "GreenCard";
Inventory.PickupMessage "$T_GREENCARD";
Inventory.PickupFlash "SWWMGreenPickupFlash";
SWWMKey.GestureWeapon "SWWMGreenCardGesture";
}
States
{
@ -167,7 +155,6 @@ Class SWWMRedSkull : SWWMKey
Species "RedSkull";
Inventory.PickupMessage "$T_REDSKULL";
Inventory.PickupFlash "SWWMRedPickupFlash";
SWWMKey.GestureWeapon "SWWMRedSkullGesture";
}
States
{
@ -184,7 +171,6 @@ Class SWWMBlueSkull : SWWMKey
Species "BlueSkull";
Inventory.PickupMessage "$T_BLUESKULL";
Inventory.PickupFlash "SWWMBluePickupFlash";
SWWMKey.GestureWeapon "SWWMBlueSkullGesture";
}
States
{
@ -201,7 +187,6 @@ Class SWWMYellowSkull : SWWMKey
Species "YellowSkull";
Inventory.PickupMessage "$T_YELLOWSKULL";
Inventory.PickupFlash "SWWMPickupFlash";
SWWMKey.GestureWeapon "SWWMYellowSkullGesture";
}
States
{
@ -218,7 +203,6 @@ Class SWWMPurpleSkull : SWWMKey
Species "PurpleSkull";
Inventory.PickupMessage "$T_PURPLESKULL";
Inventory.PickupFlash "SWWMPurplePickupFlash";
SWWMKey.GestureWeapon "SWWMPurpleSkullGesture";
}
States
{
@ -302,7 +286,6 @@ Class SWWMKeyGreen : SWWMKey
Species "KeyGreen";
Inventory.PickupMessage "$T_KEYGREEN";
Inventory.PickupFlash "SWWMGreenPickupFlash";
SWWMKey.GestureWeapon "SWWMGreenKeyGesture";
}
States
{
@ -319,7 +302,6 @@ Class SWWMKeyBlue : SWWMKey
Species "KeyBlue";
Inventory.PickupMessage "$T_KEYBLUE";
Inventory.PickupFlash "SWWMBluePickupFlash";
SWWMKey.GestureWeapon "SWWMBlueKeyGesture";
}
States
{
@ -336,7 +318,6 @@ Class SWWMKeyYellow : SWWMKey
Species "KeyYellow";
Inventory.PickupMessage "$T_KEYYELLOW";
Inventory.PickupFlash "SWWMPickupFlash";
SWWMKey.GestureWeapon "SWWMYellowKeyGesture";
}
States
{
@ -353,7 +334,6 @@ Class SWWMKeyRed : SWWMKey
Species "KeyRed";
Inventory.PickupMessage "$T_KEYRED";
Inventory.PickupFlash "SWWMRedPickupFlash";
SWWMKey.GestureWeapon "SWWMRedKeyGesture";
}
States
{

143
zscript/items/swwm_keys_gesture.zsc
View file

@ -1,143 +0,0 @@
// Key gestures
// (they all use the same exact animations, just with the object changed)
// (yeah, I'm lazy, and there's a lot of keys)
Class SWWMKeyGesture : SWWMItemGesture abstract
{
// due to specifics™ we have to handle the punching here
override void DoEffect()
{
Super.DoEffect();
if ( !Owner || !Owner.player || (Owner.player.Health <= 0) || (Owner.player.ReadyWeapon != self) )
return;
PSprite psp = Owner.player.FindPSPrite(PSP_WEAPON+1);
if ( !(Owner.player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK|BT_USER1)) && !psp )
{
// not punching, move weapon back
psp = Owner.player.FindPSPrite(PSP_WEAPON);
if ( psp )
{
psp.oldx = psp.x;
psp.x = max(0,psp.x-8);
psp.oldy = psp.y;
psp.y = min(32,psp.y+4);
}
return;
}
if ( psp )
{
// already punching, let's shift the weapon away
psp = Owner.player.FindPSPrite(PSP_WEAPON);
if ( psp )
{
// shift away from center to center
psp.oldx = psp.x;
psp.x = min(70,psp.x+8);
psp.oldy = psp.y;
psp.y = max(16,psp.y-4);
}
return;
}
// start punch
if ( Owner.player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK|BT_USER1) )
{
psp = Owner.player.FindPSPrite(PSP_WEAPON);
if ( psp && (psp.CurState == FindState("WaitingForEnd")) )
return;
Owner.player.SetPSprite(PSP_WEAPON+1,FindState("Punch"));
psp = Owner.player.FindPSPrite(PSP_WEAPON+1);
if ( psp )
{
psp.bAddWeapon = false;
psp.bAddBob = false;
psp.x = -50;
psp.y = 32;
}
}
}
States
{
Fire:
XZW1 A 0 A_Jump(256,"Fire1","Fire2","Fire3");
Fire1:
XZW1 A 3;
XZW1 B 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 CDEF 3;
XZW1 GHIJKLMNO 4;
XZW1 P 3 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 QRST 3;
Goto WaitingForEnd;
Fire2:
XZW1 A 3;
XZW1 U 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 VWX 3;
XZW1 YZ 4;
XZW2 ABC 4;
XZW2 D 4 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP,pitch:.7);
XZW2 EFGHIJ 4;
XZW2 KL 3;
XZW2 M 3 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW2 NOPQR 3;
Goto WaitingForEnd;
Fire3:
XZW1 A 3;
XZW2 S 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
XZW2 TUVWX 3;
XZW2 YZ 4;
XZW3 ABCDE 4;
XZW3 F 2 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW3 GHI 2;
XZW3 JKL 3;
XZW3 MN 2;
XZW3 O 2 A_StartSound("demolitionist/petting",CHAN_WEAPON,CHANF_OVERLAP,.4);
XZW3 PQ 2;
XZW3 RS 4;
XZW3 T 4 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW3 UV 4;
XZW3 WXY 3;
Goto WaitingForEnd;
WaitingForEnd:
XZW1 A 1 A_JumpIf(!player.FindPSprite(PSP_WEAPON+1),1);
Wait;
XZW1 A -1 A_FinishGesture();
Stop;
// overlay for melee
Punch:
XZW0 ABC 1;
PunchHold:
XZW0 D 1
{
A_PlayerMelee(true);
A_StartSound("demolitionist/swing",CHAN_WEAPON,CHANF_OVERLAP);
A_Parry(9);
}
XZW0 EF 1;
XZW0 G 1 A_Melee();
XZW0 HIJKLMN 2;
XZW0 A 0
{
if ( player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK|BT_USER1) )
{
let psp = player.FindPSprite(PSP_WEAPON);
if ( psp && (psp.CurState != ResolveState("WaitingForEnd")) )
return ResolveState("PunchHold");
}
return ResolveState(null);
}
Stop;
}
}
Class SWWMRedCardGesture : SWWMKeyGesture {}
Class SWWMYellowCardGesture : SWWMKeyGesture {}
Class SWWMBlueCardGesture : SWWMKeyGesture {}
Class SWWMSilverCardGesture : SWWMKeyGesture {}
Class SWWMGreenCardGesture : SWWMKeyGesture {}
Class SWWMOrangeCardGesture : SWWMKeyGesture {}
Class SWWMRedSkullGesture : SWWMKeyGesture {}
Class SWWMYellowSkullGesture : SWWMKeyGesture {}
Class SWWMPurpleSkullGesture : SWWMKeyGesture {}
Class SWWMBlueSkullGesture : SWWMKeyGesture {}
Class SWWMGreenKeyGesture : SWWMKeyGesture {}
Class SWWMBlueKeyGesture : SWWMKeyGesture {}
Class SWWMYellowKeyGesture : SWWMKeyGesture {}
Class SWWMRedKeyGesture : SWWMKeyGesture {}

15
zscript/swwm_player.zsc
View file

@ -3192,24 +3192,11 @@ Class Demolitionist : PlayerPawn
{
let itemtype = item.GetClass();
if ( (player.cheats&CF_TOTALLYFROZEN) || isFrozen() ) return false;
// do the key gesture
if ( item is 'Key' )
{
let hnd = SWWMHandler(EventHandler.Find("SWWMHandler"));
if ( hnd ) hnd.equinoxhack = true;
let rep = (Class<SWWMKey>)(GetReplacement(item.GetClass()));
if ( hnd ) hnd.equinoxhack = false;
if ( rep )
{
SWWMGesture.SetSpecialGesture(self,GetDefaultByType(rep).gesture);
return false;
}
}
if ( !Actor.UseInventory(item) )
{
if ( player == players[consoleplayer] )
{
if ( !(item is 'Weapon') && !(item is 'SWWMCollectible') )
if ( !(item is 'Weapon') && !(item is 'SWWMCollectible') && !(item is 'Key') )
A_StartSound("menu/noinvuse",CHAN_ITEMEXTRA);
if ( item is 'PuzzleItem' )
SWWMHandler.AddOneliner("puzzfail",2,20);