diff --git a/lumps/textures/textures.cfg b/lumps/textures/textures.cfg index 0face3f9..98154170 100644 --- a/lumps/textures/textures.cfg +++ b/lumps/textures/textures.cfg @@ -2780,7 +2780,9 @@ MC19 128 128 * MC19 0 0 ; These are "new" textures that are really just here so that all patches -; needed for Plutonia compatibility are included. +; needed for Plutonia compatibility are included. plutonia.wad has these +; textures but they're modified versions of textures that were in +; doom2.wad, so they've been renamed to avoid conflicts: ; FIREBLU1, FIREBLU2 P-FRBLU1 128 128 @@ -2804,3 +2806,110 @@ SW1PSKUL 64 64 SW2PSKUL 64 64 * SW2SKULL 0 0 +; These are "new" textures that are really just here so that all patches +; needed for TNT compatibility are included. tnt.wad has these +; textures but they're modified versions of textures that were in +; doom2.wad, so they've been renamed to avoid conflicts: + +; Was BLODGR* +T-BLODG1 512 128 +* RW48_4 0 0 +* RW48_4 64 0 +* DOSW1C 128 0 +* DOSW1 200 0 +* DOSLVR11 272 0 +* DOSLVR21 344 0 +* DOBLIP1A 416 0 +* CYAN 488 0 +T-BLODG4 512 128 +* RW48_4 0 0 +* RW48_4 64 0 +* DOSW4C 128 0 +* DOSW4 200 0 +* DOSLVR14 272 0 +* DOSLVR24 344 0 +* DOBLIP4A 416 0 +* CYAN 488 0 +; Was SW1SKULL: +SW1TSKUL 512 128 +* RW48_4 0 0 +* RW48_4 64 0 +* DOSW2C 128 0 +* DOSW2 200 0 +* DOSLVR12 272 0 +* DOSLVR22 344 0 +* DOBLIP2A 416 0 +* CYAN 488 0 +; WFALL1: +T-WFALL1 512 128 +* RW48_2 0 0 +* RW48_2 64 0 +* DOSWX1C 128 0 +* DOSWX1 200 0 +* DOBIGTVA 272 0 +* DOTV1B 344 0 +* TYWFALL1 416 0 +* CYAN 488 0 +; SW2SKULL: +SW2TSKUL 512 128 +* RW48_2 0 0 +* RW48_2 64 0 +* DOSWX2C 128 0 +* DOSWX2 200 0 +* DOBIGTVB 272 0 +* DOTV2B 344 0 +* TYWFALL2 416 0 +* CYAN 488 0 +; FALL3: this does not conflict with doom2.wad: +FALL3 512 128 +* RW48_2 0 0 +* RW48_2 64 0 +* DOSWX3C 128 0 +* DOSWX3 200 0 +* DOBIGTVC 272 0 +* DOTV3B 344 0 +* TYWFALL3 416 0 +* CYAN 488 0 +; WFALL4: +T-WFALL4 512 128 +* RW48_2 0 0 +* RW48_2 64 0 +* DOSWX4C 128 0 +* DOSWX4 200 0 +* DOBIGTVD 272 0 +* DOTV4B 344 0 +* TYWFALL4 416 0 +* CYAN 488 0 +; SKY*: +T-SKY1 1024 128 +* DOEDAY 0 0 +* DONDAY 256 0 +* DOWDAY 512 0 +* DOSDAY 768 0 +T-SKY2 1024 128 +* DOENITE 0 0 +* DONNITE 256 0 +* DOWNITE 512 0 +* DOSNITE 768 0 +T-SKY3 1024 128 +* DOEHELL 0 0 +* DONHELL 256 0 +* DOWHELL 512 0 +* DOSHELL 768 0 +; SLADRIP1: +T-SLDRP1 512 128 +* DOSHA1 0 0 +* DOSPI1B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL1 283 21 +* PREEL2 311 21 +* SAW1 344 0 +* SAW1SD 416 0 +* PBLAK 448 0 +* PL_01 462 2 + diff --git a/patches/catoptromancy/doehell.gif b/patches/catoptromancy/doehell.gif deleted file mode 100644 index e3e736d7..00000000 Binary files a/patches/catoptromancy/doehell.gif and /dev/null differ diff --git a/patches/doeday.gif b/patches/doeday.gif new file mode 120000 index 00000000..434bb26d --- /dev/null +++ b/patches/doeday.gif @@ -0,0 +1 @@ +rsky1.gif \ No newline at end of file diff --git a/patches/doehell.gif b/patches/doehell.gif index 02efcdd2..5621b77d 120000 --- a/patches/doehell.gif +++ b/patches/doehell.gif @@ -1 +1 @@ -catoptromancy/doehell.gif \ No newline at end of file +sky3.gif \ No newline at end of file diff --git a/patches/doenite.gif b/patches/doenite.gif new file mode 120000 index 00000000..367d248a --- /dev/null +++ b/patches/doenite.gif @@ -0,0 +1 @@ +sky4a.gif \ No newline at end of file diff --git a/patches/donday.gif b/patches/donday.gif new file mode 120000 index 00000000..434bb26d --- /dev/null +++ b/patches/donday.gif @@ -0,0 +1 @@ +rsky1.gif \ No newline at end of file diff --git a/patches/donhell.gif b/patches/donhell.gif new file mode 120000 index 00000000..5621b77d --- /dev/null +++ b/patches/donhell.gif @@ -0,0 +1 @@ +sky3.gif \ No newline at end of file diff --git a/patches/donnite.gif b/patches/donnite.gif new file mode 120000 index 00000000..367d248a --- /dev/null +++ b/patches/donnite.gif @@ -0,0 +1 @@ +sky4a.gif \ No newline at end of file diff --git a/patches/dosday.gif b/patches/dosday.gif new file mode 120000 index 00000000..434bb26d --- /dev/null +++ b/patches/dosday.gif @@ -0,0 +1 @@ +rsky1.gif \ No newline at end of file diff --git a/patches/doshell.gif b/patches/doshell.gif new file mode 120000 index 00000000..5621b77d --- /dev/null +++ b/patches/doshell.gif @@ -0,0 +1 @@ +sky3.gif \ No newline at end of file diff --git a/patches/dosnite.gif b/patches/dosnite.gif new file mode 120000 index 00000000..248ee873 --- /dev/null +++ b/patches/dosnite.gif @@ -0,0 +1 @@ +sky4b.gif \ No newline at end of file diff --git a/patches/dowday.gif b/patches/dowday.gif new file mode 120000 index 00000000..434bb26d --- /dev/null +++ b/patches/dowday.gif @@ -0,0 +1 @@ +rsky1.gif \ No newline at end of file diff --git a/patches/dowhell.gif b/patches/dowhell.gif new file mode 120000 index 00000000..5621b77d --- /dev/null +++ b/patches/dowhell.gif @@ -0,0 +1 @@ +sky3.gif \ No newline at end of file diff --git a/patches/downite.gif b/patches/downite.gif new file mode 120000 index 00000000..367d248a --- /dev/null +++ b/patches/downite.gif @@ -0,0 +1 @@ +sky4a.gif \ No newline at end of file