OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

owo new patron.

Browse source 
Fix Ynykron vortices sucking in non-damaging missiles.
Adjust some tags.
This commit is contained in:
Mari the Deer 2020-12-29 14:37:43 +01:00
commit 3b1b0bc4ec
7 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
language.def_base
View file

@ -700,7 +700,7 @@ FN_NDEMON_FUN1 = "Greenie";
FN_NDEMON_FUN2 = "Angry Greens";
FN_NDEMON_FUN3 = "Spinach Demon";
// obituaries
O_PUSHER = "%k opened some air holes into %o.";
O_PUSHER = "%k carefully removed %o's cavities.";
O_DEEPIMPACT = "%o was impacted deeply by %k.";
O_DEEPIMPACT_WEAK = "%k coughed in %o's general direction.";
O_EXPLODIUM = "%k inflicted severe knee explosions onto %o.";
@ -835,9 +835,10 @@ OB_MBOSS = "%o was assploded by the magic boi's Explodey Staff.";
OB_CBOSS = "%o was ghosted by the holy boi's Ghostpenis.";
OB_HERESIARCH = "%o saw that coming.";
DEFOB_PIG = "%o angered the hams."; // gzdoom will look this up since it has no obituary assigned
OB_PIG = "%o angered the hams."; // for when gzdoom fixes this (come on, graf)
// eviternity obituaries
OB_FCAPTAIN = "%o was zapped by an angry green lad.";
OB_ANNIHIL = "%o ate cybergoat rocket.";
OB_ANNIHIL = "%o was terminated by a cybergoat.";
OB_NDEMON = "%o got scronched.";
OB_ANGEL1 = "%o pissed off that angel.";
OB_ANGEL2 = "%o really pissed off that angel.";

11
language.es_base
View file

@ -554,7 +554,7 @@ FN_WOLFSS_FUN1 = "Votante de VOX";
FN_WOLFSS_FUN2 = "Rubito";
FN_WOLFSS_FUN3 = "Cosas nasis";
FN_DOG_FUN = "Perrete";
FN_CHICKEN_FUN = "Gallina";
FN_CHICKEN_FUN = "POLLO";
FN_CLINK_FUN1 = "Rasguñitos";
FN_CLINK_FUN2 = "Cacharro";
FN_CLINK_FUN3 = "Chatarra";
@ -630,8 +630,8 @@ FN_PIG_FUN = "Cochinillo";
FN_ANGEL_FUN = "Un Puto Ángel";
FN_ASTRAL = "Cacodemonio Astral";
FN_ASTRAL_FUN1 = "Bolita Gris";
FN_ASTRAL_FUN2 = "Bolita Gris";
FN_ASTRAL_FUN3 = "Bolita Gris";
FN_ASTRAL_FUN2 = "Albóndiga Desaturada";
FN_ASTRAL_FUN3 = "Cáscara Siseante";
FN_FCAPTAIN = "Capitan Zombi";
FN_FCAPTAIN_FUN1 = "Capullo Verde Tocanarices";
FN_FCAPTAIN_FUN2 = "Enemigo Basura Verde";
@ -645,7 +645,7 @@ FN_NDEMON_FUN1 = "Verdín";
FN_NDEMON_FUN2 = "Verde Cabreado";
FN_NDEMON_FUN3 = "Demonio de Espinacas";
// obituaries
O_PUSHER = "%k le abrió unos agujeros de ventilación a %o.";
O_PUSHER = "%k le quitó cuidadosamente las caries a %o.";
O_DEEPIMPACT = "%o fue impactad@[ao_esp] profundamente por %k.";
O_DEEPIMPACT_WEAK = "%k tosió en la dirección general de %o.";
O_EXPLODIUM = "%k infligió explosiones de rodilla severas a %o.";
@ -780,9 +780,10 @@ OB_MBOSS = "%o fue reventado por la varita explosiva esa del tío mágico.";
OB_CBOSS = "%o fue fantasmado por la verga fantasma del tío santurrón.";
OB_HERESIARCH = "%o lo vio venir.";
DEFOB_PIG = "%o enfureció a los jamones."; // gzdoom will look this up since it has no obituary assigned
OB_PIG = "%o enfureció a los jamones."; // for when gzdoom fixes this (come on, graf)
// eviternity obituaries
OB_FCAPTAIN = "%o fue chispad@[ao_esp] por un tío verde cabreado.";
OB_ANNIHIL = "%o comió cohete de cibercabra.";
OB_ANNIHIL = "%o fue exterminad@[ao_esp] por una cibercabra.";
OB_NDEMON = "%o fue estronchad@[ao_esp].";
OB_ANGEL1 = "%o cabreó a ese ángel.";
OB_ANGEL2 = "%o cabreó mucho a ese ángel.";

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r710 \cu(Sat 26 Dec 23:09:30 CET 2020)";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r711 \cu(Tue 29 Dec 14:37:43 CET 2020)";

1
sndinfo.txt
View file

@ -7,6 +7,7 @@ brutal/ezmodo sounds/EASYMODO.ogg
bestsound sounds/CORK.ogg
haha/dab sounds/DAB.ogg
bruh sounds/BRUH.ogg
squeak sounds/SQUEAK.ogg
saya/giggle1 sounds/saya/saya_giggle1.ogg
saya/giggle2 sounds/saya/saya_giggle2.ogg

BIN
sounds/SQUEAK.ogg Normal file
View file

Binary file not shown.

1
zscript/swwm_credits.zsc
View file

@ -189,6 +189,7 @@ Class SWWMCreditsMenu : GenericMenu
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Alexa Jones-Gonzales"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"John"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"NekoMithos"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"bouncytem"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Figo"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Holly_Rook"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Namsan"));

2
zscript/swwm_handler.zsc
View file

@ -1737,7 +1737,7 @@ Class SWWMHandler : EventHandler
SWWMShadow.Track(e.Thing);
}
// Ynykron vortex optimization
if ( e.Thing.bSHOOTABLE || e.Thing.bMISSILE )
if ( e.Thing.bSHOOTABLE || (e.Thing.bMISSILE && !e.Thing.IsZeroDamage()) )
SuckableActors.Push(e.Thing);
// vanilla blood color changes
if ( (e.Thing.GetClass() == "BaronOfHell") || (e.Thing.GetClass() == "HellKnight") || (e.Thing.GetClass() == "Bishop") || (e.Thing.GetClass() == "Korax") )