From 8afc00c0c0afb6a3f83c6f66fef93c54bc008b68 Mon Sep 17 00:00:00 2001 From: Catoptromancy Date: Sat, 27 Jun 2009 21:30:18 -0700 Subject: [PATCH] combined.txt: Complete TNT: Evilution support Signed-off-by: Mike Swanson --- textures/combined.txt | 723 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 723 insertions(+) diff --git a/textures/combined.txt b/textures/combined.txt index 116daa5a..f75d2d78 100644 --- a/textures/combined.txt +++ b/textures/combined.txt @@ -308,6 +308,729 @@ TEKWALL5 128 128 #ifdef DOOM2 +ALTAQUA 128 128 +* ALTAQUA 0 0 +ASPHALT 256 128 +* ASPHALT 0 0 +METAL2BD 64 128 +* RW33_1 0 0 +* BLOD64B 0 6 +CRBLWDH6 64 128 +* CRLWDH6 0 0 +* BLOD64A -1 -1 +CRBWDH64 64 128 +* CRWDH6B 0 0 +* BLOD64A -1 9 +CRLWDL6B 64 128 +* CRLWDL6B 0 0 +* CRWDL6D 0 64 +CRWDL128 128 128 +* CRWDL12 0 0 +* CRWDL6 0 64 +* CRWDL6B 64 64 +CRAWHBP 128 128 +* BCRATEL1 0 64 +* BCRATEM1 40 64 +* BCRATEM1 32 64 +* BCRATEM1 48 64 +* BCRATEM1 56 64 +* BCRATEM1 96 64 +* BCRATEM1 88 64 +* BCRATEM1 80 64 +* BCRATEM1 72 64 +* BCRATEM1 64 64 +* GCRATEL1 0 0 +* GCRATER1 96 0 +* GCRATEM1 48 0 +* GCRATEM1 40 0 +* GCRATEM1 32 0 +* GCRATEM1 72 0 +* GCRATEM1 64 0 +* GCRATEM1 56 0 +* GCRATEM1 80 0 +* GCRATEM1 88 0 +* BTNTCRAT 16 96 +* BTNTCRAT 16 32 +* BUL64D 54 0 +CR64HBRM 64 128 +* BCRATEL1 0 0 +* BCRATER1 32 0 +* BCRATEL1 0 64 +* BCRATER1 32 64 +* BTNTCRAT 16 32 +* BTNTCRAT 16 96 +* BUL64A 0 0 +* BUL64B 0 64 +* BLOD64B 0 0 +* ROMERO1 3 98 +CR64HBBP 64 128 +* BCRATEL1 0 0 +* BCRATER1 32 0 +* BCRATEL1 0 64 +* BCRATER1 32 64 +* BTNTCRAT 16 32 +* BTNTCRAT 16 96 +* BLOD64A 1 -21 +* BUL64C 0 0 +* BLOD64B 0 0 +CR64HGBP 64 128 +* GCRATEL1 0 0 +* GCRATER1 32 0 +* GCRATEL1 0 64 +* GCRATER1 32 64 +* BTNTCRAT 16 32 +* BTNTCRAT 16 96 +* BLOD64A 0 16 +* BUL64A 0 0 +* BUL64B 0 0 +CR64SLGB 64 128 +* SGCRATE2 0 0 +* SGCRATE2 32 0 +* BCRATEL1 0 64 +* BCRATER1 32 64 +* SMCRATG 7 15 +* SMCRATG 38 15 +* SMCRATG 7 47 +* SMCRATG 38 47 +* BTNTCRAT 16 96 +CR64HBG 64 128 +* GCRATEL1 0 64 +* GCRATER1 32 64 +* BCRATEL1 0 0 +* BCRATER1 32 0 +* BTNTCRAT 16 96 +* BTNTCRAT 16 32 +CR128LG 128 64 +* GCRATEL1 0 0 +* GCRATER1 96 0 +* GCRATEM1 48 0 +* GCRATEM1 40 0 +* GCRATEM1 32 0 +* GCRATEM1 72 0 +* GCRATEM1 64 0 +* GCRATEM1 56 0 +* GCRATEM1 80 0 +* GCRATEM1 88 0 +* BTNTCRAT 16 32 +CR64LB 64 64 +* BCRATEL1 0 0 +* BCRATER1 32 0 +* BTNTCRAT 16 32 +CR64HBB 64 128 +* BCRATEL1 0 0 +* BCRATER1 32 0 +* BCRATEL1 0 64 +* BCRATER1 32 64 +* BTNTCRAT 16 32 +* BTNTCRAT 16 96 +CR64HGB 64 128 +* GCRATEL1 0 0 +* GCRATER1 32 0 +* BCRATEL1 0 64 +* BCRATER1 32 64 +* BTNTCRAT 16 32 +* BTNTCRAT 16 96 +CR64HGG 64 128 +* GCRATEL1 0 0 +* GCRATER1 32 0 +* GCRATEL1 0 64 +* GCRATER1 32 64 +* BTNTCRAT 16 32 +* BTNTCRAT 16 96 +CRBWHBP 128 128 +* BCRATEL1 0 64 +* BCRATEM1 40 64 +* BCRATEM1 32 64 +* BCRATEM1 48 64 +* BCRATEM1 56 64 +* BCRATER1 96 64 +* BCRATEM1 88 64 +* BCRATEM1 80 64 +* BCRATEM1 72 64 +* BCRATEM1 64 64 +* GCRATEL1 0 0 +* GCRATER1 96 0 +* GCRATEM1 48 0 +* GCRATEM1 40 0 +* GCRATEM1 32 0 +* GCRATEM1 72 0 +* GCRATEM1 64 0 +* GCRATEM1 56 0 +* GCRATEM1 80 0 +* GCRATEM1 88 0 +* BTNTCRAT 16 96 +* BTNTCRAT 16 32 +* BUL64C 37 -5 +* BLOD128B -2 11 +CRSMB 64 128 +* BCRAT32 0 0 +* BCRAT32 32 0 +* SMCRATG 5 17 +* SMCRATG 37 17 +* SGCRATE2 0 32 +* SGCRATE2 32 32 +* SMCRATG 5 49 +* SMCRATG 37 49 +* SMCRATG 5 81 +* SMCRATG 37 81 +* BCRAT32 0 96 +* BCRAT32 32 96 +* SMCRATG 5 115 +* SMCRATG 37 115 +CRWDL64A 64 128 +* CRWDL6B 0 0 +* CRWDL6B 0 64 +CRWDL64B 64 128 +* CRWDL6C 0 0 +* CRWDL6B 0 64 +CRWDL64C 64 128 +* CRWDL6D 0 0 +* CRWDL6B 0 64 +CRLWDT3 32 16 +* CRLWDT3 0 0 +CRWDT32 64 128 +* CRWDT3 0 0 +* CRWDT3 32 0 +* CLWDVS3 0 16 +* CLWDVS3 32 16 +* CRWDVS3 0 40 +* CRWDVS3 32 40 +* CRWDL6D 0 64 +CRBWLBP 128 64 +* BCRATEL1 0 0 +* BCRATEM1 32 0 +* BCRATEM1 40 0 +* BCRATEM1 48 0 +* BCRATEM1 56 0 +* BCRATEM1 64 0 +* BCRATEM1 72 0 +* BCRATEM1 80 0 +* BCRATEM1 88 0 +* BCRATER1 96 0 +* BTNTCRAT 16 32 +* BUL64B 28 0 +* BLOD64A 56 -47 +CR128LB 128 64 +* BCRATEL1 0 0 +* BCRATEM1 32 0 +* BCRATEM1 40 0 +* BCRATEM1 48 0 +* BCRATEM1 56 0 +* BCRATEM1 64 0 +* BCRATEM1 72 0 +* BCRATEM1 80 0 +* BCRATEM1 88 0 +* BCRATER1 96 0 +* BTNTCRAT 16 32 +CRWDH64 64 128 +* CRWDH6 0 0 +CRWDH64B 64 128 +* CRWDH6B 0 0 +CRLWDS6 64 32 +* CRLWDS6 0 0 +DOGLDIR 128 128 +* DOGLDIR 0 0 +DOKODO1B 64 128 +* DOKODO1B 0 0 +DOKODO2B 64 128 +* DOKODO2B 0 0 +LITEYEL1 32 128 +* YELLITE1 0 0 +DOBWIRE 128 128 +* DOBWIRE 0 0 +DOBWIRE2 128 128 +* DOBWIRE2 0 0 +EGGREENI 8 128 +* EGGREENI 0 0 +EGREDI 8 128 +* EGREDI 0 0 +CR128HGB 128 128 +* BCRATEL1 0 64 +* BCRATEM1 40 64 +* BCRATEM1 32 64 +* BCRATEM1 48 64 +* BCRATEM1 56 64 +* BCRATER1 96 64 +* BCRATEM1 88 64 +* BCRATEM1 80 64 +* BCRATEM1 72 64 +* BCRATEM1 64 64 +* GCRATEL1 0 0 +* GCRATER1 96 0 +* GCRATEM1 48 0 +* GCRATEM1 40 0 +* GCRATEM1 32 0 +* GCRATEM1 72 0 +* GCRATEM1 64 0 +* GCRATEM1 56 0 +* GCRATEM1 80 0 +* GCRATEM1 88 0 +* BTNTCRAT 16 96 +* BTNTCRAT 16 32 +CRAWLBP 128 128 +* BCRATEL1 0 0 +* BCRATEM1 40 0 +* BCRATEM1 32 0 +* BCRATEM1 48 0 +* BCRATEM1 56 0 +* BCRATER1 96 0 +* BCRATEM1 88 0 +* BCRATEM1 80 0 +* BCRATEM1 72 0 +* BCRATEM1 64 0 +* BTNTCRAT 16 32 +* BCRATEM1 88 64 +* BCRATEM1 32 64 +* BCRATEL1 0 64 +* BCRATEM1 48 64 +* BCRATEM1 56 64 +* BCRATER1 96 64 +* BCRATEM1 40 64 +* BTNTCRAT 16 96 +* BCRATEM1 64 64 +* BCRATEM1 72 64 +* BCRATEM1 80 64 +* BUL64A 60 0 +* BLOD128A 2 -31 +CRWDS64 64 128 +* CRWDS6 0 0 +* CRLWDL6D 0 64 +* CRLWDS6 0 32 +* BLOD64A 0 2 +LITEGRN1 32 128 +* GRNLIT1 0 0 +LITERED1 32 128 +* REDLITE1 0 0 +CRLWDH6B 64 128 +* CRLWDH6B 0 0 +CRLWDL6 64 128 +* CRLWDL6 0 0 +* CRLWDL6D 0 64 +CRLWDL6E 64 128 +* CRLWDL6E 0 0 +* CRLWDL6C 0 64 +CRLWDL6C 64 128 +* CRLWDL6C 0 0 +* CRLWDL6E 0 64 +CRLWDL6D 64 128 +* CRLWDL6D 0 0 +* CRLWDL6B 0 64 +CRTINYB 64 128 +* BCRAT16 0 0 +* BCRAT16 16 0 +* BCRAT16 32 0 +* BCRAT16 48 0 +* VGCRATE1 0 16 +* VGCRATE1 16 16 +* VGCRATE1 32 16 +* VGCRATE1 48 16 +* BCRAT16 32 32 +* BCRAT16 48 32 +* VGCRATE1 0 32 +* VGCRATE1 16 32 +* BCRAT16 0 48 +* BCRAT16 16 48 +* VGCRATE1 32 48 +* VGCRATE1 48 48 +* SGCRATE2 0 64 +* SGCRATE2 32 64 +* SMCRATG 7 79 +* SMCRATG 38 79 +* SMCRATG 7 111 +* SMCRATG 38 111 +DORED 128 128 +* DORED 0 0 +LITERED2 8 128 +* REDLITE2 0 0 +TNTDOOR 128 128 +* DOTNTDR 0 0 +; may conflict, not yet added - SW1GSTON 512 128 +; may conflict, not yet added - SW2GSTON 512 128 +; may conflict, not yet added - BLODGR1 512 128 +; may conflict, not yet added - SW1SKULL 512 128 +; may conflict not yet added - BLODGR4 512 128 +; may conflict not yet added - SLADRIP1 512 128 + + +METALDR 128 128 +* WALL47_1 0 0 +* WALL47_1 64 0 +* WALL42_3 21 0 +* WALL42_3 85 0 +* W111_3 0 0 +* W111_3 0 64 +* W111_3 64 0 +* W111_3 64 64 +* SW2_1 52 37 +M_TEC 256 128 +* RW33_1 0 0 +* RW33_2 32 0 +* RW33_3 96 0 +* RW33_2 192 0 +* COMP03_5 160 0 +* COMP04_1 160 43 +* COMP04_8 160 86 +M_RDOOR 128 128 +* RW33_1 0 0 +* RW33_1 64 0 +* RIPW15 0 112 +* RIPW15 0 0 +* W46_38 13 29 +* W46_38 45 29 +* W46_38 77 29 +* W46_38 109 29 +M_YDOOR 128 128 +* RW33_1 0 0 +* RW33_1 64 0 +* RIPW15 0 0 +* RIPW15 0 112 +* W46_39 13 29 +* W46_39 44 29 +* W46_39 109 29 +* W46_39 77 29 +CUBICLE 128 128 +* RW34_2 0 0 +* RW34_2 64 0 +* WLITA0 3 60 +* WLITC0 117 60 +* WLITB0 109 60 +* WLITB0 11 60 +* WLITC0 19 60 +* WLITA0 101 60 +* WLITC0 52 60 +* WLITB0 44 60 +* WLITA0 36 60 +* WLITA0 68 60 +* WLITB0 76 60 +* WLITC0 84 60 +BLOD3 512 128 +* RW48_4 0 0 +* RW48_4 64 0 +* DOSW3C 128 0 +* DOSW3 200 0 +* DOSLVR13 272 0 +* DOSLVR23 344 0 +* DOBLIP3A 416 0 +* CYAN 488 0 +SLAD2 512 128 +* DOSHB1 0 0 +* DOSPI2B 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 +* SAW2 344 0 +* SAW2SD 416 0 +* PBLAK 448 0 +* PL_05 454 2 +SLAD3 512 128 +* DOSHC1 0 0 +* DOSPI3B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL4 283 21 +* PREEL5 311 21 +* SAW3 344 0 +* SAW3SD 416 0 +* PBLAK 448 0 +* PL_10 454 2 +SLAD4 512 128 +* DOSHD1 0 0 +* DOSPI2B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL3 283 21 +* PREEL3 311 21 +* SAW4 344 0 +* SAW2SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +SLAD5 512 128 +* DOSHE1 0 0 +* DOSPI3B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL3 283 21 +* PREEL3 311 21 +* SAW5 344 0 +* SAW5SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +* PL_19 454 2 +SLAD6 512 128 +* DOSHF1 0 0 +* DOSPI4B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL2 283 21 +* PREEL1 311 21 +* SAW6 344 0 +* SAW6SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +* PL_20 453 4 +SLAD7 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 +* PREEL2 283 21 +* PREEL1 311 21 +* SAW1 344 0 +* SAW1SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +* PL_U 452 20 +* PL_25 464 6 +SLAD8 512 128 +* DOSHB1 0 0 +* DOSPI2B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL7 283 21 +* PREEL6 311 21 +* SAW2 344 0 +* SAW2SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +* PL_U 452 20 +* PL_A 464 20 +* PL_31 467 2 +SLAD9 512 128 +* DOSHC1 0 0 +* DOSPI3B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL3 283 21 +* PREEL3 311 21 +* SAW3 344 0 +* SAW3SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +* PL_U 452 20 +* PL_A 464 20 +* PL_C 476 20 +SLAD10 512 128 +* DOSHD1 0 0 +* DOSPI2B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL3 283 21 +* PREEL3 311 21 +* SAW4 344 0 +* SAW4SD 416 0 +* PBLAK 448 0 +* PL_18 454 2 +* PL_A 464 20 +* PL_C 476 20 +* TFOGF0 452 20 +* TFOGI0 462 18 +SLAD11 512 128 +* DOSHE1 0 0 +* DOSPI3B 136 0 +* SMFILLER 272 0 +* COMP03_4 276 0 +* COMP03_4 276 64 +* COMP03_4 308 0 +* COMP03_4 308 64 +* SMFILLER 340 0 +* PREEL3 283 21 +* PREEL3 311 21 +* SAW5 344 0 +* SAW5SD 416 0 +* PBLAK 448 0 +* PL_19 454 2 +* PL_T 452 20 +* PL_N 464 20 +* TFOGF0 458 20 +* TFOGI0 476 18 +; SLADRIP3 +TYWHEEL1 128 64 +* TYWHEEL1 0 0 +TYUNDER1 64 64 +* TYUNDER1 0 0 +PNK4EXIT 128 128 +* DOPUNK4 0 0 +* EXIT1 48 25 +DOGRID 128 128 +* DOGRID 0 0 +DOWINDOW 64 68 +* DOWINDOW 0 0 +DOGLPANL 64 128 +* DOGLPANL 0 0 +DOGRMSC 128 128 +* DOGRMSC 0 0 +DOKGRIR 128 128 +* DOKGRIR 0 0 +DOPUNK4 128 128 +* DOPUNK4 0 0 +SMGLASS1 64 128 +* PCWINL 0 0 +SMSTONE6 128 128 +* PSTON2 0 0 +* PIVY3 0 0 +BTNTSLVR 64 128 +* RW32_1 0 0 +* BLUTNT 6 49 +LITEYEL2 8 128 +* YELLITE2 0 0 +BTNTMETL 64 128 +* WALL47_1 0 0 +* BLUTNT 6 40 +YELMETAL 128 128 +* RW38_1 0 0 +* RW38_1 64 0 +* YELTNT 0 0 +CRLWDL12 128 128 +* CRLWDL12 0 0 +* CRWDL12 0 64 +CRLWDH6 64 128 +* CRLWDH6 0 0 +CRBWDL12 128 128 +* CRWDL12 0 0 +* CRWDL12 0 64 +* BLOD64B 23 -44 +CR64LG 64 128 +* GCRATEL1 0 0 +* GCRATER1 32 0 +* BTNTCRAT 16 32 +* GCRATEL1 0 64 +* GCRATER1 32 64 +* BTNTCRAT 16 96 +CRLWDVS 64 128 +* CLWDVS3 0 0 +* CLWDVS3 32 0 +* CRWDL6C 0 64 +* CRWDT3 0 24 +* CRWDT3 32 48 +* CLWDVS3 0 40 +* CLWDVS3 32 24 +LITEYEL3 128 128 +* YELLITE3 0 0 +MTNT1 128 128 +* MWALL3_1 0 0 +* MTNT2 0 0 +DOC1 128 128 +* AG128_1 0 0 +* AG128_1 64 0 +* REDTNT2 4 32 +METAL-BD 64 128 +* WALL47_1 0 0 +* BLOD64A 0 0 +METAL-RM 64 128 +* WALL47_1 0 0 +* ROMERO1 4 81 +CARLLF1 128 128 +* CARLLF1 0 0 +CARLLF2 128 128 +* CARLLF2 0 0 +CARLRT1 128 128 +* CARLRT1 0 0 +CARLRT2 128 128 +* CARLRT2 0 0 +CAVERN1 128 128 +* CAVERN1 0 0 +CAVERN4 128 128 +* CAVERN4 0 0 +CAVERN5 64 128 +* CAVERN5 0 0 +CAVERN6 128 128 +* CAVERN6 0 0 +CAVERN7 128 128 +* CAVERN7 0 0 +STONEW1 128 128 +* STONEW1 0 0 +STONEW5 128 128 +* STONEW5 0 0 +BIGMURAL 256 128 +* BIGMURAL 0 0 +BIGWALL 128 128 +* BIGWALL 0 0 +DRFRONT 128 128 +* DRFRONT 0 0 +DRSIDE1 32 128 +* DRSIDE1 0 0 +DRSIDE2 32 128 +* DRSIDE2 0 0 +DRTOPFR 128 65 +* DRTOPFR 0 0 +DRTOPSID 32 65 +* DRTOPSID 0 0 +LONGWALL 256 128 +* LONGWALL 0 0 +MURAL1 128 128 +* MURAL1 0 0 +MURAL2 128 128 +* MURAL2 0 0 +PILLAR 32 128 +* PILLAR 0 0 +SKIRTING 256 43 +* SKIRTING 0 0 +STWALL 128 128 +* STWALL 0 0 +EGSUPRT3 16 128 +* WALL42_3 -4 0 +GRNOPEN 64 128 +* GRNOPEN 0 0 +REDOPEN 64 128 +* REDOPEN 0 0 +BRNOPEN 64 128 +* BRNOPEN 0 0 +TYIRONLG 128 128 +* FENCE4 0 0 +TYIRONSM 64 72 +* FENCE5 0 0 +WEBL 128 128 +* DOWEBL 0 0 +WEBR 128 128 +* DOWEBR 0 0 +GRNMEN 128 128 +* DOGRNMEN 0 0 +DISASTER 128 128 +* DOGRNMEN 0 0 +* DISASTER 0 32 + + + + + + ; these textures are in doom 2, but not doom 1: ASHWALL3 64 128 * RW22_2 0 0