From 0281e5dff823d897c8b67d72c6e9ab732d047b91 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 25 Nov 2022 17:00:35 +0100 Subject: [PATCH] - unified the spawnclasses definitions for Duke, Nam and WW2GI. --- wadsrc/static/filter/duke/engine/engine.def | 63 ------------------ .../static/filter/dukelike/engine/engine.def | 64 +++++++++++++++++++ wadsrc/static/filter/nam/engine/engine.def | 63 ------------------ wadsrc/static/filter/ww2gi/engine/engine.def | 63 ------------------ 4 files changed, 64 insertions(+), 189 deletions(-) delete mode 100644 wadsrc/static/filter/duke/engine/engine.def delete mode 100644 wadsrc/static/filter/nam/engine/engine.def delete mode 100644 wadsrc/static/filter/ww2gi/engine/engine.def diff --git a/wadsrc/static/filter/duke/engine/engine.def b/wadsrc/static/filter/duke/engine/engine.def deleted file mode 100644 index 4cadf7fd4..000000000 --- a/wadsrc/static/filter/duke/engine/engine.def +++ /dev/null @@ -1,63 +0,0 @@ -spawnclasses -{ - 2 = DukeActivator - 3 = DukeTouchplate - 4 = DukeActivatorLocked - 5 = DukeSoundController - 6 = DukeLocator - 7 = DukeCycler - 8 = DukeMasterSwitch - 9 = DukeRespawnController - 10 = DukeGPSpeed - - 1221 = DukeCranePole - 1222 = DukeCrane - 563 = DukeWaterFountain - 564 = DukeWaterFountain - 565 = DukeWaterFountain - 566 = DukeWaterFountain - 567 = DukeWaterFountainBroke - 951 = DukeBox - 978 = DukeCone - 908 = DukeTree1 - 910 = DukeTree2 - 990 = DukeTire - 911 = DukeCactus - 939 = DukeCactusBroke - 2566 = DukeTripbombPlaced - 2567 = DukeLaserline - 546 = DukeCrack1 - 547 = DukeCrack2 - 548 = DukeCrack3 - 549 = DukeCrack4 - 916 = DukeFireext - 1079 = DukeOozFilter - 1247 = DukeSeenine - 502 = DukeViewscreen - 499 = DukeViewscreen2 - 621 = DukeCamera // yes, they are all the same! - 622 = DukeCamera - 623 = DukeCamera - 624 = DukeCamera - 625 = DukeCamera - - 1272 = DukeTrash - 634 = DukeBolt1 - 635 = DukeBolt2 - 636 = DukeBolt3 - 637 = DukeBolt4 - 4525 = DukeSideBolt1 - 4526 = DukeSideBolt2 - 4527 = DukeSideBolt3 - 4528 = DukeSideBolt4 - 660 = DukeWaterdrip - 160 = DukeDoorshock - 1232 = DukeCanWithSomething - 2807 = DukeCanWithSomething2 - 2808 = DukeCanWithSomething3 - 2809 = DukeCanWithSomething4 - 1647 = DukeTongue - 1860 = DukeInnerJaw - 1861 = DukeInnerJaw1 - -} diff --git a/wadsrc/static/filter/dukelike/engine/engine.def b/wadsrc/static/filter/dukelike/engine/engine.def index d7c93b65f..3f523dc1d 100644 --- a/wadsrc/static/filter/dukelike/engine/engine.def +++ b/wadsrc/static/filter/dukelike/engine/engine.def @@ -1,5 +1,69 @@ include "engine/defines.def" +spawnclasses +{ + 2 = DukeActivator + 3 = DukeTouchplate + 4 = DukeActivatorLocked + 5 = DukeSoundController + 6 = DukeLocator + 7 = DukeCycler + 8 = DukeMasterSwitch + 9 = DukeRespawnController + 10 = DukeGPSpeed + + 1221 = DukeCranePole + 1222 = DukeCrane + 563 = DukeWaterFountain + 564 = DukeWaterFountain + 565 = DukeWaterFountain + 566 = DukeWaterFountain + 567 = DukeWaterFountainBroke + 951 = DukeBox + 978 = DukeCone + 908 = DukeTree1 + 910 = DukeTree2 + 990 = DukeTire + 911 = DukeCactus + 939 = DukeCactusBroke + 2566 = DukeTripbombPlaced + 2567 = DukeLaserline + 546 = DukeCrack1 + 547 = DukeCrack2 + 548 = DukeCrack3 + 549 = DukeCrack4 + 916 = DukeFireext + 1079 = DukeOozFilter + 1247 = DukeSeenine + 502 = DukeViewscreen + 499 = DukeViewscreen2 + 621 = DukeCamera // yes, they are all the same! + 622 = DukeCamera + 623 = DukeCamera + 624 = DukeCamera + 625 = DukeCamera + + 1272 = DukeTrash + 634 = DukeBolt1 + 635 = DukeBolt2 + 636 = DukeBolt3 + 637 = DukeBolt4 + 4525 = DukeSideBolt1 + 4526 = DukeSideBolt2 + 4527 = DukeSideBolt3 + 4528 = DukeSideBolt4 + 660 = DukeWaterdrip + 160 = DukeDoorshock + 1232 = DukeCanWithSomething + 2807 = DukeCanWithSomething2 + 2808 = DukeCanWithSomething3 + 2809 = DukeCanWithSomething4 + 1647 = DukeTongue + 1860 = DukeInnerJaw + 1861 = DukeInnerJaw1 + +} + tileflag TFLAG_WALLSWITCH { HANDPRINTSWITCH HANDPRINTSWITCHON diff --git a/wadsrc/static/filter/nam/engine/engine.def b/wadsrc/static/filter/nam/engine/engine.def deleted file mode 100644 index 4cadf7fd4..000000000 --- a/wadsrc/static/filter/nam/engine/engine.def +++ /dev/null @@ -1,63 +0,0 @@ -spawnclasses -{ - 2 = DukeActivator - 3 = DukeTouchplate - 4 = DukeActivatorLocked - 5 = DukeSoundController - 6 = DukeLocator - 7 = DukeCycler - 8 = DukeMasterSwitch - 9 = DukeRespawnController - 10 = DukeGPSpeed - - 1221 = DukeCranePole - 1222 = DukeCrane - 563 = DukeWaterFountain - 564 = DukeWaterFountain - 565 = DukeWaterFountain - 566 = DukeWaterFountain - 567 = DukeWaterFountainBroke - 951 = DukeBox - 978 = DukeCone - 908 = DukeTree1 - 910 = DukeTree2 - 990 = DukeTire - 911 = DukeCactus - 939 = DukeCactusBroke - 2566 = DukeTripbombPlaced - 2567 = DukeLaserline - 546 = DukeCrack1 - 547 = DukeCrack2 - 548 = DukeCrack3 - 549 = DukeCrack4 - 916 = DukeFireext - 1079 = DukeOozFilter - 1247 = DukeSeenine - 502 = DukeViewscreen - 499 = DukeViewscreen2 - 621 = DukeCamera // yes, they are all the same! - 622 = DukeCamera - 623 = DukeCamera - 624 = DukeCamera - 625 = DukeCamera - - 1272 = DukeTrash - 634 = DukeBolt1 - 635 = DukeBolt2 - 636 = DukeBolt3 - 637 = DukeBolt4 - 4525 = DukeSideBolt1 - 4526 = DukeSideBolt2 - 4527 = DukeSideBolt3 - 4528 = DukeSideBolt4 - 660 = DukeWaterdrip - 160 = DukeDoorshock - 1232 = DukeCanWithSomething - 2807 = DukeCanWithSomething2 - 2808 = DukeCanWithSomething3 - 2809 = DukeCanWithSomething4 - 1647 = DukeTongue - 1860 = DukeInnerJaw - 1861 = DukeInnerJaw1 - -} diff --git a/wadsrc/static/filter/ww2gi/engine/engine.def b/wadsrc/static/filter/ww2gi/engine/engine.def deleted file mode 100644 index 4cadf7fd4..000000000 --- a/wadsrc/static/filter/ww2gi/engine/engine.def +++ /dev/null @@ -1,63 +0,0 @@ -spawnclasses -{ - 2 = DukeActivator - 3 = DukeTouchplate - 4 = DukeActivatorLocked - 5 = DukeSoundController - 6 = DukeLocator - 7 = DukeCycler - 8 = DukeMasterSwitch - 9 = DukeRespawnController - 10 = DukeGPSpeed - - 1221 = DukeCranePole - 1222 = DukeCrane - 563 = DukeWaterFountain - 564 = DukeWaterFountain - 565 = DukeWaterFountain - 566 = DukeWaterFountain - 567 = DukeWaterFountainBroke - 951 = DukeBox - 978 = DukeCone - 908 = DukeTree1 - 910 = DukeTree2 - 990 = DukeTire - 911 = DukeCactus - 939 = DukeCactusBroke - 2566 = DukeTripbombPlaced - 2567 = DukeLaserline - 546 = DukeCrack1 - 547 = DukeCrack2 - 548 = DukeCrack3 - 549 = DukeCrack4 - 916 = DukeFireext - 1079 = DukeOozFilter - 1247 = DukeSeenine - 502 = DukeViewscreen - 499 = DukeViewscreen2 - 621 = DukeCamera // yes, they are all the same! - 622 = DukeCamera - 623 = DukeCamera - 624 = DukeCamera - 625 = DukeCamera - - 1272 = DukeTrash - 634 = DukeBolt1 - 635 = DukeBolt2 - 636 = DukeBolt3 - 637 = DukeBolt4 - 4525 = DukeSideBolt1 - 4526 = DukeSideBolt2 - 4527 = DukeSideBolt3 - 4528 = DukeSideBolt4 - 660 = DukeWaterdrip - 160 = DukeDoorshock - 1232 = DukeCanWithSomething - 2807 = DukeCanWithSomething2 - 2808 = DukeCanWithSomething3 - 2809 = DukeCanWithSomething4 - 1647 = DukeTongue - 1860 = DukeInnerJaw - 1861 = DukeInnerJaw1 - -}