zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Added +ZDOOMADD to all Heretic, Hexen, and Strife actors that needed it (that I know of...) 

- this developer's insanity level increased another 21%
This commit is contained in:
Rachael Alexanderson 2017-06-01 13:41:05 -04:00 committed by Christoph Oelckers
parent 89b372cb01
commit a937f709aa
35 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wadsrc/static/zscript/heretic/dsparil.txt
View File

@ -192,6 +192,7 @@ class SorcererFX1 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -410,6 +411,7 @@ class Sorcerer2FX1 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -457,6 +459,7 @@ class Sorcerer2FXSpark : Actor
+NOGRAVITY +NOGRAVITY
+NOTELEPORT +NOTELEPORT
+CANNOTPUSH +CANNOTPUSH
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -481,6 +484,7 @@ class Sorcerer2FX2 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }

1
wadsrc/static/zscript/heretic/hereticimp.txt
View File

@ -228,6 +228,7 @@ class HereticImpBall : Actor
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
-ACTIVATEPCROSS -ACTIVATEPCROSS
-ACTIVATEIMPACT -ACTIVATEIMPACT
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
States States

2
wadsrc/static/zscript/heretic/hereticmisc.txt
View File

@ -205,7 +205,7 @@ class TeleGlitter1 : Actor
{ {
Default Default
{ {
+NOBLOCKMAP +NOGRAVITY +MISSILE +NOBLOCKMAP +NOGRAVITY +MISSILE +ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Damage 0; Damage 0;
} }

3
wadsrc/static/zscript/heretic/ironlich.txt
View File

@ -144,6 +144,7 @@ class HeadFX1 : Actor
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+THRUGHOST +THRUGHOST
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -195,6 +196,7 @@ class HeadFX2 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -223,6 +225,7 @@ class HeadFX3 : Actor
Damage 5; Damage 5;
Projectile; Projectile;
+WINDTHRUST +WINDTHRUST
+ZDOOMADD
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
-NOBLOCKMAP -NOBLOCKMAP

1
wadsrc/static/zscript/heretic/mummy.txt
View File

@ -135,6 +135,7 @@ class MummyFX1 : Actor
-ACTIVATEPCROSS -ACTIVATEPCROSS
-ACTIVATEIMPACT -ACTIVATEIMPACT
+SEEKERMISSILE +SEEKERMISSILE
+ZDOOMADD
} }
States States
{ {

1
wadsrc/static/zscript/heretic/snake.txt
View File

@ -64,6 +64,7 @@ class SnakeProjA : Actor
-ACTIVATEPCROSS -ACTIVATEPCROSS
+WINDTHRUST +WINDTHRUST
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
SeeSound "snake/attack"; SeeSound "snake/attack";
} }

1
wadsrc/static/zscript/heretic/weaponblaster.txt
View File

@ -244,6 +244,7 @@ class BlasterPuff : Actor
+NOBLOCKMAP +NOBLOCKMAP
+NOGRAVITY +NOGRAVITY
+PUFFONACTORS +PUFFONACTORS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
SeeSound "weapons/blasterhit"; SeeSound "weapons/blasterhit";
} }

1
wadsrc/static/zscript/heretic/weaponcrossbow.txt
View File

@ -129,6 +129,7 @@ class CrossbowFX1 : Actor
SeeSound "weapons/bowshoot"; SeeSound "weapons/bowshoot";
DeathSound "weapons/bowhit"; DeathSound "weapons/bowhit";
Obituary "$OB_MPCROSSBOW"; Obituary "$OB_MPCROSSBOW";
+ZDOOMADD
} }
States States

1
wadsrc/static/zscript/heretic/weaponphoenix.txt
View File

@ -292,6 +292,7 @@ class PhoenixFX2 : Actor
DamageType "Fire"; DamageType "Fire";
Projectile; Projectile;
RenderStyle "Add"; RenderStyle "Add";
+ZDOOMADD
Obituary "$OB_MPPPHOENIXROD"; Obituary "$OB_MPPPHOENIXROD";
} }

3
wadsrc/static/zscript/heretic/weaponskullrod.txt
View File

