diff --git a/LICENSE.code b/LICENSE.code index 65f50a474..e60fff95b 100644 --- a/LICENSE.code +++ b/LICENSE.code @@ -1,4 +1,4 @@ -Copyright (c) 2020-2025 Marisa the Magician, UnSX Team +Copyright (c) 2020-2026 Mari the Deer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/graphics/Credits/MariSprite.png b/graphics/Credits/MariSprite.png index 55ac3497b..73f0f937a 100644 Binary files a/graphics/Credits/MariSprite.png and b/graphics/Credits/MariSprite.png differ diff --git a/language.def_base b/language.def_base index c5bd683c8..90d0bf59f 100644 --- a/language.def_base +++ b/language.def_base @@ -823,16 +823,12 @@ D_ANDIRA = "\cjShe knows where you are...\c-"; SWWM_YNYKRONREADY = "The Ynykron Artifact is ready for firing."; SWWM_SWAPWEAPON = "\cjPress \cfUse\cj to swap\n\cf%s\cj for \cf%s\c-"; SWWM_TODOWEAPON = "\cjThe \cf%s\cj is not yet implemented.\c-"; -SWWM_TITLEPRESENTSA = "UnSX Team"; -SWWM_TITLEPRESENTSB = "presents"; -SWWM_TITLEMODBYA = "a mod by"; -SWWM_TITLEMODBYB = "Marisa the Magician"; SWWM_TITLEINTROA = "On that day, humankind saw itself in dire danger, facing an impending doom."; SWWM_TITLEINTROB = "But one machine stood up, who fought back, who could end this whole invasion."; SWWM_TITLEINTROC = "The demons would learn to fear that machine, who they know only by one name..."; SWWM_NTITLESCROLL = "6"; SWWM_TITLESCROLL1 = "Codename: Demolitionist ~ Cute Robutt Whomst Love To Explode Demons"; -SWWM_TITLESCROLL2 = "A wondrous Doom mod by Marisa the Magician of UnSX Team"; +SWWM_TITLESCROLL2 = "A wondrous Doom mod by Mari the Deer"; SWWM_TITLESCROLL3 = "Lovingly designed 3D models with hand-painted 256-color dithered textures"; SWWM_TITLESCROLL4 = "Over 60k lines of bespoke ZScript code, and still counting (god help me)"; SWWM_TITLESCROLL5 = "The deepest lore this side of the Doom Modiverse"; @@ -1271,7 +1267,7 @@ SWWM_INTERTIP163 = "Skill levels exist for a reason. If you think only one speci SWWM_INTERTIP164 = "Not everything made of warm is for sits."; SWWM_INTERTIP165 = "Be wary of people posting YouTube links with the id \"dQw4w9WgXcQ\"."; SWWM_INTERTIP166 = "\"When you can't think straight, do you think gay?\"\n — Demo Miyamoto"; -SWWM_INTERTIP167 = "GZDoom isn't unoptimized, it just has a lot of code. They're different animals."; +SWWM_INTERTIP167 = "This mod is 100% free from generative AI usage or AI-assisted programming."; SWWM_INTERTIP168 = "You shouldn't take some of these tips too seriously."; SWWM_INTERTIP169 = "This mod won't mock you for cheating. If a map gives you shit, it's justified."; SWWM_INTERTIP170 = "Those little tubes on the sides of the Demolitionist's head are smell receptors, by the way."; diff --git a/language.es_base b/language.es_base index 8550a3e6f..4ff01b3b9 100644 --- a/language.es_base +++ b/language.es_base @@ -672,12 +672,10 @@ SWWM_YNYKRONREADY = "El Artefacto Ynykron está listo para disparar."; SWWM_SWAPWEAPON = "\cjPulsa \cfUsar\cj para cambiar\n\cf%s\cj por \cf%s\c-"; SWWM_TODOWEAPON = "\cjEl \cf%s\cj aun no está implementado.\c-"; SWWM_TODOWEAPON_FEM = "\cjLa \cf%s\cj aun no está implementada.\c-"; -SWWM_TITLEPRESENTSB = "presenta"; -SWWM_TITLEMODBYA = "un mod de"; SWWM_TITLEINTROA = "Ese día, la humanidad se vió en peligro, enfrentándose a su propia perdición."; SWWM_TITLEINTROB = "Pero una máquina se alzó, decidida a luchar, y poner fin a toda esta invasión."; SWWM_TITLEINTROC = "Los demonios aprenderían a temer la máquina, la cual conocen por un solo nombre..."; -SWWM_TITLESCROLL2 = "Un maravilleante mod de Doom por Marisa the Magician de UnSX Team"; +SWWM_TITLESCROLL2 = "Un maravilleante mod de Doom por Mari the Deer; SWWM_TITLESCROLL3 = "Modelos 3D diseñados con cariño con texturas pintadas a mano de 256 colores con dithering"; SWWM_TITLESCROLL4 = "Más de 60 mil líneas de código a medida en ZScript, y aun contando (dios me ayude)"; SWWM_TITLESCROLL5 = "El lore más profundo a este lado del Modiverso de Doom"; @@ -1102,7 +1100,7 @@ SWWM_INTERTIP163 = "Los niveles de dificultad existen para algo. Si crees que so SWWM_INTERTIP164 = "No todo lo calentito es para sentarse."; SWWM_INTERTIP165 = "Ten cuidado con la gente que postea enlaces de YouTube con el código \"dQw4w9WgXcQ\"."; SWWM_INTERTIP166 = "\"Cuando no puedes pensar con claridad, ¿piensas con oscuridad?\"\n — Demo Miyamoto"; -SWWM_INTERTIP167 = "GZDoom no está mal optimizado, es que tiene mucho código. A ver si nos enteramos."; +SWWM_INTERTIP167 = "Este mod está 100% libre del uso de IA generativa o programación asistida por IA."; SWWM_INTERTIP168 = "No deberías tomarte algunos de estos consejos muy en serio."; SWWM_INTERTIP169 = "Este mod no te hará burla si usas trucos. Si un mapa te mete mierdas, está justificado."; SWWM_INTERTIP170 = "Esos pequeños tubos a los lados de la cabeza de la Demolicionista son receptores de olor, por cierto."; diff --git a/language.version b/language.version index 0e654707d..08248dda0 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1249 \cu(Thu Mar 19 10:41:54 CET 2026)\c-"; -SWWM_SHORTVER="\cw1.3pre r1249 \cu(2026-03-19 10:41:54)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1250 \cu(Sat Mar 28 16:43:07 CET 2026)\c-"; +SWWM_SHORTVER="\cw1.3pre r1250 \cu(2026-03-28 16:43:07)\c-"; diff --git a/readme.txt b/readme.txt index 215f27b0e..40b3685d0 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ - CODENAME: DEMOLITIONIST --------------------------------------------- -(C)2020-2025 Marisa the Magician - UnSX Team + CODENAME: DEMOLITIONIST +-------------------------------------- +(C)2020-2026 Mari the Deer - UnSX Team diff --git a/shaders/pp/Grain.fp b/shaders/pp/Grain.fp index b3aff9c64..ad17cfc50 100644 --- a/shaders/pp/Grain.fp +++ b/shaders/pp/Grain.fp @@ -1,6 +1,6 @@ /* Complex grain shader ported over from MariENB - (C)2012-2022 Marisa the Magician + (C)2012-2022 Mari the Deer Edited for reduced texture sampling (3 fetches instead of 6). */ diff --git a/tools/mklang.c b/tools/mklang.c index 30009dfd9..64d8e189d 100644 --- a/tools/mklang.c +++ b/tools/mklang.c @@ -3,7 +3,7 @@ This code is a mess and it's full of hacks, but that's to be expected when it's all really just for personal use. - Copyright (c) 2020-2022 Marisa the Magician, UnSX Team + Copyright (c) 2020-2022 Mari the Deer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/zscript.txt b/zscript.txt index d76e63a31..d7c802487 100644 --- a/zscript.txt +++ b/zscript.txt @@ -2,7 +2,7 @@ version "4.15" /* DEMOLITIONIST Main Codebase - (C)2020-2025 Marisa the Magician, UnSX Team + (C)2020-2026 Mari the Deer This copyright and the attached LICENSE.code file apply to all files included from here, with the exception of any third party libraries */ diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index 748a6b1b8..591aac43b 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/zscript/menu/swwm_credits.zsc @@ -146,7 +146,7 @@ Class SWWMCreditsMenu : GenericMenu slocal = StringTable.Localize("$SWWM_CLOCAL"); spatrons = StringTable.Localize("$SWWM_CPATRON"); sthanks = StringTable.Localize("$SWWM_CTHANK"); - cdev.Push(new('SWWMCreditsEntry').Init("Marisa the Magician","$SWWM_CDEV2",s:"graphics/Credits/MariSprite.png")); + cdev.Push(new('SWWMCreditsEntry').Init("Mari the Deer","$SWWM_CDEV2",s:"graphics/Credits/MariSprite.png")); cassets.Push(new('SWWMCreditsEntry').Init("Bethesda Game Studios","Fallout: New Vegas\nFallout 4")); cassets.Push(new('SWWMCreditsEntry').Init("Epic Games","Unreal\nUnreal Tournament\nUnreal Tournament 2004\nUnreal Tournament 3")); cassets.Push(new('SWWMCreditsEntry').Init("Ion Storm","Deus Ex")); @@ -160,7 +160,7 @@ Class SWWMCreditsMenu : GenericMenu cmusic.Push(new('SWWMCreditsEntry').Init("BouncyTEM","Solitary Apprehension")); cmusic.Push(new('SWWMCreditsEntry').Init("KynikossDragonn","Credits Theme")); cvoice.Push(new('SWWMCreditsEntry').Init("Vyolette","$T_DEMOLITIONIST")); - clocal.Push(new('SWWMCreditsEntry').Init("Marisa the Magician","$SWWM_LOCES")); + clocal.Push(new('SWWMCreditsEntry').Init("Mari the Deer","$SWWM_LOCES")); cpatrons.Push(new('SWWMCreditsEntry').Init("Bean")); cpatrons.Push(new('SWWMCreditsEntry').Init("Snacks")); cpatrons.Push(new('SWWMCreditsEntry').Init("bouncytem"));