From f5c0b200c7d4461e096d799a04ee5cbbc282f9ea Mon Sep 17 00:00:00 2001 From: Georgy Samoilov Date: Mon, 14 Oct 2024 00:48:07 +0500 Subject: [PATCH 1/4] Update credits, remove text generator --- .gitignore | 3 - FORK_Scripts.txt | 2 +- Makefile | 2 - buildcfg.txt | 214 ++++++++++++------------ lumps/{titlepic => }/blasphdm_title.png | Bin lumps/text/Makefile | 21 --- lumps/text/README | 8 - lumps/text/create_caption | 72 -------- lumps/title.png | Bin 0 -> 12696 bytes lumps/{titlepic => }/titlepic.png | Bin 10 files changed, 106 insertions(+), 216 deletions(-) rename lumps/{titlepic => }/blasphdm_title.png (100%) delete mode 100644 lumps/text/Makefile delete mode 100644 lumps/text/README delete mode 100755 lumps/text/create_caption create mode 100644 lumps/title.png rename lumps/{titlepic => }/titlepic.png (100%) diff --git a/.gitignore b/.gitignore index 17ca135..1b780d4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,3 @@ wad*.txt /lumps/genmidi/*.lmp /lumps/textures/blasphdm/ /lumps/textures/blasphem/ - -/lumps/bsph*tl.png -/lumps/text/*.png diff --git a/FORK_Scripts.txt b/FORK_Scripts.txt index 7fbd228..9d0db71 100644 --- a/FORK_Scripts.txt +++ b/FORK_Scripts.txt @@ -1,7 +1,7 @@ ### Scripts ### - Cato ### Update Titlepic ### -# rm lumps/title.png && convert lumps/help1.gif -pointsize 10 -gravity east -font NimbusRoman-Bold -fill white -draw "text 5,95 '2024 v 0.1.9-fork-002 '" lumps/title.png +# rm lumps/title.png && convert lumps/titlepic.png -pointsize 10 -gravity east -font NimbusRoman-Bold -fill white -draw "text 5,95 '2024 v 0.1.9-fork-002 '" lumps/title.png ### Prepare and Push Commit ### # rm blasphem.zip && rm blasphdm.zip && make diff --git a/Makefile b/Makefile index d2c5144..af57f95 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ OBJS=$(BLASPHEM) $(BLASPHDM) all: deutex-check $(OBJS) subdirs: - $(MAKE) VERSION=$(VERSION) -C lumps/text $(MAKE) -C lumps/genmidi $(MAKE) -C lumps/dmxgus $(MAKE) -C lumps/textures @@ -76,7 +75,6 @@ clean: rm wadinfo_blasphem.txt rm wadinfo_blasphdm.txt - $(MAKE) -C lumps/text clean $(MAKE) -C lumps/genmidi clean $(MAKE) -C lumps/dmxgus clean $(MAKE) -C lumps/textures clean diff --git a/buildcfg.txt b/buildcfg.txt index 4485c45..81692ac 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -7,7 +7,7 @@ ; Stilgar - Placeholder Map, Monster placeholder [lumps] -;HEHACKED ; GeorgePieVG (lump) & Stilgar (strings) +;HEHACKED ; Georgy Samoilov (lump) & Stilgar (strings) ;HHEVER ; EMAPINFO ; Georgy Samoilov DECORATE ; Craneo, Georgy Samoilov @@ -17,11 +17,7 @@ COLORMAP ; Da Werecat TINTTAB ; Da Werecat LOADING ; Georgy Samoilov -#ifdef BLASPHEM -TITLE BSPHEMTL ; Jute Gyte -#else -TITLE BSPHDMTL ; Jute Gyte, Bradley Gratis CC0 font -#endif +TITLE ; Jute Gyte HELP1 ; Espi, MrFlibble HELP2 ; MrFlibble, Jute Gyte @@ -170,15 +166,15 @@ E6M3 ; Catoptromancy ; BlasphDM levels #else -E1M1 dm11 # Protox -E1M2 dm12 # Protox -E1M3 dm13 # Protox -E1M4 dm14 # Protox -E1M5 dm15 # Protox -E1M6 dm16 # Protox -E1M7 dm17 # Original by Jute, edited by Protox -E1M8 dm18 # Original by Rellik, edited by Protox -E1M9 dm19 # Original by Protox, edited by Cacowad +E1M1 dm11 # Xindage +E1M2 dm12 # Xindage +E1M3 dm13 # Xindage +E1M4 dm14 # Xindage +E1M5 dm15 # Xindage +E1M6 dm16 # Xindage +E1M7 dm17 # Original by Jute, edited by Xindage +E1M8 dm18 # Original by Rellik, edited by Xindage +E1M9 dm19 # Original by Xindage, edited by Cacowad E2M1 dm21 # Cacowad E2M2 dm22 # Cacowad E2M3 dm23 # Cacowad @@ -188,9 +184,9 @@ E2M6 dm26 # Cacowad E2M7 dm27 # Cacowad E2M8 dm28 # Cacowad E2M9 dm29 # Original by Rellik, edited by Cacowad -E3M1 dm31 # Protox -E3M2 dm32 # Protox -E3M3 dm33 # Protox +E3M1 dm31 # Xindage +E3M2 dm32 # Xindage +E3M3 dm33 # Xindage E3M4 dm1 # Jute Gyte E3M5 dm2 # Rellik (Conversion by Jute) E3M6 dm3 # Rellik (Conversion by Jute) @@ -235,8 +231,8 @@ AMB8 ; Jute Gyte AMB9 ; Jute Gyte ARTIUP ; Jute Gyte ARTIUSE ; Jute Gyte -BLSHIT ; SuperSomariDX -BLSSHT ; SuperSomariDX +BLSHIT ; MoonDeLaAxel +BLSSHT ; MoonDeLaAxel BOUNCE ; Craneo BOWSHT ; Jute Gyte, AntonR BSTACT ; Jute @@ -270,16 +266,16 @@ GNTHIT ; MoonDeLaAxel GNTPOW ; MoonDeLaAxel GNTUSE ; MoonDeLaAxel HEDACT ; AntonR -HEDAT1 ; SuperSomariDX -HEDAT2 ; SuperSomariDX -HEDAT3 ; SuperSomariDX +HEDAT1 ; MoonDeLaAxel +HEDAT2 ; MoonDeLaAxel +HEDAT3 ; MoonDeLaAxel HEDDTH ; (Freedoom) HEDPAI ; Jute HEDSIT ; AntonR HRNHIT ; Jute Gyte, AntonR -HRNPOW ; SuperSomariDX -HRNSHT ; SuperSomariDX -IMPAT1 ; SuperSomariDX +HRNPOW ; MoonDeLaAxel +HRNSHT ; MoonDeLaAxel +IMPAT1 ; MoonDeLaAxel IMPAT2 ; AntonR IMPDTH ; MoonDeLaAxel IMPPAI ; MoonDeLaAxel @@ -292,21 +288,21 @@ KGTDTH ; AntonR - CC0/public domain KGTPAI ; AntonR - CC0/public domain KGTSIT ; AntonR - CC0/public domain LOBHIT ; MoonDeLaAxel -LOBPOW ; SuperSomariDX +LOBPOW ; MoonDeLaAxel LOBSHT ; Jute Gyte MINACT ; undead003 (Freedoom) -MINAT1 ; SuperSomariDX -MINAT2 ; SuperSomariDX +MINAT1 ; MoonDeLaAxel +MINAT2 ; MoonDeLaAxel MINAT3 BSTACT ; * PLACE HOLDER * MINDTH ; undead003 & Goji (Freedoom) MINPAI ; undead003 (Freedoom) MINSIT ; undead003 (Freedoom) -MUMAT1 ; SuperSomariDX -MUMAT2 ; SuperSomariDX +MUMAT1 ; MoonDeLaAxel +MUMAT2 ; MoonDeLaAxel MUMDTH ; AntonR MUMHED ; MoonDeLaAxel -MUMPAI ; SuperSomariDX -MUMSIT ; SuperSomariDX +MUMPAI ; MoonDeLaAxel +MUMSIT ; MoonDeLaAxel NEWPOD ; Jute PHOHIT ; AntonR PHOPOW ; MoonDeLaAxel @@ -875,11 +871,11 @@ VFBLA0 12 12 ; Georgy Samoilov VFBLB0 12 12 ; Georgy Samoilov VTFBA0 6 6 ; Stilgar VTFBB0 6 6 ; Stilgar -WBLSA0 11 45 ; Eriance +WBLSA0 11 45 ; Amuscaria WBOWA0 21 38 ; Stilgar -WGNTA0 15 52 ; Eriance -WMCEA0 21 22 ; Eriance -WPHXA0 10 57 ; Eriance +WGNTA0 15 52 ; Amuscaria +WMCEA0 21 22 ; Amuscaria +WPHXA0 10 57 ; Amuscaria WSKLA0 18 45 ; Stilgar SOARB0 SOARA0 23 25 ; Stilgar (Unanimated!) SOARC0 SOARA0 23 25 ; Stilgar (Unanimated!) @@ -909,7 +905,7 @@ ARTIPTN2 -5 -2 ; apophis, Craneo ARTIPWBK -3 -3 ; Stilgar ARTISOAR 1 -9 ; * PLACE HOLDER * ARTISPHL -6 -5 ; Stilgar -ARTITRCH -7 -3 ; SuperSomariDX +ARTITRCH -7 -3 ; MoonDeLaAxel ATLPA0 12 35 ; Stilgar ATLPB0 12 35 ; Stilgar ATLPC0 12 35 ; Stilgar @@ -1592,10 +1588,10 @@ CRBWE0 -3 -106 ; Neoworm CRBWF0 -13 -106 ; Neoworm CRBWG0 -13 -104 ; Neoworm CRBWH0 -13 -99 ; Neoworm -BLSRA0 -103 -84 ; Eriance -BLSRB0 -103 -84 ; Eriance -BLSRC0 -97 -84 ; Eriance -BLSRD0 -89 -73 ; Eriance +BLSRA0 -103 -84 ; Amuscaria +BLSRB0 -103 -84 ; Amuscaria +BLSRC0 -97 -84 ; Amuscaria +BLSRD0 -89 -73 ; Amuscaria BSKLA0 ; Reinaldo "Horror Movie Guy" BSKLB0 ; Reinaldo "Horror Movie Guy" BSKLC0 ; Reinaldo "Horror Movie Guy" @@ -1706,11 +1702,11 @@ FX01E0 7 6 ; BethOfDeath aka bpeterson FX01F0 8 8 ; BethOfDeath aka bpeterson FX01G0 9 12 ; BethOfDeath aka bpeterson FX01H0 9 12 ; BethOfDeath aka bpeterson -FX02A0 4 4 ; Protox -FX02B0 4 4 ; SuperSomariDX -FX02C0 8 8 ; Protox -FX02D0 8 8 ; SuperSomariDX -FX02E0 15 14 ; SuperSomariDX +FX02A0 4 4 ; Xindage +FX02B0 4 4 ; MoonDeLaAxel +FX02C0 8 8 ; Xindage +FX02D0 8 8 ; MoonDeLaAxel +FX02E0 15 14 ; MoonDeLaAxel FX02F0 ; * PLACE HOLDER * FX02G0 ; * PLACE HOLDER * FX02H0 ; * PLACE HOLDER * @@ -1734,28 +1730,28 @@ FX03G0 ; * PLACE HOLDER * FX03H0 11 10 ; Leilei FX03I0 21 17 ; Leilei FX03J0 26 8 ; Leilei -FX04A1 ; Eriance -FX04A2A8 ; Eriance -FX04A3A7 ; Eriance -FX04A4A6 ; Eriance -FX04A5 ; Eriance +FX04A1 ; Amuscaria +FX04A2A8 ; Amuscaria +FX04A3A7 ; Amuscaria +FX04A4A6 ; Amuscaria +FX04A5 ; Amuscaria FX04B0 ; * PLACE HOLDER * FX04C0 ; * PLACE HOLDER * FX04D0 ; * PLACE HOLDER * FX04E0 ; * PLACE HOLDER * FX04F0 ; * PLACE HOLDER * -FX05A1A5 ; Protox -FX05A2A8 ; Protox -FX05A3A7 ; Protox -FX05A4A6 ; Protox -FX05B1B5 ; Protox -FX05B2B8 ; Protox -FX05B3B7 ; Protox -FX05B4B6 ; Protox -FX05C1C5 ; Protox -FX05C2C8 ; Protox -FX05C3C7 ; Protox -FX05C4C6 ; Protox +FX05A1A5 ; Xindage +FX05A2A8 ; Xindage +FX05A3A7 ; Xindage +FX05A4A6 ; Xindage +FX05B1B5 ; Xindage +FX05B2B8 ; Xindage +FX05B3B7 ; Xindage +FX05B4B6 ; Xindage +FX05C1C5 ; Xindage +FX05C2C8 ; Xindage +FX05C3C7 ; Xindage +FX05C4C6 ; Xindage FX05D0 ; * PLACE HOLDER * FX05E0 ; * PLACE HOLDER * FX05F0 ; * PLACE HOLDER * @@ -1800,8 +1796,8 @@ FX08H0 ; * PLACE HOLDER * FX08I0 ; * PLACE HOLDER * FX08J0 ; * PLACE HOLDER * FX08K0 ; * PLACE HOLDER * -FX09A0 ; SuperSomariDX -FX09B0 ; SuperSomariDX +FX09A0 ; MoonDeLaAxel +FX09B0 ; MoonDeLaAxel FX09C0 ; * PLACE HOLDER * FX09D0 ; * PLACE HOLDER * FX09E0 ; * PLACE HOLDER * @@ -1811,13 +1807,13 @@ FX09H0 ; * PLACE HOLDER * FX09I0 ; * PLACE HOLDER * FX09J0 ; * PLACE HOLDER * FX09K0 ; * PLACE HOLDER * -FX10A0 ; Protox -FX10B0 ; Protox -FX10C0 ; Protox -FX10D0 ; Protox -FX10E0 ; Protox -FX10F0 ; Protox -FX10G0 ; Protox +FX10A0 ; Xindage +FX10B0 ; Xindage +FX10C0 ; Xindage +FX10D0 ; Xindage +FX10E0 ; Xindage +FX10F0 ; Xindage +FX10G0 ; Xindage FX11A0 9 9 ; Georgy Samoilov FX11B0 7 7 ; Georgy Samoilov FX11C0 11 12 ; Georgy Samoilov @@ -1992,31 +1988,31 @@ FX23F0 ; * PLACE HOLDER * FX23G0 ; * PLACE HOLDER * FX23H0 ; * PLACE HOLDER * FX23I0 ; * PLACE HOLDER * -GAUNA0 -110 -118 ; Eriance -GAUNB0 -103 -105 ; Eriance -GAUNC0 -96 -90 ; Eriance -GAUND0 -82 -69 ; Eriance -GAUNE0 -74 -63 ; Eriance -GAUNF0 -82 -65 ; Eriance -GAUNG0 -110 -118 ; Eriance -GAUNH0 -110 -118 ; Eriance -GAUNI0 -110 -118 ; Eriance -GAUNJ0 -103 -105 ; Eriance -GAUNK0 -96 -90 ; Eriance -GAUNL0 -82 -69 ; Eriance -GAUNM0 -74 -63 ; Eriance +GAUNA0 -110 -118 ; Amuscaria +GAUNB0 -103 -105 ; Amuscaria +GAUNC0 -96 -90 ; Amuscaria +GAUND0 -82 -69 ; Amuscaria +GAUNE0 -74 -63 ; Amuscaria +GAUNF0 -82 -65 ; Amuscaria +GAUNG0 -110 -118 ; Amuscaria +GAUNH0 -110 -118 ; Amuscaria +GAUNI0 -110 -118 ; Amuscaria +GAUNJ0 -103 -105 ; Amuscaria +GAUNK0 -96 -90 ; Amuscaria +GAUNL0 -82 -69 ; Amuscaria +GAUNM0 -74 -63 ; Amuscaria GAUNN0 -82 -65 ; Erianc GWNDA0 -139 -94 ; BethOfDeath aka bpeterson GWNDB0 -139 -85 ; BethOfDeath aka bpeterson GWNDC0 -139 -79 ; BethOfDeath aka bpeterson GWNDD0 -139 -71 ; BethOfDeath aka bpeterson -HRODA0 -70 -103 ; Eriance -HRODB0 -70 -103 ; Eriance -HRODC0 -70 -103 ; Eriance -HRODD0 -69 -101 ; Eriance -HRODE0 -72 -92 ; Eriance -HRODF0 -75 -90 ; Eriance -HRODG0 -75 -90 ; Eriance +HRODA0 -70 -103 ; Amuscaria +HRODB0 -70 -103 ; Amuscaria +HRODC0 -70 -103 ; Amuscaria +HRODD0 -69 -101 ; Amuscaria +HRODE0 -72 -92 ; Amuscaria +HRODF0 -75 -90 ; Amuscaria +HRODG0 -75 -90 ; Amuscaria INVSA0 12 42 ; Stilgar KFR1A0 20 77 ; Warfare & Stilgar KFR1B0 20 77 ; Warfare & Stilgar @@ -2041,16 +2037,16 @@ LVASH0 ; * PLACE HOLDER * LVASI0 ; * PLACE HOLDER * LVASJ0 ; * PLACE HOLDER * LVASK0 ; * PLACE HOLDER * -MACEA0 -70 -100 # Eriance -MACEB0 -81 -100 # Eriance -MACEC0 -81 -95 # Eriance -MACED0 -92 -90 # Eriance -MACEE0 -93 -95 # Eriance -MACEF0 -93 -100 # Eriance -PHNXA0 -92 -86 ; Eriance -PHNXB0 -92 -86 ; Eriance -PHNXC0 -61 -76 ; Eriance -PHNXD0 -92 -90 ; Eriance +MACEA0 -70 -100 # Amuscaria +MACEB0 -81 -100 # Amuscaria +MACEC0 -81 -95 # Amuscaria +MACED0 -92 -90 # Amuscaria +MACEE0 -93 -95 # Amuscaria +MACEF0 -93 -100 # Amuscaria +PHNXA0 -92 -86 ; Amuscaria +PHNXB0 -92 -86 ; Amuscaria +PHNXC0 -61 -76 ; Amuscaria +PHNXD0 -92 -90 ; Amuscaria PLAYA1 13 50 ; Reinaldo "Horror Movie Guy" PLAYA2A8 13 52 ; Reinaldo "Horror Movie Guy" PLAYA3A7 16 51 ; Reinaldo "Horror Movie Guy" @@ -2228,9 +2224,9 @@ SPAXC2C8 13 5 ; AntonR SPAXC3C7 20 6 ; AntonR SPAXC4C6 13 6 ; AntonR SPAXC5 7 8 ; AntonR -SPAXD0 ; Protox -SPAXE0 ; Protox -SPAXF0 ; Protox +SPAXD0 ; Xindage +SPAXE0 ; Xindage +SPAXF0 ; Xindage SPHLA0 8 31 ; Stilgar SPSHA0 5 6 ; 40oz SPSHB0 5 6 ; 40oz @@ -2272,9 +2268,9 @@ TGLTG0 2 2 ; Stilgar TGLTH0 3 3 ; Stilgar TGLTI0 3 3 ; Stilgar TGLTJ0 2 2 ; Stilgar -TRCHA0 12 58 ; SuperSomariDX -TRCHB0 12 58 ; SuperSomariDX -TRCHC0 12 58 ; SuperSomariDX +TRCHA0 12 58 ; MoonDeLaAxel +TRCHB0 12 58 ; MoonDeLaAxel +TRCHC0 12 58 ; MoonDeLaAxel VLCOA0 16 24 ; Warfare VLCOB0 VLCOA0 17 24 ; Warfare VLCOC0 VLCOA0 16 23 ; Warfare diff --git a/lumps/titlepic/blasphdm_title.png b/lumps/blasphdm_title.png similarity index 100% rename from lumps/titlepic/blasphdm_title.png rename to lumps/blasphdm_title.png diff --git a/lumps/text/Makefile b/lumps/text/Makefile deleted file mode 100644 index 15f755d..0000000 --- a/lumps/text/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# The full set of graphics outputted by textgen includes a couple of -# extra files that are just intermediates, and are not lumps to be -# incuded in the WADs: - -# all: help.png credit.png titlepic -all: titlepic - -titlepic: bsphemtl.png bsphdmtl.png - -bsphemtl.png: ../titlepic/titlepic.png - ./create_caption $< $@ - cp $@ ../ -bsphdmtl.png: ../titlepic/blasphdm_title.png - ./create_caption $< $@ - cp $@ ../ - -clean: - $(RM) bsphemtl.png bsphdmtl.png \ - ../bsphemtl.png ../bsphdmtl.png - $(RM) __pycache__/* - -rmdir __pycache__ diff --git a/lumps/text/README b/lumps/text/README deleted file mode 100644 index bff40b5..0000000 --- a/lumps/text/README +++ /dev/null @@ -1,8 +0,0 @@ -This is a script that generates the big font graphics used in the menus and -intermission screens. The font used to generate the graphics is in the -subdirectory 'fontchars'. This is based on the original font graphics -(found in 'font') which have been split up into individual files each -containing a single character. - -The script generates the images by use of Pillow to composite -character graphics together. diff --git a/lumps/text/create_caption b/lumps/text/create_caption deleted file mode 100755 index ea08059..0000000 --- a/lumps/text/create_caption +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python3 -# encoding: utf-8 -# SPDX-License-Identifier: BSD-3-Clause - -from PIL import Image, ImageFont, ImageDraw -import sys -import os - -# create_caption.py - -font = ImageFont.load_default() - - -txt1 = "© 2001-2024" -txt2 = os.environ["VERSION"] -background_image = Image.open(sys.argv[1]) -background_image.load() -background_image = background_image.convert("RGBA") -image = Image.new("RGBA", background_image.size, (0, 0, 0, 0)) -draw = ImageDraw.Draw(image) - -# Getting the text size is tricky since for newer PIL, such as 10.0.0, only -# textbbox() is supported, but for older PIL, such 7.2.0, only textsize() -# is supported. The solution is to default to the newer API, but fallback to -# the older one when it is not available. -try: - # This newer API returns a four item tuple. The "xy" kwarg is returned in - # the first two items, and last two items is the size needed, but with "xy" - # added, so passing "(0, 0)" returns the size needed. - txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:] - txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:] -except: - # This older API simply returns the size needed. - txt1_size = draw.textsize(txt1, font=font) - txt2_size = draw.textsize(txt2, font=font) - -draw.text( - (5, int(image.height - txt1_size[1] - 5)), - txt1, - font=font, - fill=(255, 165, 0, 255), -) -draw.text( - ( - int(image.width - txt2_size[0] - 10), - int(image.height - txt2_size[1] - 5), - ), - txt2, - font=font, - fill=(255, 165, 0, 255), -) - -if len(sys.argv) > 3: - # paste the other stuff onto the thing. - logo = Image.open(sys.argv[2]) - logo.load() - phase = Image.open(sys.argv[3]) - phase.load - image.paste(logo, ((int(image.width / 2) - int(logo.width / 2), 18))) - image.paste( - phase, - ( - (int(image.width / 2) - int(phase.width / 2)), - int(image.height - phase.height - 30), - ), - ) - outfile_name = sys.argv[4] -else: - outfile_name = sys.argv[2] - -image = Image.alpha_composite(background_image, image) -image.save(outfile_name) diff --git a/lumps/title.png b/lumps/title.png new file mode 100644 index 0000000000000000000000000000000000000000..8494baf8ed907f32328f2074236110cf0b7e1bc3 GIT binary patch literal 12696 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 Ls Date: Mon, 14 Oct 2024 01:08:37 +0500 Subject: [PATCH 2/4] Update version --- lumps/title.png | Bin 12696 -> 12692 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lumps/title.png b/lumps/title.png index 8494baf8ed907f32328f2074236110cf0b7e1bc3..09687c88659675602babd5297bcc908b1addd343 100644 GIT binary patch delta 1301 zcmY+6e^8Tk0LJ&-7;uOzE(jR3Q4pds_Kqna9n1t#1O>qo_3#CO5l6a%LkW?+h((AQ z;#Uq#SVYAS=MNMa4Fdde4z|%Y_VT{b^_TxW_j#V@)0llB`&KoTrP)afryuyn(E}_?5y^Y`J7zzP!*D5!zW)zPP;< zh2FkL!5#ROZzp)7jQ5KKbSx8AygdbWD|0xGfMLDu1P^mtflle}-{t@^l(z!UF~C!0 zLhybE;03RQ_=6tU9});S@Oj8tkPScO2|+Zx&f~A}ao!#f0R^EPkN{IcBd}*m%ruM4 zX>fa;vD(J#T{N*9o-wPkVyIP8-{r+8172Nd983C(7dFuFQ3>(q+rUD3BA_C9xfc{=~6@}=lr%lb7_EX>n%A5HTUp!TECv7&!PsU|Hwu^35; zZlBOZjGmIDp5?b=2HVHXNiHFtVU;H?%ntU>A7~K~-R~UloI4;Bh1oh3_G2@(0BFEwh58!jlvKcrq)n=gC4{?7kO6#8|D=fZHqiq={>9tEHIM5x$br zTLiAA1~SaFSFN&|_R4CzP0K^7ECXkNn@2uoVTj?g{t=WS6l){rov3)j7v62^6o&N_ zzMP?(*O(`_X}L|rBOOsV(^O0KJ;cm|YGbx}T(^`kBcYn~EX@i1i{_GR6VXelFRrTb zu*b<>+eC;gN#12AaGOduc)`zl?*L6?v`CK`E!Yub^zXHDD$~fKMy3;WHf&RsZO%dv zBJqTbKyqUgRt-W;<1q$tPl0&=wdVCYV++?B4a98!NJ;t2h9F)15OwB|HaL_R#QG5~ zm0M*S!~Q@}qomPbt;Yt5U-`?b0R?Htb0%yX+ZmJwBOYN(_2}}VL|n;TM_eyHcQ%{K3)0t~dMCuAd_mx2~X@ zo$bu4qS0vY6>m*1&dDmyjmj>{%_@e@g4MBMNE8wtwPE9WWF;V%!vlYKZFpFclP@l% xg&|=Zcmjkc5bk;XFkEoa4WuqY&Z$9x1P*WyM2F*t#q3yDgcO{{o<+fW-g+ delta 1366 zcmYk6Sx{4F7>4sFAQq6Q;FcJI5>YGJvB5Yd#X{L+4I_*TF|0$aGEgjygk(_5P{axz zF(4yRVK7oF)wCc|6Di0dsE8=i3eo655F`>p$Z~Q{>3GwtZ{BC#=e_*Sr>w$AXKu z;@IG`>gsBv(b(MF43z>tRUi>g43)?(XjD>I$V`DY%s@S3>8oY?_~+UqnPi zMMXtrWu;IkOiD`1%*-4a8R7AG85tP`1qEWUSR@h^6&1D0^?i^TOLOzw=0EgQR*u0? z|AOc^CPlfl1pCmKyDBLzEyNiF|l5rrt6CvJ|D~57i#bL7aU57%K0{^IQDqHs>oTe6p*0j%R<0Ti0Bao zUP4(Ov7i>Z>p=ngA+1L^D1f%&$=C%d6oGGCMDzF^AVx)B?gbV@@QSa2m+JJ2wKy=Q zs`nZKz@ZYa4#a{1)$O$c;9-!Vhjae;`%PCIq0O)#@+43I4hkfwDfSXYdRFb1_h#zu zeja_kAuILh%+cMKEsmnu1`e$yw{Sj890L)E#{dGA6I;NDDr|iqz-qFg6Qs8wR+Zts z1mJ$q+M#T69T--5`ZPEJlIkv{90x9`BDd^w0z|06-v^9B-To9ngQoq@fOP0Ml?@I; zH>vbRK1NOO*{Sr(;FRimd{5n>(c*I+kn4kN$gS)Y#G=@ONahsqh2CAZw24W5YQN&5WNH}68h-+h==5J{ zjgP$UXWPyE1(Mb(b{8DD+)|hbUMIrh@ixtAQI)~!Ms|#8EY3ocoQIrISo%KJ3BN%r zH4hp6Li<#|*78{Qq$}zR@&|lm<;3CbaJ*fCPeF%fx z&y;l!qsw<$MDwA3d|N(3o2!U{Uk(?VA~nXhrdL{f&bR?Rsl#``9Wqnz#ORIuGIgiz zCq;dkS@7WLLX4kh;|veIhR!aqHn|`}tMB6-kfIuXrnn^G%yqoy*T8d%8i}koRC+l6NC$-Bhs9xz>q%%ZkFjq$Ly(}|x1 zi=>VTo^qF=_?}E)nu2=Y5qVZEVsDb(4os;+<2*KM%EBStN<#LL1nTNm^-)uEbeyp zHU@*sVC*UVF#3Okdn7w8D?|KAU<6W`tOO>5%VsWCKM5WB_^VI?bEEfvJ8W)1z$aX` TY{TMv!eGKfqJwYlK6K(=Y-OT) From f09ef0e1133cb64668089585387243f8c1b5b22b Mon Sep 17 00:00:00 2001 From: Georgy Samoilov Date: Mon, 14 Oct 2024 01:28:55 +0500 Subject: [PATCH 3/4] Update credits in credits.md --- CREDITS.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index d9a306f..d3c3c35 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -4,12 +4,12 @@ CREDITS.md: G. "Stilgar" Wessner - Graphics, Former Project Lead Jute Gyte - Music and Sound, Level Design, Former Project Lead -Sodaholic - Sounds and Graphics, Former Project Maintainer, Former Project Lead +Blastfrog - Sounds and Graphics, Former Project Maintainer, Former Project Lead Springy - Project Lead Cacowad - Level Design, Project Mantainer DooMAD - Graphics Blox - Graphics -Eriance - Weapon Graphics +Amuscaria - Weapon Graphics, Sprites Warfare - Graphics Leilei - Base Data, Graphics Esselfortium - Graphics @@ -43,7 +43,6 @@ EttinGrinder - Level Design AntonR - Sounds, Sprites MrFlibble - Graphics GeorgePieVG - Scripts, Sprites -Amuscaria - Sprites MoonDeLaAxel - Sounds KatherineCode - Sprites Desfar - Sprites From 95e1ca00b6a0a69ba0166109f282df60a8c93605 Mon Sep 17 00:00:00 2001 From: Georgy Samoilov Date: Mon, 14 Oct 2024 01:33:25 +0500 Subject: [PATCH 4/4] Update more credits --- CREDITS.md | 2 +- buildcfg.txt | 134 +++++++++++++++++++++++++-------------------------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index d3c3c35..731a7e5 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -36,7 +36,7 @@ BethOfDeath - Graphics Lokito - Graphics Linguica - Graphics BigProjectAlone - Graphics -HorrorMovieGuy - Graphics +HorrorMovieRei - Graphics Suporma - Level Design Craneo - Level Design EttinGrinder - Level Design diff --git a/buildcfg.txt b/buildcfg.txt index 81692ac..6fe41e4 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -358,14 +358,14 @@ IN_YAH GOD1 0 0 ; * PLACE HOLDER * MAPE1 0 0 ; MrFlibble MAPE2 0 0 ; MrFlibble MAPE3 0 0 ; MrFlibble -FACEA0 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEA1 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEA2 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEA3 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEB0 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEB1 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEB2 0 0 ; Reinaldo "Horror Movie Guy," Craneo -FACEB3 0 0 ; Reinaldo "Horror Movie Guy," Craneo +FACEA0 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEA1 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEA2 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEA3 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEB0 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEB1 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEB2 0 0 ; Reinaldo "HorrorMovieRei," Craneo +FACEB3 0 0 ; Reinaldo "HorrorMovieRei," Craneo LIFEGEM0 0 0 ; Stilgar LIFEGEM1 0 0 ; Stilgar LIFEGEM2 0 0 ; Stilgar @@ -1592,12 +1592,12 @@ BLSRA0 -103 -84 ; Amuscaria BLSRB0 -103 -84 ; Amuscaria BLSRC0 -97 -84 ; Amuscaria BLSRD0 -89 -73 ; Amuscaria -BSKLA0 ; Reinaldo "Horror Movie Guy" -BSKLB0 ; Reinaldo "Horror Movie Guy" -BSKLC0 ; Reinaldo "Horror Movie Guy" -BSKLD0 ; Reinaldo "Horror Movie Guy" -BSKLE0 ; Reinaldo "Horror Movie Guy" -BSKLF0 ; Reinaldo "Horror Movie Guy" +BSKLA0 ; Reinaldo "HorrorMovieRei" +BSKLB0 ; Reinaldo "HorrorMovieRei" +BSKLC0 ; Reinaldo "HorrorMovieRei" +BSKLD0 ; Reinaldo "HorrorMovieRei" +BSKLE0 ; Reinaldo "HorrorMovieRei" +BSKLF0 ; Reinaldo "HorrorMovieRei" CHDLA0 28 60 ; Warfare CHDLB0 28 60 ; Warfare CHDLC0 28 60 ; Warfare @@ -2047,59 +2047,59 @@ PHNXA0 -92 -86 ; Amuscaria PHNXB0 -92 -86 ; Amuscaria PHNXC0 -61 -76 ; Amuscaria PHNXD0 -92 -90 ; Amuscaria -PLAYA1 13 50 ; Reinaldo "Horror Movie Guy" -PLAYA2A8 13 52 ; Reinaldo "Horror Movie Guy" -PLAYA3A7 16 51 ; Reinaldo "Horror Movie Guy" -PLAYA4A6 14 50 ; Reinaldo "Horror Movie Guy" -PLAYA5 14 50 ; Reinaldo "Horror Movie Guy" -PLAYB1 15 51 ; Reinaldo "Horror Movie Guy" -PLAYB2B8 14 52 ; Reinaldo "Horror Movie Guy" -PLAYB3B7 13 52 ; Reinaldo "Horror Movie Guy" -PLAYB4B6 15 51 ; Reinaldo "Horror Movie Guy" -PLAYB5 16 51 ; Reinaldo "Horror Movie Guy" -PLAYC1 12 50 ; Reinaldo "Horror Movie Guy" -PLAYC2C8 13 51 ; Reinaldo "Horror Movie Guy" -PLAYC3C7 14 51 ; Reinaldo "Horror Movie Guy" -PLAYC4C6 16 50 ; Reinaldo "Horror Movie Guy" -PLAYC5 16 50 ; Reinaldo "Horror Movie Guy" -PLAYD1 15 51 ; Reinaldo "Horror Movie Guy" -PLAYD2D8 13 51 ; Reinaldo "Horror Movie Guy" -PLAYD3D7 13 52 ; Reinaldo "Horror Movie Guy" -PLAYD4D6 15 51 ; Reinaldo "Horror Movie Guy" -PLAYD5 16 51 ; Reinaldo "Horror Movie Guy" -PLAYE1 11 48 ; Reinaldo "Horror Movie Guy" -PLAYE2E8 17 48 ; Reinaldo "Horror Movie Guy" -PLAYE3E7 19 48 ; Reinaldo "Horror Movie Guy" -PLAYE4E6 15 48 ; Reinaldo "Horror Movie Guy" -PLAYE5 11 48 ; Reinaldo "Horror Movie Guy" -PLAYF1 12 48 ; Reinaldo "Horror Movie Guy" -PLAYF2F8 22 48 ; Reinaldo "Horror Movie Guy" -PLAYF3F7 21 48 ; Reinaldo "Horror Movie Guy" -PLAYF4F6 18 48 ; Reinaldo "Horror Movie Guy" -PLAYF5 13 48 ; Reinaldo "Horror Movie Guy" -PLAYG1 16 49 ; Reinaldo "Horror Movie Guy" -PLAYG2G8 16 50 ; Reinaldo "Horror Movie Guy" -PLAYG3G7 12 50 ; Reinaldo "Horror Movie Guy" -PLAYG4G6 14 49 ; Reinaldo "Horror Movie Guy" -PLAYG5 18 49 ; Reinaldo "Horror Movie Guy" -PLAYH0 16 49 ; Reinaldo "Horror Movie Guy" -PLAYI0 19 45 ; Reinaldo "Horror Movie Guy" -PLAYJ0 20 40 ; Reinaldo "Horror Movie Guy" -PLAYK0 23 39 ; Reinaldo "Horror Movie Guy" -PLAYL0 24 33 ; Reinaldo "Horror Movie Guy" -PLAYM0 27 23 ; Reinaldo "Horror Movie Guy" -PLAYN0 27 17 ; Reinaldo "Horror Movie Guy" -PLAYO0 27 17 ; Reinaldo "Horror Movie Guy" -PLAYP0 27 18 ; Reinaldo "Horror Movie Guy" -PLAYQ0 14 48 ; Reinaldo "Horror Movie Guy" -PLAYR0 15 41 ; Reinaldo "Horror Movie Guy" -PLAYS0 15 35 ; Reinaldo "Horror Movie Guy" -PLAYT0 21 32 ; Reinaldo "Horror Movie Guy" -PLAYU0 20 21 ; Reinaldo "Horror Movie Guy" -PLAYV0 23 19 ; Reinaldo "Horror Movie Guy" -PLAYW0 23 15 ; Reinaldo "Horror Movie Guy" -PLAYX0 24 13 ; Reinaldo "Horror Movie Guy" -PLAYY0 26 13 ; Reinaldo "Horror Movie Guy" +PLAYA1 13 50 ; Reinaldo "HorrorMovieRei" +PLAYA2A8 13 52 ; Reinaldo "HorrorMovieRei" +PLAYA3A7 16 51 ; Reinaldo "HorrorMovieRei" +PLAYA4A6 14 50 ; Reinaldo "HorrorMovieRei" +PLAYA5 14 50 ; Reinaldo "HorrorMovieRei" +PLAYB1 15 51 ; Reinaldo "HorrorMovieRei" +PLAYB2B8 14 52 ; Reinaldo "HorrorMovieRei" +PLAYB3B7 13 52 ; Reinaldo "HorrorMovieRei" +PLAYB4B6 15 51 ; Reinaldo "HorrorMovieRei" +PLAYB5 16 51 ; Reinaldo "HorrorMovieRei" +PLAYC1 12 50 ; Reinaldo "HorrorMovieRei" +PLAYC2C8 13 51 ; Reinaldo "HorrorMovieRei" +PLAYC3C7 14 51 ; Reinaldo "HorrorMovieRei" +PLAYC4C6 16 50 ; Reinaldo "HorrorMovieRei" +PLAYC5 16 50 ; Reinaldo "HorrorMovieRei" +PLAYD1 15 51 ; Reinaldo "HorrorMovieRei" +PLAYD2D8 13 51 ; Reinaldo "HorrorMovieRei" +PLAYD3D7 13 52 ; Reinaldo "HorrorMovieRei" +PLAYD4D6 15 51 ; Reinaldo "HorrorMovieRei" +PLAYD5 16 51 ; Reinaldo "HorrorMovieRei" +PLAYE1 11 48 ; Reinaldo "HorrorMovieRei" +PLAYE2E8 17 48 ; Reinaldo "HorrorMovieRei" +PLAYE3E7 19 48 ; Reinaldo "HorrorMovieRei" +PLAYE4E6 15 48 ; Reinaldo "HorrorMovieRei" +PLAYE5 11 48 ; Reinaldo "HorrorMovieRei" +PLAYF1 12 48 ; Reinaldo "HorrorMovieRei" +PLAYF2F8 22 48 ; Reinaldo "HorrorMovieRei" +PLAYF3F7 21 48 ; Reinaldo "HorrorMovieRei" +PLAYF4F6 18 48 ; Reinaldo "HorrorMovieRei" +PLAYF5 13 48 ; Reinaldo "HorrorMovieRei" +PLAYG1 16 49 ; Reinaldo "HorrorMovieRei" +PLAYG2G8 16 50 ; Reinaldo "HorrorMovieRei" +PLAYG3G7 12 50 ; Reinaldo "HorrorMovieRei" +PLAYG4G6 14 49 ; Reinaldo "HorrorMovieRei" +PLAYG5 18 49 ; Reinaldo "HorrorMovieRei" +PLAYH0 16 49 ; Reinaldo "HorrorMovieRei" +PLAYI0 19 45 ; Reinaldo "HorrorMovieRei" +PLAYJ0 20 40 ; Reinaldo "HorrorMovieRei" +PLAYK0 23 39 ; Reinaldo "HorrorMovieRei" +PLAYL0 24 33 ; Reinaldo "HorrorMovieRei" +PLAYM0 27 23 ; Reinaldo "HorrorMovieRei" +PLAYN0 27 17 ; Reinaldo "HorrorMovieRei" +PLAYO0 27 17 ; Reinaldo "HorrorMovieRei" +PLAYP0 27 18 ; Reinaldo "HorrorMovieRei" +PLAYQ0 14 48 ; Reinaldo "HorrorMovieRei" +PLAYR0 15 41 ; Reinaldo "HorrorMovieRei" +PLAYS0 15 35 ; Reinaldo "HorrorMovieRei" +PLAYT0 21 32 ; Reinaldo "HorrorMovieRei" +PLAYU0 20 21 ; Reinaldo "HorrorMovieRei" +PLAYV0 23 19 ; Reinaldo "HorrorMovieRei" +PLAYW0 23 15 ; Reinaldo "HorrorMovieRei" +PLAYX0 24 13 ; Reinaldo "HorrorMovieRei" +PLAYY0 26 13 ; Reinaldo "HorrorMovieRei" PPODA0 23 40 ; Stilgar PPODB0 23 40 ; Stilgar PPODC0 24 42 ; Amuscaria/Freedoom