zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed ZDOOMADD and updated actors in question with ZDOOMTRANS

Browse source
This commit is contained in:
Rachael Alexanderson 2017-06-01 14:03:51 -04:00
parent 91e3b19264
commit b240ad0814
41 changed files with 57 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/actor.h
View file

@ -445,7 +445,6 @@ enum ActorRenderFlag
RF_SPRITEFLIP = 0x08000000, // sprite flipped on x-axis RF_SPRITEFLIP = 0x08000000, // sprite flipped on x-axis
RF_ZDOOMTRANS = 0x10000000, // is not normally transparent in Vanilla Doom RF_ZDOOMTRANS = 0x10000000, // is not normally transparent in Vanilla Doom
RF_ZDOOMADD = 0x20000000, // is not normally additive in Vanilla Hexen/Heretic/Strife
}; };
// This translucency value produces the closest match to Heretic's TINTTAB. // This translucency value produces the closest match to Heretic's TINTTAB.

7
src/gl/scene/gl_sprite.cpp
View file

@ -1004,13 +1004,6 @@ void GLSprite::Process(AActor* thing, sector_t * sector, int thruportal)
RenderStyle.SrcAlpha = STYLEALPHA_One; RenderStyle.SrcAlpha = STYLEALPHA_One;
RenderStyle.DestAlpha = STYLEALPHA_Zero; RenderStyle.DestAlpha = STYLEALPHA_Zero;
} }
if (thing->renderflags & RF_ZDOOMADD)
{
RenderStyle.BlendOp = STYLEOP_Add;
RenderStyle.SrcAlpha = STYLEALPHA_Src;
RenderStyle.DestAlpha = STYLEALPHA_InvSrc;
}
} }
if (trans >= 1.f - FLT_EPSILON && RenderStyle.BlendOp != STYLEOP_Shadow && ( if (trans >= 1.f - FLT_EPSILON && RenderStyle.BlendOp != STYLEOP_Shadow && (
(RenderStyle.SrcAlpha == STYLEALPHA_One && RenderStyle.DestAlpha == STYLEALPHA_Zero) || (RenderStyle.SrcAlpha == STYLEALPHA_One && RenderStyle.DestAlpha == STYLEALPHA_Zero) ||

2
src/polyrenderer/scene/poly_sprite.cpp
View file

@ -148,8 +148,6 @@ void RenderPolySprite::Render(const TriMatrix &worldToClip, const PolyClipPlane
args.SetClipPlane(clipPlane); args.SetClipPlane(clipPlane);
if ((thing->renderflags & RF_ZDOOMTRANS) && r_vanillatrans) if ((thing->renderflags & RF_ZDOOMTRANS) && r_vanillatrans)
args.SetStyle(LegacyRenderStyles[STYLE_Normal], 1.0f, thing->fillcolor, thing->Translation, tex, fullbrightSprite); args.SetStyle(LegacyRenderStyles[STYLE_Normal], 1.0f, thing->fillcolor, thing->Translation, tex, fullbrightSprite);
else if ((thing->renderflags & RF_ZDOOMADD) && r_vanillatrans)
args.SetStyle(LegacyRenderStyles[STYLE_Translucent], thing->Alpha, thing->fillcolor, thing->Translation, tex, fullbrightSprite);
else else
args.SetStyle(thing->RenderStyle, thing->Alpha, thing->fillcolor, thing->Translation, tex, fullbrightSprite); args.SetStyle(thing->RenderStyle, thing->Alpha, thing->fillcolor, thing->Translation, tex, fullbrightSprite);
args.SetSubsectorDepthTest(true); args.SetSubsectorDepthTest(true);

1
src/scripting/thingdef_data.cpp
View file

@ -347,7 +347,6 @@ static FFlagDef ActorFlagDefs[]=
DEFINE_FLAG(RF, DONTINTERPOLATE, AActor, renderflags), DEFINE_FLAG(RF, DONTINTERPOLATE, AActor, renderflags),
DEFINE_FLAG(RF, SPRITEFLIP, AActor, renderflags), DEFINE_FLAG(RF, SPRITEFLIP, AActor, renderflags),
DEFINE_FLAG(RF, ZDOOMTRANS, AActor, renderflags), DEFINE_FLAG(RF, ZDOOMTRANS, AActor, renderflags),
DEFINE_FLAG(RF, ZDOOMADD, AActor, renderflags),
// Bounce flags // Bounce flags
DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags), DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags),

2
src/swrenderer/things/r_sprite.cpp
View file

@ -217,8 +217,6 @@ namespace swrenderer
{ {
if (thing->renderflags & RF_ZDOOMTRANS) if (thing->renderflags & RF_ZDOOMTRANS)
vis->RenderStyle = LegacyRenderStyles[STYLE_Normal]; vis->RenderStyle = LegacyRenderStyles[STYLE_Normal];
if (thing->renderflags & RF_ZDOOMADD)
vis->RenderStyle = LegacyRenderStyles[STYLE_Translucent];
} }
vis->FillColor = thing->fillcolor; vis->FillColor = thing->fillcolor;
vis->Translation = thing->Translation; // [RH] thing translation table vis->Translation = thing->Translation; // [RH] thing translation table

4
wadsrc/static/zscript/heretic/beast.txt
View file

@ -75,7 +75,7 @@ class BeastBall : Actor
-NOBLOCKMAP -NOBLOCKMAP
+WINDTHRUST +WINDTHRUST
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
+ZDOOMADD +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
SeeSound "beast/attack"; SeeSound "beast/attack";
} }
@ -105,7 +105,7 @@ class Puffy : Actor
+MISSILE +MISSILE
+NOTELEPORT +NOTELEPORT
+DONTSPLASH +DONTSPLASH
+ZDOOMADD +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
} }
States States

8
wadsrc/static/zscript/heretic/dsparil.txt
View file

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

2
wadsrc/static/zscript/heretic/hereticimp.txt
View file

@ -228,7 +228,7 @@ class HereticImpBall : Actor
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
-ACTIVATEPCROSS -ACTIVATEPCROSS
-ACTIVATEIMPACT -ACTIVATEIMPACT
+ZDOOMADD +ZDOOMTRANS
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 +ZDOOMADD +NOBLOCKMAP +NOGRAVITY +MISSILE +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
Damage 0; Damage 0;
} }

6
wadsrc/static/zscript/heretic/ironlich.txt
View file

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

2
wadsrc/static/zscript/heretic/mummy.txt
View file

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

2
wadsrc/static/zscript/heretic/snake.txt
View file

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

2
wadsrc/static/zscript/heretic/weaponblaster.txt
View file

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

2
wadsrc/static/zscript/heretic/weaponcrossbow.txt
View file

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

2
wadsrc/static/zscript/heretic/weaponphoenix.txt
View file

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

6
wadsrc/static/zscript/heretic/weaponskullrod.txt
View file

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

2
wadsrc/static/zscript/heretic/weaponstaff.txt
View file

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

2
wadsrc/static/zscript/heretic/weaponwand.txt
View file

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

2
wadsrc/static/zscript/heretic/wizard.txt
View file

@ -145,7 +145,7 @@ class WizardFX1 : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD +ZDOOMTRANS
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 +ZDOOMADD +STRIFEDAMAGE +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
DeathSound "BishopMissileExplode"; DeathSound "BishopMissileExplode";
} }

2
wadsrc/static/zscript/hexen/centaur.txt
View file

@ -154,7 +154,7 @@ class CentaurFX : Actor
Damage 4; Damage 4;
Projectile; Projectile;
+SPAWNSOUNDSOURCE +SPAWNSOUNDSOURCE
+ZDOOMADD +ZDOOMTRANS
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 +ZDOOMADD +NOBLOCKMAP +NOGRAVITY +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
} }
States States
@ -93,7 +93,7 @@ class FlamePuff : Actor
{ {
Radius 1; Radius 1;
Height 1; Height 1;
+NOBLOCKMAP +NOGRAVITY +ZDOOMADD +NOBLOCKMAP +NOGRAVITY +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
SeeSound "ClericFlameExplode"; SeeSound "ClericFlameExplode";
AttackSound "ClericFlameExplode"; AttackSound "ClericFlameExplode";
@ -159,7 +159,7 @@ class CircleFlame : Actor
Projectile; Projectile;
-ACTIVATEIMPACT -ACTIVATEIMPACT
-ACTIVATEPCROSS -ACTIVATEPCROSS
+ZDOOMADD +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
DeathSound "ClericFlameCircle"; DeathSound "ClericFlameCircle";
Obituary "$OB_MPCWEAPFLAME"; Obituary "$OB_MPCWEAPFLAME";
@ -217,7 +217,7 @@ class CFlameMissile : FastProjectile
Damage 8; Damage 8;
DamageType "Fire"; DamageType "Fire";
+INVISIBLE +INVISIBLE
+ZDOOMADD +ZDOOMTRANS
RenderStyle "Add"; RenderStyle "Add";
Obituary "$OB_MPCWEAPFLAME"; Obituary "$OB_MPCWEAPFLAME";
} }

4
wadsrc/static/zscript/hexen/demons.txt
View file

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

4
wadsrc/static/zscript/hexen/dragon.txt
View file

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

2
wadsrc/static/zscript/hexen/fighteraxe.txt
View file

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

2
wadsrc/static/zscript/hexen/fighterquietus.txt
View file

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

2
wadsrc/static/zscript/hexen/firedemon.txt
View file

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

8
wadsrc/static/zscript/hexen/flame.txt
View file

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

2
wadsrc/static/zscript/hexen/heresiarch.txt
View file

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

6
wadsrc/static/zscript/hexen/magelightning.txt
View file

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

2
wadsrc/static/zscript/hexen/scriptprojectiles.txt
View file

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

2
wadsrc/static/zscript/hexen/serpent.txt
View file

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

2
wadsrc/static/zscript/raven/minotaur.txt
View file

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

2
wadsrc/static/zscript/strife/sentinel.txt
View file

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

4
wadsrc/static/zscript/strife/spectral.txt
View file

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

2
wadsrc/static/zscript/strife/strifestuff.txt
View file

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

2
wadsrc/static/zscript/strife/strifeweapons.txt
View file

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

2
wadsrc/static/zscript/strife/thingstoblowup.txt
View file

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

2
wadsrc/static/zscript/strife/weaponflamer.txt
View file

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

2
wadsrc/static/zscript/strife/weapongrenade.txt
View file

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

6
wadsrc/static/zscript/strife/weaponmauler.txt
View file

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