Personal rebranding.

LICENSE.code

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2022 Marisa Kirisame, UnSX Team
+Copyright (c) 2020-2022 Marisa the Magician, UnSX Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

credits.txt

@@ -27,9 +27,7 @@ Most of the work here is original, but there are some notable exceptions:
  - The anti-BD feature uses art and music by IOSYS, art was edited into the Doom palette.
  - The crash handler uses a short clip of the Curb Your Enthusiasm theme.
  - Tewi font by lucy (https://github.com/lucy/tewi-font). Modified to add gradients and drop shadow.
- - MPlus font by M⁺ FONTS PROJECT (http://mplus-fonts.osdn.jp/mplus-bitmap-fonts). Modified to add gradients and drop shadow.
  - Miniwi font by Josuah Demangeon (http://josuah.net). Modified to add gradients and drop shadow.
- - k6x8 font by littlelimit (https://littlelimit.net/k6x8.htm). Modified to add gradients and drop shadow.
  - Nashgore footprint texture by Valerie Lavender.
  - Slope alignment utility code by ZZYZX & Nash.
  - Intermission fanart:

language.def_base

@@ -663,15 +663,15 @@ SWWM_TITLEPRESENTSA = "UnSX Team";
 SWWM_TITLEPRESENTSB = "presents";
 SWWM_TITLEPRESENTS = "presents";
 SWWM_TITLEMODBYA = "a mod by";
-SWWM_TITLEMODBYB = "Marisa Kirisame";
-SWWM_TITLEMODBY = "a mod by \cxMarisa Kirisame";
+SWWM_TITLEMODBYB = "Marisa the Magician";
+SWWM_TITLEMODBY = "a mod by \cxMarisa 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 = "9";
 SWWM_TITLESCROLL1 = "SWWM GZ ~ Cute Robutt Whomst Love To Explode Demons";
 SWWM_TITLESCROLL1_NEW = "Codename: Demolitionist ~ Cute Robutt Whomst Love To Explode Demons";
-SWWM_TITLESCROLL2 = "A wondrous GZDoom gameplay mod by Marisa Kirisame of UnSX Team";
+SWWM_TITLESCROLL2 = "A wondrous GZDoom gameplay mod by Marisa the Magician of UnSX Team";
 SWWM_TITLESCROLL3 = "Lovingly designed 3D models with hand-painted 256-color dithered textures";
 SWWM_TITLESCROLL4 = "Over 60k lines of ZScript, and still counting (god help me)";
 SWWM_TITLESCROLL5 = "The deepest lore this side of the Doom Modiverse";

language.es_base

@@ -558,11 +558,11 @@ SWWM_SWAPWEAPON = "\cjPulsa \cfUsar\cj para cambiar \cf%s\cj por \cf%s\cj.\c-";
 SWWM_TITLEPRESENTSB = "presenta";
 SWWM_TITLEPRESENTS = "presenta";
 SWWM_TITLEMODBYA = "un mod de";
-SWWM_TITLEMODBY = "un mod de \cxMarisa Kirisame";
+SWWM_TITLEMODBY = "un mod de \cxMarisa the Magician";
 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 gameplay para GZDoom por Marisa Kirisame de UnSX Team";
+SWWM_TITLESCROLL2 = "Un maravilleante mod de gameplay para GZDoom por Marisa the Magician de UnSX Team";
 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 ZScript, y aun contando (dios me ayude)";
 SWWM_TITLESCROLL5 = "El lore más profundo a este lado del Modiverso de Doom";

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r64 \cu(Mon  9 May 10:28:20 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r64 \cu(2022-05-09 10:28:20)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r65 \cu(Fri 13 May 18:29:45 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r65 \cu(2022-05-13 18:29:45)\c-";

readme.txt

@@ -1,8 +1,8 @@
-        CODENAME: DEMOLITIONIST
-                 a.k.a.
- Some Weird Weapons Mod: GZDoom Edition
-----------------------------------------
-(C)2020-2022 Marisa Kirisame - UnSX Team
+          CODENAME: DEMOLITIONIST
+                   a.k.a.
+   Some Weird Weapons Mod: GZDoom Edition
+--------------------------------------------
+(C)2020-2022 Marisa the Magician - UnSX Team
 
 
 

shaders/pp/Grain.fp

@@ -1,6 +1,6 @@
 /*
    Complex grain shader ported over from MariENB
-   (C)2012-2018 Marisa Kirisame
+   (C)2012-2022 Marisa the Magician
 */
 const float nf = .000005;
 const vec3 nm1 = vec3(2.05,3.11,2.22);

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 Kirisame, UnSX Team
+	Copyright (c) 2020-2022 Marisa the Magician, UnSX Team
 
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the

tools/mkstartup.c

@@ -5,7 +5,7 @@
 	your own damn fault. Add them yourself if you want, this tool was made
 	for personal use anyway.
 
-	Copyright (c) 2020-2021 Marisa Kirisame, UnSX Team
+	Copyright (c) 2020-2022 Marisa the Magician, UnSX Team
 
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the

zscript.txt

@@ -2,7 +2,7 @@ version "4.8"
 
 /*
    DEMOLITIONIST Main Codebase
-   (C)2020-2022 Marisa Kirisame, UnSX Team
+   (C)2020-2022 Marisa the Magician, UnSX Team
    This copyright and the attached LICENSE.code file apply to all files
    included from here, with the exception of any third party libraries
 */

zscript/menu/swwm_credits.zsc

@@ -2,24 +2,22 @@
 Class SWWMCreditsEntry ui
 {
 	String title;
-	bool MariHack;
-	TextureID MariSprite[15];
+	TextureID Sprite;
+	int sheight;
 	int tics, cur;
 	BrokenLines btext;
 	int width, height;
 	int titlecol, btextcol;
 	Font mSmallFont;
 
-	SWWMCreditsEntry Init( String t, String b = "", int c1 = Font.CR_SAPPHIRE, int c2 = Font.CR_WHITE, bool mari = false )
+	SWWMCreditsEntry Init( String t, String b = "", int c1 = Font.CR_SAPPHIRE, int c2 = Font.CR_WHITE, String s = "" )
 	{
 		mSmallFont = Font.GetFont('TewiFont');
-		if ( mari )
+		if ( s != "" )
 		{
-			MariHack = true;
-			for ( int i=0; i<15; i++ )
-				MariSprite[i] = TexMan.CheckForTexture(String.Format("graphics/Credits/MariSprite%d.png",i),TexMan.Type_Any);
-			tics = 3;
-			cur = 0;
+			Sprite = TexMan.CheckForTexture(s,TexMan.Type_Any);
+			Vector2 ofs = TexMan.GetScaledOffset(Sprite);
+			sheight = int(ofs.y);
 		}
 		titlecol = c1;
 		btextcol = c2;
@@ -58,7 +56,7 @@ Class SWWMCreditsEntry ui
 	private int CalcHeight()
 	{
 		int h = 0;
-		if ( MariHack ) h = 148;
+		if ( Sprite.IsValid() ) h = sheight;
 		h += mSmallFont.GetHeight();
 		if ( !btext ) return h;
 		h += 6;
@@ -66,26 +64,16 @@ Class SWWMCreditsEntry ui
 		return h;
 	}
 
-	void Ticker()
-	{
-		if ( !MariHack ) return;
-		if ( tics > 0 ) tics--;
-		if ( !tics )
-		{
-			cur = (cur+1)%15;
-			tics = 3;
-		}
-	}
-
 	double Draw( Vector2 ss, double x, double y )
 	{
 		// don't draw if we're offscreen, saves time
 		if ( (y+height < 0) || (y > ss.y) ) return height;
 		double yy = y;
-		if ( MariHack )
+		if ( Sprite.IsValid() )
 		{
-			yy += 148;
-			Screen.DrawTexture(MariSprite[cur],false,x,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
+			yy += sheight;
+			Screen.DrawTexture(Sprite,true,x+1,yy+1,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,Color(255,0,0,0));
+			Screen.DrawTexture(Sprite,true,x,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		}
 		int w = mSmallFont.StringWidth(title);
 		double xx = x-w/2;
@@ -162,7 +150,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 Kirisame","$SWWM_CDEV2",mari:true));
+		cdev.Push(new("SWWMCreditsEntry").Init("Marisa the Magician","$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"));
@@ -184,7 +172,7 @@ Class SWWMCreditsMenu : GenericMenu
 		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 Kirisame","$SWWM_LOCES"));
+		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("FireFly"));
@@ -384,7 +372,6 @@ Class SWWMCreditsMenu : GenericMenu
 		spos -= speed/GameTicRate;
 		if ( spos < -theight ) spos = ss.y;
 		if ( spos > ss.y ) spos = -theight;
-		cdev[0].Ticker();
 	}
 	override bool TranslateKeyboardEvents()
 	{

zscript/utility/swwm_coordutil.zsc

@@ -3,7 +3,7 @@
    Reproduces the old UnrealScript Get(Un)Axes functions, providing XYZ axis
    vectors relative to an euler rotation (defaults to left-handed coords).
 
-   Copyright (c)2018-2021 Marisa Kirisame, UnSX Team
+   Copyright (c)2018-2022 Marisa the Magician, UnSX Team
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to