@ -143,6 +143,7 @@ class HornRodFX1 : Actor
Damage 3; Damage 3;
Projectile; Projectile;
+WINDTHRUST +WINDTHRUST
+ZDOOMADD
-NOBLOCKMAP -NOBLOCKMAP
RenderStyle "Add"; RenderStyle "Add";
SeeSound "weapons/hornrodshoot"; SeeSound "weapons/hornrodshoot";
@ -177,6 +178,7 @@ class HornRodFX2 : Actor
Health 140; Health 140;
Projectile; Projectile;
RenderStyle "Add"; RenderStyle "Add";
+ZDOOMADD
SeeSound "weapons/hornrodpowshoot"; SeeSound "weapons/hornrodpowshoot";
DeathSound "weapons/hornrodpowhit"; DeathSound "weapons/hornrodpowhit";
Obituary "$OB_MPPSKULLROD"; Obituary "$OB_MPPSKULLROD";
@ -364,6 +366,7 @@ class RainPillar : Actor
Projectile; Projectile;
-ACTIVATEPCROSS -ACTIVATEPCROSS
-ACTIVATEIMPACT -ACTIVATEIMPACT
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Obituary "$OB_MPPSKULLROD"; Obituary "$OB_MPPSKULLROD";
} }

1
wadsrc/static/zscript/heretic/weaponstaff.txt
View File

@ -132,6 +132,7 @@ class StaffPuff2 : Actor
+NOBLOCKMAP +NOBLOCKMAP
+NOGRAVITY +NOGRAVITY
+PUFFONACTORS +PUFFONACTORS
+ZDOOMADD
AttackSound "weapons/staffpowerhit"; AttackSound "weapons/staffpowerhit";
} }

1
wadsrc/static/zscript/heretic/weaponwand.txt
View File

@ -142,6 +142,7 @@ class GoldWandFX1 : Actor
Damage 2; Damage 2;
Projectile; Projectile;
RenderStyle "Add"; RenderStyle "Add";
+ZDOOMADD
DeathSound "weapons/wandhit"; DeathSound "weapons/wandhit";
Obituary "$OB_MPPGOLDWAND"; Obituary "$OB_MPPGOLDWAND";
} }

1
wadsrc/static/zscript/heretic/wizard.txt
View File

@ -145,6 +145,7 @@ class WizardFX1 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }

2
wadsrc/static/zscript/hexen/bishop.txt
View File

@ -290,7 +290,7 @@ class BishopFX : Actor
Projectile; Projectile;
+SEEKERMISSILE +SEEKERMISSILE
-ACTIVATEIMPACT -ACTIVATEPCROSS -ACTIVATEIMPACT -ACTIVATEPCROSS
+STRIFEDAMAGE +STRIFEDAMAGE +ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "BishopMissileExplode"; DeathSound "BishopMissileExplode";
} }

1
wadsrc/static/zscript/hexen/centaur.txt
View File

@ -154,6 +154,7 @@ class CentaurFX : Actor
Damage 4; Damage 4;
Projectile; Projectile;
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
SeeSound "CentaurLeaderAttack"; SeeSound "CentaurLeaderAttack";
DeathSound "CentaurMissileExplode"; DeathSound "CentaurMissileExplode";

8
wadsrc/static/zscript/hexen/clericflame.txt
View File

@ -72,7 +72,7 @@ class CFlameFloor : Actor
{ {
Default Default
{ {
+NOBLOCKMAP +NOGRAVITY +NOBLOCKMAP +NOGRAVITY +ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
States States
@ -93,8 +93,8 @@ class FlamePuff : Actor
{ {
Radius 1; Radius 1;
Height 1; Height 1;
+NOBLOCKMAP +NOGRAVITY +NOBLOCKMAP +NOGRAVITY +ZDOOMADD
RenderStyle "Add";; RenderStyle "Add";
SeeSound "ClericFlameExplode"; SeeSound "ClericFlameExplode";
AttackSound "ClericFlameExplode"; AttackSound "ClericFlameExplode";
} }
@ -159,6 +159,7 @@ class CircleFlame : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "ClericFlameCircle"; DeathSound "ClericFlameCircle";
Obituary "$OB_MPCWEAPFLAME"; Obituary "$OB_MPCWEAPFLAME";
@ -216,6 +217,7 @@ class CFlameMissile : FastProjectile
Damage 8; Damage 8;
DamageType "Fire"; DamageType "Fire";
+INVISIBLE +INVISIBLE
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Obituary "$OB_MPCWEAPFLAME"; Obituary "$OB_MPCWEAPFLAME";
} }

2
wadsrc/static/zscript/hexen/demons.txt
View File

@ -205,6 +205,7 @@ class Demon1FX1 : Actor
DamageType "Fire"; DamageType "Fire";
Projectile; Projectile;
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
SeeSound "DemonMissileFire"; SeeSound "DemonMissileFire";
DeathSound "DemonMissileExplode"; DeathSound "DemonMissileExplode";
@ -392,6 +393,7 @@ class Demon2FX1 : Actor
DamageType "Fire"; DamageType "Fire";
Projectile; Projectile;
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
SeeSound "DemonMissileFire"; SeeSound "DemonMissileFire";
DeathSound "DemonMissileExplode"; DeathSound "DemonMissileExplode";

2
wadsrc/static/zscript/hexen/dragon.txt
View File

@ -311,6 +311,7 @@ class DragonFireball : Actor
DamageType "Fire"; DamageType "Fire";
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEPCROSS -ACTIVATEIMPACT -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "DragonFireballExplode"; DeathSound "DragonFireballExplode";
} }
@ -364,6 +365,7 @@ class DragonExplosion : Actor
+NOBLOCKMAP +NOBLOCKMAP
+NOTELEPORT +NOTELEPORT
+INVISIBLE +INVISIBLE
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "DragonFireballExplode"; DeathSound "DragonFireballExplode";
} }

