- moved NWinter items to a subfolder and added Duke Vacation items (only 6 that have code changes.)

wadsrc/static/filter/duke.nwinter/rmapinfo.spawnclasses

@@ -29,5 +29,11 @@ spawnclasses
 	3823= NWinterFemaleGeek                                   
 	3787= NWinterSnowmaker                                    
 	3789= NWinterSnowmakerNomove                              
-	3697= NWinterSnowflake                                    
+	3697= NWinterSnowflake          
+	// actors that were altered.
+	1975 = NWinterTank
+	1920 = NWinterCommander
+	1921 = NWinterCommanderStayput
+	57 = NWinterJetpack
+
 }

wadsrc/static/filter/duke.vacation/rmapinfo.spawnclasses

@@ -0,0 +1,11 @@
+
+spawnclasses
+{
+	2165 = VacationBeachBabe
+	2400 = VacationBeachBall
+	1312 = VacationBeachBather
+	2120 = VacationDragon
+	1638 = VacationSeagullShit
+	2150 = VacationSeagull
+	1550 = VacationShark
+}

wadsrc/static/zscript.txt

@@ -65,8 +65,6 @@ version "4.10"
 
 #include "zscript/games/duke/actors/player.zs"
 
-#include "zscript/games/duke/actors/nwinter.zs"
-
 #include "zscript/games/duke/actors/dukecstuff/bloodpool.zs"
 #include "zscript/games/duke/actors/dukecstuff/bloodsplats.zs"
 #include "zscript/games/duke/actors/dukecstuff/bolt.zs"
@@ -147,6 +145,23 @@ version "4.10"
 #include "zscript/games/duke/actors/worldtour/firefly.zs"
 #include "zscript/games/duke/actors/worldtour/flamethrower.zs"
 
+#include "zscript/games/duke/actors/vacation/beachbabe.zs"
+#include "zscript/games/duke/actors/vacation/beachball.zs"
+#include "zscript/games/duke/actors/vacation/beachbather.zs"
+#include "zscript/games/duke/actors/vacation/dragon.zs"
+#include "zscript/games/duke/actors/vacation/seagull.zs"
+#include "zscript/games/duke/actors/vacation/vacashark.zs"
+
+#include "zscript/games/duke/actors/nwinter/breakables.zs"
+#include "zscript/games/duke/actors/nwinter/elfgun.zs"
+#include "zscript/games/duke/actors/nwinter/elfuzi.zs"
+#include "zscript/games/duke/actors/nwinter/commander.zs"
+#include "zscript/games/duke/actors/nwinter/jetpack.zs"
+#include "zscript/games/duke/actors/nwinter/misc.zs"
+#include "zscript/games/duke/actors/nwinter/santaboss.zs"
+#include "zscript/games/duke/actors/nwinter/snowman.zs"
+#include "zscript/games/duke/actors/nwinter/xmaspresent.zs"
+
 #include "zscript/games/duke/actors/redneckcstuff/airplane.zs"
 #include "zscript/games/duke/actors/redneckcstuff/balloons.zs"
 #include "zscript/games/duke/actors/redneckcstuff/bowling.zs"

wadsrc/static/zscript/games/duke/actors/nwinter.zs

@@ -1,217 +0,0 @@
-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";
-	}
-}

wadsrc/static/zscript/games/duke/actors/nwinter/breakables.zs

