diff --git a/README.md b/README.md index 77dd080c1..705a9c78c 100644 --- a/README.md +++ b/README.md @@ -714,13 +714,15 @@ These components are toggleable. ![](docimg/demolitionist_mp.png) -Although it's not officially supported, it is possible to play both co-op and deathmatch with this mod. Some caveats apply, such as the need to disable network prediction, as the various changes to player physics and behavior would quickly cause desyncs otherwise. Thus, the only recommendation I can give is to only try it out if there's low latency between players *(e.g.: LAN multiplayer)*. +Like a true Marisa mod, **Codename: Demolitionist** does not have multiplayer support *(no, seriously, this has been a thing since my UT99 modding days)*. + +Still, although it's not officially supported, it is possible to play both co-op and deathmatch with this mod, as GZDoom's netplay requires less modder involvement. Some caveats apply, however, such as the need to disable network prediction, as the various changes to player physics and behavior would quickly cause desyncs otherwise. Thus, the only recommendation I can give is to only try it out if there's low latency between players *(e.g.: LAN multiplayer)*. In cooperative play, the healthbars of other players are always visible no matter the distance or any occluding map geometry, so you can easily keep track of where everyone is, roughly. When playing deathmatch, detailed ranking and score stats will be shown on the right side of the HUD, so you know who's winning and by how far of a margin. Note that in deathmatch, the full map is always revealed, but other players will NOT appear in the minimap or target array unless they're visible, or they're part of your team *(if teamplay is enabled)*. -Now, all things considered, the experience of multiplayer with this mod can only be described as *"pure unadulterated chaos"*. If one **Demolitionist** can already wreak intense havoc, imagine up to 8 of them on the same map. +Now, all things considered, the experience of multiplayer with this mod can only be described as *"pure unadulterated chaos"*. If one **Demolitionist** can already wreak intense havoc, imagine two... Or even more! ## The End ![](docimg/demolitionist_doublev.png) diff --git a/credits.txt b/credits.txt index 1e4de4dbc..6b8629107 100644 --- a/credits.txt +++ b/credits.txt @@ -34,7 +34,6 @@ Most of the work here is original, but there are some notable exceptions: - Intermission fanart: * Substance20 (@S20TBL) * Captain J (@Jho7835) - * Redead-ITA * Sgt. Shivers (@Sgt_Shivers_) * Moa Dixøn / Endie (@MoaDixon) * Monsoon-Soft (@MonsoonSoft) diff --git a/gldefs/misc.txt b/gldefs/misc.txt index dabddf3e7..1e14fbd34 100644 --- a/gldefs/misc.txt +++ b/gldefs/misc.txt @@ -343,10 +343,6 @@ Material Texture "graphics/Fanart/Monsoon4.png" { Shader "shaders/glsl/Bilinear.fp" } -Material Texture "graphics/Fanart/RedeadITA.png" -{ - Shader "shaders/glsl/Oversample.fp" -} Material Texture "graphics/Fanart/S20TBL.jpg" { Shader "shaders/glsl/Bilinear.fp" diff --git a/graphics/Fanart/RedeadITA.png b/graphics/Fanart/RedeadITA.png deleted file mode 100644 index e8af44c36..000000000 Binary files a/graphics/Fanart/RedeadITA.png and /dev/null differ diff --git a/language.def_base b/language.def_base index fd97af406..bf13c4d43 100644 --- a/language.def_base +++ b/language.def_base @@ -963,7 +963,7 @@ SWWM_INTERTIP70 = "Did you know that even with seat belts people die all the tim SWWM_INTERTIP71 = "\"On the internet nobody can hear you being subtle.\"\n — Linus Torvalds"; SWWM_INTERTIP72 = "There are approximately 9.3 billion demons bred solely for warfare in Hell. That is eight hundred and seventy six thousand times the monster count of nuts.wad, and that's terrible."; SWWM_INTERTIP73 = "People die if they are killed. But legends never die, they get back up and pwn you."; -SWWM_INTERTIP74 = "\"TREEEEEEEEEES!\"\n — Marty"; +SWWM_INTERTIP74 = "This tip intentionally left blank."; SWWM_INTERTIP75 = "Kobolds are small little creechers that go yip."; SWWM_INTERTIP76 = "I showed you my intermission tip pls respond."; SWWM_INTERTIP77 = "AAA gaming is rotten to the core, riddled with corporate torture of honest workers. Support small developers whenever you can."; @@ -1102,35 +1102,34 @@ SWWM_INTERTIP209 = "This mod requires hardware rendering. If you've come this fa SWWM_INTERTIP210 = "\"Ian Kelliher is like the Elon Musk of his generation, and I automatically hate him for that.\"\n — Saya Miyamoto"; // intermission fanart SWWM_FANART = "Art: "; -SWWM_NFANART = "28"; +SWWM_NFANART = "27"; SWWM_FANART1 = "S20TBL.jpg;Substance20 (@S20_TBL)"; SWWM_FANART2 = "CaptainJ.png;Captain J (@Jho7835)"; -SWWM_FANART3 = "RedeadITA.png;Redead-ITA (@RedeadITA)"; -SWWM_FANART4 = "Shivers.png;Sgt. Shivers (@Sgt_Shivers_)"; -SWWM_FANART5 = "Shivers2.png;Sgt. Shivers (@Sgt_Shivers_)"; -SWWM_FANART6 = "Endie.jpg;Moa Dixøn / Endie (@MoaDixon)"; -SWWM_FANART7 = "CaptainJ2.png;Captain J (@Jho7835)"; -SWWM_FANART8 = "Marisa.jpg"; -SWWM_FANART9 = "Marisa2.jpg"; -SWWM_FANART10 = "Marisa3.jpg"; -SWWM_FANART11 = "Marisa4.jpg"; -SWWM_FANART12 = "Marisa5.jpg"; -SWWM_FANART13 = "Marisa6.jpg"; -SWWM_FANART14 = "Marisa7.jpg"; -SWWM_FANART15 = "Marisa8.jpg"; -SWWM_FANART16 = "Marisa9.jpg"; -SWWM_FANART17 = "Marisa10.jpg"; -SWWM_FANART18 = "Marisa11.jpg"; -SWWM_FANART19 = "Marisa12.jpg"; -SWWM_FANART20 = "Marisa13.jpg"; -SWWM_FANART21 = "Marisa14.jpg"; -SWWM_FANART22 = "Monsoon.jpg;Monsoon-Soft (@MonsoonSoft)"; -SWWM_FANART23 = "Monsoon2.jpg;Monsoon-Soft (@MonsoonSoft)"; -SWWM_FANART24 = "Monsoon3.png;Monsoon-Soft (@MonsoonSoft)"; -SWWM_FANART25 = "Monsoon4.png;Monsoon-Soft (@MonsoonSoft)"; -SWWM_FANART26 = "Marisa15.jpg"; -SWWM_FANART27 = "Marisa16.jpg"; -SWWM_FANART28 = "Marisa17.jpg"; +SWWM_FANART3 = "Shivers.png;Sgt. Shivers (@Sgt_Shivers_)"; +SWWM_FANART4 = "Shivers2.png;Sgt. Shivers (@Sgt_Shivers_)"; +SWWM_FANART5 = "Endie.jpg;Moa Dixøn / Endie (@MoaDixon)"; +SWWM_FANART6 = "CaptainJ2.png;Captain J (@Jho7835)"; +SWWM_FANART7 = "Marisa.jpg"; +SWWM_FANART8 = "Marisa2.jpg"; +SWWM_FANART9 = "Marisa3.jpg"; +SWWM_FANART10 = "Marisa4.jpg"; +SWWM_FANART11 = "Marisa5.jpg"; +SWWM_FANART12 = "Marisa6.jpg"; +SWWM_FANART13 = "Marisa7.jpg"; +SWWM_FANART14 = "Marisa8.jpg"; +SWWM_FANART15 = "Marisa9.jpg"; +SWWM_FANART16 = "Marisa10.jpg"; +SWWM_FANART17 = "Marisa11.jpg"; +SWWM_FANART18 = "Marisa12.jpg"; +SWWM_FANART19 = "Marisa13.jpg"; +SWWM_FANART20 = "Marisa14.jpg"; +SWWM_FANART21 = "Monsoon.jpg;Monsoon-Soft (@MonsoonSoft)"; +SWWM_FANART22 = "Monsoon2.jpg;Monsoon-Soft (@MonsoonSoft)"; +SWWM_FANART23 = "Monsoon3.png;Monsoon-Soft (@MonsoonSoft)"; +SWWM_FANART24 = "Monsoon4.png;Monsoon-Soft (@MonsoonSoft)"; +SWWM_FANART25 = "Marisa15.jpg"; +SWWM_FANART26 = "Marisa16.jpg"; +SWWM_FANART27 = "Marisa17.jpg"; // achievements SWWM_ACHIEVEMENT_ALLCOLL_TAG = "The Full Set"; SWWM_ACHIEVEMENT_ALLCOLL_TXT = "Obtain all collectibles in a single save"; diff --git a/language.def_menu b/language.def_menu index 93b8f9170..e18139728 100644 --- a/language.def_menu +++ b/language.def_menu @@ -334,7 +334,7 @@ SWWM_CFANART = "Intermission Fanart:"; SWWM_CPATRON = "Patreon Backers:"; 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."; +SWWM_CDRAGON2 = "For being a good pet dragon who cares about me. No matter what, our love will stay strong."; 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_CMIKO2 = "For the VERY useful ZPolyobject library."; @@ -346,8 +346,8 @@ SWWM_CSLEDGE2 = "For being great buds, not just for me but for all of us. Your s SWWM_CSPY2 = "For being so enthusiastic about everything in this mod, and for some sound design assistance here and there."; SWWM_CINSP1 = "Combine Kegan, HyperUltra64, TerminusEst13, Yholl and friends"; SWWM_CINSP2 = "For inspiration and also for being really cool people. Bless all of you, keep being amazing."; -SWWM_CCOMMUNITY1 = "All my amazing friends from the Doom community"; -SWWM_CCOMMUNITY2 = "For helping me keep this whole thing rolling, and for all the time we spend together. Here's to many more years of Dooming, stay awesome, everyone!"; +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_CDEVS1 = "Randi, Graf, and the rest of the GZDoom dev team"; SWWM_CDEVS2 = "For your work on the source port that brought back my faith in modding. I don't care what others think, you're great."; SWWM_CYOU1 = "You"; diff --git a/language.es_base b/language.es_base index e5fba2851..cd1b7f030 100644 --- a/language.es_base +++ b/language.es_base @@ -842,6 +842,7 @@ SWWM_INTERTIP70 = "¿Sabíais que incluso con cinturones de seguridad la gente m SWWM_INTERTIP71 = "\"En internet nadie puede escucharte ser sutil.\"\n — Linus Torvalds"; SWWM_INTERTIP72 = "Hay aproximadamente 9.3 mil millones de demonios criados solo para la guerra en el Infierno. Eso es ochocientas setenta y seis mil veces el conteo de monstruos de nuts.wad, y eso es terrible."; SWWM_INTERTIP73 = "La gente muere si la matan. Pero las leyendas nunca mueren, se levantan de nuevo y te parten la badana."; +SWWM_INTERTIP74 = "Este consejo está intencionalmente en blanco."; SWWM_INTERTIP75 = "Los kobolds son pequeñas criaturitas que hacen yip."; SWWM_INTERTIP76 = "Te he enseñado mi consejo de intermisión contesta pls."; SWWM_INTERTIP77 = "El gaming AAA está podrido hasta la médula, plagado por la tortura corporativa de trabajadores honestos. Apoya a los pequeños desarrolladores siempre que puedas."; diff --git a/language.es_menu b/language.es_menu index 6be030958..c4c09782d 100644 --- a/language.es_menu +++ b/language.es_menu @@ -293,7 +293,7 @@ SWWM_CFANART = "Fanart de Intermisión:"; SWWM_CPATRON = "Mecenas de Patreon:"; 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í."; +SWWM_CDRAGON2 = "Por ser un buen dragón mascota que se preocupa por mí. A pesar de todo, nuestro amor permanecerá fuerte."; 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_CMIKO2 = "Por la MUY útil librería de ZPolyobject."; @@ -305,8 +305,8 @@ SWWM_CSLEDGE2 = "Por ser grandes colegas, no solo conmigo si no con todos nosotr SWWM_CSPY2 = "Por el nivel de entusiasmo mostrado por todo en este mod, y por asistencia con mezclado de sonido aquí y allá."; SWWM_CINSP1 = "Combine Kegan, HyperUltra64, TerminusEst13, Yholl y amigos"; 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 de la comunidad de Doom"; -SWWM_CCOMMUNITY2 = "Por ayudarme a seguir trabajando en esto, y por todo el tiempo que compartimos. Por muchos más años de Doom. ¡Os adoro!"; +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_CDEVS1 = "Randi, Graf, y el resto del equipo de desarrollo de GZDoom"; SWWM_CDEVS2 = "Por vuestro trabajo en el source port que me ha devuelto la fe en el modding. No me importa lo que piensen los demás, sois la caña."; SWWM_CYOU1 = "Tú"; diff --git a/language.version b/language.version index 01bbe90b6..676199416 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r801 \cu(Wed 12 Apr 21:20:50 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r801 \cu(2023-04-12 21:20:50)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r802 \cu(Thu 20 Apr 12:51:35 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r802 \cu(2023-04-20 12:51:36)\c-"; diff --git a/readme.txt b/readme.txt index 9a22350b3..ffba1f20a 100644 --- a/readme.txt +++ b/readme.txt @@ -430,19 +430,16 @@ with other people. 3.2. Special Thanks - - - - - - - - - - -Bless all of you from the Doom community that I love so much. -The very awesome and friend-shaped 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). +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 interconnected lore and worldbuilding. You're a very fine pair of cool buds. a1337spy for basically becoming the biggest fanboy of this mod. Glad you enjoy it and its characters and lore (maybe a bit too much, but it's all in healthy -levels). You really are like the little brother I never had (gonna headpat ya). +levels). Valerie Lavender for also supporting this mod and providing some neat little things. You're a good bun and a good friend, stay awesome. -Kathy for being a real good friend and one who loves my lore and characters so -dearly. Stay cool, and keep creating. 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. Gutawer for not only being one of my ZScript senseis back in the day, but also @@ -458,6 +455,8 @@ you are, I hope you're doing well. We miss you. All my wonderful patrons, of course, for supporting me economically so I can basically keep working on what I love. It's a bit embarrassing to admit that I wouldn't be able to afford HRT without your help, by the way. +And of course, all of my friends whom I have met throughout the years, and who +have stayed with me all this time, thank you all. [End of file] diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index fecf2abb5..0ced26226 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/zscript/menu/swwm_credits.zsc @@ -163,20 +163,18 @@ Class SWWMCreditsMenu : GenericMenu cvoice.Push(new("SWWMCreditsEntry").Init("Vyolette","$T_DEMOLITIONIST")); cfanart.Push(new("SWWMCreditsEntry").Init("Substance20 (@S20TBL)")); cfanart.Push(new("SWWMCreditsEntry").Init("Captain J (@Jho7835)")); - cfanart.Push(new("SWWMCreditsEntry").Init("Redead-ITA (@RedeadITA)")); cfanart.Push(new("SWWMCreditsEntry").Init("Sgt. Shivers (@Sgt_Shivers_)")); cfanart.Push(new("SWWMCreditsEntry").Init("Moa Dixøn / Endie (@MoaDixon)")); cfanart.Push(new("SWWMCreditsEntry").Init("Monsoon-Soft (@MonsoonSoft)")); clocal.Push(new("SWWMCreditsEntry").Init("Marisa the Magician","$SWWM_LOCES")); cpatrons.Push(new("SWWMCreditsEntry").Init("Snacks")); cpatrons.Push(new("SWWMCreditsEntry").Init("john")); + cpatrons.Push(new("SWWMCreditsEntry").Init("rxn")); + cpatrons.Push(new("SWWMCreditsEntry").Init("Hierizen")); cpatrons.Push(new("SWWMCreditsEntry").Init("bouncytem")); cpatrons.Push(new("SWWMCreditsEntry").Init("Corey Hectus")); - cpatrons.Push(new("SWWMCreditsEntry").Init("kevansevans")); cpatrons.Push(new("SWWMCreditsEntry").Init("Pietro Gagliardi")); - cpatrons.Push(new("SWWMCreditsEntry").Init("Ryan Weatherman")); cpatrons.Push(new("SWWMCreditsEntry").Init("S.I.M.O.N.")); - cpatrons.Push(new("SWWMCreditsEntry").Init("Zard1084")); cpatrons.Push(new("SWWMCreditsEntry").Init("John")); cpatrons.Push(new("SWWMCreditsEntry").Init("NekoMithos")); cpatrons.Push(new("SWWMCreditsEntry").Init("Dac"));