1
wadsrc/static/zscript/hexen/fighteraxe.txt
View File

@ -307,6 +307,7 @@ class AxePuffGlow : AxePuff
Default Default
{ {
+PUFFONACTORS +PUFFONACTORS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Alpha 1; Alpha 1;
} }

1
wadsrc/static/zscript/hexen/fighterquietus.txt
View File

@ -168,6 +168,7 @@ class FSwordMissile : Actor
Damage 8; Damage 8;
Projectile; Projectile;
+EXTREMEDEATH +EXTREMEDEATH
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "FighterSwordExplode"; DeathSound "FighterSwordExplode";
Obituary "$OB_MPFWEAPQUIETUS"; Obituary "$OB_MPFWEAPQUIETUS";

1
wadsrc/static/zscript/hexen/firedemon.txt
View File

@ -436,6 +436,7 @@ class FireDemonMissile : Actor
Projectile; Projectile;
RenderStyle "Add"; RenderStyle "Add";
DeathSound "FireDemonMissileHit"; DeathSound "FireDemonMissileHit";
+ZDOOMADD
} }
States States
{ {

4
wadsrc/static/zscript/hexen/flame.txt
View File

@ -5,6 +5,7 @@ class FlameSmallTemp : Actor
Default Default
{ {
+NOTELEPORT +NOTELEPORT
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -28,6 +29,7 @@ class FlameLargeTemp : Actor
Default Default
{ {
+NOTELEPORT +NOTELEPORT
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -62,6 +64,7 @@ class FlameSmall : SwitchableDecoration
{ {
+NOTELEPORT +NOTELEPORT
+INVISIBLE +INVISIBLE
+ZDOOMADD
Radius 15; Radius 15;
RenderStyle "Add"; RenderStyle "Add";
} }
@ -95,6 +98,7 @@ class FlameLarge : SwitchableDecoration
{ {
+NOTELEPORT +NOTELEPORT
+INVISIBLE +INVISIBLE
+ZDOOMADD
Radius 15; Radius 15;
RenderStyle "Add"; RenderStyle "Add";
} }

1
wadsrc/static/zscript/hexen/heresiarch.txt
View File

@ -1125,6 +1125,7 @@ class SorcSpark1 : Actor
+NOBLOCKMAP +NOBLOCKMAP
+DROPOFF +DROPOFF
+NOTELEPORT +NOTELEPORT
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
States States

3
wadsrc/static/zscript/hexen/magelightning.txt
View File

@ -165,6 +165,7 @@ class LightningCeiling : Lightning
Damage 8; Damage 8;
Projectile; Projectile;
+CEILINGHUGGER +CEILINGHUGGER
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -319,6 +320,7 @@ class LightningFloor : LightningCeiling
{ {
-CEILINGHUGGER -CEILINGHUGGER
+FLOORHUGGER +FLOORHUGGER
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
@ -374,6 +376,7 @@ class LightningZap : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Obituary "$OB_MPMWEAPLIGHTNING"; Obituary "$OB_MPMWEAPLIGHTNING";
} }

1
wadsrc/static/zscript/hexen/scriptprojectiles.txt
View File

@ -11,6 +11,7 @@ class FireBall : Actor
DamageType "Fire"; DamageType "Fire";
+NOBLOCKMAP +NOGRAVITY +DROPOFF +MISSILE +NOBLOCKMAP +NOGRAVITY +DROPOFF +MISSILE
+NOTELEPORT +NOTELEPORT
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "Fireball"; DeathSound "Fireball";
} }

1
wadsrc/static/zscript/hexen/serpent.txt
View File

@ -317,6 +317,7 @@ class SerpentFX : Actor
Damage 4; Damage 4;
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEPCROSS -ACTIVATEIMPACT -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DeathSound "SerpentFXHit"; DeathSound "SerpentFXHit";
} }

1
wadsrc/static/zscript/raven/minotaur.txt
View File

@ -655,6 +655,7 @@ class MinotaurFX1 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
States States

1
wadsrc/static/zscript/strife/sentinel.txt
View File

@ -97,6 +97,7 @@ class SentinelFX1 : Actor
DamageType "Disintegrate"; DamageType "Disintegrate";
Projectile; Projectile;
+STRIFEDAMAGE +STRIFEDAMAGE
+ZDOOMADD
MaxStepHeight 4; MaxStepHeight 4;
RenderStyle "Add"; RenderStyle "Add";
} }

