From 281dbfb14ca59ac44c6cd3e0b652a462b5268a55 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 19 Dec 2022 22:40:16 +0100 Subject: [PATCH] - added BADGUY/KILLCOUNT combos to all enemies. --- .../zscript/games/duke/actors/billyray.zs | 2 + .../static/zscript/games/duke/actors/boss1.zs | 2 + .../zscript/games/duke/actors/commander.zs | 2 + .../static/zscript/games/duke/actors/coot.zs | 2 + .../static/zscript/games/duke/actors/cow.zs | 1 + .../zscript/games/duke/actors/dukemisc.zs | 4 ++ .../zscript/games/duke/actors/greenslime.zs | 2 + .../static/zscript/games/duke/actors/hen.zs | 1 + .../zscript/games/duke/actors/lizman.zs | 2 + .../zscript/games/duke/actors/liztroop.zs | 2 + .../static/zscript/games/duke/actors/mech.zs | 7 +++ .../zscript/games/duke/actors/minion.zs | 2 + .../zscript/games/duke/actors/octabrain.zs | 2 + .../static/zscript/games/duke/actors/pig.zs | 1 + .../zscript/games/duke/actors/pigcop.zs | 2 + .../zscript/games/duke/actors/rabbit.zs | 2 + .../static/zscript/games/duke/actors/rat.zs | 1 + .../static/zscript/games/duke/actors/recon.zs | 2 + .../games/duke/actors/redneckenemies.zs | 43 +++++++++++++++++++ 19 files changed, 82 insertions(+) diff --git a/wadsrc/static/zscript/games/duke/actors/billyray.zs b/wadsrc/static/zscript/games/duke/actors/billyray.zs index 7b6274657..2dddb61fa 100644 --- a/wadsrc/static/zscript/games/duke/actors/billyray.zs +++ b/wadsrc/static/zscript/games/duke/actors/billyray.zs @@ -4,6 +4,8 @@ class RedneckBillyRay : DukeActor default { pic "BILLYRAY"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() diff --git a/wadsrc/static/zscript/games/duke/actors/boss1.zs b/wadsrc/static/zscript/games/duke/actors/boss1.zs index d12fa33e4..58070db7c 100644 --- a/wadsrc/static/zscript/games/duke/actors/boss1.zs +++ b/wadsrc/static/zscript/games/duke/actors/boss1.zs @@ -3,6 +3,8 @@ class DukeBoss1 : DukeActor default { pic "BOSS1"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/commander.zs b/wadsrc/static/zscript/games/duke/actors/commander.zs index a9beda5a3..4e4d9f318 100644 --- a/wadsrc/static/zscript/games/duke/actors/commander.zs +++ b/wadsrc/static/zscript/games/duke/actors/commander.zs @@ -3,6 +3,8 @@ class DukeCommander : DukeActor default { pic "COMMANDER"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() diff --git a/wadsrc/static/zscript/games/duke/actors/coot.zs b/wadsrc/static/zscript/games/duke/actors/coot.zs index 2045d6fa3..049bd5b64 100644 --- a/wadsrc/static/zscript/games/duke/actors/coot.zs +++ b/wadsrc/static/zscript/games/duke/actors/coot.zs @@ -24,6 +24,8 @@ class RedneckCootStayput: RedneckCoot default { pic "COOTSTAYPUT"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() diff --git a/wadsrc/static/zscript/games/duke/actors/cow.zs b/wadsrc/static/zscript/games/duke/actors/cow.zs index 611857cca..e056afd98 100644 --- a/wadsrc/static/zscript/games/duke/actors/cow.zs +++ b/wadsrc/static/zscript/games/duke/actors/cow.zs @@ -3,6 +3,7 @@ class RedneckCow : DukeActor default { pic "COW"; + +BADGUY; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/dukemisc.zs b/wadsrc/static/zscript/games/duke/actors/dukemisc.zs index bb29bb4b7..c6ec6f01b 100644 --- a/wadsrc/static/zscript/games/duke/actors/dukemisc.zs +++ b/wadsrc/static/zscript/games/duke/actors/dukemisc.zs @@ -272,6 +272,9 @@ class DukeNewBeast : DukeActor default { pic "NEWBEAST"; + +BADGUY; + +KILLCOUNT; + } } @@ -280,6 +283,7 @@ class DukeNewBeastStayput : DukeNewBeast default { pic "NEWBEASTSTAYPUT"; + +BADGUYSTAYPUT; } } diff --git a/wadsrc/static/zscript/games/duke/actors/greenslime.zs b/wadsrc/static/zscript/games/duke/actors/greenslime.zs index 288ff2b2c..ffae11c5d 100644 --- a/wadsrc/static/zscript/games/duke/actors/greenslime.zs +++ b/wadsrc/static/zscript/games/duke/actors/greenslime.zs @@ -3,6 +3,8 @@ class DukeGreenSlime : DukeActor default { spriteset "GREENSLIME", "GREENSLIME1", "GREENSLIME2", "GREENSLIME3", "GREENSLIME4", "GREENSLIME5", "GREENSLIME6", "GREENSLIME7"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/hen.zs b/wadsrc/static/zscript/games/duke/actors/hen.zs index ac89c9255..0e27e45d5 100644 --- a/wadsrc/static/zscript/games/duke/actors/hen.zs +++ b/wadsrc/static/zscript/games/duke/actors/hen.zs @@ -3,6 +3,7 @@ class RedneckHen : DukeActor default { pic "HEN"; + +INTERNAL_BADGUY; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/lizman.zs b/wadsrc/static/zscript/games/duke/actors/lizman.zs index 1f81a873d..a2b1b3da1 100644 --- a/wadsrc/static/zscript/games/duke/actors/lizman.zs +++ b/wadsrc/static/zscript/games/duke/actors/lizman.zs @@ -4,6 +4,8 @@ class DukeLizMan : DukeActor default { pic "LIZMAN"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() diff --git a/wadsrc/static/zscript/games/duke/actors/liztroop.zs b/wadsrc/static/zscript/games/duke/actors/liztroop.zs index 8f9489c7f..0e0d796ff 100644 --- a/wadsrc/static/zscript/games/duke/actors/liztroop.zs +++ b/wadsrc/static/zscript/games/duke/actors/liztroop.zs @@ -4,6 +4,8 @@ class DukeLizTrooper : DukeActor default { pic "LIZTROOP"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/mech.zs b/wadsrc/static/zscript/games/duke/actors/mech.zs index 15fffad98..08c4e0543 100644 --- a/wadsrc/static/zscript/games/duke/actors/mech.zs +++ b/wadsrc/static/zscript/games/duke/actors/mech.zs @@ -3,6 +3,8 @@ class DukeDrone : DukeActor default { pic "DRONE"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() @@ -16,6 +18,8 @@ class DukeTurret : DukeActor default { pic "ORGANTIC"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() @@ -34,6 +38,8 @@ class DukeRotateGun : DukeActor default { pic "ROTATEGUN"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() @@ -47,6 +53,7 @@ class DukeShark : DukeActor default { pic "SHARK"; + +INTERNAL_BADGUY; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/minion.zs b/wadsrc/static/zscript/games/duke/actors/minion.zs index 0d0ff7552..46c4c9e64 100644 --- a/wadsrc/static/zscript/games/duke/actors/minion.zs +++ b/wadsrc/static/zscript/games/duke/actors/minion.zs @@ -3,6 +3,8 @@ class RedneckMinion : DukeActor default { pic "MINION"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/octabrain.zs b/wadsrc/static/zscript/games/duke/actors/octabrain.zs index 05db5c9a8..4ae5b3c57 100644 --- a/wadsrc/static/zscript/games/duke/actors/octabrain.zs +++ b/wadsrc/static/zscript/games/duke/actors/octabrain.zs @@ -3,6 +3,8 @@ class DukeOctabrain : DukeActor default { pic "OCTABRAIN"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() diff --git a/wadsrc/static/zscript/games/duke/actors/pig.zs b/wadsrc/static/zscript/games/duke/actors/pig.zs index 9b89fb537..069be940e 100644 --- a/wadsrc/static/zscript/games/duke/actors/pig.zs +++ b/wadsrc/static/zscript/games/duke/actors/pig.zs @@ -3,6 +3,7 @@ class RedneckPig : DukeActor default { pic "PIG"; + +INTERNAL_BADGUY; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/pigcop.zs b/wadsrc/static/zscript/games/duke/actors/pigcop.zs index c017e5d37..016cdcce9 100644 --- a/wadsrc/static/zscript/games/duke/actors/pigcop.zs +++ b/wadsrc/static/zscript/games/duke/actors/pigcop.zs @@ -3,6 +3,8 @@ class DukePigCop : DukeActor default { pic "PIGCOP"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void PlayFTASound() diff --git a/wadsrc/static/zscript/games/duke/actors/rabbit.zs b/wadsrc/static/zscript/games/duke/actors/rabbit.zs index fef74321e..0b9e60972 100644 --- a/wadsrc/static/zscript/games/duke/actors/rabbit.zs +++ b/wadsrc/static/zscript/games/duke/actors/rabbit.zs @@ -3,6 +3,8 @@ class RedneckRabbit : DukeActor default { pic "RABBIT"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/rat.zs b/wadsrc/static/zscript/games/duke/actors/rat.zs index 7423e88d0..549482d43 100644 --- a/wadsrc/static/zscript/games/duke/actors/rat.zs +++ b/wadsrc/static/zscript/games/duke/actors/rat.zs @@ -5,6 +5,7 @@ class DukeRat : DukeActor default { pic "RAT"; + +INTERNAL_BADGUY; } override void Initialize() diff --git a/wadsrc/static/zscript/games/duke/actors/recon.zs b/wadsrc/static/zscript/games/duke/actors/recon.zs index a57615747..9986a856c 100644 --- a/wadsrc/static/zscript/games/duke/actors/recon.zs +++ b/wadsrc/static/zscript/games/duke/actors/recon.zs @@ -3,6 +3,8 @@ class DukeRecon : DukeActor default { spriteset "RECON", "RECON2"; + +INTERNAL_BADGUY; + +KILLCOUNT; } Sound AttackSnd; diff --git a/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs b/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs index eb8505e8a..7f9aeebfa 100644 --- a/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs +++ b/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs @@ -4,6 +4,8 @@ class RedneckBikerBV2 : DukeActor default { pic "BIKERBV2"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -17,6 +19,8 @@ class RedneckBikerB : DukeActor default { pic "BIKERB"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -30,6 +34,8 @@ class RedneckBiker : DukeActor default { pic "BIKER"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -43,6 +49,8 @@ class RedneckMakeout : DukeActor default { pic "MAKEOUT"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -56,6 +64,8 @@ class RedneckCheerleaderB : DukeActor default { pic "CHEERB"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -69,6 +79,8 @@ class RedneckCheerleader : DukeActor default { pic "CHEER"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -82,6 +94,7 @@ class RedneckCootplay : DukeActor default { pic "COOTPLAY"; + +INTERNAL_BADGUY; } override void Initialize() { @@ -96,6 +109,7 @@ class RedneckBillyPlay : DukeActor default { pic "BILLYPLAY"; + +INTERNAL_BADGUY; } override void Initialize() { @@ -109,6 +123,8 @@ class RedneckMinionBoat : DukeActor default { pic "MINIONBOAT"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -122,6 +138,8 @@ class RedneckHulkBoat : DukeActor default { pic "HULKBOAT"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -135,6 +153,8 @@ class RedneckCheerBoat : DukeActor default { pic "CHEERBOAT"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -148,6 +168,7 @@ class RedneckRock : DukeActor default { pic "ROCK"; + +INTERNAL_BADGUY; } override void Initialize() { @@ -161,6 +182,7 @@ class RedneckRock2 : RedneckRock default { pic "ROCK2"; + +INTERNAL_BADGUY; } } @@ -185,6 +207,8 @@ class RedneckMama : DukeActor default { pic "MAMA"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() @@ -218,6 +242,9 @@ class RedneckSBSwipe : DukeActor default { pic "SBSWIPE"; + +BADGUYSTAYPUT; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void initialize() @@ -248,6 +275,8 @@ class RedneckShitBoss : DukeActor { pic "SBMOVE"; +FULLBRIGHT; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() @@ -262,6 +291,7 @@ class RedneckBubbaStand : DukeActor default { pic "BUBBASTAND"; + +INTERNAL_BADGUY; } override void initialize() @@ -278,6 +308,8 @@ class RedneckHulk : DukeActor default { pic "HULK"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() @@ -306,6 +338,7 @@ class RedneckBoulder : DukeActor default { pic "BOULDER"; + +INTERNAL_BADGUY; } } @@ -314,6 +347,7 @@ class RedneckBoulder1 : DukeActor default { pic "BOULDER1"; + +INTERNAL_BADGUY; } } @@ -322,6 +356,7 @@ class RedneckTornado : DukeActor default { pic "TORNADO"; + +INTERNAL_BADGUY; } override void Initialize() { @@ -337,6 +372,8 @@ class RedneckDog : DukeActor default { pic "DOGRUN"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -350,6 +387,8 @@ class RedneckSheriff : DukeActor default { pic "LTH"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -363,6 +402,8 @@ class RedneckMosquito : DukeActor default { pic "DRONE"; + +INTERNAL_BADGUY; + +KILLCOUNT; } override void Initialize() { @@ -376,5 +417,7 @@ class RedneckVixen : DukeActor default { pic "VIXEN"; + +INTERNAL_BADGUY; + +KILLCOUNT; } }