diff --git a/textures/combined.txt b/textures/combined.txt index f75d2d78..3b27883f 100644 --- a/textures/combined.txt +++ b/textures/combined.txt @@ -308,13 +308,59 @@ TEKWALL5 128 128 #ifdef DOOM2 + +; tnt texture support +; 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 +; may conflict, not yet added - SLADRIP3 512 128 + ALTAQUA 128 128 * ALTAQUA 0 0 ASPHALT 256 128 * ASPHALT 0 0 -METAL2BD 64 128 -* RW33_1 0 0 -* BLOD64B 0 6 +BIGMURAL 256 128 +* BIGMURAL 0 0 +BIGWALL 128 128 +* BIGWALL 0 0 +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 +BRNOPEN 64 128 +* BRNOPEN 0 0 +BTNTMETL 64 128 +* WALL47_1 0 0 +* BLUTNT 6 40 +BTNTSLVR 64 128 +* RW32_1 0 0 +* BLUTNT 6 49 +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 CRBLWDH6 64 128 * CRLWDH6 0 0 * BLOD64A -1 -1 @@ -528,22 +574,6 @@ 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 @@ -597,10 +627,6 @@ CRWDS64 64 128 * 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 @@ -638,20 +664,126 @@ CRTINYB 64 128 * SMCRATG 38 79 * SMCRATG 7 111 * SMCRATG 38 111 +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 +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 +DOC1 128 128 +* AG128_1 0 0 +* AG128_1 64 0 +* REDTNT2 4 32 +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 +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 DORED 128 128 * DORED 0 0 +DISASTER 128 128 +* DOGRNMEN 0 0 +* DISASTER 0 32 +DOGLDIR 128 128 +* DOGLDIR 0 0 +DOKODO1B 64 128 +* DOKODO1B 0 0 +DOKODO2B 64 128 +* DOKODO2B 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 +EGSUPRT3 16 128 +* WALL42_3 -4 0 +GRNMEN 128 128 +* DOGRNMEN 0 0 +GRNOPEN 64 128 +* GRNOPEN 0 0 +LITEGRN1 32 128 +* GRNLIT1 0 0 +LITERED1 32 128 +* REDLITE1 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 - - +LITEYEL1 32 128 +* YELLITE1 0 0 +LITEYEL2 8 128 +* YELLITE2 0 0 +LITEYEL3 128 128 +* YELLITE3 0 0 +LONGWALL 256 128 +* LONGWALL 0 0 +MURAL1 128 128 +* MURAL1 0 0 +MURAL2 128 128 +* MURAL2 0 0 +MTNT1 128 128 +* MWALL3_1 0 0 +* MTNT2 0 0 +METAL-BD 64 128 +* WALL47_1 0 0 +* BLOD64A 0 0 +METAL-RM 64 128 +* WALL47_1 0 0 +* ROMERO1 4 81 +METAL2BD 64 128 +* RW33_1 0 0 +* BLOD64B 0 6 METALDR 128 128 * WALL47_1 0 0 * WALL47_1 64 0 @@ -688,30 +820,13 @@ M_YDOOR 128 128 * 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 +PILLAR 32 128 +* PILLAR 0 0 +PNK4EXIT 128 128 +* DOPUNK4 0 0 +* EXIT1 48 25 +REDOPEN 64 128 +* REDOPEN 0 0 SLAD2 512 128 * DOSHB1 0 0 * DOSPI2B 136 0 @@ -880,155 +995,37 @@ SLAD11 512 128 * 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 +TNTDOOR 128 128 +* DOTNTDR 0 0 TYIRONLG 128 128 * FENCE4 0 0 TYIRONSM 64 72 * FENCE5 0 0 +TYWHEEL1 128 64 +* TYWHEEL1 0 0 +TYUNDER1 64 64 +* TYUNDER1 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 - - - - +YELMETAL 128 128 +* RW38_1 0 0 +* RW38_1 64 0 +* YELTNT 0 0 ; these textures are in doom 2, but not doom 1: