From 45c1cc8c08cae6133694d7ab9875bacec64e5ca5 Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Tue, 16 Mar 2021 02:45:30 +0800 Subject: [PATCH] Add tag properties to Strife's enemies. --- wadsrc/static/zscript/actors/strife/alienspectres.zs | 1 + wadsrc/static/zscript/actors/strife/crusader.zs | 1 + wadsrc/static/zscript/actors/strife/entityboss.zs | 1 + wadsrc/static/zscript/actors/strife/inquisitor.zs | 1 + wadsrc/static/zscript/actors/strife/klaxon.zs | 1 + wadsrc/static/zscript/actors/strife/peasants.zs | 1 + wadsrc/static/zscript/actors/strife/programmer.zs | 1 + wadsrc/static/zscript/actors/strife/reaver.zs | 1 + wadsrc/static/zscript/actors/strife/sentinel.zs | 1 + wadsrc/static/zscript/actors/strife/stalker.zs | 1 + wadsrc/static/zscript/actors/strife/strifebishop.zs | 1 + wadsrc/static/zscript/actors/strife/zombie.zs | 1 + 12 files changed, 12 insertions(+) diff --git a/wadsrc/static/zscript/actors/strife/alienspectres.zs b/wadsrc/static/zscript/actors/strife/alienspectres.zs index 6b2c83dc11..840c0664ef 100644 --- a/wadsrc/static/zscript/actors/strife/alienspectres.zs +++ b/wadsrc/static/zscript/actors/strife/alienspectres.zs @@ -15,6 +15,7 @@ class AlienSpectre1 : SpectralMonster MinMissileChance 150; RenderStyle "Translucent"; Alpha 0.666; + Tag "$TAG_ALIENSPECTRE"; SeeSound "alienspectre/sight"; AttackSound "alienspectre/blade"; PainSound "alienspectre/pain"; diff --git a/wadsrc/static/zscript/actors/strife/crusader.zs b/wadsrc/static/zscript/actors/strife/crusader.zs index ce2ba6ef8b..f08d0f847d 100644 --- a/wadsrc/static/zscript/actors/strife/crusader.zs +++ b/wadsrc/static/zscript/actors/strife/crusader.zs @@ -21,6 +21,7 @@ class Crusader : Actor MinMissileChance 120; MaxDropoffHeight 32; DropItem "EnergyPod", 256, 20; + Tag "$TAG_CRUSADER"; SeeSound "crusader/sight"; PainSound "crusader/pain"; DeathSound "crusader/death"; diff --git a/wadsrc/static/zscript/actors/strife/entityboss.zs b/wadsrc/static/zscript/actors/strife/entityboss.zs index 107442e281..406873fa44 100644 --- a/wadsrc/static/zscript/actors/strife/entityboss.zs +++ b/wadsrc/static/zscript/actors/strife/entityboss.zs @@ -91,6 +91,7 @@ class EntityBoss : SpectralMonster MinMissileChance 150; RenderStyle "Translucent"; Alpha 0.5; + TAG "$TAG_ENTITY"; SeeSound "entity/sight"; AttackSound "entity/melee"; PainSound "entity/pain"; diff --git a/wadsrc/static/zscript/actors/strife/inquisitor.zs b/wadsrc/static/zscript/actors/strife/inquisitor.zs index 5ad81d0504..9b2e37f566 100644 --- a/wadsrc/static/zscript/actors/strife/inquisitor.zs +++ b/wadsrc/static/zscript/actors/strife/inquisitor.zs @@ -19,6 +19,7 @@ class Inquisitor : Actor +NORADIUSDMG MaxDropOffHeight 32; MinMissileChance 150; + Tag "$TAG_INQUISITOR"; SeeSound "inquisitor/sight"; DeathSound "inquisitor/death"; ActiveSound "inquisitor/active"; diff --git a/wadsrc/static/zscript/actors/strife/klaxon.zs b/wadsrc/static/zscript/actors/strife/klaxon.zs index 6b12593c05..d6c5a44f2b 100644 --- a/wadsrc/static/zscript/actors/strife/klaxon.zs +++ b/wadsrc/static/zscript/actors/strife/klaxon.zs @@ -44,6 +44,7 @@ class CeilingTurret : Actor +NOSPLASHALERT +DONTFALL MinMissileChance 150; + Tag "$TAG_CEILINGTURRET"; DeathSound "turret/death"; } States diff --git a/wadsrc/static/zscript/actors/strife/peasants.zs b/wadsrc/static/zscript/actors/strife/peasants.zs index 6645c69fa6..a0952c5d59 100644 --- a/wadsrc/static/zscript/actors/strife/peasants.zs +++ b/wadsrc/static/zscript/actors/strife/peasants.zs @@ -19,6 +19,7 @@ class Peasant : StrifeHumanoid MinMissileChance 150; MaxStepHeight 16; MaxDropoffHeight 32; + Tag "$TAG_PEASANT"; SeeSound "peasant/sight"; AttackSound "peasant/attack"; PainSound "peasant/pain"; diff --git a/wadsrc/static/zscript/actors/strife/programmer.zs b/wadsrc/static/zscript/actors/strife/programmer.zs index 88e2974c0d..4a364f23f5 100644 --- a/wadsrc/static/zscript/actors/strife/programmer.zs +++ b/wadsrc/static/zscript/actors/strife/programmer.zs @@ -25,6 +25,7 @@ class Programmer : Actor +NOTARGETSWITCH DamageFactor "Fire", 0.5; MinMissileChance 150; + Tag "$TAG_PROGRAMMER"; AttackSound "programmer/attack"; PainSound "programmer/pain"; DeathSound "programmer/death"; diff --git a/wadsrc/static/zscript/actors/strife/reaver.zs b/wadsrc/static/zscript/actors/strife/reaver.zs index 408fbf89c2..2dd616d993 100644 --- a/wadsrc/static/zscript/actors/strife/reaver.zs +++ b/wadsrc/static/zscript/actors/strife/reaver.zs @@ -14,6 +14,7 @@ class Reaver : Actor MinMissileChance 150; MaxDropoffHeight 32; Mass 500; + Tag "$TAG_REAVER"; SeeSound "reaver/sight"; PainSound "reaver/pain"; DeathSound "reaver/death"; diff --git a/wadsrc/static/zscript/actors/strife/sentinel.zs b/wadsrc/static/zscript/actors/strife/sentinel.zs index 190111be7b..0acc8580f0 100644 --- a/wadsrc/static/zscript/actors/strife/sentinel.zs +++ b/wadsrc/static/zscript/actors/strife/sentinel.zs @@ -22,6 +22,7 @@ class Sentinel : Actor +LOOKALLAROUND +NEVERRESPAWN MinMissileChance 150; + Tag "$TAG_SENTINEL"; SeeSound "sentinel/sight"; DeathSound "sentinel/death"; ActiveSound "sentinel/active"; diff --git a/wadsrc/static/zscript/actors/strife/stalker.zs b/wadsrc/static/zscript/actors/strife/stalker.zs index 1677e6a13c..7efa5e0328 100644 --- a/wadsrc/static/zscript/actors/strife/stalker.zs +++ b/wadsrc/static/zscript/actors/strife/stalker.zs @@ -20,6 +20,7 @@ class Stalker : Actor +NOVERTICALMELEERANGE MaxDropOffHeight 32; MinMissileChance 150; + Tag "$TAG_STALKER"; SeeSound "stalker/sight"; AttackSound "stalker/attack"; PainSound "stalker/pain"; diff --git a/wadsrc/static/zscript/actors/strife/strifebishop.zs b/wadsrc/static/zscript/actors/strife/strifebishop.zs index 32aacd03a3..f32ba71eb8 100644 --- a/wadsrc/static/zscript/actors/strife/strifebishop.zs +++ b/wadsrc/static/zscript/actors/strife/strifebishop.zs @@ -21,6 +21,7 @@ class StrifeBishop : Actor DamageFactor "Fire", 0.5; MinMissileChance 150; MaxDropoffHeight 32; + Tag "$TAG_BISHOP"; SeeSound "bishop/sight"; PainSound "bishop/pain"; DeathSound "bishop/death"; diff --git a/wadsrc/static/zscript/actors/strife/zombie.zs b/wadsrc/static/zscript/actors/strife/zombie.zs index c7a7cea593..5bfd0ba609 100644 --- a/wadsrc/static/zscript/actors/strife/zombie.zs +++ b/wadsrc/static/zscript/actors/strife/zombie.zs @@ -19,6 +19,7 @@ class Zombie : StrifeHumanoid MaxStepHeight 16; MaxDropOffHeight 32; Translation 0; + Tag "$TAG_STRIFEZOMBIE"; DeathSound "zombie/death"; CrushPainSound "misc/pcrush"; }