@@ -0,0 +1,92 @@
+class NWinterWoodSlats : DukeScriptedBreakable // WOODSLATS (3757)
+{
+	default
+	{
+		pic "WOODSLATS";
+		Strength MEDIUMSTRENGTH;
+	}
+	
+}
+class NWinterRibbon : DukeScriptedBreakable // RIBBON (930)
+{
+	default
+	{
+		pic "RIBBON";
+		Strength WEAK;
+	}
+	
+}
+class NWinterSSpeaker : DukeScriptedBreakable // SSPEAKER (589)
+{
+	default
+	{
+		pic "SSPEAKER";
+		Strength WEAK;
+	}
+	
+}
+class NWinterMybox : NWinterRibbon // MYBOX (3666)
+{
+	default
+	{
+		pic "MYBOX";
+		Strength WEAK;
+	}
+}
+class NWinterDrunkElf : DukeScriptedBreakable // DRUNKELF (3592)
+{
+	default
+	{
+		pic "DRUNKELF";
+		Strength WEAK;
+	}
+	
+}
+class NWinterHalfBitch : NWinterDrunkElf // HALFBITCH (3627)
+{
+	default
+	{
+		pic "HALFBITCH";
+		Strength WEAK;
+	}
+}
+class NWinterSlutAss : NWinterDrunkElf // SLUTASS (3637)
+{
+	default
+	{
+		pic "SLUTASS";
+		Strength WEAK;
+	}
+}
+class NWinterChoochooslut : DukeScriptedBreakable // CHOOCHOOSLUT (3779)
+{
+	default
+	{
+		pic "CHOOCHOOSLUT";
+		Strength WEAK;
+	}
+}
+class NWinterHorsepower : NWinterChoochooslut // HORSEPOWER (3783)
+{
+	default
+	{
+		pic "HORSEPOWER";
+		Strength WEAK;
+	}
+}
+class NWinterSnowgib : DukeScriptedBreakable // SNOWGIB (3777)
+{
+	default
+	{
+		pic "SNOWGIB";
+		Strength WEAK;
+	}
+}
+class NWinterTreeWithSomething : DukeScriptedBreakable // TREEWITHSOMETHING (3648)
+{
+	default
+	{
+		pic "TREEWITHSOMETHING";
+		Strength TOUGH;
+	}
+}

wadsrc/static/zscript/games/duke/actors/nwinter/commander.zs

@@ -0,0 +1,17 @@
+class NWinterCommander : DukeCommander
+{
+	default
+	{
+	}
+	
+	
+}
+
+class NWinterCommanderStayput: NWinterCommander
+{
+	default
+	{
+		pic "COMMANDERSTAYPUT";
+		+BADGUYSTAYPUT;
+	}
+}

wadsrc/static/zscript/games/duke/actors/nwinter/elfgun.zs

@@ -0,0 +1,27 @@
+
+class NWinterElfGun : DukeActor
+{
+	const ELFGUNSTRENGTH = 75;
+
+	default
+	{
+		+BADGUY
+		+KILLCOUNT
+		Strength ELFGUNSTRENGTH;
+		
+		pic "ELFGUN";
+	}
+	
+	
+}
+
+
+class NWinterElfGunStayput : NWinterElfGun
+{
+	default
+	{
+		+BADGUYSTAYPUT
+	}
+	
+	
+}

wadsrc/static/zscript/games/duke/actors/nwinter/elfuzi.zs

@@ -0,0 +1,36 @@
+class NWinterElfUzi : DukeActor
+{
+	const ELFUZISTRENGTH = 50;
+	const ELFUZIALTSTR = 25;
+	
+	default
+	{
+		pic "ELFUZI";
+		+BADGUY
+		+KILLCOUNT
+		Strength ELFUZISTRENGTH;
+
+	}
+	
+	
+}
+
+class NWinterElfUziStayput : DukeActor
+{
+	default
+	{
+		pic "ELFUZISTAYPUT";
+		+BADGUYSTAYPUT;
+	}
+	
+}
+
+class NWinterSpecBlood : DukeActor
+{
+	default
+	{
+		pic "SPECBLOOD";
+	}
+	
+	
+}

wadsrc/static/zscript/games/duke/actors/nwinter/jetpack.zs

@@ -0,0 +1,14 @@
+class NWinterJetpack : DukeItemBase
+{
+	const JETPACK_NEAR_EMPTY = 160;
+
+	default
+	{
+		pic "JETPACK";
+		+INVENTORY;
+	}
+	
+	
+}
+
+

wadsrc/static/zscript/games/duke/actors/nwinter/misc.zs

@@ -0,0 +1,60 @@
+// NWinter new stuff
+
+class NWinterNoisemaker : DukeActor // NOISEMAKER (3883)
+{
+	default
+	{
+		pic "NOISEMAKER";
+		Strength 999;
+	}
+	
+}
+class NWinterMaleGeek : DukeActor // MALEGEEK (3761)
+{
+	default
+	{
+		pic "MALEGEEK";
+		Strength 20;
+	}
+	
+}
+class NWinterFemaleGeek : DukeActor // FEMALEGEEK (3823)
+{
+	default
+	{
+		pic "FEMALEGEEK";
+		Strength 20;
+	}
+	
+}
+class NWinterSnowmaker : DukeActor // SNOWMAKER (3787)
+{
+	default
+	{
+		pic "SNOWMAKER";
+		Strength 0;
+	}
+	
+	
+}
+
+class NWinterSnowmakerNomove : DukeActor // SNOWMAKERNOMOVE (3789)
+{
+	default
+	{
+		pic "SNOWMAKERNOMOVE";
+		Strength 0;
+	}
+}
+
+
+class NWinterSnowflake : DukeActor // SNOWFLAKE (3697)
+{
+	default
+	{
+		pic "SNOWFLAKE";
+		Strength 0;
+	}
+	
+	
+}

