I want to fucking die.

This commit is contained in:
Mari the Deer 2025-02-13 11:00:19 +01:00
commit 722121e21a
11 changed files with 9 additions and 47 deletions

View file

@ -30,7 +30,6 @@ Most of the work here is original, but there are some notable exceptions:
- Miniwi font by Josuah Demangeon (http://josuah.net). Modified to add gradients and drop shadow. - Miniwi font by Josuah Demangeon (http://josuah.net). Modified to add gradients and drop shadow.
- EB Garamond font by Octavio Pardo et al (https://github.com/octaviopardo/EBGaramond12). Rendered to texture atlas with outline. - EB Garamond font by Octavio Pardo et al (https://github.com/octaviopardo/EBGaramond12). Rendered to texture atlas with outline.
- Takao Gothic font by Jun Kobayashi et al (https://launchpad.net/takao-fonts). Modified to add gradients and drop shadow. - Takao Gothic font by Jun Kobayashi et al (https://launchpad.net/takao-fonts). Modified to add gradients and drop shadow.
- Nashgore footprint texture by Valerie Lavender.
- Slope alignment utility code by ZZYZX & Nash. - Slope alignment utility code by ZZYZX & Nash.
- SiFi270 (Less mean-spirited Keen replacement) - SiFi270 (Less mean-spirited Keen replacement)
- Widescreen version of Hexen finale screens by Nash. - Widescreen version of Hexen finale screens by Nash.

View file

@ -347,18 +347,16 @@ SWWM_CMUSIC = "Music Tracks Used:";
SWWM_CVOICE = "Voices:"; SWWM_CVOICE = "Voices:";
SWWM_CPATRON = "Patreon & Ko-fi Backers:"; SWWM_CPATRON = "Patreon & Ko-fi Backers:";
SWWM_CTHANK = "Special Thanks:"; SWWM_CTHANK = "Special Thanks:";
SWWM_CMAB2 = "For your work in Lithium, one of the mods that have inspired me the most. I'm really really happy to have met you.";
SWWM_CDRAGON2 = "For being a good pet dragon who cares about me. No matter what, our love will stay strong."; SWWM_CDRAGON2 = "For being a good pet dragon who cares about me. No matter what, our love will stay strong.";
SWWM_CVYOLETTE2 = "For your love and support during my hardest times. I can't thank you enough."; SWWM_CVYOLETTE2 = "For your love and support during my hardest times. I can't thank you enough.";
SWWM_CLUCY2 = "For the Tewi font, which I've used for many many years. I hope you're doing well, wherever you are."; SWWM_CLUCY2 = "For the Tewi font, which I've used for many many years. I hope you're doing well, wherever you are.";
SWWM_CGUTA2 = "For the Gutamatics library, and for helping me with learning ZScript."; SWWM_CGUTA2 = "For the Gutamatics library.";
SWWM_CMIKO2 = "For the VERY useful ZPolyobject library."; SWWM_CMIKO2 = "For the VERY useful ZPolyobject library.";
SWWM_CKEKS2 = "For assistance with exception handling code, and also for being such a cool Touhou nerd."; SWWM_CKEKS2 = "For assistance with exception handling code, and also for being such a cool Touhou nerd.";
SWWM_CZN2 = "For slope alignment code, and to Nash also for being a cool smart cactus dude."; SWWM_CZN2 = "For slope alignment code, and to Nash also for being a cool smart cactus dude.";
SWWM_CVAL2 = "For the custom Nashgore footprints, and for being a good bun-bot friend.";
SWWM_CBOUNCY2 = "For lots of help with testing and for letting me rant about lore for hours and being there to listen along. You're a wonderful friend."; SWWM_CBOUNCY2 = "For lots of help with testing and for letting me rant about lore for hours and being there to listen along. You're a wonderful friend.";
SWWM_CSLEDGE2 = "For being great buds, not just for me but for all of us. Your support and encouragement are something I value a lot, and I can't thank you enough."; SWWM_CSLEDGE2 = "For being great buds, not just for me but for all of us. Your support and encouragement are something I value a lot, and I can't thank you enough.";
SWWM_CINSP1 = "Combine Kegan, HyperUltra64, TerminusEst13, Yholl and friends"; SWWM_CINSP1 = "Combine Kegan, HyperUltra64, Yholl and friends";
SWWM_CINSP2 = "For inspiration and also for being really cool people. Bless all of you, keep being amazing."; SWWM_CINSP2 = "For inspiration and also for being really cool people. Bless all of you, keep being amazing.";
SWWM_CCOMMUNITY1 = "All my amazing friends"; SWWM_CCOMMUNITY1 = "All my amazing friends";
SWWM_CCOMMUNITY2 = "For helping me keep this whole thing rolling, and for all the time we spend together. Stay awesome, everyone!"; SWWM_CCOMMUNITY2 = "For helping me keep this whole thing rolling, and for all the time we spend together. Stay awesome, everyone!";

View file

@ -303,18 +303,16 @@ SWWM_CMUSIC = "Música Usada:";
SWWM_CVOICE = "Voces:"; SWWM_CVOICE = "Voces:";
SWWM_CPATRON = "Mecenas de Patreon y Ko-fi:"; SWWM_CPATRON = "Mecenas de Patreon y Ko-fi:";
SWWM_CTHANK = "Agradecimientos Especiales:"; SWWM_CTHANK = "Agradecimientos Especiales:";
SWWM_CMAB2 = "Por tu trabajo en Lithium, uno de los mods que más me han inspirado. Me alegro muchísimo de haberte conocido.";
SWWM_CDRAGON2 = "Por ser un buen dragón mascota que se preocupa por mí. A pesar de todo, nuestro amor permanecerá fuerte."; SWWM_CDRAGON2 = "Por ser un buen dragón mascota que se preocupa por mí. A pesar de todo, nuestro amor permanecerá fuerte.";
SWWM_CVYOLETTE2 = "Por tu cariño y apoyo durante mis peores momentos. No me sobran formas de agradecértelo."; SWWM_CVYOLETTE2 = "Por tu cariño y apoyo durante mis peores momentos. No me sobran formas de agradecértelo.";
SWWM_CLUCY2 = "Por la fuente Tewi, que he seguido usando todos estos años. Espero que estés donde estés, te encuentres bien."; SWWM_CLUCY2 = "Por la fuente Tewi, que he seguido usando todos estos años. Espero que estés donde estés, te encuentres bien.";
SWWM_CGUTA2 = "Por la librería de Gutamatics, y por ayudarme a aprender ZScript."; SWWM_CGUTA2 = "Por la librería de Gutamatics.";
SWWM_CMIKO2 = "Por la MUY útil librería de ZPolyobject."; SWWM_CMIKO2 = "Por la MUY útil librería de ZPolyobject.";
SWWM_CKEKS2 = "Por asistencia con el código de manejo de excepciones, y también por ser un friki tan guay de Touhou."; SWWM_CKEKS2 = "Por asistencia con el código de manejo de excepciones, y también por ser un friki tan guay de Touhou.";
SWWM_CZN2 = "Por el código para alineación con superficies inclinadas, y a Nash además por ser un molón tío cactus listo."; SWWM_CZN2 = "Por el código para alineación con superficies inclinadas, y a Nash además por ser un molón tío cactus listo.";
SWWM_CVAL2 = "Por las huellas personalizadas para Nashgore, y por ser una buena amiga conejo-robot.";
SWWM_CBOUNCY2 = "Por tu gran ayuda con el testeo y por dejar que suelte lore durante horas y estar ahí para escuchar. Eres un amigo maravilloso."; SWWM_CBOUNCY2 = "Por tu gran ayuda con el testeo y por dejar que suelte lore durante horas y estar ahí para escuchar. Eres un amigo maravilloso.";
SWWM_CSLEDGE2 = "Por ser grandes colegas, no solo conmigo si no con todos nosotros. Vuestro apoyo y ánimo es algo que valoro muchísimo, y no hay forma de agradecéroslo suficientemente."; SWWM_CSLEDGE2 = "Por ser grandes colegas, no solo conmigo si no con todos nosotros. Vuestro apoyo y ánimo es algo que valoro muchísimo, y no hay forma de agradecéroslo suficientemente.";
SWWM_CINSP1 = "Combine Kegan, HyperUltra64, TerminusEst13, Yholl y amigos"; SWWM_CINSP1 = "Combine Kegan, HyperUltra64, Yholl y amigos";
SWWM_CINSP2 = "Por servir de inspiración y por ser gente muy molona. Benditos seáis todos, seguid siendo fenomenales."; SWWM_CINSP2 = "Por servir de inspiración y por ser gente muy molona. Benditos seáis todos, seguid siendo fenomenales.";
SWWM_CCOMMUNITY1 = "Todo mi súper colegueo"; SWWM_CCOMMUNITY1 = "Todo mi súper colegueo";
SWWM_CCOMMUNITY2 = "Por ayudarme a seguir trabajando en esto, y por todo el tiempo que compartimos. ¡Os adoro!"; SWWM_CCOMMUNITY2 = "Por ayudarme a seguir trabajando en esto, y por todo el tiempo que compartimos. ¡Os adoro!";

View file

@ -1,3 +1,3 @@
[default] [default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1180 \cu(mié 12 feb 2025 12:10:17 CET)\c-"; SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1181 \cu(jue 13 feb 2025 11:00:19 CET)\c-";
SWWM_SHORTVER="\cw1.3pre r1180 \cu(2025-02-12 12:10:17)\c-"; SWWM_SHORTVER="\cw1.3pre r1181 \cu(2025-02-13 11:00:19)\c-";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

View file

@ -439,18 +439,12 @@ with other people.
3.2. Special Thanks 3.2. Special Thanks
- - - - - - - - - - - - - - - - - - - -
The very awesome Marrub for making Lithium, one of the many sources of
inspiration for this here mod's little worldbuilding and some other traits here
and there (which you might easily notice).
CptSledge and Bunray for making me dive deep into the Doom Modiverse™ and its CptSledge and Bunray for making me dive deep into the Doom Modiverse™ and its
interconnected lore and worldbuilding. You're a very fine pair of cool buds. interconnected lore and worldbuilding. You're a very fine pair of cool buds.
Valerie Lavender for also supporting this mod and providing some neat little
things. You're a good bun and a good friend, stay awesome.
Bouncy for being one of the few friends who can just stand there and listen to Bouncy for being one of the few friends who can just stand there and listen to
me rant about lore for several hours straight. Many thanks. me rant about lore for several hours straight. Many thanks.
Gutawer for not only being one of my ZScript senseis back in the day, but also Gutawer and Mikolah for the Gutamatics and ZPolyobject libraries, respectively,
for creating the mighty Gutamatics library, which has made some fancy things which have made certain complicated tasks much easier.
here possible.
KeksDose for being another ZScript mad genius and teaching me a nifty trick to KeksDose for being another ZScript mad genius and teaching me a nifty trick to
fuck around with VM aborts (which I then perfected). fuck around with VM aborts (which I then perfected).
ZZYZX and Nash for a handy piece of code to align stuff to slopes. The math's ZZYZX and Nash for a handy piece of code to align stuff to slopes. The math's

View file

@ -1,23 +1,3 @@
// marb colors
Heliotrope
{
#130023 #C885FF
Console:
#000000 #9664BF 0 127
#C885FF #FFFFFF 128 256
Flat:
#C885FF
}
BlushPink
{
#220923 #F367F8
Console:
#000000 #BB4FBF 0 127
#F367F8 #FFFFFF 128 256
Flat:
#F367F8
}
// TRANS RIGHTS // TRANS RIGHTS
TransPink TransPink
{ {

View file

@ -258,7 +258,7 @@ extend Class SWWMHandler
else if ( e.DamageType == 'Love' ) else if ( e.DamageType == 'Love' )
{ {
score += 600; score += 600;
if ( scr ) scr.AppendXString(StringTable.Localize(((e.Thing is 'WolfensteinSS')||(e.Thing.Species=='WolfensteinSS'))?"$SWWM_LOVED_ALT":"$SWWM_LOVED"),0,Font.FindFontColor('BlushPink')); if ( scr ) scr.AppendXString(StringTable.Localize(((e.Thing is 'WolfensteinSS')||(e.Thing.Species=='WolfensteinSS'))?"$SWWM_LOVED_ALT":"$SWWM_LOVED"),0,Font.FindFontColor('TransPink'));
} }
else if ( inflictor is 'FroggyChair' ) else if ( inflictor is 'FroggyChair' )
{ {

View file

@ -261,11 +261,6 @@ extend Class SWWMHandler
if ( inultdoom2 == -1 ) inultdoom2 = SWWMUtility.IsUltDoom2(); if ( inultdoom2 == -1 ) inultdoom2 = SWWMUtility.IsUltDoom2();
if ( e.Thing.GetClass() == 'Pig' ) if ( e.Thing.GetClass() == 'Pig' )
e.Thing.SetTag("$FN_PIG"); // missing in gzdoom e.Thing.SetTag("$FN_PIG"); // missing in gzdoom
// nashgore compat
else if ( e.Thing.GetClassName() == "NashGoreFootprintLeft" )
e.Thing.A_ChangeModel("",0,"","",0,"models/nashgore/Footprint","DemoFootprintL.png");
else if ( e.Thing.GetClassName() == "NashGoreFootprintRight" )
e.Thing.A_ChangeModel("",0,"","",0,"models/nashgore/Footprint","DemoFootprintR.png");
// eviternity stuff // eviternity stuff
else if ( (e.Thing.GetClassName() == "Archangelus") else if ( (e.Thing.GetClassName() == "Archangelus")
|| (e.Thing.GetClassName() == "ArchangelusA") || (e.Thing.GetClassName() == "ArchangelusA")

View file

@ -170,7 +170,6 @@ Class SWWMCreditsMenu : GenericMenu
cpatrons.Push(new("SWWMCreditsEntry").Init("NekoMithos")); cpatrons.Push(new("SWWMCreditsEntry").Init("NekoMithos"));
cpatrons.Push(new("SWWMCreditsEntry").Init("Antlason Widowz")); cpatrons.Push(new("SWWMCreditsEntry").Init("Antlason Widowz"));
cpatrons.Push(new("SWWMCreditsEntry").Init("YaGirlJuniper")); cpatrons.Push(new("SWWMCreditsEntry").Init("YaGirlJuniper"));
cthanks.Push(new("SWWMCreditsEntry").Init("Marrub","$SWWM_CMAB2",Font.FindFontColor('Heliotrope'),Font.FindFontColor('BlushPink')));
cthanks.Push(new("SWWMCreditsEntry").Init("KynikossDragonn","$SWWM_CDRAGON2")); cthanks.Push(new("SWWMCreditsEntry").Init("KynikossDragonn","$SWWM_CDRAGON2"));
cthanks.Push(new("SWWMCreditsEntry").Init("Vyolette","$SWWM_CVYOLETTE2")); cthanks.Push(new("SWWMCreditsEntry").Init("Vyolette","$SWWM_CVYOLETTE2"));
cthanks.Push(new("SWWMCreditsEntry").Init("Lucy","$SWWM_CLUCY2")); cthanks.Push(new("SWWMCreditsEntry").Init("Lucy","$SWWM_CLUCY2"));
@ -178,7 +177,6 @@ Class SWWMCreditsMenu : GenericMenu
cthanks.Push(new("SWWMCreditsEntry").Init("Mikolah","$SWWM_CMIKO2")); cthanks.Push(new("SWWMCreditsEntry").Init("Mikolah","$SWWM_CMIKO2"));
cthanks.Push(new("SWWMCreditsEntry").Init("KeksDose","$SWWM_CKEKS2")); cthanks.Push(new("SWWMCreditsEntry").Init("KeksDose","$SWWM_CKEKS2"));
cthanks.Push(new("SWWMCreditsEntry").Init("ZZYZX & Nash","$SWWM_CZN2")); cthanks.Push(new("SWWMCreditsEntry").Init("ZZYZX & Nash","$SWWM_CZN2"));
cthanks.Push(new("SWWMCreditsEntry").Init("Val Pal","$SWWM_CVAL2"));
cthanks.Push(new("SWWMCreditsEntry").Init("BouncyTEM","$SWWM_CBOUNCY2")); cthanks.Push(new("SWWMCreditsEntry").Init("BouncyTEM","$SWWM_CBOUNCY2"));
cthanks.Push(new("SWWMCreditsEntry").Init("\ctCptSledge\c- & \cdBunray\c-","$SWWM_CSLEDGE2")); cthanks.Push(new("SWWMCreditsEntry").Init("\ctCptSledge\c- & \cdBunray\c-","$SWWM_CSLEDGE2"));
cthanks.Push(new("SWWMCreditsEntry").Init("$SWWM_CINSP1","$SWWM_CINSP2")); cthanks.Push(new("SWWMCreditsEntry").Init("$SWWM_CINSP1","$SWWM_CINSP2"));