2
wadsrc/static/zscript/strife/spectral.txt
View File

@ -112,6 +112,7 @@ class SpectralLightningBase : Actor
+ACTIVATEIMPACT +ACTIVATEIMPACT
+ACTIVATEPCROSS +ACTIVATEPCROSS
+STRIFEDAMAGE +STRIFEDAMAGE
+ZDOOMADD
MaxStepHeight 4; MaxStepHeight 4;
RenderStyle "Add"; RenderStyle "Add";
SeeSound "weapons/sigil"; SeeSound "weapons/sigil";
@ -257,6 +258,7 @@ class SpectralLightningHTail : Actor
+NOBLOCKMAP +NOBLOCKMAP
+NOGRAVITY +NOGRAVITY
+DROPOFF +DROPOFF
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
States States

1
wadsrc/static/zscript/strife/strifestuff.txt
View File

@ -632,6 +632,7 @@ class TeleportSwirl : Actor
Default Default
{ {
+NOBLOCKMAP +NOBLOCKMAP
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Alpha 0.25; Alpha 0.25;
} }

1
wadsrc/static/zscript/strife/strifeweapons.txt
View File

@ -40,6 +40,7 @@ class StrifeSpark : StrifePuff
{ {
Default Default
{ {
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
} }
States States

1
wadsrc/static/zscript/strife/thingstoblowup.txt
View File

@ -49,6 +49,7 @@ class Bang4Cloud : Actor
{ {
+NOBLOCKMAP +NOBLOCKMAP
+NOGRAVITY +NOGRAVITY
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
VSpeed 1; VSpeed 1;
} }

1
wadsrc/static/zscript/strife/weaponflamer.txt
View File

@ -85,6 +85,7 @@ class FlameMissile : Actor
Projectile; Projectile;
-NOGRAVITY -NOGRAVITY
+STRIFEDAMAGE +STRIFEDAMAGE
+ZDOOMADD
MaxStepHeight 4; MaxStepHeight 4;
RenderStyle "Add"; RenderStyle "Add";
SeeSound "weapons/flamethrower"; SeeSound "weapons/flamethrower";

1
wadsrc/static/zscript/strife/weapongrenade.txt
View File

@ -217,6 +217,7 @@ class PhosphorousFire : Actor
+NOTELEPORT +NOTELEPORT
+NODAMAGETHRUST +NODAMAGETHRUST
+DONTSPLASH +DONTSPLASH
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
Obituary "$OB_MPPHOSPHOROUSGRENADE"; Obituary "$OB_MPPHOSPHOROUSGRENADE";
} }

3
wadsrc/static/zscript/strife/weaponmauler.txt
View File

@ -181,6 +181,7 @@ class MaulerPuff : Actor
+NOBLOCKMAP +NOBLOCKMAP
+NOGRAVITY +NOGRAVITY
+PUFFONACTORS +PUFFONACTORS
+ZDOOMADD
RenderStyle "Add"; RenderStyle "Add";
DamageType "Disintegrate"; DamageType "Disintegrate";
} }
@ -206,6 +207,7 @@ class MaulerTorpedo : Actor
DamageType "Disintegrate"; DamageType "Disintegrate";
Projectile; Projectile;
+STRIFEDAMAGE +STRIFEDAMAGE
+ZDOOMADD
MaxStepHeight 4; MaxStepHeight 4;
RenderStyle "Add"; RenderStyle "Add";
SeeSound "weapons/mauler2fire"; SeeSound "weapons/mauler2fire";
@ -268,6 +270,7 @@ class MaulerTorpedoWave : Actor
DamageType "Disintegrate"; DamageType "Disintegrate";
Projectile; Projectile;
+STRIFEDAMAGE +STRIFEDAMAGE
+ZDOOMADD
MaxStepHeight 4; MaxStepHeight 4;
RenderStyle "Add"; RenderStyle "Add";
Obituary "$OB_MPMAULER"; Obituary "$OB_MPMAULER";