diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp index 20da4c6999..18c3992fee 100644 --- a/src/gameconfigfile.cpp +++ b/src/gameconfigfile.cpp @@ -210,13 +210,23 @@ void FGameConfigFile::DoAutoloadSetup (FIWadManager *iwad_man) RenameSection("Freedoom2.Autoload", "doom.freedoom.phase2.Autoload"); RenameSection("Freedoom1.Autoload", "doom.freedoom.phase1.Autoload"); RenameSection("Freedoom.Autoload", "doom.freedoom.Autoload"); - RenameSection("DoomBFG.Autoload", "doom.doom1.bfg.Autoload"); - RenameSection("DoomU.Autoload", "doom.doom1.ultimate.Autoload"); - RenameSection("Doom1.Autoload", "doom.doom1.registered.Autoload"); - RenameSection("TNT.Autoload", "doom.doom2.tnt.Autoload"); - RenameSection("Plutonia.Autoload", "doom.doom2.plutonia.Autoload"); - RenameSection("Doom2BFG.Autoload", "doom.doom2.bfg.Autoload"); - RenameSection("Doom2.Autoload", "doom.doom2.commercial.Autoload"); + RenameSection("DoomBFG.Autoload", "doom.id.doom1.bfg.Autoload"); + RenameSection("DoomU.Autoload", "doom.id.doom1.ultimate.Autoload"); + RenameSection("Doom1.Autoload", "doom.id.doom1.registered.Autoload"); + RenameSection("TNT.Autoload", "doom.id.doom2.tnt.Autoload"); + RenameSection("Plutonia.Autoload", "doom.id.doom2.plutonia.Autoload"); + RenameSection("Doom2BFG.Autoload", "doom.id.doom2.bfg.Autoload"); + RenameSection("Doom2.Autoload", "doom.id.doom2.commercial.Autoload"); + } + else if (last < 218) + { + RenameSection("doom.doom1.bfg.Autoload", "doom.id.doom1.bfg.Autoload"); + RenameSection("doom.doom1.ultimate.Autoload", "doom.id.doom1.ultimate.Autoload"); + RenameSection("doom.doom1.registered.Autoload", "doom.id.doom1.registered.Autoload"); + RenameSection("doom.doom2.tnt.Autoload", "doom.id.doom2.tnt.Autoload"); + RenameSection("doom.doom2.plutonia.Autoload", "doom.id.doom2.plutonia.Autoload"); + RenameSection("doom.doom2.bfg.Autoload", "doom.id.doom2.bfg.Autoload"); + RenameSection("doom.doom2.commercial.Autoload", "doom.id.doom2.commercial.Autoload"); } const FString *pAuto; for (int num = 0; (pAuto = iwad_man->GetAutoname(num)) != NULL; num++) diff --git a/src/gamedata/resourcefiles/resourcefile.cpp b/src/gamedata/resourcefiles/resourcefile.cpp index fbb6e1aa27..92232e701e 100644 --- a/src/gamedata/resourcefiles/resourcefile.cpp +++ b/src/gamedata/resourcefiles/resourcefile.cpp @@ -367,6 +367,7 @@ void FResourceFile::PostProcessArchive(void *lumps, size_t lumpsize) { // Entries in archives are sorted alphabetically qsort(lumps, NumLumps, lumpsize, lumpcmp); + // Filter out lumps using the same names as the Autoload.* sections // in the ini file use. We reduce the maximum lump concidered after @@ -406,7 +407,17 @@ int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, return 0; } filter << "filter/" << filtername << '/'; - if (FindPrefixRange(filter, lumps, lumpsize, max, start, end)) + + bool found = FindPrefixRange(filter, lumps, lumpsize, max, start, end); + + // Workaround for old Doom filter names. + if (!found && filtername.IndexOf("doom.id.doom") == 0) + { + filter.Substitute("doom.id.doom", "doom.doom"); + found = FindPrefixRange(filter, lumps, lumpsize, max, start, end); + } + + if (found) { void *from = (uint8_t *)lumps + start * lumpsize; diff --git a/src/version.h b/src/version.h index 02d1bbc8b4..f08211dcbe 100644 --- a/src/version.h +++ b/src/version.h @@ -65,7 +65,7 @@ const char *GetVersionString(); // Version stored in the ini's [LastRun] section. // Bump it if you made some configuration change that you want to // be able to migrate in FGameConfigFile::DoGlobalSetup(). -#define LASTRUNVERSION "217" +#define LASTRUNVERSION "218" // Protocol version used in demos. // Bump it if you change existing DEM_ commands or add new ones. diff --git a/wadsrc/static/filter/doom.doom2/sprofs.txt b/wadsrc/static/filter/doom.doom2/sprofs.txt deleted file mode 100644 index 1485959efd..0000000000 --- a/wadsrc/static/filter/doom.doom2/sprofs.txt +++ /dev/null @@ -1,162 +0,0 @@ -BAR1A0, 10, 32, iwad -BAR1B0, 10, 32, iwad -BEXPA0, 10, 32, iwad -BEXPB0, 10, 31, iwad -BEXPC0, 19, 36, iwad -BEXPD0, 27, 49, iwad -BEXPE0, 29, 52, iwad -BOS2I0, 20, 71, iwad -BOS2J0, 26, 62, iwad -BOS2K0, 26, 52, iwad -BOS2L0, 29, 33, iwad -BOS2M0, 30, 29, iwad -BOS2N0, 30, 29, iwad -BOS2O0, 30, 29, iwad -BOSSI0, 20, 72, iwad -BOSSJ0, 26, 63, iwad -BOSSK0, 26, 51, iwad -BOSSL0, 29, 33, iwad -BOSSM0, 30, 29, iwad -BOSSN0, 30, 29, iwad -BOSSO0, 30, 29, iwad -BRS1A0, 13, 8, iwad -BSPIJ0, 50, 54, iwad -BSPIK0, 50, 57, iwad -BSPIL0, 47, 52, iwad -BSPIM0, 45, 44, iwad -BSPIN0, 45, 42, iwad -BSPIO0, 45, 30, iwad -BSPIP0, 45, 28, iwad -CBRAA0, 15, 60, iwad -CEYEA0, 21, 59, iwad -CEYEB0, 21, 58, iwad -CEYEC0, 21, 59, iwad -COL1A0, 16, 51, iwad -COL2A0, 16, 39, iwad -COL3A0, 16, 52, iwad -COL4A0, 17, 39, iwad -COL5A0, 16, 44, iwad -COL5B0, 16, 45, iwad -COL6A0, 17, 47, iwad -COLUA0, 9, 45, iwad -CPOSH0, 20, 61, iwad -CPOSI0, 23, 64, iwad -CPOSJ0, 28, 59, iwad -CPOSK0, 30, 48, iwad -CPOSL0, 31, 34, iwad -CPOSM0, 32, 22, iwad -CPOSN0, 32, 18, iwad -CPOSO0, 26, 59, iwad -CPOSP0, 28, 59, iwad -CPOSQ0, 30, 48, iwad -CPOSR0, 32, 40, iwad -CPOSS0, 32, 31, iwad -CPOST0, 32, 19, iwad -CYBRH0, 60, 108, iwad -CYBRI0, 55, 110, iwad -CYBRJ0, 49, 113, iwad -CYBRK0, 56, 114, iwad -CYBRL0, 62, 121, iwad -CYBRM0, 67, 128, iwad -CYBRN0, 70, 132, iwad -CYBRO0, 69, 132, iwad -CYBRP0, 60, 28, iwad -ELECA0, 19, 125, iwad -FATTO0, 35, 43, iwad -FATTP0, 36, 41, iwad -FATTQ0, 36, 40, iwad -FATTR0, 36, 40, iwad -FATTS0, 36, 40, iwad -FATTT0, 36, 39, iwad -FCANA0, 19, 52, iwad -FCANB0, 19, 52, iwad -FCANC0, 19, 50, iwad -PLAYH0, 16, 50, iwad -PLAYI0, 11, 42, iwad -PLAYJ0, 12, 45, iwad -PLAYK0, 17, 37, iwad -PLAYL0, 27, 14, iwad -PLAYM0, 27, 14, iwad -PLAYN0, 27, 14, iwad -POB1A0, 16, 6, iwad -POB2A0, 14, 3, iwad -POL1A0, 22, 65, iwad -POL2A0, 19, 66, iwad -POL3A0, 19, 42, iwad -POL3B0, 19, 42, iwad -POL4A0, 19, 55, iwad -POL5A0, 27, 8, iwad -POL6A0, 17, 65, iwad -POL6B0, 19, 65, iwad -POSSH0, 19, 55, iwad -POSSL0, 22, 14, iwad -SARGI0, 25, 56, iwad -SARGM0, 33, 43, iwad -SARGN0, 33, 29, iwad -SKELM0, 27, 78, iwad -SKELN0, 38, 69, iwad -SKELO0, 28, 55, iwad -SKELP0, 28, 35, iwad -SKELQ0, 40, 20, iwad -SMITA0, 22, 44, iwad -SPIDJ0, 79, 102, iwad -SPIDK0, 95, 95, iwad -SPIDL0, 94, 88, iwad -SPIDM0, 94, 76, iwad -SPIDN0, 98, 71, iwad -SPIDO0, 101, 68, iwad -SPIDP0, 104, 85, iwad -SPIDQ0, 109, 90, iwad -SPIDR0, 110, 111, iwad -SPIDS0, 98, 35, iwad -SPOSH0, 14, 60, iwad -SPOSL0, 24, 15, iwad -SSWVI0, 18, 54, iwad -SSWVJ0, 15, 44, iwad -SSWVK0, 15, 40, iwad -SSWVL0, 15, 25, iwad -SSWVM0, 24, 13, iwad -SSWVN0, 15, 57, iwad -SSWVO0, 22, 59, iwad -SSWVP0, 25, 58, iwad -TBLUA0, 14, 94, iwad -TBLUB0, 14, 94, iwad -TBLUC0, 14, 94, iwad -TBLUD0, 14, 95, iwad -TGRNA0, 14, 94, iwad -TGRNB0, 14, 89, iwad -TGRNC0, 14, 89, iwad -TGRND0, 14, 95, iwad -TLMPA0, 11, 78, iwad -TLMPB0, 11, 78, iwad -TLMPC0, 11, 78, iwad -TLMPD0, 11, 78, iwad -TLP2A0, 10, 58, iwad -TLP2B0, 10, 58, iwad -TLP2C0, 10, 58, iwad -TLP2D0, 10, 58, iwad -TRE1A0, 25, 67, iwad -TREDA0, 14, 94, iwad -TREDB0, 14, 89, iwad -TREDC0, 14, 89, iwad -TREDD0, 14, 95, iwad -TROOI0, 22, 62, iwad -TROOJ0, 21, 59, iwad -TROOM0, 29, 20, iwad -TROON0, 24, 59, iwad -TROOO0, 20, 61, iwad -TROOP0, 24, 61, iwad -TROOQ0, 24, 61, iwad -TROOR0, 24, 44, iwad -TROOS0, 27, 34, iwad -TROOT0, 27, 31, iwad -TROOU0, 27, 18, iwad -VILER0, 18, 80, iwad -VILES0, 23, 76, iwad -VILET0, 27, 69, iwad -VILEU0, 35, 56, iwad -VILEV0, 34, 45, iwad -VILEW0, 34, 35, iwad -VILEX0, 34, 23, iwad -VILEY0, 34, 20, iwad -VILEZ0, 34, 20, iwad diff --git a/wadsrc/static/filter/doom.doom1/sprofs.txt b/wadsrc/static/filter/doom.id/sprofs.txt similarity index 100% rename from wadsrc/static/filter/doom.doom1/sprofs.txt rename to wadsrc/static/filter/doom.id/sprofs.txt diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt index 711c181578..c545567677 100644 --- a/wadsrc/static/iwadinfo.txt +++ b/wadsrc/static/iwadinfo.txt @@ -307,7 +307,7 @@ IWad IWad { Name = "DOOM: BFG Edition" - Autoname = "doom.doom1.bfg" + Autoname = "doom.id.doom1.bfg" Game = "Doom" Config = "Doom" IWADName = "doom.wad", 2 @@ -324,7 +324,7 @@ IWad IWad { Name = "DOOM: Complete: WadSmoosh" - Autoname = "doom.doom2.wadsmoosh" + Autoname = "doom.id.doom2.wadsmoosh" Game = "Doom" Config = "Doom" Mapinfo = "mapinfo/doom2.txt" @@ -337,7 +337,7 @@ IWad IWad { Name = "The Ultimate DOOM" - Autoname = "doom.doom1.ultimate" + Autoname = "doom.id.doom1.ultimate" Game = "Doom" Config = "Doom" IWADName = "doom.wad" @@ -353,7 +353,7 @@ IWad IWad { Name = "DOOM Registered" - Autoname = "doom.doom1.registered" + Autoname = "doom.id.doom1.registered" Game = "Doom" Config = "Doom" IWADName = "doom.wad", 1 @@ -381,7 +381,7 @@ IWad IWad { Name = "Final Doom: TNT - Evilution" - Autoname = "doom.doom2.tnt" + Autoname = "doom.id.doom2.tnt" Game = "Doom" Config = "Doom" IWADName = "tnt.wad" @@ -395,7 +395,7 @@ IWad IWad { Name = "Final Doom: Plutonia Experiment" - Autoname = "doom.doom2.plutonia" + Autoname = "doom.id.doom2.plutonia" Game = "Doom" Config = "Doom" IWADName = "plutonia.wad" @@ -409,7 +409,7 @@ IWad IWad { Name = "DOOM 2: BFG Edition" - Autoname = "doom.doom2.bfg" + Autoname = "doom.id.doom2.bfg" Game = "Doom" Config = "Doom" IWADName = "doom2.wad" @@ -425,7 +425,7 @@ IWad IWad { Name = "DOOM 2: Hell on Earth" - Autoname = "doom.doom2.commercial" + Autoname = "doom.id.doom2.commercial" Game = "Doom" Config = "Doom" IWADName = "doom2.wad", 1 diff --git a/wadsrc_bm/static/filter/doom.doom2/gldefs.bm b/wadsrc_bm/static/filter/doom.doom2/gldefs.bm deleted file mode 100644 index 78159bddd2..0000000000 --- a/wadsrc_bm/static/filter/doom.doom2/gldefs.bm +++ /dev/null @@ -1,2181 +0,0 @@ -brightmap sprite CELLA0 -{ - map "brightmaps/doom/cella0.png" - iwad -} - -brightmap sprite CELPA0 -{ - map "brightmaps/doom/celpa0.png" - iwad -} - -brightmap sprite PLAYF1 -{ - map "brightmaps/doom/PLAYf1.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF2F8 -{ - map "brightmaps/doom/PLAYf2f8.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF3F7 -{ - map "brightmaps/doom/PLAYf3f7.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF4F6 -{ - map "brightmaps/doom/PLAYf4f6.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF5 -{ - map "brightmaps/doom/PLAYf5.png" - iwad - disablefullbright -} - -brightmap sprite POSSF1 -{ - map "brightmaps/doom/possf1.png" - iwad - disablefullbright -} - -brightmap sprite POSSF2F8 -{ - map "brightmaps/doom/possf2f8.png" - iwad - disablefullbright -} - -brightmap sprite POSSF3F7 -{ - map "brightmaps/doom/possf3f7.png" - iwad - disablefullbright -} - -brightmap sprite POSSF4F6 -{ - map "brightmaps/doom/possf4f6.png" - iwad - disablefullbright -} - -brightmap sprite POSSF5 -{ - map "brightmaps/doom/possf5.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF1 -{ - map "brightmaps/doom/SPOSf1.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF2F8 -{ - map "brightmaps/doom/SPOSf2f8.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF3F7 -{ - map "brightmaps/doom/SPOSf3f7.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF4F6 -{ - map "brightmaps/doom/SPOSf4f6.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF5 -{ - iwad - map "brightmaps/doom/SPOSf5.png" - disablefullbright -} - -brightmap sprite CPOSE1 -{ - map "brightmaps/doom/CPOSE1.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE2 -{ - map "brightmaps/doom/CPOSE2.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE3 -{ - map "brightmaps/doom/CPOSE3.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE4 -{ - iwad - disablefullbright -} - -brightmap sprite CPOSE5 -{ - map "brightmaps/doom/CPOSE5.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE6 -{ - map "brightmaps/doom/CPOSE6.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE7 -{ - map "brightmaps/doom/CPOSE7.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE8 -{ - map "brightmaps/doom/CPOSE8.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF1 -{ - map "brightmaps/doom/CPOSF1.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF2 -{ - map "brightmaps/doom/CPOSF2.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF3 -{ - map "brightmaps/doom/CPOSF3.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF4 -{ - map "brightmaps/doom/CPOSF4.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF5 -{ - map "brightmaps/doom/CPOSF5.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF6 -{ - map "brightmaps/doom/CPOSF6.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF7 -{ - map "brightmaps/doom/CPOSF7.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF8 -{ - map "brightmaps/doom/CPOSF8.png" - iwad - disablefullbright -} - -brightmap sprite SSWVG0 -{ - map "brightmaps/doom/sswvg0.png" - iwad - disablefullbright -} - -brightmap sprite BSPIA1D1 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA2a8 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA3A7 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA4A6 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA5D5 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIG1 -{ - map "brightmaps/doom/bspig1.png" - iwad - disablefullbright -} - -brightmap sprite BSPIG2G8 -{ - map "brightmaps/doom/bspig2g8.png" - iwad - disablefullbright -} - -brightmap sprite BSPIG3G7 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIG4G6 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIG5 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIH1 -{ - map "brightmaps/doom/bspih1.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH2H8 -{ - map "brightmaps/doom/bspih2h8.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH3H7 -{ - map "brightmaps/doom/bspih3h7.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH4H6 -{ - map "brightmaps/doom/bspih4h6.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH5 -{ - map "brightmaps/doom/bspih5.png" - iwad - disablefullbright -} - -brightmap sprite BOSSA1 -{ - map "brightmaps/doom/bossa1.png" - iwad -} - -brightmap sprite BOSSA2A8 -{ - map "brightmaps/doom/bossa2a8.png" - iwad -} - -brightmap sprite BOSSA3A7 -{ - map "brightmaps/doom/bossa3a7.png" - iwad -} - -brightmap sprite BOSSA4A6 -{ - map "brightmaps/doom/bossa4a6.png" - iwad -} - -brightmap sprite BOSSA5 -{ - map "brightmaps/doom/bossa5.png" - iwad -} - -brightmap sprite BOSSb1 -{ - map "brightmaps/doom/bossb1.png" - iwad -} - -brightmap sprite BOSSB2B8 -{ - map "brightmaps/doom/bossb2b8.png" - iwad -} - -brightmap sprite BOSSB3B7 -{ - map "brightmaps/doom/bossb3b7.png" - iwad -} - -brightmap sprite BOSSB4B6 -{ - map "brightmaps/doom/bossb4b6.png" - iwad -} - -brightmap sprite BOSSB5 -{ - map "brightmaps/doom/bossb5.png" - iwad -} - -brightmap sprite BOSSC1 -{ - map "brightmaps/doom/bossc1.png" - iwad -} - -brightmap sprite BOSSC2C8 -{ - map "brightmaps/doom/bossc2c8.png" - iwad -} - -brightmap sprite BOSSC3C7 -{ - map "brightmaps/doom/bossc3c7.png" - iwad -} - -brightmap sprite BOSSC4C6 -{ - map "brightmaps/doom/bossc4c6.png" - iwad -} - -brightmap sprite BOSSC5 -{ - map "brightmaps/doom/bossc5.png" - iwad -} - -brightmap sprite BOSSD1 -{ - map "brightmaps/doom/bossd1.png" - iwad -} - -brightmap sprite BOSSD2D8 -{ - map "brightmaps/doom/bossd2d8.png" - iwad -} - -brightmap sprite BOSSD3D7 -{ - map "brightmaps/doom/bossd3d7.png" - iwad -} - -brightmap sprite BOSSD4D6 -{ - map "brightmaps/doom/bossd4d6.png" - iwad -} - -brightmap sprite BOSSD5 -{ - map "brightmaps/doom/bossd5.png" - iwad -} - -brightmap sprite BOSSE1 -{ - map "brightmaps/doom/bosse1.png" - iwad -} - -brightmap sprite BOSSE2 -{ - map "brightmaps/doom/bosse2.png" - iwad -} - -brightmap sprite BOSSE3 -{ - map "brightmaps/doom/bosse3.png" - iwad -} - -brightmap sprite BOSSE4 -{ - map "brightmaps/doom/bosse4.png" - iwad -} - -brightmap sprite BOSSE5 -{ - map "brightmaps/doom/bosse5.png" - iwad -} - -brightmap sprite BOSSE6 -{ - map "brightmaps/doom/bosse6.png" - iwad -} - -brightmap sprite BOSSE7 -{ - map "brightmaps/doom/bosse7.png" - iwad -} - -brightmap sprite BOSSE8 -{ - map "brightmaps/doom/bosse8.png" - iwad -} - -brightmap sprite BOSSF1 -{ - map "brightmaps/doom/BOSSF1.png" - iwad -} - -brightmap sprite BOSSF2 -{ - map "brightmaps/doom/BOSSF2.png" - iwad -} - -brightmap sprite BOSSF3 -{ - map "brightmaps/doom/BOSSF3.png" - iwad -} - -brightmap sprite BOSSF4 -{ - map "brightmaps/doom/BOSSF4.png" - iwad -} - -brightmap sprite BOSSF5 -{ - map "brightmaps/doom/BOSSF5.png" - iwad -} - -brightmap sprite BOSSF6 -{ - map "brightmaps/doom/BOSSF6.png" - iwad -} - -brightmap sprite BOSSF7 -{ - map "brightmaps/doom/BOSSF7.png" - iwad -} - -brightmap sprite BOSSF8 -{ - map "brightmaps/doom/BOSSF8.png" - iwad -} - -brightmap sprite BOSSG1 -{ - map "brightmaps/doom/BOSSG1.png" - iwad -} - -brightmap sprite BOSSG2 -{ - map "brightmaps/doom/BOSSG2.png" - iwad -} - -brightmap sprite BOSSG3 -{ - map "brightmaps/doom/BOSSG3.png" - iwad -} - -brightmap sprite BOSSG4 -{ - map "brightmaps/doom/BOSSG4.png" - iwad -} - -brightmap sprite BOSSG5 -{ - map "brightmaps/doom/BOSSG5.png" - iwad -} - -brightmap sprite BOSSG6 -{ - map "brightmaps/doom/BOSSG6.png" - iwad -} - -brightmap sprite BOSSG7 -{ - map "brightmaps/doom/BOSSG7.png" - iwad -} - -brightmap sprite BOSSG8 -{ - map "brightmaps/doom/BOSSG8.png" - iwad -} - -brightmap sprite BOSSH1 -{ - map "brightmaps/doom/BOSSH1.png" - iwad -} - -brightmap sprite BOSSH2 -{ - map "brightmaps/doom/BOSSH2.png" - iwad -} - -brightmap sprite BOSSH3 -{ - map "brightmaps/doom/BOSSH3.png" - iwad -} - -brightmap sprite BOSSH4 -{ - map "brightmaps/doom/BOSSH4.png" - iwad -} - -brightmap sprite BOSSH5 -{ - map "brightmaps/doom/BOSSH5.png" - iwad -} - -brightmap sprite BOSSH6 -{ - map "brightmaps/doom/BOSSH6.png" - iwad -} - -brightmap sprite BOSSH7 -{ - map "brightmaps/doom/BOSSH7.png" - iwad -} - -brightmap sprite BOSSH8 -{ - map "brightmaps/doom/BOSSH8.png" - iwad -} - -brightmap sprite BOSSI0 -{ - map "brightmaps/doom/BOSSI0.png" - iwad -} - -brightmap sprite BOSSJ0 -{ - map "brightmaps/doom/BOSSJ0.png" - iwad -} - -brightmap sprite BOSSK0 -{ - map "brightmaps/doom/BOSSK0.png" - iwad -} - -brightmap sprite BOSSL0 -{ - map "brightmaps/doom/BOSSL0.png" - iwad -} - -brightmap sprite BOSSM0 -{ - map "brightmaps/doom/BOSSM0.png" - iwad -} - -brightmap sprite BOS2A1C1 -{ - map "brightmaps/doom/bossa1.png" - iwad -} - -brightmap sprite BOS2A2C8 -{ - map "brightmaps/doom/bossa2a8.png" - iwad -} - -brightmap sprite BOS2A3C7 -{ - map "brightmaps/doom/bossa3a7.png" - iwad -} - -brightmap sprite BOS2A4C6 -{ - map "brightmaps/doom/bossa4a6.png" - iwad -} - -brightmap sprite BOS2A5C5 -{ - map "brightmaps/doom/bossa5.png" - iwad -} - -brightmap sprite BOS2b1D1 -{ - map "brightmaps/doom/bossb1.png" - iwad -} - -brightmap sprite BOS2B2D8 -{ - map "brightmaps/doom/bossb2b8.png" - iwad -} - -brightmap sprite BOS2B3D7 -{ - map "brightmaps/doom/bossb3b7.png" - iwad -} - -brightmap sprite BOS2B4D6 -{ - map "brightmaps/doom/bossb4b6.png" - iwad -} - -brightmap sprite BOS2B5D5 -{ - map "brightmaps/doom/bossb5.png" - iwad -} - -brightmap sprite BOS2E1 -{ - map "brightmaps/doom/bosse1.png" - iwad -} - -brightmap sprite BOS2E2 -{ - map "brightmaps/doom/bosse2.png" - iwad -} - -brightmap sprite BOS2E3 -{ - map "brightmaps/doom/bosse3.png" - iwad -} - -brightmap sprite BOS2E4 -{ - map "brightmaps/doom/bosse4.png" - iwad -} - -brightmap sprite BOS2E5 -{ - map "brightmaps/doom/bosse5.png" - iwad -} - -brightmap sprite BOS2E6 -{ - map "brightmaps/doom/bosse6.png" - iwad -} - -brightmap sprite BOS2E7 -{ - map "brightmaps/doom/bosse7.png" - iwad -} - -brightmap sprite BOS2E8 -{ - map "brightmaps/doom/bosse8.png" - iwad -} - -brightmap sprite BOS2F1 -{ - map "brightmaps/doom/BOSSF1.png" - iwad -} - -brightmap sprite BOS2F2 -{ - map "brightmaps/doom/BOSSF2.png" - iwad -} - -brightmap sprite BOS2F3 -{ - map "brightmaps/doom/BOSSF3.png" - iwad -} - -brightmap sprite BOS2F4 -{ - map "brightmaps/doom/BOSSF4.png" - iwad -} - -brightmap sprite BOS2F5 -{ - map "brightmaps/doom/BOSSF5.png" - iwad -} - -brightmap sprite BOS2F6 -{ - map "brightmaps/doom/BOSSF6.png" - iwad -} - -brightmap sprite BOS2F7 -{ - map "brightmaps/doom/BOSSF7.png" - iwad -} - -brightmap sprite BOS2F8 -{ - map "brightmaps/doom/BOSSF8.png" - iwad -} - -brightmap sprite BOS2G1 -{ - map "brightmaps/doom/BOSSG1.png" - iwad -} - -brightmap sprite BOS2G2 -{ - map "brightmaps/doom/BOSSG2.png" - iwad -} - -brightmap sprite BOS2G3 -{ - map "brightmaps/doom/BOSSG3.png" - iwad -} - -brightmap sprite BOS2G4 -{ - map "brightmaps/doom/BOSSG4.png" - iwad -} - -brightmap sprite BOS2G5 -{ - map "brightmaps/doom/BOSSG5.png" - iwad -} - -brightmap sprite BOS2G6 -{ - map "brightmaps/doom/BOSSG6.png" - iwad -} - -brightmap sprite BOS2G7 -{ - map "brightmaps/doom/BOSSG7.png" - iwad -} - -brightmap sprite BOS2G8 -{ - map "brightmaps/doom/BOSSG8.png" - iwad -} - -brightmap sprite BOS2H1 -{ - map "brightmaps/doom/BOSSH1.png" - iwad -} - -brightmap sprite BOS2H2 -{ - map "brightmaps/doom/BOSSH2.png" - iwad -} - -brightmap sprite BOS2H3 -{ - map "brightmaps/doom/BOSSH3.png" - iwad -} - -brightmap sprite BOS2H4 -{ - map "brightmaps/doom/BOSSH4.png" - iwad -} - -brightmap sprite BOS2H5 -{ - map "brightmaps/doom/BOSSH5.png" - iwad -} - -brightmap sprite BOS2H6 -{ - map "brightmaps/doom/BOSSH6.png" - iwad -} - -brightmap sprite BOS2H7 -{ - map "brightmaps/doom/BOSSH7.png" - iwad -} - -brightmap sprite BOS2H8 -{ - map "brightmaps/doom/BOSSH8.png" - iwad -} - -brightmap sprite BOS2I0 -{ - map "brightmaps/doom/BOSSI0.png" - iwad -} - -brightmap sprite BOS2J0 -{ - map "brightmaps/doom/BOSSJ0.png" - iwad -} - -brightmap sprite BOS2K0 -{ - map "brightmaps/doom/BOSSK0.png" - iwad -} - -brightmap sprite BOS2L0 -{ - map "brightmaps/doom/BOSSL0.png" - iwad -} - -brightmap sprite BOS2M0 -{ - map "brightmaps/doom/BOSSM0.png" - iwad -} - -brightmap sprite BOS2A6C4 -{ - map "brightmaps/doom/BOS2A6C4.png" - iwad -} - -brightmap sprite BOS2A7C3 -{ - map "brightmaps/doom/BOS2A7C3.png" - iwad -} - -brightmap sprite BOS2A8C2 -{ - map "brightmaps/doom/BOS2A8C2.png" - iwad -} - -brightmap sprite BOS2B6D4 -{ - map "brightmaps/doom/BOS2B6D4.png" - iwad -} - -brightmap sprite BOS2B7D3 -{ - map "brightmaps/doom/BOS2B7D3.png" - iwad -} - -brightmap sprite BOS2B8D2 -{ - map "brightmaps/doom/BOS2B8D2.png" - iwad -} - -brightmap sprite SKELJ1 -{ - map "brightmaps/doom/SKELJ1.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ2 -{ - map "brightmaps/doom/SKELJ2.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ3 -{ - map "brightmaps/doom/SKELJ3.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ4 -{ - map "brightmaps/doom/SKELJ4.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ5 -{ - map "brightmaps/doom/SKELJ5.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ6 -{ - map "brightmaps/doom/SKELJ6.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ7 -{ - map "brightmaps/doom/SKELJ7.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ8 -{ - map "brightmaps/doom/SKELJ8.png" - iwad - disablefullbright -} - -brightmap sprite FATTH1 -{ - map "brightmaps/doom/FATTH1.png" - iwad - disablefullbright -} - -brightmap sprite FATTH2H8 -{ - map "brightmaps/doom/FATTH2H8.png" - iwad - disablefullbright -} - -brightmap sprite FATTH3H7 -{ - map "brightmaps/doom/FATTH3H7.png" - iwad - disablefullbright -} - -brightmap sprite FATTH4H6 -{ - map "brightmaps/doom/FATTH4H6.png" - iwad - disablefullbright -} - -brightmap sprite FATTH5 -{ - map "brightmaps/doom/FATTH5.png" - iwad - disablefullbright -} - -brightmap sprite HEADC1 -{ - map "brightmaps/doom/HEADC1.png" - iwad - disablefullbright -} - -brightmap sprite HEADC2C8 -{ - map "brightmaps/doom/HEADC2C8.png" - iwad - disablefullbright -} - -brightmap sprite HEADC3C7 -{ - map "brightmaps/doom/HEADC3C7.png" - iwad - disablefullbright -} - -brightmap sprite HEADD1 -{ - map "brightmaps/doom/HEADD1.png" - iwad - disablefullbright -} - -brightmap sprite HEADD2D8 -{ - map "brightmaps/doom/HEADD2D8.png" - iwad - disablefullbright -} - -brightmap sprite HEADD3D7 -{ - map "brightmaps/doom/HEADD3D7.png" - iwad - disablefullbright -} - -brightmap sprite HEADD4D6 -{ - iwad - disablefullbright -} - -brightmap sprite HEADD5 -{ - iwad - disablefullbright -} - -brightmap sprite PAINF1 -{ - map "brightmaps/doom/PAINf1.png" - iwad - disablefullbright -} - -brightmap sprite PAINF2F8 -{ - map "brightmaps/doom/PAINf2f8.png" - iwad - disablefullbright -} - -brightmap sprite PAINF3F7 -{ - map "brightmaps/doom/PAINf3f7.png" - iwad - disablefullbright -} - -brightmap sprite PAINF4F6 -{ - iwad - disablefullbright -} - -brightmap sprite PAINF5 -{ - iwad - disablefullbright -} - -brightmap sprite CYBRF1 -{ - map "brightmaps/doom/CYBRF1.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF2 -{ - map "brightmaps/doom/CYBRF2.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF3 -{ - map "brightmaps/doom/CYBRF3.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF4 -{ - map "brightmaps/doom/CYBRF4.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF5 -{ - map "brightmaps/doom/CYBRF5.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF6 -{ - map "brightmaps/doom/CYBRF6.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF7 -{ - map "brightmaps/doom/CYBRF7.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF8 -{ - map "brightmaps/doom/CYBRF8.png" - iwad - disablefullbright -} - -brightmap sprite CYBRJ0 -{ - map "brightmaps/doom/CYBRJ0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRK0 -{ - map "brightmaps/doom/CYBRK0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRL0 -{ - map "brightmaps/doom/CYBRL0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRM0 -{ - map "brightmaps/doom/CYBRM0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRN0 -{ - map "brightmaps/doom/CYBRN0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDA1D1 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA2D8 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA3D7 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA4D6 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA5D5 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDG1 -{ - map "brightmaps/doom/SPIDG1.png" - iwad - disablefullbright -} - -brightmap sprite SPIDG2G8 -{ - map "brightmaps/doom/SPIDG2G8.png" - iwad - disablefullbright -} - -brightmap sprite SPIDG3G7 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDG4G6 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDG5 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDH1 -{ - map "brightmaps/doom/SPIDH1.png" - iwad - disablefullbright -} - -brightmap sprite SPIDG2G8 -{ - map "brightmaps/doom/SPIDH2H8.png" - iwad - disablefullbright -} - -brightmap sprite SPIDH3H7 -{ - map "brightmaps/doom/SPIDH3H7.png" - iwad - disablefullbright -} - -brightmap sprite SPIDH4H6 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDH5 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDH1 -{ - map "brightmaps/doom/SPIDH1.png" - iwad - disablefullbright -} - -brightmap sprite SPIDL0 -{ - map "brightmaps/doom/SPIDL0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDM0 -{ - map "brightmaps/doom/SPIDM0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDN0 -{ - map "brightmaps/doom/SPIDN0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDO0 -{ - map "brightmaps/doom/SPIDO0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDP0 -{ - map "brightmaps/doom/SPIDP0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDQ0 -{ - map "brightmaps/doom/SPIDQ0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDR0 -{ - map "brightmaps/doom/SPIDR0.png" - iwad - disablefullbright -} - -brightmap sprite BON2B0 -{ - map "brightmaps/doom/BON2B0.png" - iwad - disablefullbright -} - -brightmap sprite BON2c0 -{ - map "brightmaps/doom/BON2c0.png" - iwad - disablefullbright -} - -brightmap sprite BON2d0 -{ - map "brightmaps/doom/BON2d0.png" - iwad - disablefullbright -} - -brightmap sprite FCANA0 -{ - map "brightmaps/doom/FCANA0.png" - iwad - disablefullbright -} - -brightmap sprite FCANb0 -{ - map "brightmaps/doom/FCANb0.png" - iwad - disablefullbright -} - -brightmap sprite FCANc0 -{ - map "brightmaps/doom/FCANc0.png" - iwad - disablefullbright -} - -brightmap sprite treda0 -{ - map "brightmaps/doom/treda0.png" - iwad - disablefullbright -} - -brightmap sprite tredb0 -{ - map "brightmaps/doom/tredb0.png" - iwad - disablefullbright -} - -brightmap sprite tredc0 -{ - map "brightmaps/doom/tredc0.png" - iwad - disablefullbright -} - -brightmap sprite tredd0 -{ - map "brightmaps/doom/tredd0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUA0 -{ - map "brightmaps/doom/treda0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUb0 -{ - map "brightmaps/doom/TBLUb0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUc0 -{ - map "brightmaps/doom/TBLUc0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUd0 -{ - map "brightmaps/doom/tredd0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNA0 -{ - map "brightmaps/doom/treda0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNb0 -{ - map "brightmaps/doom/tredb0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNc0 -{ - map "brightmaps/doom/tredc0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNd0 -{ - map "brightmaps/doom/tredd0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTA0 -{ - map "brightmaps/doom/SMRTA0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTb0 -{ - map "brightmaps/doom/SMRTb0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTc0 -{ - map "brightmaps/doom/SMRTc0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTd0 -{ - map "brightmaps/doom/SMRTd0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTA0 -{ - map "brightmaps/doom/SMRTA0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTb0 -{ - map "brightmaps/doom/SMRTb0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTc0 -{ - map "brightmaps/doom/SMRTc0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTd0 -{ - map "brightmaps/doom/SMRTd0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTA0 -{ - map "brightmaps/doom/SMRTA0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTb0 -{ - map "brightmaps/doom/SMRTb0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTc0 -{ - map "brightmaps/doom/SMRTc0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTd0 -{ - map "brightmaps/doom/SMRTd0.png" - iwad - disablefullbright -} - -brightmap sprite vileg1 -{ - map "brightmaps/doom/vileg1.png" - iwad - disablefullbright -} - -brightmap sprite vileg2 -{ - map "brightmaps/doom/vileg2.png" - iwad - disablefullbright -} - -brightmap sprite vileg3 -{ - map "brightmaps/doom/vileg3.png" - iwad - disablefullbright -} - -brightmap sprite vileg4 -{ - map "brightmaps/doom/vileg4.png" - iwad - disablefullbright -} - -brightmap sprite vileg5 -{ - map "brightmaps/doom/vileg5.png" - iwad - disablefullbright -} - -brightmap sprite vileg6 -{ - map "brightmaps/doom/vileg6.png" - iwad - disablefullbright -} - -brightmap sprite vileg7 -{ - map "brightmaps/doom/vileg7.png" - iwad - disablefullbright -} - -brightmap sprite vileg8 -{ - map "brightmaps/doom/vileg8.png" - iwad - disablefullbright -} - -brightmap sprite vileh1 -{ - map "brightmaps/doom/vileh1.png" - iwad - disablefullbright -} - -brightmap sprite vileh2 -{ - map "brightmaps/doom/vileh2.png" - iwad - disablefullbright -} - -brightmap sprite vileh3 -{ - map "brightmaps/doom/vileh3.png" - iwad - disablefullbright -} - -brightmap sprite vileh4 -{ - map "brightmaps/doom/vileh4.png" - iwad - disablefullbright -} - -brightmap sprite vileh5 -{ - map "brightmaps/doom/vileh5.png" - iwad - disablefullbright -} - -brightmap sprite vileh6 -{ - map "brightmaps/doom/vileh6.png" - iwad - disablefullbright -} - -brightmap sprite vileh7 -{ - map "brightmaps/doom/vileh7.png" - iwad - disablefullbright -} - -brightmap sprite vileh8 -{ - map "brightmaps/doom/vileh8.png" - iwad - disablefullbright -} - -brightmap sprite vilei1 -{ - map "brightmaps/doom/vilei1.png" - iwad - disablefullbright -} - -brightmap sprite vilei2 -{ - map "brightmaps/doom/vilei2.png" - iwad - disablefullbright -} - -brightmap sprite vilei3 -{ - map "brightmaps/doom/vilei3.png" - iwad - disablefullbright -} - -brightmap sprite vilei4 -{ - map "brightmaps/doom/vilei4.png" - iwad - disablefullbright -} - -brightmap sprite vilei5 -{ - map "brightmaps/doom/vilei5.png" - iwad - disablefullbright -} - -brightmap sprite vilei6 -{ - map "brightmaps/doom/vilei6.png" - iwad - disablefullbright -} - -brightmap sprite vilei7 -{ - map "brightmaps/doom/vilei7.png" - iwad - disablefullbright -} - -brightmap sprite vilei8 -{ - map "brightmaps/doom/vilei8.png" - iwad - disablefullbright -} - -brightmap sprite vilej1 -{ - map "brightmaps/doom/vilej1.png" - iwad - disablefullbright -} - -brightmap sprite vilej2 -{ - map "brightmaps/doom/vilej2.png" - iwad - disablefullbright -} - -brightmap sprite vilej3 -{ - map "brightmaps/doom/vilej3.png" - iwad - disablefullbright -} - -brightmap sprite vilej4 -{ - map "brightmaps/doom/vilej4.png" - iwad - disablefullbright -} - -brightmap sprite vilej5 -{ - map "brightmaps/doom/vilej5.png" - iwad - disablefullbright -} - -brightmap sprite vilej6 -{ - map "brightmaps/doom/vilej6.png" - iwad - disablefullbright -} - -brightmap sprite vilej7 -{ - map "brightmaps/doom/vilej7.png" - iwad - disablefullbright -} - -brightmap sprite vilej8 -{ - map "brightmaps/doom/vilej8.png" - iwad - disablefullbright -} - -brightmap sprite vilek1 -{ - map "brightmaps/doom/vilek1.png" - iwad - disablefullbright -} - -brightmap sprite vilek2 -{ - map "brightmaps/doom/vilek2.png" - iwad - disablefullbright -} - -brightmap sprite vilek3 -{ - map "brightmaps/doom/vilek3.png" - iwad - disablefullbright -} - -brightmap sprite vilek4 -{ - map "brightmaps/doom/vilek4.png" - iwad - disablefullbright -} - -brightmap sprite vilek5 -{ - map "brightmaps/doom/vilek5.png" - iwad - disablefullbright -} - -brightmap sprite vilek6 -{ - map "brightmaps/doom/vilek6.png" - iwad - disablefullbright -} - -brightmap sprite vilek7 -{ - map "brightmaps/doom/vilek7.png" - iwad - disablefullbright -} - -brightmap sprite vilek8 -{ - map "brightmaps/doom/vilek8.png" - iwad - disablefullbright -} - -brightmap sprite vilel1 -{ - map "brightmaps/doom/vilel1.png" - iwad - disablefullbright -} - -brightmap sprite vilel2 -{ - map "brightmaps/doom/vilel2.png" - iwad - disablefullbright -} - -brightmap sprite vilel3 -{ - map "brightmaps/doom/vilel3.png" - iwad - disablefullbright -} - -brightmap sprite vilel4 -{ - map "brightmaps/doom/vilel4.png" - iwad - disablefullbright -} - -brightmap sprite vilel5 -{ - map "brightmaps/doom/vilel5.png" - iwad - disablefullbright -} - -brightmap sprite vilel6 -{ - map "brightmaps/doom/vilel6.png" - iwad - disablefullbright -} - -brightmap sprite vilel7 -{ - map "brightmaps/doom/vilel7.png" - iwad - disablefullbright -} - -brightmap sprite vilel8 -{ - map "brightmaps/doom/vilel8.png" - iwad - disablefullbright -} - -brightmap sprite vilem1 -{ - map "brightmaps/doom/vilem1.png" - iwad - disablefullbright -} - -brightmap sprite vilem2 -{ - map "brightmaps/doom/vilem2.png" - iwad - disablefullbright -} - -brightmap sprite vilem3 -{ - map "brightmaps/doom/vilem3.png" - iwad - disablefullbright -} - -brightmap sprite vilem4 -{ - map "brightmaps/doom/vilem4.png" - iwad - disablefullbright -} - -brightmap sprite vilem5 -{ - map "brightmaps/doom/vilem5.png" - iwad - disablefullbright -} - -brightmap sprite vilem6 -{ - map "brightmaps/doom/vilem6.png" - iwad - disablefullbright -} - -brightmap sprite vilem7 -{ - map "brightmaps/doom/vilem7.png" - iwad - disablefullbright -} - -brightmap sprite vilem8 -{ - map "brightmaps/doom/vilem8.png" - iwad - disablefullbright -} - -brightmap sprite vilen1 -{ - map "brightmaps/doom/vilen1.png" - iwad - disablefullbright -} - -brightmap sprite vilen2 -{ - map "brightmaps/doom/vilen2.png" - iwad - disablefullbright -} - -brightmap sprite vilen3 -{ - map "brightmaps/doom/vilen3.png" - iwad - disablefullbright -} - -brightmap sprite vilen4 -{ - map "brightmaps/doom/vilen4.png" - iwad - disablefullbright -} - -brightmap sprite vilen5 -{ - map "brightmaps/doom/vilen5.png" - iwad - disablefullbright -} - -brightmap sprite vilen6 -{ - map "brightmaps/doom/vilen6.png" - iwad - disablefullbright -} - -brightmap sprite vilen7 -{ - map "brightmaps/doom/vilen7.png" - iwad - disablefullbright -} - -brightmap sprite vilen8 -{ - map "brightmaps/doom/vilen8.png" - iwad - disablefullbright -} - -brightmap sprite vileo1 -{ - map "brightmaps/doom/vileo1.png" - iwad - disablefullbright -} - -brightmap sprite vileo2 -{ - map "brightmaps/doom/vileo2.png" - iwad - disablefullbright -} - -brightmap sprite vileo3 -{ - map "brightmaps/doom/vileo3.png" - iwad - disablefullbright -} - -brightmap sprite vileo4 -{ - map "brightmaps/doom/vileo4.png" - iwad - disablefullbright -} - -brightmap sprite vileo5 -{ - map "brightmaps/doom/vileo5.png" - iwad - disablefullbright -} - -brightmap sprite vileo6 -{ - map "brightmaps/doom/vileo6.png" - iwad - disablefullbright -} - -brightmap sprite vileo7 -{ - map "brightmaps/doom/vileo7.png" - iwad - disablefullbright -} - -brightmap sprite vileo8 -{ - map "brightmaps/doom/vileo8.png" - iwad - disablefullbright -} - -brightmap sprite vilep1 -{ - map "brightmaps/doom/vilep1.png" - iwad - disablefullbright -} - -brightmap sprite vilep2 -{ - map "brightmaps/doom/vilep2.png" - iwad - disablefullbright -} - -brightmap sprite vilep3 -{ - map "brightmaps/doom/vilep3.png" - iwad - disablefullbright -} - -brightmap sprite vilep4 -{ - map "brightmaps/doom/vilep4.png" - iwad - disablefullbright -} - -brightmap sprite vilep5 -{ - map "brightmaps/doom/vilep5.png" - iwad - disablefullbright -} - -brightmap sprite vilep6 -{ - map "brightmaps/doom/vilep6.png" - iwad - disablefullbright -} - -brightmap sprite vilep7 -{ - map "brightmaps/doom/vilep7.png" - iwad - disablefullbright -} - -brightmap sprite vilep8 -{ - map "brightmaps/doom/vilep8.png" - iwad - disablefullbright -} diff --git a/wadsrc_bm/static/filter/doom.doom1/gldefs.bm b/wadsrc_bm/static/filter/doom.id/gldefs.bm similarity index 100% rename from wadsrc_bm/static/filter/doom.doom1/gldefs.bm rename to wadsrc_bm/static/filter/doom.id/gldefs.bm diff --git a/wadsrc_lights/static/filter/doom.doom2/gldefs.txt b/wadsrc_lights/static/filter/doom.doom2/gldefs.txt deleted file mode 100644 index 61536f97f3..0000000000 --- a/wadsrc_lights/static/filter/doom.doom2/gldefs.txt +++ /dev/null @@ -1,1385 +0,0 @@ -// ------------------------------------------------------ -// ------------------ DOOM GAME LIGHTS ------------------ -// ------------------------------------------------------ - -// ------------------ -// -- Doom Weapons -- -// ------------------ - -// Bullet puff -flickerlight BPUFF1 -{ - color 0.5 0.5 0.0 - size 9 - secondarySize 12 - chance 0.8 - attenuate 1 -} - -flickerlight BPUFF2 -{ - color 0.5 0.5 0.0 - size 4 - secondarySize 6 - chance 0.8 - attenuate 1 -} - -object BulletPuff -{ - frame PUFFA { light BPUFF1 } - frame PUFFB { light BPUFF2 } -} - -// Rocket -pointlight ROCKET -{ - color 1.0 0.7 0.0 - size 84 - attenuate 1 -} - -flickerlight ROCKET_X1 -{ - color 1.0 0.7 0.5 - size 96 - secondarySize 108 - chance 0.3 - attenuate 1 -} - -flickerlight ROCKET_X2 -{ - color 0.5 0.3 0.2 - size 120 - secondarySize 132 - chance 0.3 - attenuate 1 -} - -flickerlight ROCKET_X3 -{ - color 0.3 0.1 0.1 - size 144 - secondarySize 156 - chance 0.3 - attenuate 1 -} - -object Rocket -{ - frame MISLA { light ROCKET } - - frame MISLB { light ROCKET_X1 } - frame MISLC { light ROCKET_X2 } - frame MISLD { light ROCKET_X3 } -} - -// Plasma -pointlight PLASMABALL -{ - color 0.5 0.5 1.0 - size 84 - attenuate 1 -} - -flickerlight PLASMA_X1 -{ - color 0.5 0.5 1.0 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA_X2 -{ - color 0.4 0.4 0.8 - size 120 - secondarySize 132 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA_X3 -{ - color 0.25 0.25 0.5 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA_X4 -{ - color 0.1 0.1 0.2 - size 12 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object PlasmaBall -{ - frame PLSSA { light PLASMABALL } - frame PLSSB { light PLASMABALL } - - frame PLSEA { light PLASMA_X1 } - frame PLSEB { light PLASMA_X2 } - frame PLSEC { light PLASMA_X2 } - frame PLSED { light PLASMA_X3 } - frame PLSEE { light PLASMA_X4 } -} - -// Beta Plasma 1 -pointlight PLASMABALL1 -{ - color 0.1 1.0 0.0 - size 84 - attenuate 1 -} - -flickerlight PLASMA1_X1 -{ - color 0.2 1.0 0.2 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X2 -{ - color 0.2 0.8 0.2 - size 120 - secondarySize 132 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X3 -{ - color 0.1 0.5 0.1 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X4 -{ - color 0.0 0.2 0.0 - size 12 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object PlasmaBall1 -{ - frame PLS1A { light PLASMABALL1 } - frame PLS1B { light PLASMABALL1 } - - frame PLS1C { light PLASMA1_X1 } - frame PLS1D { light PLASMA1_X2 } - frame PLS1E { light PLASMA1_X2 } - frame PLS1F { light PLASMA1_X3 } - frame PLS1G { light PLASMA1_X4 } -} - -// Beta Plasma 2 -pointlight PLASMABALL2 -{ - color 1.0 0.1 0.0 - size 84 - attenuate 1 -} - -flickerlight PLASMA1_X1 -{ - color 0.9 0.2 0.2 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X2 -{ - color 0.6 0.2 0.2 - size 120 - secondarySize 132 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X3 -{ - color 0.2 0.0 0.0 - size 12 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object PlasmaBall2 -{ - frame PLS2A { light PLASMABALL2 } - frame PLS2B { light PLASMABALL2 } - - frame PLS2C { light PLASMA2_X1 } - frame PLS2D { light PLASMA2_X2 } - frame PLS2E { light PLASMA2_X3 } -} - -// BFG -pointlight BFGBALL -{ - color 0.5 1.0 0.5 - size 120 - attenuate 1 -} - -flickerlight BFGBALL_X1 -{ - color 0.5 1.0 0.5 - size 120 - secondarySize 132 - chance 0.3 - attenuate 1 -} - -flickerlight BFGBALL_X2 -{ - color 0.6 1.0 0.6 - size 156 - secondarySize 168 - chance 0.3 - attenuate 1 -} - -flickerlight BFGBALL_X3 -{ - color 0.7 1.0 0.7 - size 180 - secondarySize 192 - chance 0.3 - attenuate 1 -} - -flickerlight BFGBALL_X4 -{ - color 0.4 0.7 0.4 - size 84 - secondarySize 96 - chance 0.3 - attenuate 1 - attenuate 1 -} - -flickerlight BFGBALL_X5 -{ - color 0.1 0.3 0.1 - size 72 - secondarySize 84 - chance 0.3 - attenuate 1 -} - -object BFGBall -{ - frame BFS1A { light BFGBALL } - frame BFS1B { light BFGBALL } - - frame BFE1A { light BFGBALL_X1 } - frame BFE1B { light BFGBALL_X2 } - frame BFE1C { light BFGBALL_X3 } - frame BFE1D { light BFGBALL_X1 } - frame BFE1E { light BFGBALL_X4 } - frame BFE1F { light BFGBALL_X5 } -} - - -object BFGExtra -{ - frame BFE2A { light BFGBALL } - frame BFE2B { light BFGBALL_X1 } - frame BFE2C { light BFGBALL_X4 } - frame BFE2D { light BFGBALL_X5 } -} - - - -// ---------------------- -// -- Doom Decorations -- -// ---------------------- - -// Barrel -pulselight BARREL -{ - color 0.0 0.3 0.0 - size 20 - secondarySize 21 - interval 0.5 - offset 0 36 0 - dontlightself 1 - attenuate 1 -} - -object ExplosiveBarrel -{ - frame BAR1 { light BARREL } - - frame BEXPC { light ROCKET_X1 } - frame BEXPD { light ROCKET_X2 } - frame BEXPE { light ROCKET_X3 } -} - -// Floor lamp -pointlight LAMP -{ - color 1.0 1.0 0.8 - size 84 - offset 0 44 0 - attenuate 1 -} - -object Column -{ - frame COLU { light LAMP } -} - -// Short tech lamp -pulselight SMALLLAMP -{ - color 0.8 0.8 1.0 - size 84 - secondarySize 87 - interval 0.4 - offset 0 44 0 - attenuate 1 -} - -object TechLamp2 -{ - frame TLP2 { light SMALLLAMP } -} - -// Tall tech lamp -pulselight BIGLAMP -{ - color 0.8 0.8 1.0 - size 96 - secondarySize 99 - interval 0.4 - offset 0 72 0 - attenuate 1 -} - -object TechLamp -{ - frame TLMP { light BIGLAMP } -} - -// Tall red torch -flickerlight2 BIGREDTORCH -{ - color 0.7 0.35 0.14 - size 90 - secondarySize 99 - interval 0.1 - offset 0 60 0 - attenuate 1 -} - -object RedTorch -{ - frame TRED { light BIGREDTORCH } -} - -// Tall green torch -flickerlight2 BIGGREENTORCH -{ - color 0.2 0.7 0.2 - size 90 - secondarySize 99 - interval 0.1 - offset 0 60 0 - attenuate 1 -} - -object GreenTorch -{ - frame TGRN { light BIGGREENTORCH } -} - -// Tall blue torch -flickerlight2 BIGBLUETORCH -{ - color 0.2 0.2 0.7 - size 90 - secondarySize 99 - interval 0.1 - offset 0 60 0 - attenuate 1 -} - -object BlueTorch -{ - frame TBLU { light BIGBLUETORCH } -} - -// Small red torch -flickerlight2 SMALLREDTORCH -{ - color 0.7 0.35 0.14 - size 72 - secondarySize 81 - interval 0.1 - offset 0 35 0 - attenuate 1 -} - -object ShortRedTorch -{ - frame SMRT { light SMALLREDTORCH } -} - -// Small green torch -flickerlight2 SMALLGREENTORCH -{ - color 0.2 0.7 0.2 - size 72 - secondarySize 81 - interval 0.1 - offset 0 35 0 - attenuate 1 -} - -object ShortGreenTorch -{ - frame SMGT { light SMALLGREENTORCH } -} - -// Small blue torch -flickerlight2 SMALLBLUETORCH -{ - color 0.2 0.2 0.7 - size 72 - secondarySize 81 - interval 0.1 - offset 0 35 0 - attenuate 1 -} - -object ShortBlueTorch -{ - frame SMBT { light SMALLBLUETORCH } -} - -// Burning barrel -flickerlight2 FIREBARREL -{ - color 1.0 0.9 0.4 - size 72 - secondarySize 81 - interval 0.1 - offset 0 32 0 - attenuate 1 -} - -object BurningBarrel -{ - frame FCAN { light FIREBARREL } -} - -// Skulls w/candles -flickerlight2 SKULLCANDLES -{ - color 1.0 1.0 0.3 - size 48 - secondarySize 51 - interval 0.1 - offset 0 24 0 - attenuate 1 -} - -object HeadCandles -{ - frame POL3 { light SKULLCANDLES } -} - -// Candle -pointlight CANDLE -{ - color 1.0 1.0 0.3 - size 24 - offset 0 16 0 - attenuate 1 -} - -object Candlestick -{ - frame CAND { light CANDLE } -} - -// Candelabra -pointlight CANDELABRA -{ - color 1.0 1.0 0.3 - size 67 - offset 0 52 0 - attenuate 1 -} - -object Candelabra -{ - frame CBRA { light CANDELABRA } -} - - - -// ---------------- -// -- Doom Items -- -// ---------------- - -// Soul Sphere -pulselight SOULSPHERE -{ - color 0.3 0.3 1.0 - size 60 - secondarySize 63 - interval 2.0 - offset 0 16 0 - attenuate 1 -} - -object SoulSphere -{ - frame SOUL { light SOULSPHERE } -} - -pulselight MEGASPHERE -{ - color 0.5 0.5 0.4 - size 60 - secondarySize 63 - interval 2.0 - offset 0 16 0 - attenuate 1 -} - -object MegaSphere -{ - frame MEGA { light MEGASPHERE } -} - -// Invulnerability Sphere -pulselight INVULN -{ - color 0.3 1.0 0.3 - size 60 - secondarySize 63 - interval 2.0 - offset 0 16 0 - attenuate 1 -} - -object InvulnerabilitySphere -{ - frame PINV { light INVULN } -} - -// Blur Sphere -pointlight BLURSPHERE1 -{ - color 1.0 0.0 0.0 - size 60 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE2 -{ - color 0.0 0.0 1.0 - size 48 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE3 -{ - color 0.0 0.0 1.0 - size 36 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE4 -{ - color 0.0 0.0 1.0 - size 24 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE5 -{ - color 0.0 0.0 1.0 - size 12 - offset 0 16 0 - attenuate 1 -} - -object BlurSphere -{ - frame PINS { light BLURSPHERE1 } - - frame PINSA { light BLURSPHERE2 } - frame PINSB { light BLURSPHERE3 } - frame PINSC { light BLURSPHERE4 } - frame PINSD { light BLURSPHERE5 } -} - -// Health Potion -pulselight HEALTHPOTION -{ - color 0.0 0.0 0.3 - size 16 - secondarySize 20 - interval 2.0 - attenuate 1 - offset 0 10 0 -} - -object HealthBonus -{ - frame BON1 { light HEALTHPOTION } -} - -// Armour Helmet -pulselight ARMORBONUS -{ - color 0.1 0.3 0.1 - size 16 - secondarySize 20 - interval 1.0 - dontlightself 1 - attenuate 1 - offset 0 10 0 -} - -object ArmorBonus -{ - frame BON2 { light ARMORBONUS } -} - -// Blue Keys -object BlueCard -{ - frame BKEY { light HEALTHPOTION } -} - -object BlueSkull -{ - frame BSKU { light HEALTHPOTION } -} - -// Yellow Keys -pulselight YELLOWKEY -{ - color 0.6 0.6 0.0 - size 24 - secondarySize 27 - interval 2.0 - attenuate 1 - offset 0 10 0 -} - -object YellowCard -{ - frame YKEY { light YELLOWKEY } -} - -object YellowSkull -{ - frame YSKU { light YELLOWKEY } -} - -// Red Keys -pulselight REDKEY -{ - color 0.6 0.0 0.0 - size 24 - secondarySize 27 - interval 2.0 - attenuate 1 - offset 0 10 0 -} - -object RedCard -{ - frame RKEY { light REDKEY } -} - -object RedSkull -{ - frame RSKU { light REDKEY } -} - -// Green armour -pointlight GREENARMOR1 -{ - color 0.0 0.3 0.0 - size 40 - attenuate 1 - offset 0 10 0 -} - -pointlight GREENARMOR2 -{ - color 0.0 0.3 0.0 - size 30 - attenuate 1 - offset 0 10 0 -} - -object GreenArmor -{ - frame ARM1A { light GREENARMOR1 } - frame ARM1B { light GREENARMOR2 } -} - -// Blue armour -pointlight BLUEARMOR1 -{ - color 0.0 0.0 0.3 - size 40 - attenuate 1 - offset 0 10 0 -} - -pointlight BLUEARMOR2 -{ - color 0.0 0.0 0.3 - size 30 - attenuate 1 - offset 0 10 0 -} - -object BlueArmor -{ - frame ARM2A { light BLUEARMOR1 } - frame ARM2B { light BLUEARMOR2 } -} - - - -// ------------------ -// -- Doom Enemies -- -// ------------------ - -// Zombies -flickerlight2 ZOMBIEATK -{ - color 1.0 0.8 0.2 - size 72 - secondarySize 84 - interval 1 - offset 0 40 0 - attenuate 1 -} - -object ZombieMan -{ - frame POSSF { light ZOMBIEATK } -} - -object ShotgunGuy -{ - frame SPOSF { light ZOMBIEATK } -} - -object ChaingunGuy -{ - frame CPOSE { light ZOMBIEATK } - frame CPOSF { light ZOMBIEATK } -} - -object DoomPlayer -{ - frame PLAYF { light ZOMBIEATK } -} - - -// Doom Imp Fireball -pointlight IMPBALL -{ - color 1.0 0.7 0.4 - size 96 - attenuate 1 -} - -// Doom imp fireball explosion -flickerlight IMPBALL_X1 -{ - color 0.7 0.4 0.25 - size 120 - secondarySize 132 - chance 0.25 - attenuate 1 -} - -flickerlight IMPBALL_X2 -{ - color 0.4 0.2 0.1 - size 144 - secondarySize 156 - chance 0.25 - attenuate 1 -} - -flickerlight IMPBALL_X3 -{ - color 0.2 0.1 0.0 - size 168 - secondarySize 180 - chance 0.25 - attenuate 1 -} - -object DoomImpBall -{ - frame BAL1A { light IMPBALL } - frame BAL1B { light IMPBALL } - - frame BAL1C { light IMPBALL_X1 } - frame BAL1D { light IMPBALL_X2 } - frame BAL1E { light IMPBALL_X3 } -} - -pointlight SPECTRE -{ - color 0.5 0.5 0.5 - size 72 - offset 0 24 0 - subtractive 1 - attenuate 1 -} - -/* -object Spectre -{ - frame SARG { light SPECTRE } -} -*/ - -// Cacodemon fireball -flickerlight CACOBALL -{ - color 1.0 0.5 0.8 - size 84 - secondarySize 96 - chance 0.5 - attenuate 1 -} - -flickerlight CACOBALL_X1 -{ - color 0.9 0.4 0.7 - size 108 - secondarySize 120 - chance 0.25 - attenuate 1 -} - -flickerlight CACOBALL_X2 -{ - color 0.6 0.3 0.5 - size 132 - secondarySize 144 - chance 0.25 - attenuate 1 -} - -flickerlight CACOBALL_X3 -{ - color 0.3 0.1 0.1 - size 156 - secondarySize 168 - chance 0.25 - attenuate 1 -} - -object CacodemonBall -{ - frame BAL2A { light CACOBALL } - frame BAL2B { light CACOBALL } - - frame BAL2C { light CACOBALL_X1 } - frame BAL2D { light CACOBALL_X2 } - frame BAL2E { light CACOBALL_X3 } -} - -// Baron / Hell Knight fireball -pointlight BARONBALL -{ - color 0.0 1.0 0.0 - size 96 - attenuate 1 -} - -flickerlight BARONBALL_X1 -{ - color 0.6 0.9 0.6 - size 120 - secondarySize 132 - chance 0.25 - attenuate 1 -} - -flickerlight BARONBALL_X2 -{ - color 0.45 0.6 0.45 - size 144 - secondarySize 156 - chance 0.25 - attenuate 1 -} - -flickerlight BARONBALL_X3 -{ - color 0.2 0.3 0.2 - size 168 - secondarySize 180 - chance 0.25 - attenuate 1 -} - -object BaronBall -{ - frame BAL7A { light BARONBALL } - frame BAL7B { light BARONBALL } - - frame BAL7C { light BARONBALL_X1 } - frame BAL7D { light BARONBALL_X2 } - frame BAL7E { light BARONBALL_X3 } -} - -// Lost Soul -flickerlight LOSTSOUL -{ - color 1.0 0.6 0.3 - size 84 - secondarysize 64 - chance 0.1 - attenuate 1 -} - -flickerlight LOSTSOUL_X1 -{ - color 0.8 0.5 0.3 - size 108 - secondarySize 120 - chance 0.25 - attenuate 1 -} - -flickerlight LOSTSOUL_X2 -{ - color 0.6 0.3 0.2 - size 132 - secondarySize 144 - chance 0.25 - attenuate 1 -} - -flickerlight LOSTSOUL_X3 -{ - color 0.4 0.1 0.0 - size 156 - secondarySize 168 - chance 0.25 - attenuate 1 -} - -flickerlight LOSTSOUL_X4 -{ - color 0.2 0.0 0.0 - size 168 - secondarySize 180 - chance 0.25 - attenuate 1 -} - -object LostSoul -{ - frame SKULA { light LOSTSOUL } - frame SKULB { light LOSTSOUL } - frame SKULC { light LOSTSOUL } - frame SKULD { light LOSTSOUL } - frame SKULE { light LOSTSOUL } - frame SKULF { light LOSTSOUL } - frame SKULG { light LOSTSOUL } - - frame SKULH { light LOSTSOUL_X1 } - frame SKULI { light LOSTSOUL_X2 } - frame SKULJ { light LOSTSOUL_X3 } - frame SKULK { light LOSTSOUL_X4 } -} - -// Mancubus Fireball -object FatShot -{ - frame MANFA { light IMPBALL } - frame MANFB { light IMPBALL } - - frame MISLB { light ROCKET_X1 } - frame MISLC { light ROCKET_X2 } - frame MISLD { light ROCKET_X3 } -} - -// Arachnotron Fireball -pointlight ARACHPLAS -{ - color 0.6 1.0 0.4 - size 84 - attenuate 1 -} - -flickerlight ARACHPLAS_X1 -{ - color 0.4 0.8 0.3 - size 108 - secondarySize 120 - chance 0.3 - attenuate 1 -} - -flickerlight ARACHPLAS_X2 -{ - color 0.6 0.6 0.3 - size 132 - secondarySize 144 - chance 0.3 - attenuate 1 -} - -flickerlight ARACHPLAS_X3 -{ - color 0.4 0.4 0.2 - size 72 - secondarySize 48 - chance 0.3 - attenuate 1 -} - -flickerlight ARACHPLAS_X4 -{ - color 0.2 0.2 0.1 - size 36 - secondarySize 24 - chance 0.3 - attenuate 1 -} - -object ArachnotronPlasma -{ - frame APLSA { light ARACHPLAS } - frame APLSB { light ARACHPLAS } - - frame APBXA { light ARACHPLAS_X1 } - frame APBXB { light ARACHPLAS_X2 } - frame APBXC { light ARACHPLAS_X2 } - frame APBXD { light ARACHPLAS_X3 } - frame APBXE { light ARACHPLAS_X4 } -} - -// Revenant tracer -pointlight TRACER -{ - color 1.0 0.5 0.3 - size 72 - attenuate 1 -} - -flickerlight TRACER_X1 -{ - color 1.0 0.5 0.2 - size 96 - secondarySize 108 - chance 0.25 - attenuate 1 -} - -flickerlight TRACER_X2 -{ - color 0.6 0.3 0.1 - size 120 - secondarySize 132 - chance 0.25 - attenuate 1 -} - -flickerlight TRACER_X3 -{ - color 0.3 0.1 0.0 - size 144 - secondarySize 156 - chance 0.25 - attenuate 1 -} - -object RevenantTracer -{ - frame FATBA { light TRACER } - frame FATBB { light TRACER } - - frame FBXPA { light TRACER_X1 } - frame FBXPB { light TRACER_X2 } - frame FBXPC { light TRACER_X3 } -} - -// Arch Vile Fire -flickerlight ARCHFIRE1 -{ - color 1.0 1.0 0.5 - size 36 - secondarySize 48 - chance 0.3 - offset 0 8 0 - attenuate 1 -} - -flickerlight ARCHFIRE2 -{ - color 1.0 1.0 0.5 - size 60 - secondarySize 72 - chance 0.3 - offset 0 24 0 - attenuate 1 -} - -flickerlight ARCHFIRE3 -{ - color 1.0 1.0 0.5 - size 96 - secondarySize 108 - chance 0.3 - offset 0 32 0 - attenuate 1 -} - -flickerlight ARCHFIRE4 -{ - color 0.8 0.8 0.4 - size 96 - secondarySize 108 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -flickerlight ARCHFIRE5 -{ - color 0.8 0.8 0.4 - size 96 - secondarySize 108 - chance 0.3 - offset 0 48 0 - attenuate 1 -} - -flickerlight ARCHFIRE6 -{ - color 0.6 0.6 0.3 - size 72 - secondarySize 84 - chance 0.3 - offset 0 64 0 - attenuate 1 -} - -flickerlight ARCHFIRE7 -{ - color 0.4 0.4 0.2 - size 48 - secondarySize 60 - chance 0.3 - offset 0 72 0 - attenuate 1 -} - -flickerlight ARCHFIRE8 -{ - color 0.2 0.2 0.1 - size 24 - secondarySize 36 - chance 0.3 - offset 0 80 0 - attenuate 1 -} - -object ArchvileFire -{ - frame FIREA { light ARCHFIRE1 } - frame FIREB { light ARCHFIRE2 } - frame FIREC { light ARCHFIRE3 } - frame FIRED { light ARCHFIRE4 } - frame FIREE { light ARCHFIRE5 } - frame FIREF { light ARCHFIRE6 } - frame FIREG { light ARCHFIRE7 } - frame FIREH { light ARCHFIRE8 } -} - -// Arch-vile -flickerlight ARCHATK1 -{ - color 1.0 1.0 0.4 - size 48 - secondarySize 72 - chance 0.3 - offset 0 80 0 - attenuate 1 -} - -flickerlight ARCHATK2 -{ - color 1.0 1.0 0.4 - size 84 - secondarySize 96 - chance 0.3 - offset 0 80 0 - attenuate 1 -} - -flickerlight ARCHATK3 -{ - color 1.0 1.0 0.4 - size 84 - secondarySize 96 - chance 0.3 - offset 0 64 0 - attenuate 1 -} - -flickerlight ARCHATK4 -{ - color 1.0 1.0 0.4 - size 96 - secondarySize 108 - chance 0.3 - offset 0 48 0 - attenuate 1 -} - -flickerlight ARCHATK5 -{ - color 1.0 1.0 0.4 - size 120 - secondarySize 132 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -flickerlight ARCHATK6 -{ - color 0.7 0.7 0.3 - size 144 - secondarySize 156 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -flickerlight ARCHATK7 -{ - color 0.3 0.3 0.1 - size 156 - secondarySize 168 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -pulselight ARCHRES -{ - color 0.6 0.3 0.3 - size 96 - secondarySize 105 - interval 0.5 - offset 0 36 0 - attenuate 1 -} - -object Archvile -{ - frame VILEH { light ARCHATK1 } - frame VILEI { light ARCHATK2 } - frame VILEJ { light ARCHATK3 } - frame VILEK { light ARCHATK4 } - frame VILEL { light ARCHATK4 } - frame VILEM { light ARCHATK4 } - frame VILEN { light ARCHATK5 } - frame VILEO { light ARCHATK6 } - frame VILEP { light ARCHATK7 } - - frame VILE[ { light ARCHRES } - frame VILE\ { light ARCHRES } - frame VILE] { light ARCHRES } -} - -// ------------------ -// -- Doom Effects -- -// ------------------ - -// Doom Teleport fog -flickerlight DTFOG1 -{ - color 0.4 1.0 0.4 - size 84 - secondarySize 96 - chance 0.4 - attenuate 1 -} - -flickerlight DTFOG2 -{ - color 0.4 1.0 0.4 - size 60 - secondarySize 72 - chance 0.4 - attenuate 1 -} - -flickerlight DTFOG3 -{ - color 0.4 1.0 0.4 - size 36 - secondarySize 48 - chance 0.4 - attenuate 1 -} - -flickerlight DTFOG4 -{ - color 0.4 1.0 0.4 - size 15 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object TeleportFog -{ - frame TFOGA { light DTFOG1 } - frame TFOGB { light DTFOG2 } - frame TFOGC { light DTFOG2 } - frame TFOGD { light DTFOG2 } - frame TFOGE { light DTFOG3 } - frame TFOGF { light DTFOG4 } - frame TFOGI { light DTFOG4 } - frame TFOGJ { light DTFOG3 } -} diff --git a/wadsrc_lights/static/filter/doom.doom1/gldefs.txt b/wadsrc_lights/static/filter/doom.id/gldefs.txt similarity index 100% rename from wadsrc_lights/static/filter/doom.doom1/gldefs.txt rename to wadsrc_lights/static/filter/doom.id/gldefs.txt