From 5f68291f69f9176dc92af1b8d8615552a9e843e1 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 24 Dec 2022 11:41:56 +0100 Subject: [PATCH] - added skeleton definitions for all new Nuclear Winter items and their base tiles. --- source/games/duke/src/namelist_d.h | 28 +++ .../filter/duke.nwinter/rmapinfo.spawnclasses | 33 +++ wadsrc/static/zscript.txt | 1 + .../zscript/games/duke/actors/nwinter.zs | 217 ++++++++++++++++++ 4 files changed, 279 insertions(+) create mode 100644 wadsrc/static/filter/duke.nwinter/rmapinfo.spawnclasses create mode 100644 wadsrc/static/zscript/games/duke/actors/nwinter.zs diff --git a/source/games/duke/src/namelist_d.h b/source/games/duke/src/namelist_d.h index cc5172906..cbee7ec5b 100644 --- a/source/games/duke/src/namelist_d.h +++ b/source/games/duke/src/namelist_d.h @@ -962,3 +962,31 @@ x(DUKEDCSKY, 3708) x(NAMSKY1, 212) x(NAMSKY2, 225) x(PLATOONSKY, 1086) + +// NWinter tiles getting referenced by name + +x(WOODSLATS, 3757) +x(RIBBON, 930) +x(SSPEAKER, 589) +x(MYBOX, 3666) +x(DRUNKELF, 3592) +x(HALFBITCH, 3627) +x(SLUTASS, 3637) +x(CHOOCHOOSLUT, 3779) +x(HORSEPOWER, 3783) +x(SNOWGIB, 3777) +x(TREEWITHSOMETHING, 3648) +x(SNOWBALL, 3882) +x(SNOWMAN, 3841) +x(SPECBLOOD, 105) +x(ELFUZI, 3800) +x(ELFUZISTAYPUT, 3801) +x(ELFGUN, 4000) +x(ELFGUNSTAYPUT, 4001) +x(XMASPRESENT, 3782) +x(NOISEMAKER, 3883) +x(MALEGEEK, 3761) +x(FEMALEGEEK, 3823) +x(SNOWMAKER, 3787) +x(SNOWMAKERNOMOVE, 3789) +x(SNOWFLAKE, 3697) diff --git a/wadsrc/static/filter/duke.nwinter/rmapinfo.spawnclasses b/wadsrc/static/filter/duke.nwinter/rmapinfo.spawnclasses new file mode 100644 index 000000000..0d9fbd646 --- /dev/null +++ b/wadsrc/static/filter/duke.nwinter/rmapinfo.spawnclasses @@ -0,0 +1,33 @@ +spawnclasses +{ + 2002 = DukePigCop + 2003 = DukePigCopStayput + 2047 = DukePigCopDive + 2000= NWinterSanta + 2045= NWinterSantaFly + 3757= NWinterWoodSlats + 930= NWinterRibbon + 589= NWinterSSpeaker + 3666= NWinterMybox + 3592= NWinterDrunkElf + 3627= NWinterHalfBitch + 3637= NWinterSlutAss + 3779= NWinterChoochooslut + 3783= NWinterHorsepower + 3777= NWinterSnowgib + 3648= NWinterTreeWithSomething + 3882= NWinterSnowball + 3841= NWinterSnowman + 105= NWinterSpecBlood + 3800= NWinterElfUzi + 3801= NWinterElfUziStayput + 4000= NWinterElfGun + 4001= NWinterElfGunStayput + 3782= NWinterXmasPresent + 3883= NWinterNoisemaker + 3761= NWinterMaleGeek + 3823= NWinterFemaleGeek + 3787= NWinterSnowmaker + 3789= NWinterSnowmakerNomove + 3697= NWinterSnowflake +} diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt index 870703f2a..5a686aa31 100644 --- a/wadsrc/static/zscript.txt +++ b/wadsrc/static/zscript.txt @@ -157,6 +157,7 @@ version "4.10" #include "zscript/games/duke/actors/pig.zs" #include "zscript/games/duke/actors/rabbit.zs" +#include "zscript/games/duke/actors/nwinter.zs" #include "zscript/games/duke/actors/dukeweapons/melee.zs" #include "zscript/games/duke/actors/dukeweapons/hitscan.zs" diff --git a/wadsrc/static/zscript/games/duke/actors/nwinter.zs b/wadsrc/static/zscript/games/duke/actors/nwinter.zs new file mode 100644 index 000000000..7c61eaca4 --- /dev/null +++ b/wadsrc/static/zscript/games/duke/actors/nwinter.zs @@ -0,0 +1,217 @@ +class NWinterSanta : DukeActor +{ + default + { + pic "PIGCOP"; // tiles are offset from here. + } +} + +class NWinterSantaFly : DukeActor +{ + default + { + pic "PIGCOPDIVE"; // tiles are offset from here. + } +} + +class NWinterWoodSlats : DukeActor +{ + default + { + pic "WOODSLATS"; + } +} + +class NWinterRibbon : DukeActor +{ + default + { + pic "RIBBON"; + } +} + +class NWinterSSpeaker : DukeActor +{ + default + { + pic "SSPEAKER"; + } +} + +class NWinterMybox : DukeActor +{ + default + { + pic "MYBOX"; + } +} + +class NWinterDrunkElf : DukeActor +{ + default + { + pic "DRUNKELF"; + } +} + +class NWinterHalfBitch : DukeActor +{ + default + { + pic "HALFBITCH"; + } +} + +class NWinterSlutAss : DukeActor +{ + default + { + pic "SLUTASS"; + } +} + +class NWinterChoochooslut : DukeActor +{ + default + { + pic "CHOOCHOOSLUT"; + } +} + +class NWinterHorsepower : DukeActor +{ + default + { + pic "HORSEPOWER"; + } +} + +class NWinterSnowgib : DukeActor +{ + default + { + pic "SNOWGIB"; + } +} + +class NWinterTreeWithSomething : DukeActor +{ + default + { + pic "TREEWITHSOMETHING"; + } +} + +class NWinterSnowball : DukeActor +{ + default + { + pic "SNOWBALL"; + } +} + +class NWinterSnowman : DukeActor +{ + default + { + pic "SNOWMAN"; + } +} + +class NWinterSpecBlood : DukeActor +{ + default + { + pic "SPECBLOOD"; + } +} + +class NWinterElfUzi : DukeActor +{ + default + { + pic "ELFUZI"; + } +} + +class NWinterElfUziStayput : DukeActor +{ + default + { + pic "ELFUZISTAYPUT"; + +BADGUYSTAYPUT; + } +} + +class NWinterElfGun : DukeActor +{ + default + { + pic "ELFGUN"; + } +} + + +class NWinterElfGunStayput : DukeActor +{ + default + { + pic "ELFGUNSTAYPUT"; + } +} + +class NWinterXmasPresent : DukeActor +{ + default + { + pic "XMASPRESENT"; + } +} + +class NWinterNoisemaker : DukeActor +{ + default + { + pic "NOISEMAKER"; + } +} + +class NWinterMaleGeek : DukeActor +{ + default + { + pic "MALEGEEK"; + } +} + +class NWinterFemaleGeek : DukeActor +{ + default + { + pic "FEMALEGEEK"; + } +} + +class NWinterSnowmaker : DukeActor +{ + default + { + pic "SNOWMAKER"; + } +} + +class NWinterSnowmakerNomove : DukeActor +{ + default + { + pic "SNOWMAKERNOMOVE"; + } +} + +class NWinterSnowflake : DukeActor +{ + default + { + pic "SNOWFLAKE"; + } +}