From 6b943043d171668b1f228e36cd15dce7b462524d Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Sat, 31 Dec 2016 22:48:10 +0100 Subject: [PATCH 1/9] - Update the list of dummy actor flags from Zandronum. --- src/scripting/thingdef_data.cpp | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp index 18962fbca..2244600dc 100644 --- a/src/scripting/thingdef_data.cpp +++ b/src/scripting/thingdef_data.cpp @@ -357,13 +357,30 @@ static FFlagDef MoreFlagDefs[] = DEFINE_DUMMY_FLAG(FASTER, true), // obsolete, replaced by 'Fast' state flag DEFINE_DUMMY_FLAG(FASTMELEE, true), // obsolete, replaced by 'Fast' state flag + // Deprecated name as an alias + DEFINE_FLAG2_DEPRECATED(MF4_DONTHARMCLASS, DONTHURTSPECIES, AActor, flags4), + // Various Skulltag flags that are quite irrelevant to ZDoom - DEFINE_DUMMY_FLAG(NONETID, false), // netcode-based - DEFINE_DUMMY_FLAG(ALLOWCLIENTSPAWN, false), // netcode-based - DEFINE_DUMMY_FLAG(CLIENTSIDEONLY, false), // netcode-based - DEFINE_DUMMY_FLAG(SERVERSIDEONLY, false), // netcode-based - DEFINE_DUMMY_FLAG(EXPLODEONDEATH, true), // seems useless - DEFINE_FLAG2_DEPRECATED(MF4_DONTHARMCLASS, DONTHURTSPECIES, AActor, flags4), // Deprecated name as an alias + // [BC] New DECORATE flag defines here. + DEFINE_DUMMY_FLAG(BLUETEAM, false), + DEFINE_DUMMY_FLAG(REDTEAM, false), + DEFINE_DUMMY_FLAG(USESPECIAL, false), + DEFINE_DUMMY_FLAG(BASEHEALTH, false), + DEFINE_DUMMY_FLAG(SUPERHEALTH, false), + DEFINE_DUMMY_FLAG(BASEARMOR, false), + DEFINE_DUMMY_FLAG(SUPERARMOR, false), + DEFINE_DUMMY_FLAG(SCOREPILLAR, false), + DEFINE_DUMMY_FLAG(NODE, false), + DEFINE_DUMMY_FLAG(USESTBOUNCESOUND, false), + DEFINE_DUMMY_FLAG(EXPLODEONDEATH, true), + DEFINE_DUMMY_FLAG(DONTIDENTIFYTARGET, false), // [CK] + + // Skulltag netcode-based flags. + // [BB] New DECORATE network related flag defines here. + DEFINE_DUMMY_FLAG(NONETID, false), + DEFINE_DUMMY_FLAG(ALLOWCLIENTSPAWN, false), + DEFINE_DUMMY_FLAG(CLIENTSIDEONLY, false), + DEFINE_DUMMY_FLAG(SERVERSIDEONLY, false), }; static FFlagDef InventoryFlagDefs[] = @@ -391,6 +408,8 @@ static FFlagDef InventoryFlagDefs[] = DEFINE_FLAG(IF, TRANSFER, AInventory, ItemFlags), DEFINE_FLAG(IF, NOTELEPORTFREEZE, AInventory, ItemFlags), + DEFINE_DUMMY_FLAG(FORCERESPAWNINSURVIVAL, false), + DEFINE_DEPRECATED_FLAG(PICKUPFLASH), DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP), }; From e4c63563e3c8ca562a26f0856b85769d1ce5c4e3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 00:16:00 +0100 Subject: [PATCH 2/9] - fixed: The 3D floor light splitting code for sprites did not copy the sector's fog density. - fixed: fog calculations for fuzz effects were wrong. --- src/gl/renderer/gl_colormap.h | 1 + src/gl/scene/gl_sprite.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gl/renderer/gl_colormap.h b/src/gl/renderer/gl_colormap.h index 37a762970..8bee402c9 100644 --- a/src/gl/renderer/gl_colormap.h +++ b/src/gl/renderer/gl_colormap.h @@ -56,6 +56,7 @@ struct FColormap LightColor = from->Color; desaturation = from->Desaturate; FadeColor = from->Fade; + FadeColor.a = 0; blendfactor = from->Color.a; fogdensity = from->Fade.a*2; return * this; diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp index 4479cb3eb..102337ecc 100644 --- a/src/gl/scene/gl_sprite.cpp +++ b/src/gl/scene/gl_sprite.cpp @@ -296,11 +296,10 @@ void GLSprite::Draw(int pass) if (!gl_isBlack(Colormap.FadeColor)) { float dist=Dist2(ViewPos.X, ViewPos.Y, x,y); - - if (!Colormap.FadeColor.a) Colormap.FadeColor.a=clamp(255-lightlevel,60,255); + int fogd = gl_GetFogDensity(lightlevel, Colormap.FadeColor, Colormap.fogdensity); // this value was determined by trial and error and is scale dependent! - float factor=0.05f+exp(-Colormap.FadeColor.a*dist/62500.f); + float factor = 0.05f + exp(-fogd*dist / 62500.f); fuzzalpha*=factor; minalpha*=factor; } @@ -387,6 +386,7 @@ void GLSprite::Draw(int pass) FColormap thiscm; thiscm.FadeColor = Colormap.FadeColor; + thiscm.fogdensity = Colormap.fogdensity; thiscm.CopyFrom3DLight(&(*lightlist)[i]); if (glset.nocoloredspritelighting) { From 9575715b1edbc613161fac8ca74213a8f80bd0a4 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Sat, 31 Dec 2016 22:35:24 +0100 Subject: [PATCH 3/9] - Added support to GCC/Clang sanitizers. --- src/CMakeLists.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d006d2948..64e865a21 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -452,6 +452,33 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) set( CMAKE_CXX_FLAGS_MINSIZEREL "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_MINSIZEREL}" ) set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" ) + # Support for the GCC/Clang sanitizers. + set( WITH_ASAN 0 CACHE BOOL "Enable the Address Sanitizer") + if( NOT CMAKE_COMPILER_IS_GNUCXX ) + set( WITH_MSAN 0 CACHE BOOL "Enable the Memory Sanitizer") + endif( NOT CMAKE_COMPILER_IS_GNUCXX ) + set( WITH_UBSAN 0 CACHE BOOL "Enable the Undefined Behavior Sanitizer") + if( WITH_MSAN ) + if ( WITH_ASAN OR WITH_UBSAN ) + message( SEND_ERROR "You can't use MSAN with either ASAN or UBSAN." ) + endif ( WITH_ASAN OR WITH_UBSAN ) + endif( WITH_MSAN ) + + set( SANITIZER_FLAG "" ) + if( WITH_ASAN ) + set( SANITIZER_FLAG "-fsanitize=address" ) + if ( WITH_UBSAN ) + set( SANITIZER_FLAG "${SANITIZER_FLAG},undefined" ) + endif( WITH_UBSAN ) + elseif( WITH_MSAN ) + set( SANITIZER_FLAG "-fsanitize=memory" ) + elseif( WITH_UBSAN ) + set( SANITIZER_FLAG "-fsanitize=undefined" ) + endif( WITH_ASAN ) + + set( CMAKE_CXX_FLAGS "${SANITIZER_FLAG} ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "${SANITIZER_FLAG} ${CMAKE_C_FLAGS}" ) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5") set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" ) set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" ) From 3b30b4d979d71591c4eb7a4ea08ecbdddb9c4f40 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 11:57:07 +0100 Subject: [PATCH 4/9] - use filter directories for light definitions so that they do not get used for unwanted IWADs using the same game type. - fixed light definitions for Freedoom to match the graphics. --- .../{doomdefs.txt => doom.doom1/gldefs.txt} | 12 +- wadsrc_lights/static/doom.doom2/gldefs.txt | 1258 +++++++++++++++++ wadsrc_lights/static/doom.freedoom/gldefs.txt | 1132 +++++++++++++++ .../{hticdefs.txt => heretic/gldefs.txt} | 0 .../static/{hexndefs.txt => hexen/gldefs.txt} | 0 .../{strfdefs.txt => strife/gldefs.txt} | 0 6 files changed, 2396 insertions(+), 6 deletions(-) rename wadsrc_lights/static/{doomdefs.txt => doom.doom1/gldefs.txt} (99%) create mode 100644 wadsrc_lights/static/doom.doom2/gldefs.txt create mode 100644 wadsrc_lights/static/doom.freedoom/gldefs.txt rename wadsrc_lights/static/{hticdefs.txt => heretic/gldefs.txt} (100%) rename wadsrc_lights/static/{hexndefs.txt => hexen/gldefs.txt} (100%) rename wadsrc_lights/static/{strfdefs.txt => strife/gldefs.txt} (100%) diff --git a/wadsrc_lights/static/doomdefs.txt b/wadsrc_lights/static/doom.doom1/gldefs.txt similarity index 99% rename from wadsrc_lights/static/doomdefs.txt rename to wadsrc_lights/static/doom.doom1/gldefs.txt index 3690120e3..6c037b49f 100644 --- a/wadsrc_lights/static/doomdefs.txt +++ b/wadsrc_lights/static/doom.doom1/gldefs.txt @@ -354,8 +354,8 @@ object TechLamp flickerlight2 BIGREDTORCH { color 1.0 0.5 0.2 - size 64 - secondarySize 72 + size 60 + secondarySize 66 interval 0.1 offset 0 60 0 } @@ -369,8 +369,8 @@ object RedTorch flickerlight2 BIGGREENTORCH { color 0.3 1.0 0.3 - size 64 - secondarySize 72 + size 60 + secondarySize 66 interval 0.1 offset 0 60 0 } @@ -384,8 +384,8 @@ object GreenTorch flickerlight2 BIGBLUETORCH { color 0.3 0.3 1.0 - size 64 - secondarySize 72 + size 60 + secondarySize 66 interval 0.1 offset 0 60 0 } diff --git a/wadsrc_lights/static/doom.doom2/gldefs.txt b/wadsrc_lights/static/doom.doom2/gldefs.txt new file mode 100644 index 000000000..6c037b49f --- /dev/null +++ b/wadsrc_lights/static/doom.doom2/gldefs.txt @@ -0,0 +1,1258 @@ +// ------------------------------------------------------ +// ------------------ DOOM GAME LIGHTS ------------------ +// ------------------------------------------------------ + +// ------------------ +// -- Doom Weapons -- +// ------------------ + +// Bullet puff +flickerlight BPUFF1 +{ + color 0.5 0.5 0.0 + size 6 + secondarySize 8 + chance 0.8 +} + +flickerlight BPUFF2 +{ + color 0.5 0.5 0.0 + size 3 + secondarySize 4 + chance 0.8 +} + +object BulletPuff +{ + frame PUFFA { light BPUFF1 } + frame PUFFB { light BPUFF2 } +} + +// Rocket +pointlight ROCKET +{ + color 1.0 0.7 0.0 + size 56 +} + +flickerlight ROCKET_X1 +{ + color 1.0 0.7 0.5 + size 64 + secondarySize 72 + chance 0.3 +} + +flickerlight ROCKET_X2 +{ + color 0.5 0.3 0.2 + size 80 + secondarySize 88 + chance 0.3 +} + +flickerlight ROCKET_X3 +{ + color 0.3 0.1 0.1 + size 96 + secondarySize 104 + chance 0.3 +} + +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 56 +} + +flickerlight PLASMA_X1 +{ + color 0.5 0.5 1.0 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA_X2 +{ + color 0.4 0.4 0.8 + size 80 + secondarySize 88 + chance 0.4 +} + +flickerlight PLASMA_X3 +{ + color 0.25 0.25 0.5 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA_X4 +{ + color 0.1 0.1 0.2 + size 8 + secondarySize 16 + chance 0.4 +} + +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 56 +} + +flickerlight PLASMA1_X1 +{ + color 0.2 1.0 0.2 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA1_X2 +{ + color 0.2 0.8 0.2 + size 80 + secondarySize 88 + chance 0.4 +} + +flickerlight PLASMA1_X3 +{ + color 0.1 0.5 0.1 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA1_X4 +{ + color 0.0 0.2 0.0 + size 8 + secondarySize 16 + chance 0.4 +} + +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 56 +} + +flickerlight PLASMA1_X1 +{ + color 0.9 0.2 0.2 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA1_X2 +{ + color 0.6 0.2 0.2 + size 80 + secondarySize 88 + chance 0.4 +} + +flickerlight PLASMA1_X3 +{ + color 0.2 0.0 0.0 + size 8 + secondarySize 16 + chance 0.4 +} + +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 80 +} + +flickerlight BFGBALL_X1 +{ + color 0.5 1.0 0.5 + size 80 + secondarySize 88 + chance 0.3 +} + +flickerlight BFGBALL_X2 +{ + color 0.6 1.0 0.6 + size 104 + secondarySize 112 + chance 0.3 +} + +flickerlight BFGBALL_X3 +{ + color 0.7 1.0 0.7 + size 120 + secondarySize 128 + chance 0.3 +} + +flickerlight BFGBALL_X4 +{ + color 0.4 0.7 0.4 + size 56 + secondarySize 64 + chance 0.3 +} + +flickerlight BFGBALL_X5 +{ + color 0.1 0.3 0.1 + size 48 + secondarySize 56 + chance 0.3 +} + +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.5 0.0 + size 20 + secondarySize 21 + interval 0.5 + offset 0 36 0 + dontlightself 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 56 + offset 0 44 0 +} + +object Column +{ + frame COLU { light LAMP } +} + +// Short tech lamp +pulselight SMALLLAMP +{ + color 0.8 0.8 1.0 + size 56 + secondarySize 58 + interval 0.4 + offset 0 44 0 +} + +object TechLamp2 +{ + frame TLP2 { light SMALLLAMP } +} + +// Tall tech lamp +pulselight BIGLAMP +{ + color 0.8 0.8 1.0 + size 64 + secondarySize 66 + interval 0.4 + offset 0 72 0 +} + +object TechLamp +{ + frame TLMP { light BIGLAMP } +} + +// Tall red torch +flickerlight2 BIGREDTORCH +{ + color 1.0 0.5 0.2 + size 60 + secondarySize 66 + interval 0.1 + offset 0 60 0 +} + +object RedTorch +{ + frame TRED { light BIGREDTORCH } +} + +// Tall green torch +flickerlight2 BIGGREENTORCH +{ + color 0.3 1.0 0.3 + size 60 + secondarySize 66 + interval 0.1 + offset 0 60 0 +} + +object GreenTorch +{ + frame TGRN { light BIGGREENTORCH } +} + +// Tall blue torch +flickerlight2 BIGBLUETORCH +{ + color 0.3 0.3 1.0 + size 60 + secondarySize 66 + interval 0.1 + offset 0 60 0 +} + +object BlueTorch +{ + frame TBLU { light BIGBLUETORCH } +} + +// Small red torch +flickerlight2 SMALLREDTORCH +{ + color 1.0 0.5 0.2 + size 48 + secondarySize 54 + interval 0.1 + offset 0 35 0 +} + +object ShortRedTorch +{ + frame SMRT { light SMALLREDTORCH } +} + +// Small green torch +flickerlight2 SMALLGREENTORCH +{ + color 0.3 1.0 0.3 + size 48 + secondarySize 54 + interval 0.1 + offset 0 35 0 +} + +object ShortGreenTorch +{ + frame SMGT { light SMALLGREENTORCH } +} + +// Small blue torch +flickerlight2 SMALLBLUETORCH +{ + color 0.3 0.3 1.0 + size 48 + secondarySize 54 + interval 0.1 + offset 0 35 0 +} + +object ShortBlueTorch +{ + frame SMBT { light SMALLBLUETORCH } +} + +// Burning barrel +flickerlight2 FIREBARREL +{ + color 1.0 0.9 0.4 + size 48 + secondarySize 54 + interval 0.1 + offset 0 32 0 +} + +object BurningBarrel +{ + frame FCAN { light FIREBARREL } +} + +// Skulls w/candles +flickerlight2 SKULLCANDLES +{ + color 1.0 1.0 0.3 + size 32 + secondarySize 34 + interval 0.1 + offset 0 24 0 +} + +object HeadCandles +{ + frame POL3 { light SKULLCANDLES } +} + +// Candle +pointlight CANDLE +{ + color 1.0 1.0 0.3 + size 16 + offset 0 16 0 +} + +object Candlestick +{ + frame CAND { light CANDLE } +} + +// Candelabra +pointlight CANDELABRA +{ + color 1.0 1.0 0.3 + size 48 + offset 0 52 0 +} + +object Candelabra +{ + frame CBRA { light CANDELABRA } +} + + + +// ---------------- +// -- Doom Items -- +// ---------------- + +// Soul Sphere +pulselight SOULSPHERE +{ + color 0.3 0.3 1.0 + size 40 + secondarySize 42 + interval 2.0 + offset 0 16 0 +} + +object SoulSphere +{ + frame SOUL { light SOULSPHERE } +} + +// Invulnerability Sphere +pulselight INVULN +{ + color 0.3 1.0 0.3 + size 40 + secondarySize 42 + interval 2.0 + offset 0 16 0 +} + +object InvulnerabilitySphere +{ + frame PINV { light INVULN } +} + +// Blur Sphere +pointlight BLURSPHERE1 +{ + color 1.0 0.0 0.0 + size 40 + offset 0 16 0 +} + +pointlight BLURSPHERE2 +{ + color 0.0 0.0 1.0 + size 32 + offset 0 16 0 +} + +pointlight BLURSPHERE3 +{ + color 0.0 0.0 1.0 + size 24 + offset 0 16 0 +} + +pointlight BLURSPHERE4 +{ + color 0.0 0.0 1.0 + size 16 + offset 0 16 0 +} + +pointlight BLURSPHERE5 +{ + color 0.0 0.0 1.0 + size 8 + offset 0 16 0 +} + +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.6 + size 16 + secondarySize 18 + interval 2.0 +} + +object HealthBonus +{ + frame BON1 { light HEALTHPOTION } +} + +// Armour Helmet +pulselight ARMORBONUS +{ + color 0.2 0.6 0.2 + size 16 + secondarySize 14 + interval 1.0 + dontlightself 1 +} + +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 16 + secondarySize 18 + interval 2.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 16 + secondarySize 18 + interval 2.0 +} + +object RedCard +{ + frame RKEY { light REDKEY } +} + +object RedSkull +{ + frame RSKU { light REDKEY } +} + +// Green armour +pointlight GREENARMOR1 +{ + color 0.0 0.6 0.0 + size 48 +} + +pointlight GREENARMOR2 +{ + color 0.0 0.6 0.0 + size 32 +} + +object GreenArmor +{ + frame ARM1A { light GREENARMOR1 } + frame ARM1B { light GREENARMOR2 } +} + +// Blue armour +pointlight BLUEARMOR1 +{ + color 0.0 0.0 0.6 + size 48 +} + +pointlight BLUEARMOR2 +{ + color 0.0 0.0 0.6 + size 32 +} + +object BlueArmor +{ + frame ARM2A { light BLUEARMOR1 } + frame ARM2B { light BLUEARMOR2 } +} + + + +// ------------------ +// -- Doom Enemies -- +// ------------------ + +// Zombies +flickerlight2 ZOMBIEATK +{ + color 1.0 0.8 0.2 + size 48 + secondarySize 56 + interval 1 + offset 0 40 0 +} + +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 64 +} + +// Doom imp fireball explosion +flickerlight IMPBALL_X1 +{ + color 0.7 0.4 0.25 + size 80 + secondarySize 88 + chance 0.25 +} + +flickerlight IMPBALL_X2 +{ + color 0.4 0.2 0.1 + size 96 + secondarySize 104 + chance 0.25 +} + +flickerlight IMPBALL_X3 +{ + color 0.2 0.1 0.0 + size 112 + secondarySize 120 + chance 0.25 +} + +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 48 + offset 0 24 0 + subtractive 1 +} + +/* +object Spectre +{ + frame SARG { light SPECTRE } +} +*/ + +// Cacodemon fireball +flickerlight CACOBALL +{ + color 1.0 0.5 0.8 + size 56 + secondarySize 64 + chance 0.5 +} + +flickerlight CACOBALL_X1 +{ + color 0.9 0.4 0.7 + size 72 + secondarySize 80 + chance 0.25 +} + +flickerlight CACOBALL_X2 +{ + color 0.6 0.3 0.5 + size 88 + secondarySize 96 + chance 0.25 +} + +flickerlight CACOBALL_X3 +{ + color 0.3 0.1 0.1 + size 104 + secondarySize 112 + chance 0.25 +} + +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 64 +} + +flickerlight BARONBALL_X1 +{ + color 0.6 0.9 0.6 + size 80 + secondarySize 88 + chance 0.25 +} + +flickerlight BARONBALL_X2 +{ + color 0.45 0.6 0.45 + size 96 + secondarySize 104 + chance 0.25 +} + +flickerlight BARONBALL_X3 +{ + color 0.2 0.3 0.2 + size 112 + secondarySize 120 + chance 0.25 +} + +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 56 + secondarysize 64 + chance 0.1 +} + +flickerlight LOSTSOUL_X1 +{ + color 0.8 0.5 0.3 + size 72 + secondarySize 80 + chance 0.25 +} + +flickerlight LOSTSOUL_X2 +{ + color 0.6 0.3 0.2 + size 88 + secondarySize 96 + chance 0.25 +} + +flickerlight LOSTSOUL_X3 +{ + color 0.4 0.1 0.0 + size 104 + secondarySize 112 + chance 0.25 +} + +flickerlight LOSTSOUL_X4 +{ + color 0.2 0.0 0.0 + size 112 + secondarySize 120 + chance 0.25 +} + +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 56 +} + +flickerlight ARACHPLAS_X1 +{ + color 0.4 0.8 0.3 + size 72 + secondarySize 80 + chance 0.3 +} + +flickerlight ARACHPLAS_X2 +{ + color 0.6 0.6 0.3 + size 88 + secondarySize 96 + chance 0.3 +} + +flickerlight ARACHPLAS_X3 +{ + color 0.4 0.4 0.2 + size 48 + secondarySize 32 + chance 0.3 +} + +flickerlight ARACHPLAS_X4 +{ + color 0.2 0.2 0.1 + size 24 + secondarySize 16 + chance 0.3 +} + +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 48 +} + +flickerlight TRACER_X1 +{ + color 1.0 0.5 0.2 + size 64 + secondarySize 72 + chance 0.25 +} + +flickerlight TRACER_X2 +{ + color 0.6 0.3 0.1 + size 80 + secondarySize 88 + chance 0.25 +} + +flickerlight TRACER_X3 +{ + color 0.3 0.1 0.0 + size 96 + secondarySize 104 + chance 0.25 +} + +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 24 + secondarySize 32 + chance 0.3 + offset 0 8 0 +} + +flickerlight ARCHFIRE2 +{ + color 1.0 1.0 0.5 + size 40 + secondarySize 48 + chance 0.3 + offset 0 24 0 +} + +flickerlight ARCHFIRE3 +{ + color 1.0 1.0 0.5 + size 64 + secondarySize 72 + chance 0.3 + offset 0 32 0 +} + +flickerlight ARCHFIRE4 +{ + color 0.8 0.8 0.4 + size 64 + secondarySize 72 + chance 0.3 + offset 0 40 0 +} + +flickerlight ARCHFIRE5 +{ + color 0.8 0.8 0.4 + size 64 + secondarySize 72 + chance 0.3 + offset 0 48 0 +} + +flickerlight ARCHFIRE6 +{ + color 0.6 0.6 0.3 + size 48 + secondarySize 56 + chance 0.3 + offset 0 64 0 +} + +flickerlight ARCHFIRE7 +{ + color 0.4 0.4 0.2 + size 32 + secondarySize 40 + chance 0.3 + offset 0 72 0 +} + +flickerlight ARCHFIRE8 +{ + color 0.2 0.2 0.1 + size 16 + secondarySize 24 + chance 0.3 + offset 0 80 0 +} + +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 32 + secondarySize 48 + chance 0.3 + offset 0 80 0 +} + +flickerlight ARCHATK2 +{ + color 1.0 1.0 0.4 + size 56 + secondarySize 64 + chance 0.3 + offset 0 80 0 +} + +flickerlight ARCHATK3 +{ + color 1.0 1.0 0.4 + size 56 + secondarySize 64 + chance 0.3 + offset 0 64 0 +} + +flickerlight ARCHATK4 +{ + color 1.0 1.0 0.4 + size 64 + secondarySize 72 + chance 0.3 + offset 0 48 0 +} + +flickerlight ARCHATK5 +{ + color 1.0 1.0 0.4 + size 80 + secondarySize 88 + chance 0.3 + offset 0 40 0 +} + +flickerlight ARCHATK6 +{ + color 0.7 0.7 0.3 + size 96 + secondarySize 104 + chance 0.3 + offset 0 40 0 +} + +flickerlight ARCHATK7 +{ + color 0.3 0.3 0.1 + size 104 + secondarySize 112 + chance 0.3 + offset 0 40 0 +} + +pulselight ARCHRES +{ + color 0.6 0.3 0.3 + size 64 + secondarySize 70 + interval 0.5 + offset 0 36 0 +} + +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 56 + secondarySize 64 + chance 0.4 +} + +flickerlight DTFOG2 +{ + color 0.4 1.0 0.4 + size 40 + secondarySize 48 + chance 0.4 +} + +flickerlight DTFOG3 +{ + color 0.4 1.0 0.4 + size 24 + secondarySize 32 + chance 0.4 +} + +flickerlight DTFOG4 +{ + color 0.4 1.0 0.4 + size 10 + secondarySize 16 + chance 0.4 +} + +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/doom.freedoom/gldefs.txt b/wadsrc_lights/static/doom.freedoom/gldefs.txt new file mode 100644 index 000000000..23575d51d --- /dev/null +++ b/wadsrc_lights/static/doom.freedoom/gldefs.txt @@ -0,0 +1,1132 @@ +// ------------------------------------------------------ +// ------------------ DOOM GAME LIGHTS ------------------ +// ------------------------------------------------------ + +// ------------------ +// -- Doom Weapons -- +// ------------------ + +// Bullet puff +flickerlight BPUFF1 +{ + color 0.5 0.5 0.0 + size 6 + secondarySize 8 + chance 0.8 +} + +flickerlight BPUFF2 +{ + color 0.5 0.5 0.0 + size 3 + secondarySize 4 + chance 0.8 +} + +object BulletPuff +{ + frame PUFFA { light BPUFF1 } + frame PUFFB { light BPUFF2 } +} + +// Rocket +pointlight ROCKET +{ + color 1.0 1.0 0.0 + size 56 +} + +flickerlight ROCKET_X1 +{ + color 1.0 1.0 0.5 + size 64 + secondarySize 72 + chance 0.3 +} + +flickerlight ROCKET_X2 +{ + color 0.5 0.5 0.2 + size 80 + secondarySize 88 + chance 0.3 +} + +flickerlight ROCKET_X3 +{ + color 0.3 0.3 0.1 + size 96 + secondarySize 104 + chance 0.3 +} + +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 56 +} + +flickerlight PLASMA_X1 +{ + color 0.5 0.5 1.0 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA_X2 +{ + color 0.4 0.4 0.8 + size 80 + secondarySize 88 + chance 0.4 +} + +flickerlight PLASMA_X3 +{ + color 0.25 0.25 0.5 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA_X4 +{ + color 0.1 0.1 0.2 + size 8 + secondarySize 16 + chance 0.4 +} + +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 56 +} + +flickerlight PLASMA1_X1 +{ + color 0.2 1.0 0.2 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA1_X2 +{ + color 0.2 0.8 0.2 + size 80 + secondarySize 88 + chance 0.4 +} + +flickerlight PLASMA1_X3 +{ + color 0.1 0.5 0.1 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA1_X4 +{ + color 0.0 0.2 0.0 + size 8 + secondarySize 16 + chance 0.4 +} + +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 56 +} + +flickerlight PLASMA1_X1 +{ + color 0.9 0.2 0.2 + size 64 + secondarySize 72 + chance 0.4 +} + +flickerlight PLASMA1_X2 +{ + color 0.6 0.2 0.2 + size 80 + secondarySize 88 + chance 0.4 +} + +flickerlight PLASMA1_X3 +{ + color 0.2 0.0 0.0 + size 8 + secondarySize 16 + chance 0.4 +} + +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 0.5 1.0 + size 80 +} + +flickerlight BFGBALL_X1 +{ + color 0.5 0.5 1.0 + size 80 + secondarySize 88 + chance 0.3 +} + +flickerlight BFGBALL_X2 +{ + color 0.6 0.6 1.0 + size 104 + secondarySize 112 + chance 0.3 +} + +flickerlight BFGBALL_X3 +{ + color 0.7 0.7 1.0 + size 120 + secondarySize 128 + chance 0.3 +} + +flickerlight BFGBALL_X4 +{ + color 0.4 0.4 0.7 + size 56 + secondarySize 64 + chance 0.3 +} + +flickerlight BFGBALL_X5 +{ + color 0.1 0.1 0.3 + size 48 + secondarySize 56 + chance 0.3 +} + +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.5 0.0 + size 20 + secondarySize 21 + interval 0.5 + offset 0 36 0 + dontlightself 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 66 + offset 0 40 0 +} + +object Column +{ + frame COLU { light LAMP } +} + +// Short tech lamp +pulselight SMALLLAMP +{ + color 0.8 0.8 1.0 + size 56 + secondarySize 58 + interval 0.4 + offset 0 44 0 +} + +object TechLamp2 +{ + frame TLP2 { light SMALLLAMP } +} + +// Tall tech lamp +pulselight BIGLAMP +{ + color 0.8 0.8 1.0 + size 64 + secondarySize 66 + interval 0.4 + offset 0 72 0 +} + +object TechLamp +{ + frame TLMP { light BIGLAMP } +} + +// Tall red torch +flickerlight2 BIGREDTORCH +{ + color 1.0 0.9 0.2 + size 60 + secondarySize 66 + interval 0.1 + offset 0 60 0 +} + +object RedTorch +{ + frame TRED { light BIGREDTORCH } +} + +// Tall green torch +flickerlight2 BIGGREENTORCH +{ + color 0.3 1.0 0.3 + size 60 + secondarySize 66 + interval 0.1 + offset 0 60 0 +} + +object GreenTorch +{ + frame TGRN { light BIGGREENTORCH } +} + +// Tall blue torch +flickerlight2 BIGBLUETORCH +{ + color 0.3 0.3 1.0 + size 60 + secondarySize 66 + interval 0.1 + offset 0 50 0 +} + +object BlueTorch +{ + frame TBLU { light BIGBLUETORCH } +} + +// Small red torch +flickerlight2 SMALLREDTORCH +{ + color 1.0 0.5 0.2 + size 48 + secondarySize 54 + interval 0.1 + offset 0 35 0 +} + +object ShortRedTorch +{ + frame SMRT { light SMALLREDTORCH } +} + +// Small green torch +flickerlight2 SMALLGREENTORCH +{ + color 0.3 1.0 0.3 + size 48 + secondarySize 54 + interval 0.1 + offset 0 35 0 +} + +object ShortGreenTorch +{ + frame SMGT { light SMALLGREENTORCH } +} + +// Small blue torch +flickerlight2 SMALLBLUETORCH +{ + color 0.3 0.3 1.0 + size 48 + secondarySize 54 + interval 0.1 + offset 0 35 0 +} + +object ShortBlueTorch +{ + frame SMBT { light SMALLBLUETORCH } +} + +// Burning barrel +flickerlight2 FIREBARREL +{ + color 1.0 0.9 0.4 + size 54 + secondarySize 60 + interval 0.1 + offset 0 32 0 +} + +object BurningBarrel +{ + frame FCAN { light FIREBARREL } +} + +// Skulls w/candles +flickerlight2 SKULLCANDLES +{ + color 1.0 1.0 0.3 + size 32 + secondarySize 34 + interval 0.1 + offset 0 24 0 +} + +object HeadCandles +{ + frame POL3 { light SKULLCANDLES } +} + +// Candle +pointlight CANDLE +{ + color 1.0 1.0 0.3 + size 16 + offset 0 16 0 +} + +object Candlestick +{ + frame CAND { light CANDLE } +} + +// ---------------- +// -- Doom Items -- +// ---------------- + +// Soul Sphere +pulselight SOULSPHERE +{ + color 0.3 0.3 1.0 + size 40 + secondarySize 42 + interval 2.0 + offset 0 16 0 +} + +object SoulSphere +{ + frame SOUL { light SOULSPHERE } +} + +// Invulnerability Sphere +pulselight INVULN +{ + color 1.0 0.6 1.0 + size 40 + secondarySize 42 + interval 2.0 + offset 0 16 0 +} + +object InvulnerabilitySphere +{ + frame PINV { light INVULN } +} + +// Blur Sphere +pointlight BLURSPHERE1 +{ + color 1.0 0.0 0.0 + size 40 + offset 0 16 0 +} + +pointlight BLURSPHERE2 +{ + color 0.0 0.0 1.0 + size 32 + offset 0 16 0 +} + +pointlight BLURSPHERE3 +{ + color 0.0 0.0 1.0 + size 24 + offset 0 16 0 +} + +pointlight BLURSPHERE4 +{ + color 0.0 0.0 1.0 + size 16 + offset 0 16 0 +} + +pointlight BLURSPHERE5 +{ + color 0.0 0.0 1.0 + size 8 + offset 0 16 0 +} + +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.6 + size 16 + secondarySize 18 + interval 2.0 +} + +object HealthBonus +{ + frame BON1 { light HEALTHPOTION } +} + +// Armour Helmet +pulselight ARMORBONUS +{ + color 0.6 0.2 0.2 + size 16 + secondarySize 14 + interval 1.0 + dontlightself 1 +} + +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 16 + secondarySize 18 + interval 2.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 16 + secondarySize 18 + interval 2.0 +} + +object RedCard +{ + frame RKEY { light REDKEY } +} + +object RedSkull +{ + frame RSKU { light REDKEY } +} + +pointlight GREENARMOR2 +{ + color 0.4 0.0 0.0 + size 20 +} + +object GreenArmor +{ + frame ARM1B { light GREENARMOR2 } +} + + +// ------------------ +// -- Doom Enemies -- +// ------------------ + +// Zombies +flickerlight2 ZOMBIEATK +{ + color 1.0 0.8 0.2 + size 48 + secondarySize 56 + interval 1 + offset 0 40 0 +} + +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 64 +} + +// Doom imp fireball explosion +flickerlight IMPBALL_X1 +{ + color 0.7 0.7 0.25 + size 80 + secondarySize 88 + chance 0.25 +} + +flickerlight IMPBALL_X2 +{ + color 0.4 0.4 0.1 + size 96 + secondarySize 104 + chance 0.25 +} + +flickerlight IMPBALL_X3 +{ + color 0.2 0.2 0.0 + size 112 + secondarySize 120 + chance 0.25 +} + +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 48 + offset 0 24 0 + subtractive 1 +} + +/* +object Spectre +{ + frame SARG { light SPECTRE } +} +*/ + +// Cacodemon fireball +flickerlight CACOBALL +{ + color 1.0 0.5 0.8 + size 56 + secondarySize 64 + chance 0.5 +} + +flickerlight CACOBALL_X1 +{ + color 0.7 0.4 0.9 + size 72 + secondarySize 80 + chance 0.25 +} + +flickerlight CACOBALL_X2 +{ + color 0.5 0.3 0.6 + size 88 + secondarySize 96 + chance 0.25 +} + +flickerlight CACOBALL_X3 +{ + color 0.1 0.1 0.3 + size 104 + secondarySize 112 + chance 0.25 +} + +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 64 +} + +flickerlight BARONBALL_X1 +{ + color 0.6 0.9 0.6 + size 80 + secondarySize 88 + chance 0.25 +} + +flickerlight BARONBALL_X2 +{ + color 0.45 0.6 0.45 + size 96 + secondarySize 104 + chance 0.25 +} + +flickerlight BARONBALL_X3 +{ + color 0.2 0.3 0.2 + size 112 + secondarySize 120 + chance 0.25 +} + +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 56 + secondarysize 64 + chance 0.1 +} + +flickerlight LOSTSOUL_X1 +{ + color 0.8 0.5 0.3 + size 72 + secondarySize 80 + chance 0.25 +} + +flickerlight LOSTSOUL_X2 +{ + color 0.6 0.3 0.2 + size 88 + secondarySize 96 + chance 0.25 +} + +flickerlight LOSTSOUL_X3 +{ + color 0.4 0.1 0.0 + size 104 + secondarySize 112 + chance 0.25 +} + +flickerlight LOSTSOUL_X4 +{ + color 0.2 0.0 0.0 + size 112 + secondarySize 120 + chance 0.25 +} + +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 +pointlight MANCBALL +{ + color 0.8 0.4 0.4 + size 64 +} + + +object FatShot +{ + frame MANFA { light MANCBALL } + frame MANFB { light MANCBALL } + + frame MISLB { light ROCKET_X1 } + frame MISLC { light ROCKET_X2 } + frame MISLD { light ROCKET_X3 } +} + +// Arachnotron Fireball +pointlight ARACHPLAS +{ + color 0.4 1.0 0.4 + size 56 +} + +flickerlight ARACHPLAS_X1 +{ + color 0.3 0.8 0.3 + size 72 + secondarySize 80 + chance 0.3 +} + +flickerlight ARACHPLAS_X2 +{ + color 0.3 0.6 0.3 + size 88 + secondarySize 96 + chance 0.3 +} + +flickerlight ARACHPLAS_X3 +{ + color 0.2 0.4 0.2 + size 48 + secondarySize 32 + chance 0.3 +} + +flickerlight ARACHPLAS_X4 +{ + color 0.1 0.2 0.1 + size 24 + secondarySize 16 + chance 0.3 +} + +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 48 +} + +flickerlight TRACER_X1 +{ + color 1.0 0.7 0.2 + size 64 + secondarySize 72 + chance 0.25 +} + +flickerlight TRACER_X2 +{ + color 0.6 0.4 0.1 + size 80 + secondarySize 88 + chance 0.25 +} + +flickerlight TRACER_X3 +{ + color 0.3 0.2 0.0 + size 96 + secondarySize 104 + chance 0.25 +} + +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 24 + secondarySize 32 + chance 0.3 + offset 0 8 0 +} + +flickerlight ARCHFIRE2 +{ + color 1.0 1.0 0.5 + size 40 + secondarySize 48 + chance 0.3 + offset 0 24 0 +} + +flickerlight ARCHFIRE3 +{ + color 1.0 1.0 0.5 + size 64 + secondarySize 72 + chance 0.3 + offset 0 32 0 +} + +flickerlight ARCHFIRE4 +{ + color 0.8 0.8 0.4 + size 64 + secondarySize 72 + chance 0.3 + offset 0 40 0 +} + +flickerlight ARCHFIRE5 +{ + color 0.8 0.8 0.4 + size 64 + secondarySize 72 + chance 0.3 + offset 0 48 0 +} + +flickerlight ARCHFIRE6 +{ + color 0.6 0.6 0.3 + size 48 + secondarySize 56 + chance 0.3 + offset 0 64 0 +} + +flickerlight ARCHFIRE7 +{ + color 0.4 0.4 0.2 + size 32 + secondarySize 40 + chance 0.3 + offset 0 72 0 +} + +flickerlight ARCHFIRE8 +{ + color 0.2 0.2 0.1 + size 16 + secondarySize 24 + chance 0.3 + offset 0 80 0 +} + +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 } +} + +// ------------------ +// -- Doom Effects -- +// ------------------ + +// Doom Teleport fog +flickerlight DTFOG1 +{ + color 0.4 1.0 0.4 + size 56 + secondarySize 64 + chance 0.4 +} + +flickerlight DTFOG2 +{ + color 0.4 1.0 0.4 + size 40 + secondarySize 48 + chance 0.4 +} + +flickerlight DTFOG3 +{ + color 0.4 1.0 0.4 + size 24 + secondarySize 32 + chance 0.4 +} + +flickerlight DTFOG4 +{ + color 0.4 1.0 0.4 + size 10 + secondarySize 16 + chance 0.4 +} + +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/hticdefs.txt b/wadsrc_lights/static/heretic/gldefs.txt similarity index 100% rename from wadsrc_lights/static/hticdefs.txt rename to wadsrc_lights/static/heretic/gldefs.txt diff --git a/wadsrc_lights/static/hexndefs.txt b/wadsrc_lights/static/hexen/gldefs.txt similarity index 100% rename from wadsrc_lights/static/hexndefs.txt rename to wadsrc_lights/static/hexen/gldefs.txt diff --git a/wadsrc_lights/static/strfdefs.txt b/wadsrc_lights/static/strife/gldefs.txt similarity index 100% rename from wadsrc_lights/static/strfdefs.txt rename to wadsrc_lights/static/strife/gldefs.txt From 61a9a308e2e4724ea219fe43913758ceab511f6b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 11:58:40 +0100 Subject: [PATCH 5/9] - forgot the filter directory. --- wadsrc_lights/static/{ => filter}/doom.doom1/gldefs.txt | 0 wadsrc_lights/static/{ => filter}/doom.doom2/gldefs.txt | 0 wadsrc_lights/static/{ => filter}/doom.freedoom/gldefs.txt | 0 wadsrc_lights/static/{ => filter}/heretic/gldefs.txt | 0 wadsrc_lights/static/{ => filter}/hexen/gldefs.txt | 0 wadsrc_lights/static/{ => filter}/strife/gldefs.txt | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename wadsrc_lights/static/{ => filter}/doom.doom1/gldefs.txt (100%) rename wadsrc_lights/static/{ => filter}/doom.doom2/gldefs.txt (100%) rename wadsrc_lights/static/{ => filter}/doom.freedoom/gldefs.txt (100%) rename wadsrc_lights/static/{ => filter}/heretic/gldefs.txt (100%) rename wadsrc_lights/static/{ => filter}/hexen/gldefs.txt (100%) rename wadsrc_lights/static/{ => filter}/strife/gldefs.txt (100%) diff --git a/wadsrc_lights/static/doom.doom1/gldefs.txt b/wadsrc_lights/static/filter/doom.doom1/gldefs.txt similarity index 100% rename from wadsrc_lights/static/doom.doom1/gldefs.txt rename to wadsrc_lights/static/filter/doom.doom1/gldefs.txt diff --git a/wadsrc_lights/static/doom.doom2/gldefs.txt b/wadsrc_lights/static/filter/doom.doom2/gldefs.txt similarity index 100% rename from wadsrc_lights/static/doom.doom2/gldefs.txt rename to wadsrc_lights/static/filter/doom.doom2/gldefs.txt diff --git a/wadsrc_lights/static/doom.freedoom/gldefs.txt b/wadsrc_lights/static/filter/doom.freedoom/gldefs.txt similarity index 100% rename from wadsrc_lights/static/doom.freedoom/gldefs.txt rename to wadsrc_lights/static/filter/doom.freedoom/gldefs.txt diff --git a/wadsrc_lights/static/heretic/gldefs.txt b/wadsrc_lights/static/filter/heretic/gldefs.txt similarity index 100% rename from wadsrc_lights/static/heretic/gldefs.txt rename to wadsrc_lights/static/filter/heretic/gldefs.txt diff --git a/wadsrc_lights/static/hexen/gldefs.txt b/wadsrc_lights/static/filter/hexen/gldefs.txt similarity index 100% rename from wadsrc_lights/static/hexen/gldefs.txt rename to wadsrc_lights/static/filter/hexen/gldefs.txt diff --git a/wadsrc_lights/static/strife/gldefs.txt b/wadsrc_lights/static/filter/strife/gldefs.txt similarity index 100% rename from wadsrc_lights/static/strife/gldefs.txt rename to wadsrc_lights/static/filter/strife/gldefs.txt From d5233c2bd296fd1671db91541dea2d42e8732482 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 12:19:15 +0100 Subject: [PATCH 6/9] - do the same for brightmaps, Doom's original ones also don't really match with Freedoom. --- .../doom.doom1/gldefs.bm} | 0 wadsrc_bm/static/filter/doom.doom2/gldefs.bm | 2181 +++++++++++++++++ .../{hticdefs.bm => filter/heretic/gldefs.bm} | 0 .../{hexndefs.bm => filter/hexen/gldefs.bm} | 0 .../{strfdefs.bm => filter/strife/gldefs.bm} | 0 5 files changed, 2181 insertions(+) rename wadsrc_bm/static/{doomdefs.bm => filter/doom.doom1/gldefs.bm} (100%) create mode 100644 wadsrc_bm/static/filter/doom.doom2/gldefs.bm rename wadsrc_bm/static/{hticdefs.bm => filter/heretic/gldefs.bm} (100%) rename wadsrc_bm/static/{hexndefs.bm => filter/hexen/gldefs.bm} (100%) rename wadsrc_bm/static/{strfdefs.bm => filter/strife/gldefs.bm} (100%) diff --git a/wadsrc_bm/static/doomdefs.bm b/wadsrc_bm/static/filter/doom.doom1/gldefs.bm similarity index 100% rename from wadsrc_bm/static/doomdefs.bm rename to wadsrc_bm/static/filter/doom.doom1/gldefs.bm diff --git a/wadsrc_bm/static/filter/doom.doom2/gldefs.bm b/wadsrc_bm/static/filter/doom.doom2/gldefs.bm new file mode 100644 index 000000000..78159bddd --- /dev/null +++ b/wadsrc_bm/static/filter/doom.doom2/gldefs.bm @@ -0,0 +1,2181 @@ +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/hticdefs.bm b/wadsrc_bm/static/filter/heretic/gldefs.bm similarity index 100% rename from wadsrc_bm/static/hticdefs.bm rename to wadsrc_bm/static/filter/heretic/gldefs.bm diff --git a/wadsrc_bm/static/hexndefs.bm b/wadsrc_bm/static/filter/hexen/gldefs.bm similarity index 100% rename from wadsrc_bm/static/hexndefs.bm rename to wadsrc_bm/static/filter/hexen/gldefs.bm diff --git a/wadsrc_bm/static/strfdefs.bm b/wadsrc_bm/static/filter/strife/gldefs.bm similarity index 100% rename from wadsrc_bm/static/strfdefs.bm rename to wadsrc_bm/static/filter/strife/gldefs.bm From 356c5f2e08088e5851e33dfe880e7352e3dfdcd6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 12:29:03 +0100 Subject: [PATCH 7/9] - removed the ZScript warning. --- src/scripting/zscript/zcc_parser.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/scripting/zscript/zcc_parser.cpp b/src/scripting/zscript/zcc_parser.cpp index b26ef3f39..07cc695d8 100644 --- a/src/scripting/zscript/zcc_parser.cpp +++ b/src/scripting/zscript/zcc_parser.cpp @@ -414,15 +414,7 @@ void ParseScripts() while ((lump = Wads.FindLump("ZSCRIPT", &lastlump)) != -1) { DoParse(lump); - if (!Args->CheckParm("-zscript")) - { - return; - } } - Printf(TEXTCOLOR_PURPLE "WARNING!!!\n"); - Printf(TEXTCOLOR_PURPLE "As of this version, Zscript is still considered a feature in development which can change " TEXTCOLOR_RED "WITHOUT WARNING!!!\n"); - Printf(TEXTCOLOR_PURPLE "Use at your own risk!\n"); - } /* From 5d9cea9e0e377cf828a35733c34c71347cc5bf50 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 14:38:46 +0100 Subject: [PATCH 8/9] - fixed: FString::StripRight's space checking counter was broken and would cause deletion of the last valid character in the string. --- src/zstring.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zstring.cpp b/src/zstring.cpp index aed599cd6..cef956c90 100644 --- a/src/zstring.cpp +++ b/src/zstring.cpp @@ -696,7 +696,7 @@ void FString::StripRight () { size_t max = Len(), i; if (max == 0) return; - for (i = --max; i-- > 0; ) + for (i = --max; i > 0; i--) { if (!isspace((unsigned char)Chars[i])) break; @@ -728,12 +728,12 @@ void FString::StripRight (const char *charset) { size_t max = Len(), i; if (max == 0) return; - for (i = --max; i-- > 0; ) + for (i = --max; i > 0; i--) { if (!strchr (charset, Chars[i])) break; } - if (i == max) + if (i == max-1) { // Nothing to strip. return; } From 80effbb5477cdcc8f9e94221df07e4697107ad42 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Jan 2017 15:41:40 +0100 Subject: [PATCH 9/9] - fixed: A_M_Refire's 'ignoremissile' parameter lost its default value. --- wadsrc/static/zscript/doom/scriptedmarine.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/doom/scriptedmarine.txt b/wadsrc/static/zscript/doom/scriptedmarine.txt index 7428b7be3..51277ebd4 100644 --- a/wadsrc/static/zscript/doom/scriptedmarine.txt +++ b/wadsrc/static/zscript/doom/scriptedmarine.txt @@ -282,7 +282,7 @@ class ScriptedMarine : Actor // //============================================================================ - void A_M_Refire (bool ignoremissile, statelabel jumpto = null) + void A_M_Refire (bool ignoremissile = false, statelabel jumpto = null) { if (target == null || target.health <= 0) {