wadsrc/static/zscript/games/duke/actors/nwinter/santaboss.zs

@@ -0,0 +1,25 @@
+class NWinterSanta : DukeActor
+{
+	const SOBBOTSTRENGTH = 2500;
+	const MINIBOSSSTRENGTH = 100;
+
+	default
+	{
+		+BADGUY;
+		+KILLCOUNT;
+		pic "PIGCOP";	// tiles are offset from here.
+	}
+	
+}
+
+
+class NWinterSantaFly : NWinterSanta
+{
+	default
+	{
+		pic "PIGCOPDIVE";	// tiles are offset from here.
+		Strength SOBBOTSTRENGTH;
+		StartAction "ABOTFLY";
+	}
+	
+}

wadsrc/static/zscript/games/duke/actors/nwinter/snowman.zs

@@ -0,0 +1,34 @@
+class NWinterSnowball : DukeActor
+{
+	default
+	{
+		pic "SNOWBALL";
+		Strength 0;
+	}
+	
+}
+
+
+
+class NWinterSnowman : DukeActor
+{
+	const SNOWMANSTRENGTH = 75;
+	
+	default
+	{
+		pic "SNOWMAN";
+		+BADGUY
+		+KILLCOUNT
+		Strength SNOWMANSTRENGTH;
+	}
+	
+	
+}
+
+class NWinterTank : DukeTank
+{
+	default
+	{
+		DukeTank.SpawnType "NWinterSnowman";
+	}
+}

wadsrc/static/zscript/games/duke/actors/nwinter/xmaspresent.zs

@@ -0,0 +1,24 @@
+class NWinterXmasPresent : DukeActor
+{
+	default
+	{
+		pic "XMASPRESENT";
+	}
+
+}
+
+	//---------------------------------------------------------------------------
+	//
+	// 
+	//
+	//---------------------------------------------------------------------------
+
+class NWinterXmasPresent2 : DukeActor
+{
+	default
+	{
+		pic "XMASPRESENT";
+	}
+
+
+}

wadsrc/static/zscript/games/duke/actors/vacation/beachbabe.zs

@@ -0,0 +1,16 @@
+class VacationBeachBabe : DukeLizmanJump
+{
+
+	const BEACHBABESTRENGTH = 30;
+	default
+	{
+		pic "BEACHBABE";
+		Strength BEACHBABESTRENGTH;
+		+INTERNAL_BADGUY;
+	}
+	
+	override void PlayFTASound()
+	{
+		self.PlayActorSound("CAPT_RECOG");
+	}
+}

wadsrc/static/zscript/games/duke/actors/vacation/beachball.zs

@@ -0,0 +1,12 @@
+
+
+class VacationBeachBall : DukeActor
+{
+	const BALLSTRENGTH = 20;
+	default
+	{
+		pic "BEACHBALL";
+		Strength WEAK;
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/vacation/beachbather.zs

@@ -0,0 +1,11 @@
+
+class VacationBeachBather : DukeActor
+{
+	const BEACHBATHERSTRENGTH = 30;
+	default
+	{
+		pic "BEACHBATHER";
+		Strength BEACHBATHERSTRENGTH;
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/vacation/dragon.zs

@@ -0,0 +1,12 @@
+
+class VacationDragon : DukeActor // DRAGON (2120)
+{
+	const DRAGONSTRENGTH = 50;
+	
+	default
+	{
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		Strength DRAGONSTRENGTH;
+	}
+}

wadsrc/static/zscript/games/duke/actors/vacation/seagull.zs

@@ -0,0 +1,18 @@
+
+class VacationSeagull : DukeActor // SEAGULL (2150)
+{
+	const SEAGULLSTRENGTH = 20;
+	default
+	{
+		Strength SEAGULLSTRENGTH;
+	}
+	
+}
+
+class VacationSeagullShit : DukeActor // (1638) invalid class
+{
+	default
+	{
+		+BADGUY
+	}
+}

wadsrc/static/zscript/games/duke/actors/vacation/vacashark.zs

@@ -0,0 +1,8 @@
+class VacationShark : DukeShark // SHARK (1550)
+{
+	default
+	{
+		Strength DukeShark.SHARKSTRENGTH;
+	}
+
+}