diff --git a/LICENSE.code b/LICENSE.code index 4190e6460..efd190704 100644 --- a/LICENSE.code +++ b/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 diff --git a/credits.txt b/credits.txt index b81589174..1003cc342 100644 --- a/credits.txt +++ b/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: diff --git a/graphics/Credits/MariSprite.png b/graphics/Credits/MariSprite.png new file mode 100644 index 000000000..48c73d833 Binary files /dev/null and b/graphics/Credits/MariSprite.png differ diff --git a/graphics/Credits/MariSprite0.png b/graphics/Credits/MariSprite0.png deleted file mode 100644 index 4d05e28be..000000000 Binary files a/graphics/Credits/MariSprite0.png and /dev/null differ diff --git a/graphics/Credits/MariSprite1.png b/graphics/Credits/MariSprite1.png deleted file mode 100644 index f57cb0719..000000000 Binary files a/graphics/Credits/MariSprite1.png and /dev/null differ diff --git a/graphics/Credits/MariSprite10.png b/graphics/Credits/MariSprite10.png deleted file mode 100644 index 758d30607..000000000 Binary files a/graphics/Credits/MariSprite10.png and /dev/null differ diff --git a/graphics/Credits/MariSprite11.png b/graphics/Credits/MariSprite11.png deleted file mode 100644 index 3d889dd74..000000000 Binary files a/graphics/Credits/MariSprite11.png and /dev/null differ diff --git a/graphics/Credits/MariSprite12.png b/graphics/Credits/MariSprite12.png deleted file mode 100644 index 33229f31a..000000000 Binary files a/graphics/Credits/MariSprite12.png and /dev/null differ diff --git a/graphics/Credits/MariSprite13.png b/graphics/Credits/MariSprite13.png deleted file mode 100644 index f77155373..000000000 Binary files a/graphics/Credits/MariSprite13.png and /dev/null differ diff --git a/graphics/Credits/MariSprite14.png b/graphics/Credits/MariSprite14.png deleted file mode 100644 index fd8269c46..000000000 Binary files a/graphics/Credits/MariSprite14.png and /dev/null differ diff --git a/graphics/Credits/MariSprite2.png b/graphics/Credits/MariSprite2.png deleted file mode 100644 index 396d82209..000000000 Binary files a/graphics/Credits/MariSprite2.png and /dev/null differ diff --git a/graphics/Credits/MariSprite3.png b/graphics/Credits/MariSprite3.png deleted file mode 100644 index 07f3550c4..000000000 Binary files a/graphics/Credits/MariSprite3.png and /dev/null differ diff --git a/graphics/Credits/MariSprite4.png b/graphics/Credits/MariSprite4.png deleted file mode 100644 index 254493dbd..000000000 Binary files a/graphics/Credits/MariSprite4.png and /dev/null differ diff --git a/graphics/Credits/MariSprite5.png b/graphics/Credits/MariSprite5.png deleted file mode 100644 index b47c2a561..000000000 Binary files a/graphics/Credits/MariSprite5.png and /dev/null differ diff --git a/graphics/Credits/MariSprite6.png b/graphics/Credits/MariSprite6.png deleted file mode 100644 index 3a11c6df2..000000000 Binary files a/graphics/Credits/MariSprite6.png and /dev/null differ diff --git a/graphics/Credits/MariSprite7.png b/graphics/Credits/MariSprite7.png deleted file mode 100644 index 2d31d8784..000000000 Binary files a/graphics/Credits/MariSprite7.png and /dev/null differ diff --git a/graphics/Credits/MariSprite8.png b/graphics/Credits/MariSprite8.png deleted file mode 100644 index 2ca8455b8..000000000 Binary files a/graphics/Credits/MariSprite8.png and /dev/null differ diff --git a/graphics/Credits/MariSprite9.png b/graphics/Credits/MariSprite9.png deleted file mode 100644 index bcb908858..000000000 Binary files a/graphics/Credits/MariSprite9.png and /dev/null differ diff --git a/language.def_base b/language.def_base index 1f259ae51..16861f4d3 100644 --- a/language.def_base +++ b/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"; diff --git a/language.es_base b/language.es_base index 1641efca3..900dd3616 100644 --- a/language.es_base +++ b/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"; diff --git a/language.version b/language.version index 54e05a642..c8853266d 100644 --- a/language.version +++ b/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-"; diff --git a/palettes/GrandExpl.pal b/palettes/GrandExpl.pal deleted file mode 100644 index bf03ef1c4..000000000 Binary files a/palettes/GrandExpl.pal and /dev/null differ diff --git a/palettes/KinyExpl.pal b/palettes/KinyExpl.pal new file mode 100644 index 000000000..57d9c8a10 Binary files /dev/null and b/palettes/KinyExpl.pal differ diff --git a/palettes/MADCAT.pal b/palettes/MADCAT.pal deleted file mode 100644 index 59b152556..000000000 Binary files a/palettes/MADCAT.pal and /dev/null differ diff --git a/palettes/NokrExpl.pal b/palettes/NokrExpl.pal new file mode 100644 index 000000000..da6e039ad Binary files /dev/null and b/palettes/NokrExpl.pal differ diff --git a/palettes/SWWMGZ.pal b/palettes/SWWMGZ.pal deleted file mode 100644 index 1c73c4cc2..000000000 Binary files a/palettes/SWWMGZ.pal and /dev/null differ diff --git a/palettes/SWWMGZStartup.pal b/palettes/SWWMGZStartup.pal deleted file mode 100644 index a5ab9fcc1..000000000 Binary files a/palettes/SWWMGZStartup.pal and /dev/null differ diff --git a/palettes/SWWMGZTerm.pal b/palettes/SWWMGZTerm.pal deleted file mode 100644 index 0dcf2a063..000000000 Binary files a/palettes/SWWMGZTerm.pal and /dev/null differ diff --git a/readme.txt b/readme.txt index 60c8495f1..8dacc3aec 100644 --- a/readme.txt +++ b/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 diff --git a/shaders/pp/Grain.fp b/shaders/pp/Grain.fp index 43fa816e8..020ea3273 100644 --- a/shaders/pp/Grain.fp +++ b/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); diff --git a/tools/mklang.c b/tools/mklang.c index 078951883..f5d5ffa33 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 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 diff --git a/tools/mkstartup.c b/tools/mkstartup.c index 56494c9b6..e2a897e11 100644 --- a/tools/mkstartup.c +++ b/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 diff --git a/zscript.txt b/zscript.txt index a3fc9d1ff..6058e57e0 100644 --- a/zscript.txt +++ b/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 */ diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index e78a67fee..2227d71f5 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/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() { diff --git a/zscript/utility/swwm_coordutil.zsc b/zscript/utility/swwm_coordutil.zsc index 500426c57..969623b01 100644 --- a/zscript/utility/swwm_coordutil.zsc +++ b/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