diff --git a/CREDITS b/CREDITS index c6a4f990..27f102af 100644 --- a/CREDITS +++ b/CREDITS @@ -229,7 +229,8 @@ E: trwhite@fgbc.org D: sounds, musics, sprites, levels S: Nrkn -E: nrkn@ihug.co.nz +E: nrkn.com@gmail.com +W: https://nrkn.com/ D: textures N: Tyler P. diff --git a/buildcfg.txt b/buildcfg.txt index 3dbfd697..bac38a16 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -220,6 +220,9 @@ PNAMES = fd2pname #endif +; light definitions for ports that use them +GLDEFS + ; List of Sounds [sounds] DSPISTOL @@ -2459,9 +2462,9 @@ COL1A0 18 53 COL2A0 18 40 COL3A0 18 53 COL4A0 18 40 -COL5A0 18 48 -COL5B0 18 48 -COL6A0 18 52 +COL5A0 18 53 +COL5B0 18 53 +COL6A0 18 49 FCANA0 12 62 FCANB0 12 62 FCANC0 12 62 diff --git a/levels/dm25.wad b/levels/dm25.wad index 57527c22..02215532 100644 Binary files a/levels/dm25.wad and b/levels/dm25.wad differ diff --git a/lumps/dehacked/dehacked.txt b/lumps/dehacked/dehacked.txt index 2a908b7c..c73b6c88 100644 --- a/lumps/dehacked/dehacked.txt +++ b/lumps/dehacked/dehacked.txt @@ -316,7 +316,7 @@ HUSTR_21 = DM21: Refinery HUSTR_22 = DM22: Military Depot HUSTR_23 = DM23: Testing Grounds HUSTR_24 = DM24: Flooded Base -HUSTR_25 = DM25: Mansion Yard +HUSTR_25 = DM25: Tripod keep HUSTR_26 = DM26: Crater Excavation HUSTR_27 = DM27: The Exile HUSTR_28 = DM28: Weapons Factory diff --git a/lumps/fdmuminf.lmp b/lumps/fdmuminf.lmp index c70de119..a6c4106b 100644 --- a/lumps/fdmuminf.lmp +++ b/lumps/fdmuminf.lmp @@ -13,6 +13,7 @@ map MAP01 ParTime = 0 Episode = clear Episode = "M_EPI1", "FreeDM", "1" + Author = "Xindage" } map MAP02 @@ -24,6 +25,7 @@ map MAP02 Music = "D_STALKS" SkyTexture = "SKY1" ParTime = 0 + Author = "Hellbent" } map MAP03 @@ -35,6 +37,7 @@ map MAP03 Music = "D_COUNTD" SkyTexture = "SKY1" ParTime = 0 + Author = "Xindage" } map MAP04 @@ -46,6 +49,7 @@ map MAP04 Music = "D_BETWEE" SkyTexture = "SKY1" ParTime = 0 + Author = "deathz0r" } map MAP05 @@ -57,6 +61,7 @@ map MAP05 Music = "D_DOOM" SkyTexture = "SKY1" ParTime = 0 + Author = "Xindage" } map MAP06 @@ -69,6 +74,7 @@ map MAP06 SkyTexture = "SKY1" InterText = clear ParTime = 0 + Author = "Catoptromancy& Xindage" } map MAP07 @@ -80,6 +86,7 @@ map MAP07 Music = "D_SHAWN" SkyTexture = "SKY1" ParTime = 0 + Author = "Rellik" } map MAP08 @@ -91,6 +98,7 @@ map MAP08 Music = "D_DDTBLU" SkyTexture = "SKY1" ParTime = 0 + Author = "AXDOOMER" } map MAP09 @@ -102,6 +110,7 @@ map MAP09 Music = "D_IN_CIT" SkyTexture = "SKY1" ParTime = 0 + Author = "Xindage" } map MAP10 @@ -113,6 +122,7 @@ map MAP10 Music = "D_DEAD" SkyTexture = "SKY1" ParTime = 0 + Author = "Xindage" } map MAP11 @@ -124,6 +134,7 @@ map MAP11 Music = "D_STLKS2" SkyTexture = "SKY1" InterText = clear + Author = "Xindage" } map MAP12 @@ -135,6 +146,7 @@ map MAP12 Music = "D_THEDA2" SkyTexture = "SKY2" ParTime = 0 + Author = "Catoptromancy" } map MAP13 @@ -146,6 +158,7 @@ map MAP13 Music = "D_DOOM2" SkyTexture = "SKY2" ParTime = 0 + Author = "Catoptromancy & Xindage" } map MAP14 @@ -157,6 +170,7 @@ map MAP14 Music = "D_DDTBL2" SkyTexture = "SKY2" ParTime = 0 + Author = "Xindage" } map MAP15 @@ -169,6 +183,7 @@ map MAP15 Music = "D_RUNNI2" SkyTexture = "SKY2" InterTextSecret = clear + Author = "Xindage" } map MAP16 @@ -180,6 +195,7 @@ map MAP16 Music = "D_DEAD2" SkyTexture = "SKY2" ParTime = 0 + Author = "Xindage" } map MAP17 @@ -191,6 +207,7 @@ map MAP17 Music = "D_STLKS3" SkyTexture = "SKY2" ParTime = 0 + Author = "Xindage" } map MAP18 @@ -202,6 +219,7 @@ map MAP18 Music = "D_ROMERO" SkyTexture = "SKY2" ParTime = 0 + Author = "Xindage" } map MAP19 @@ -213,6 +231,7 @@ map MAP19 Music = "D_SHAWN2" SkyTexture = "SKY2" ParTime = 0 + Author = "Xindage" } map MAP20 @@ -224,6 +243,7 @@ map MAP20 Music = "D_MESSAG" SkyTexture = "SKY2" InterText = clear + Author = "Xindage" } map MAP21 @@ -235,6 +255,7 @@ map MAP21 Music = "D_COUNT2" SkyTexture = "SKY3" ParTime = 0 + Author = "Rellik" } map MAP22 @@ -246,6 +267,7 @@ map MAP22 Music = "D_DDTBL3" SkyTexture = "SKY3" ParTime = 0 + Author = "AXDOOMER" } map MAP23 @@ -257,6 +279,7 @@ map MAP23 Music = "D_AMPIE" SkyTexture = "SKY3" ParTime = 0 + Author = "Xindage" } map MAP24 @@ -268,17 +291,19 @@ map MAP24 Music = "D_THEDA3" SkyTexture = "SKY3" ParTime = 0 + Author = "Mechadon" } map MAP25 { - LevelName = "Mansion Yard" + LevelName = "Tripod keep" Label = "DM25" LevelPic = "CWILV24" Next = "MAP26" Music = "D_ADRIAN" SkyTexture = "SKY3" ParTime = 0 + Author = "Catoptromancy" } map MAP26 @@ -290,6 +315,7 @@ map MAP26 Music = "D_MESSG2" SkyTexture = "SKY3" ParTime = 0 + Author = "Xindage" } map MAP27 @@ -301,6 +327,7 @@ map MAP27 Music = "D_ROMER2" SkyTexture = "SKY3" ParTime = 0 + Author = "Rellik" } map MAP28 @@ -312,6 +339,7 @@ map MAP28 Music = "D_TENSE" SkyTexture = "SKY3" ParTime = 0 + Author = "Rellik" } map MAP29 @@ -323,6 +351,7 @@ map MAP29 Music = "D_SHAWN3" SkyTexture = "SKY3" ParTime = 0 + Author = "Xindage" } map MAP30 @@ -334,6 +363,7 @@ map MAP30 Music = "D_OPENIN" SkyTexture = "SKY3" InterText = clear + Author = "deathz0r" } map MAP31 @@ -347,6 +377,7 @@ map MAP31 SkyTexture = "SKY3" ParTime = 0 InterTextSecret = clear + Author = "Xindage" } map MAP32 @@ -358,4 +389,5 @@ map MAP32 Music = "D_ULTIMA" SkyTexture = "SKY3" ParTime = 0 + Author = "Mechadon" } diff --git a/lumps/gldefs.lmp b/lumps/gldefs.lmp new file mode 100644 index 00000000..9cf9bc45 --- /dev/null +++ b/lumps/gldefs.lmp @@ -0,0 +1,1265 @@ +// ------------------------------------------------------ +// ------------------ 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 1.0 0.0 + size 56 + attenuate 1 +} + +flickerlight ROCKET_X1 +{ + color 1.0 1.0 0.5 + size 96 + secondarySize 108 + chance 0.3 + attenuate 1 +} + +flickerlight ROCKET_X2 +{ + color 0.5 0.5 0.2 + size 120 + secondarySize 132 + chance 0.3 + attenuate 1 +} + +flickerlight ROCKET_X3 +{ + color 0.3 0.3 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 0.5 1.0 + size 120 + attenuate 1 +} + +flickerlight BFGBALL_X1 +{ + color 0.5 0.5 1.0 + size 120 + secondarySize 132 + chance 0.3 + attenuate 1 +} + +flickerlight BFGBALL_X2 +{ + color 0.6 0.6 1.0 + size 156 + secondarySize 168 + chance 0.3 + attenuate 1 +} + +flickerlight BFGBALL_X3 +{ + color 0.7 0.7 1.0 + size 180 + secondarySize 192 + chance 0.3 + attenuate 1 +} + +flickerlight BFGBALL_X4 +{ + color 0.4 0.4 0.7 + size 84 + secondarySize 96 + chance 0.3 + attenuate 1 +} + +flickerlight BFGBALL_X5 +{ + color 0.1 0.1 0.3 + 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.6 + size 84 + offset 0 44 0 + attenuate 1 +} + +object Column +{ + frame COLU { light LAMP } +} + +// Short tech lamp +pulselight SMALLLAMP +{ + color 1.0 1.0 0.7 + size 84 + secondarySize 87 + interval 0.4 + offset 0 44 0 + attenuate 1 +} + +object TechLamp2 +{ + frame TLP2 { light SMALLLAMP } +} + +// Tall tech lamp +pointlight BIGLAMP1 +{ + color 1.0 0.9 0.4 + size 100 + offset 0 72 0 + attenuate 1 +} + +pointlight BIGLAMP2 +{ + color 0.97 0.87 0.37 + size 99 + offset 0 72 0 + attenuate 1 +} + +pointlight BIGLAMP3 +{ + color 0.94 0.84 0.34 + size 98 + offset 0 72 0 + attenuate 1 +} + +object TechLamp +{ + frame TLMPA { light BIGLAMP1 } + frame TLMPB { light BIGLAMP2 } + frame TLMPC { light BIGLAMP3 } + frame TLMPD { light BIGLAMP2 } +} + +// Tall red torch +flickerlight2 BIGREDTORCH +{ + color 1.0 0.9 0.2 + 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.3 1.0 0.3 + 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.3 0.3 1.0 + size 90 + secondarySize 99 + interval 0.1 + offset 0 50 0 + attenuate 1 +} + +object BlueTorch +{ + frame TBLU { light BIGBLUETORCH } +} + +// Small red torch +flickerlight2 SMALLREDTORCH +{ + color 1.0 0.5 0.2 + 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.3 1.0 0.3 + 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.3 0.3 1.0 + 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 } +} + +// Floating Skull Rock +pulselight SKULLROCK +{ + color 0.5 0.4 0.1 + offset 0 5 0 + size 60 + secondarysize 40 + interval 0.6 + attenuate 1 +} +object FloatingSkull +{ + frame FSKU { light SKULLROCK } +} + +// ---------------- +// -- Doom Items -- +// ---------------- + +// Soul Sphere +pulselight SOULSPHERE +{ + color 1.0 1.0 0.3 + size 60 + secondarySize 63 + interval 2.0 + offset 0 16 0 + attenuate 1 +} + +object SoulSphere +{ + frame SOUL { light SOULSPHERE } +} + +// Soul Sphere +pulselight MEGASPHERE +{ + color 1.0 0.8 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.6 1.0 0.6 + size 60 + secondarySize 63 + interval 2.0 + offset 0 16 0 + attenuate 1 +} + +object InvulnerabilitySphere +{ + frame PINV { light INVULN } +} + +// Blur Sphere +pulselight BLURSPHERE1 +{ + color 0.6 0.6 0.6 + size 40 + secondarysize 35 + offset 0 16 0 + subtractive 1 + attenuate 1 + interval 0.3 +} + +object BlurSphere +{ + frame PINS { light BLURSPHERE1 } +} + +// Armour Shield +pulselight ARMORBONUS +{ + color 0.3 0.1 0.1 + size 16 + secondarySize 20 + interval 1.0 + attenuate 1 + offset 0 10 0 +} + +object ArmorBonus +{ + frame BON2 { light ARMORBONUS } +} + +// Blue Keys +pulselight BLUEKEY +{ + color 0.2 0.2 0.8 + size 15 + secondarySize 27 + interval 2.0 + attenuate 1 + offset 0 10 0 +} +object BlueCard +{ + frame BKEY { light BLUEKEY } +} + +object BlueSkull +{ + frame BSKU { light BLUEKEY } +} + +// Yellow Keys +pulselight YELLOWKEY +{ + color 0.6 0.6 0.0 + size 15 + 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 } +} + + +// Both armor pickups have a big red blinking light in the middle +pointlight GREENARMOR2 +{ + color 0.1 0.2 0.0 + size 40 + attenuate 1 + offset 0 10 0 +} +pointlight REDARMOR +{ + color 0.2 0.0 0.0 + size 40 + attenuate 1 + offset 0 10 0 +} +pointlight ARMORLITE +{ + color 0.4 0.0 0.0 + size 10 + attenuate 1 + offset 0 20 0 +} + +object GreenArmor +{ + frame ARM1 { light GREENARMOR2 } + frame ARM1B { light ARMORLITE } +} + +object BlueArmor +{ + frame ARM2 { light REDARMOR } + frame ARM2B { light ARMORLITE } +} + + +// ------------------ +// -- 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 0.8 0.7 0.4 + size 96 + attenuate 1 +} + +// Doom imp fireball explosion +flickerlight IMPBALL_X1 +{ + color 0.9 0.7 0.25 + size 120 + secondarySize 132 + chance 0.25 + attenuate 1 +} + +flickerlight IMPBALL_X2 +{ + color 0.5 0.4 0.1 + size 144 + secondarySize 156 + chance 0.25 + attenuate 1 +} + +flickerlight IMPBALL_X3 +{ + color 0.3 0.2 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.7 0.4 0.9 + size 108 + secondarySize 120 + chance 0.25 + attenuate 1 +} + +flickerlight CACOBALL_X2 +{ + color 0.5 0.3 0.6 + size 132 + secondarySize 144 + chance 0.25 + attenuate 1 +} + +flickerlight CACOBALL_X3 +{ + color 0.1 0.1 0.3 + 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 +pulselight LOSTSOUL +{ + color 0.4 0.4 0.2 + size 64 + secondarysize 44 + interval 0.9 + attenuate 1 +} +flickerlight HATCHLING_ATK +{ + color 0.8 0.8 0.5 + size 84 + secondarysize 64 + chance 0.3 + 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 HATCHLING_ATK } + frame SKULD { light HATCHLING_ATK } + 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 84 + attenuate 1 +} + +flickerlight ARACHPLAS_X1 +{ + color 0.3 0.8 0.3 + size 108 + secondarySize 120 + chance 0.3 + attenuate 1 +} + +flickerlight ARACHPLAS_X2 +{ + color 0.3 0.6 0.3 + size 132 + secondarySize 144 + chance 0.3 + attenuate 1 +} + +flickerlight ARACHPLAS_X3 +{ + color 0.2 0.4 0.2 + size 72 + secondarySize 48 + chance 0.3 + attenuate 1 +} + +flickerlight ARACHPLAS_X4 +{ + color 0.1 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.7 0.2 + size 96 + secondarySize 108 + chance 0.25 + attenuate 1 +} + +flickerlight TRACER_X2 +{ + color 0.6 0.4 0.1 + size 120 + secondarySize 132 + chance 0.25 + attenuate 1 +} + +flickerlight TRACER_X3 +{ + color 0.3 0.2 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 } +} + +// ------------------ +// -- 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/lumps/p1_uminf.lmp b/lumps/p1_uminf.lmp index 4baed95f..8c07e2b6 100644 --- a/lumps/p1_uminf.lmp +++ b/lumps/p1_uminf.lmp @@ -13,6 +13,7 @@ map E1M1 ParTime = 30 Episode = clear Episode = "M_EPI1", "Outpost Outbreak", "1" + Author = "YukiHerz" } map E1M2 @@ -24,6 +25,7 @@ map E1M2 Music = "D_E1M2" SkyTexture = "SKY1" ParTime = 120 + Author = "acc" } map E1M3 @@ -36,6 +38,7 @@ map E1M3 Music = "D_E1M3" SkyTexture = "SKY1" ParTime = 150 + Author = "Paar" } map E1M4 @@ -47,6 +50,7 @@ map E1M4 Music = "D_E1M4" SkyTexture = "SKY1" ParTime = 180 + Author = "GeekMarine" } map E1M5 @@ -58,6 +62,7 @@ map E1M5 Music = "D_E1M5" SkyTexture = "SKY1" ParTime = 90 + Author = "Wereknight" } map E1M6 @@ -69,6 +74,7 @@ map E1M6 Music = "D_E1M6" SkyTexture = "SKY1" ParTime = 390 + Author = "GeekMarine" } map E1M7 @@ -80,6 +86,7 @@ map E1M7 Music = "D_E1M7" SkyTexture = "SKY1" ParTime = 690 + Author = "Kid Airbag" } map E1M8 @@ -110,6 +117,7 @@ map E1M8 " ", "Just gotta hope that ship will launch", "from these routed\, infested ruins..." + Author = "Xindage" } map E1M9 @@ -121,6 +129,7 @@ map E1M9 Music = "D_E1M9" SkyTexture = "SKY1" ParTime = 240 + Author = "Mortrixs19" } map E2M1 @@ -133,6 +142,7 @@ map E2M1 SkyTexture = "SKY2" ParTime = 120 Episode = "M_EPI2", "Ruin Upon Ruin", "2" + Author = "Xindage" } map E2M2 @@ -144,6 +154,7 @@ map E2M2 Music = "D_E2M2" SkyTexture = "SKY2" ParTime = 150 + Author = "Hayden49" } map E2M3 @@ -155,6 +166,7 @@ map E2M3 Music = "D_E2M3" SkyTexture = "SKY2" ParTime = 180 + Author = "SUNPYG Senpai" } map E2M4 @@ -166,6 +178,7 @@ map E2M4 Music = "D_E2M4" SkyTexture = "SKY2" ParTime = 270 + Author = "Xindage" } map E2M5 @@ -178,6 +191,7 @@ map E2M5 Music = "D_E2M5" SkyTexture = "SKY2" ParTime = 300 + Author = "Xindage" } map E2M6 @@ -189,6 +203,7 @@ map E2M6 Music = "D_E2M6" SkyTexture = "SKY2" ParTime = 150 + Author = "Catoptromancy" } map E2M7 @@ -200,6 +215,7 @@ map E2M7 Music = "D_E2M7" SkyTexture = "SKY2" ParTime = 120 + Author = "Xindage" } map E2M8 @@ -229,6 +245,7 @@ map E2M8 " ", "You board the platform and fade away.", "Next stop: Horizon." + Author = "Xindage" } map E2M9 @@ -240,6 +257,7 @@ map E2M9 Music = "D_E2M9" SkyTexture = "SKY2" ParTime = 360 + Author = "Z0k" } map E3M1 @@ -252,6 +270,7 @@ map E3M1 SkyTexture = "SKY3" ParTime = 30 Episode = "M_EPI3", "Event Horizon", "3" + Author = "Jayextee" } map E3M2 @@ -263,6 +282,7 @@ map E3M2 Music = "D_E3M2" SkyTexture = "SKY3" ParTime = 120 + Author = "pan-te" } map E3M3 @@ -274,6 +294,7 @@ map E3M3 Music = "D_E3M3" SkyTexture = "SKY3" ParTime = 240 + Author = "SgtCrispy" } map E3M4 @@ -285,6 +306,7 @@ map E3M4 Music = "D_E3M4" SkyTexture = "SKY3" ParTime = 270 + Author = "GuyNamedErick" } map E3M5 @@ -296,6 +318,7 @@ map E3M5 Music = "D_E3M5" SkyTexture = "SKY3" ParTime = 0 + Author = "SUNPYG Senpai" } map E3M6 @@ -308,6 +331,7 @@ map E3M6 Music = "D_E3M6" SkyTexture = "SKY3" ParTime = 180 + Author = "Archfile" } map E3M7 @@ -319,6 +343,7 @@ map E3M7 Music = "D_E3M7" SkyTexture = "SKY3" ParTime = 300 + Author = "Cacodemon Leader" } map E3M8 @@ -349,6 +374,7 @@ map E3M8 "Wherever or whatever that is, you pray", "to any listening deity that there's", "a working ship on the other side." + Author = "Torn" } map E3M9 @@ -360,6 +386,7 @@ map E3M9 Music = "D_E3M9" SkyTexture = "SKY3" ParTime = 570 + Author = "Angry Saint" } map E4M1 diff --git a/lumps/p2_uminf.lmp b/lumps/p2_uminf.lmp index 246b4070..a48f662a 100644 --- a/lumps/p2_uminf.lmp +++ b/lumps/p2_uminf.lmp @@ -13,6 +13,7 @@ map MAP01 ParTime = 30 Episode = clear Episode = "M_EPI1", "Phase 2", "1" + Author = "Blastfrog, Xindage & Jon Dowland" } map MAP02 @@ -24,6 +25,7 @@ map MAP02 Music = "D_STALKS" SkyTexture = "SKY1" ParTime = 90 + Author = "Siggi" } map MAP03 @@ -35,6 +37,7 @@ map MAP03 Music = "D_COUNTD" SkyTexture = "SKY1" ParTime = 120 + Author = "SgtCrispy" } map MAP04 @@ -46,6 +49,7 @@ map MAP04 Music = "D_BETWEE" SkyTexture = "SKY1" ParTime = 120 + Author = "Macro11_1" } map MAP05 @@ -57,6 +61,7 @@ map MAP05 Music = "D_DOOM" SkyTexture = "SKY1" ParTime = 150 + Author = "Amarande" } map MAP06 @@ -87,6 +92,7 @@ map MAP06 "Planted your feet.", "Checked your weapons.", "Time to punch through." + Author = "Jayextee" } map MAP07 @@ -98,6 +104,7 @@ map MAP07 Music = "D_SHAWN" SkyTexture = "SKY1" ParTime = 150 + Author = "Mortrixs19" } map MAP08 @@ -109,6 +116,7 @@ map MAP08 Music = "D_DDTBLU" SkyTexture = "SKY1" ParTime = 330 + Author = "Boris Iwanski" } map MAP09 @@ -120,6 +128,7 @@ map MAP09 Music = "D_IN_CIT" SkyTexture = "SKY1" ParTime = 150 + Author = "sajbear" } map MAP10 @@ -131,6 +140,7 @@ map MAP10 Music = "D_DEAD" SkyTexture = "SKY1" ParTime = 120 + Author = "Xerent" } map MAP11 @@ -160,6 +170,7 @@ map MAP11 "Cities mean people.", " ", "Right?" + Author = "Kaiser" } map MAP12 @@ -171,6 +182,7 @@ map MAP12 Music = "D_THEDA2" SkyTexture = "SKY2" ParTime = 630 + Author = "Z0k" } map MAP13 @@ -182,6 +194,7 @@ map MAP13 Music = "D_DOOM2" SkyTexture = "SKY2" ParTime = 180 + Author = "Jayextee" } map MAP14 @@ -193,6 +206,7 @@ map MAP14 Music = "D_DDTBL2" SkyTexture = "SKY2" ParTime = 150 + Author = "Jayextee" } map MAP15 @@ -224,6 +238,7 @@ map MAP15 "entire time\, locked inside of your brain?", " ", "You\'d rather not find out." + Author = "Z0k" } map MAP16 @@ -235,6 +250,7 @@ map MAP16 Music = "D_DEAD2" SkyTexture = "SKY2" ParTime = 120 + Author = "Hyena" } map MAP17 @@ -246,6 +262,7 @@ map MAP17 Music = "D_STLKS3" SkyTexture = "SKY2" ParTime = 120 + Author = "Jayextee" } map MAP18 @@ -257,6 +274,7 @@ map MAP18 Music = "D_ROMERO" SkyTexture = "SKY2" ParTime = 180 + Author = "Jimmy" } map MAP19 @@ -268,6 +286,7 @@ map MAP19 Music = "D_SHAWN2" SkyTexture = "SKY2" ParTime = 210 + Author = "Jayextee" } map MAP20 @@ -298,6 +317,7 @@ map MAP20 " ", "This could be the beginning", "of your freedom - or your doom." + Author = "Lazer" } map MAP21 @@ -309,6 +329,7 @@ map MAP21 Music = "D_COUNT2" SkyTexture = "SKY3" ParTime = 330 + Author = "Mortrixs19" } map MAP22 @@ -320,6 +341,7 @@ map MAP22 Music = "D_DDTBL3" SkyTexture = "SKY3" ParTime = 420 + Author = "Boris Iwanski" } map MAP23 @@ -331,6 +353,7 @@ map MAP23 Music = "D_AMPIE" SkyTexture = "SKY3" ParTime = 240 + Author = "Submerge" } map MAP24 @@ -342,6 +365,7 @@ map MAP24 Music = "D_THEDA3" SkyTexture = "SKY3" ParTime = 420 + Author = "Jayextee" } map MAP25 @@ -353,6 +377,7 @@ map MAP25 Music = "D_ADRIAN" SkyTexture = "SKY3" ParTime = 600 + Author = "Cyb" } map MAP26 @@ -364,6 +389,7 @@ map MAP26 Music = "D_MESSG2" SkyTexture = "SKY3" ParTime = 270 + Author = "GooseJelly" } map MAP27 @@ -375,6 +401,7 @@ map MAP27 Music = "D_ROMER2" SkyTexture = "SKY3" ParTime = 690 + Author = "DOGB01" } map MAP28 @@ -386,6 +413,7 @@ map MAP28 Music = "D_TENSE" SkyTexture = "SKY3" ParTime = 450 + Author = "Z0k" } map MAP29 @@ -397,6 +425,7 @@ map MAP29 Music = "D_SHAWN3" SkyTexture = "SKY3" ParTime = 300 + Author = "Amarande" } map MAP30 @@ -426,6 +455,7 @@ map MAP30 "No one will know what happened here.", " ", "No one will ever find you again." + Author = "Cacodemon Leader" } map MAP31 @@ -456,6 +486,7 @@ map MAP31 "You will find your way back to the city,", "but it will have to be on the other side", "of a few homicidal mutants..." + Author = "Jayextee" } map MAP32 @@ -467,4 +498,5 @@ map MAP32 Music = "D_ULTIMA" SkyTexture = "SKY3" ParTime = 210 + Author = "Catoptromancy" }