- moved all RRRA enemies to a subfolder.

# Conflicts:
#	wadsrc/static/zscript/games/duke/actors/redneckenemies.zs

wadsrc/static/filter/redneck.ridesagain/rmapinfo.spawnclasses

@@ -56,6 +56,7 @@ spawnclasses
 	7220 = RedneckEmptyBike, noskill
 	7233 = RedneckEmptyBoat, noskill
 	4352 = RedneckRASheriff
+	4357 = RedneckDeputy
 
 	7636 = DukeGenericDestructible, noskill, "OLDPHOTO0", "OLDPHOTO0BROKE", "VENT_BUST"
 	7638 = DukeGenericDestructible, noskill, "OLDPHOTO1", "OLDPHOTO1BROKE", "VENT_BUST"
@@ -183,7 +184,7 @@ spawnclasses
 	8036 = RedneckRock2
 	8663 = RedneckMamaCloud
 	8705 = RedneckMama
-	4770 = RedneckSBSwipe
+	4770 = RedneckBubbaElvis
 	6659 = RedneckCheerStayput
 	8612 = RedneckWacoWindow
 	

wadsrc/static/zscript.txt

@@ -74,9 +74,6 @@ version "4.10"
 #include "zscript/games/duke/actors/redneckitems.zs"
 #include "zscript/games/duke/actors/redneckenemies.zs"
 #include "zscript/games/duke/actors/bowling.zs"
-#include "zscript/games/duke/actors/rabbitspawner.zs"
-
-#include "zscript/games/duke/actors/rabbit.zs"
 
 #include "zscript/games/duke/actors/nwinter.zs"
 
@@ -191,6 +188,23 @@ version "4.10"
 #include "zscript/games/duke/actors/redneckenemies/tornado.zs"
 #include "zscript/games/duke/actors/redneckenemies/vixen.zs"
 
+#include "zscript/games/duke/actors/rrraenemies/biker.zs"
+#include "zscript/games/duke/actors/rrraenemies/bikerb.zs"
+#include "zscript/games/duke/actors/rrraenemies/bikerbv2.zs"
+#include "zscript/games/duke/actors/rrraenemies/bubbaelvis.zs"
+#include "zscript/games/duke/actors/rrraenemies/cheer.zs"
+#include "zscript/games/duke/actors/rrraenemies/cheerb.zs"
+#include "zscript/games/duke/actors/rrraenemies/cheerboat.zs"
+#include "zscript/games/duke/actors/rrraenemies/cheers.zs"
+#include "zscript/games/duke/actors/rrraenemies/cootbillyplay.zs"
+#include "zscript/games/duke/actors/rrraenemies/deputy.zs"
+#include "zscript/games/duke/actors/rrraenemies/hulkboat.zs"
+#include "zscript/games/duke/actors/rrraenemies/makeout.zs"
+#include "zscript/games/duke/actors/rrraenemies/mama.zs"
+#include "zscript/games/duke/actors/rrraenemies/minionboat.zs"
+#include "zscript/games/duke/actors/rrraenemies/rabbit.zs"
+#include "zscript/games/duke/actors/rrraenemies/rabbitspawner.zs"
+#include "zscript/games/duke/actors/rrraenemies/shootout.zs"
 #include "zscript/games/duke/actors/redneckweapons/boatcannon.zs"
 #include "zscript/games/duke/actors/redneckweapons/crossbow.zs"
 #include "zscript/games/duke/actors/redneckweapons/ripsaw.zs"

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

@@ -1,198 +1,3 @@
-
-class RedneckBikerBV2 : DukeActor
-{
-	default
-	{
-		pic "BIKERBV2";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		watermovefactor 0.5;
-		gravityfactor 0.125;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.4375, 0.34375);
-		self.clipdist = 18;
-	}
-}
-
-class RedneckBikerB : DukeActor
-{
-	default
-	{
-		pic "BIKERB";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		watermovefactor 0.5;
-		gravityfactor 0.25;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.4375, 0.34375);
-		self.clipdist = 18;
-	}
-}
-
-class RedneckBiker : DukeActor
-{
-	default
-	{
-		pic "BIKER";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.4375, 0.34375);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckMakeout : DukeActor
-{
-	default
-	{
-		pic "MAKEOUT";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.40625, 0.40625);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckCheerleaderB : DukeActor
-{
-	default
-	{
-		pic "CHEERB";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		watermovefactor 0.5;
-		gravityfactor 0.25;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.4375, 0.34375);
-		self.clipdist = 18;
-	}
-}
-
-class RedneckCheerleader : DukeActor
-{
-	default
-	{
-		pic "CHEER";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		+ALTPROJECTILESPRITE; // owed to CON's shittiness. Todo: Think of something better.
-		jumptoplayer_factor 1.6;
-}
-	override void Initialize()
-	{
-		self.scale = (0.3125, 0.3125);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckCootplay : DukeActor
-{
-	default
-	{
-		pic "COOTPLAY";
-		+INTERNAL_BADGUY;
-		+LOOKALLAROUND;
-		+NORADIUSPUSH;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.375, 0.28128);
-		self.setClipDistFromTile();
-		self.clipdist *= 4;
-	}
-}
-
-class RedneckBillyPlay : DukeActor
-{
-	default
-	{
-		pic "BILLYPLAY";
-		+INTERNAL_BADGUY;
-		+LOOKALLAROUND;
-		+NORADIUSPUSH;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.390625, 0.328125);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckMinionBoat : DukeActor
-{
-	default
-	{
-		pic "MINIONBOAT";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		+DONTDIVE;
-		falladjustz 3;
-		landmovefactor 0.5;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.25, 0.25);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckHulkBoat : DukeActor
-{
-	default
-	{
-		pic "HULKBOAT";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		+DONTDIVE;
-		falladjustz 12;
-		landmovefactor 0.5;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.75, 0.75);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckCheerBoat : DukeActor
-{
-	default
-	{
-		pic "CHEERBOAT";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		+DONTDIVE;
-		falladjustz 6;
-		landmovefactor 0.5;
-	}
-	override void Initialize()
-	{
-		self.scale = (0.5, 0.5);
-		self.setClipDistFromTile();
-	}
-}
-
 class RedneckRock : DukeActor
 {
 	default
@@ -216,96 +21,6 @@ class RedneckRock2 : RedneckRock
 	}
 }
 
-class RedneckMamaCloud : DukeActor
-{
-	default
-	{
-		pic "MAMACLOUD";
-		+NORADIUSPUSH;
-	}
-	override void Initialize()
-	{
-		self.scale = (1, 1);
-		self.cstat = CSTAT_SPRITE_TRANSLUCENT | CSTAT_SPRITE_TRANS_FLIP;
-		self.pos.X += frandom(-64, 64);
-		self.pos.Y += frandom(-64, 64);
-		self.pos.Z += frandom(-4, 4);
-	}
-}
-
-class RedneckMama : DukeActor
-{
-	default
-	{
-		pic "MAMA";
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-		+LOOKALLAROUND;
-		+NORADIUSPUSH;
-		+SPAWNRABBITGUTS; // owed to CON's shittiness. Todo: Think of something better.
-		justjump1_factor 1.83;
-		justjump2_factor 2.286;
-	}
-
-	override void Initialize()
-	{
-		if (self.pal == 30)
-		{
-			self.scale = (0.40625, 0.40625);
-			self.clipdist = 18.75;
-		}
-		else if (self.pal == 31)
-		{
-			self.scale = (0.5625, 0.5625);
-			self.clipdist = 25;
-		}
-		else if (self.pal == 32)
-		{
-			self.scale = (0.78125, 0.78125);
-			self.clipdist = 25;
-		}
-		else
-		{
-			self.scale = (0.78125, 0.78125);
-			self.clipdist = 25;
-		}
-	}
-	
-}
-
-class RedneckSBSwipe : DukeActor
-{
-	default
-	{
-		pic "SBSWIPE";
-		+BADGUYSTAYPUT;
-		+INTERNAL_BADGUY;
-		+KILLCOUNT;
-	}
-	
-	override void initialize()
-	{
-		self.actorstayput = self.sector;	// make this a flag once everything has been exported.
-		self.scale = (0.390625, 0.328125);
-		self.setClipDistFromTile();
-	}
-}
-
-class RedneckCheerStayput : RedneckCheerleader
-{
-	default
-	{
-		pic "CHEERSTAYPUT";
-		jumptoplayer_factor 2.0;
-	}
-	
-	override void initialize()
-	{
-		super.initialize();
-		self.actorstayput = self.sector;	// make this a flag once everything has been exported.
-	}
-}
-
 class RedneckBoulder : DukeActor
 {
 	default

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

@@ -1,14 +1,3 @@
-
-class RedneckWacoWindow : DukeActor
-{
-	default
-	{
-		pic "WACOWINDER";
-		+BADGUY;
-	}
-}
-
-
 class RedneckTeslaBall : DukeItemBase
 {
 	default

wadsrc/static/zscript/games/duke/actors/rrraenemies/biker.zs

@@ -0,0 +1,18 @@
+
+class RedneckBiker : DukeActor
+{
+	default
+	{
+		pic "BIKER";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		Strength 150;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.4375, 0.34375);
+		self.setClipDistFromTile();
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/bikerb.zs

@@ -0,0 +1,19 @@
+class RedneckBikerB : DukeActor
+{
+	default
+	{
+		pic "BIKERB";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		watermovefactor 0.5;
+		gravityfactor 0.25;
+		Strength 300;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.4375, 0.34375);
+		self.clipdist = 18;
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/bikerbv2.zs

@@ -0,0 +1,20 @@
+
+class RedneckBikerBV2 : DukeActor
+{
+	default
+	{
+		pic "BIKERBV2";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		watermovefactor 0.5;
+		gravityfactor 0.125;
+		Strength 200;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.4375, 0.34375);
+		self.clipdist = 18;
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/bubbaelvis.zs

@@ -0,0 +1,19 @@
+class RedneckBubbaelvis : RedneckBubbaStand
+{
+	default
+	{
+		pic "SBSWIPE";
+		+BADGUYSTAYPUT;
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+BADGUYSTAYPUT;
+		Strength 100;
+	}
+	
+	override void initialize()
+	{
+		self.scale = (0.390625, 0.328125);
+		self.setClipDistFromTile();
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/cheer.zs

@@ -0,0 +1,19 @@
+
+class RedneckCheerleader : DukeActor
+{
+	default
+	{
+		pic "CHEER";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		+ALTPROJECTILESPRITE; // owed to CON's shittiness. Todo: Think of something better.
+		jumptoplayer_factor 1.6;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.3125, 0.3125);
+		self.setClipDistFromTile();
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/cheerb.zs

@@ -0,0 +1,18 @@
+class RedneckCheerleaderB : DukeActor
+{
+	default
+	{
+		pic "CHEERB";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		watermovefactor 0.5;
+		gravityfactor 0.25;
+		Strength 150;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.4375, 0.34375);
+		self.clipdist = 18;
+	}
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/cheerboat.zs

@@ -0,0 +1,19 @@
+class RedneckCheerBoat : DukeActor
+{
+	default
+	{
+		pic "CHEERBOAT";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		+DONTDIVE;
+		falladjustz 6;
+		landmovefactor 0.5;
+		Strength 200;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.5, 0.5);
+		self.setClipDistFromTile();
+	}
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/cheers.zs

@@ -0,0 +1,11 @@
+class RedneckCheerStayput : RedneckCheerleader
+{
+	default
+	{
+		pic "CHEERSTAYPUT";
+		jumptoplayer_factor 2.0;
+		+BADGUYSTAYPUT;
+		Strength 150;
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/cootbillyplay.zs

@@ -0,0 +1,36 @@
+class RedneckCootplay : DukeActor
+{
+	default
+	{
+		pic "COOTPLAY";
+		+INTERNAL_BADGUY;
+		+LOOKALLAROUND;
+		+NORADIUSPUSH;
+		Strength 10000;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.375, 0.28128);
+		self.setClipDistFromTile();
+		self.clipdist *= 4;
+	}
+	
+}
+
+class RedneckBillyPlay : DukeActor
+{
+	default
+	{
+		pic "BILLYPLAY";
+		+INTERNAL_BADGUY;
+		+LOOKALLAROUND;
+		+NORADIUSPUSH;
+		Strength 10000;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.390625, 0.328125);
+		self.setClipDistFromTile();
+	}
+		
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/deputy.zs

@@ -0,0 +1,10 @@
+class RedneckDeputy : DukeActor
+{
+	default
+	{
+		+BADGUY
+		+KILLCOUNT
+		Strength 2;
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/hulkboat.zs

@@ -0,0 +1,20 @@
+class RedneckHulkBoat : DukeActor
+{
+	default
+	{
+		pic "HULKBOAT";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		+DONTDIVE;
+		falladjustz 12;
+		landmovefactor 0.5;
+		Strength 300;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.75, 0.75);
+		self.setClipDistFromTile();
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/makeout.zs

@@ -0,0 +1,17 @@
+class RedneckMakeout : DukeActor
+{
+	default
+	{
+		pic "MAKEOUT";
+		+INTERNAL_BADGUY;
+		//+KILLCOUNT;
+		+LOOKALLAROUND;
+		Strength 150;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.40625, 0.40625);
+		self.setClipDistFromTile();
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/mama.zs

@@ -0,0 +1,60 @@
+class RedneckMamaCloud : DukeActor
+{
+	default
+	{
+		pic "MAMACLOUD";
+		Strength 10000;
+		+NORADIUSPUSH;
+	}
+	override void Initialize()
+	{
+		self.scale = (1, 1);
+		self.cstat = CSTAT_SPRITE_TRANSLUCENT | CSTAT_SPRITE_TRANS_FLIP;
+		self.pos.X += frandom(-64, 64);
+		self.pos.Y += frandom(-64, 64);
+		self.pos.Z += frandom(-4, 4);
+	}
+	
+}
+
+class RedneckMama : DukeActor
+{
+	default
+	{
+		pic "MAMA";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		+NORADIUSPUSH;
+		+SPAWNRABBITGUTS; // owed to CON's shittiness. Todo: Think of something better.
+		justjump1_factor 1.83;
+		justjump2_factor 2.286;
+		Strength 2000;
+	}
+
+	override void Initialize()
+	{
+		if (self.pal == 30)
+		{
+			self.scale = (0.40625, 0.40625);
+			self.clipdist = 18.75;
+		}
+		else if (self.pal == 31)
+		{
+			self.scale = (0.5625, 0.5625);
+			self.clipdist = 25;
+		}
+		else if (self.pal == 32)
+		{
+			self.scale = (0.78125, 0.78125);
+			self.clipdist = 25;
+		}
+		else
+		{
+			self.scale = (0.78125, 0.78125);
+			self.clipdist = 25;
+		}
+	}
+	
+}
+

wadsrc/static/zscript/games/duke/actors/rrraenemies/minionboat.zs

@@ -0,0 +1,20 @@
+class RedneckMinionBoat : DukeActor
+{
+	default
+	{
+		pic "MINIONBOAT";
+		+INTERNAL_BADGUY;
+		+KILLCOUNT;
+		+LOOKALLAROUND;
+		+DONTDIVE;
+		falladjustz 3;
+		landmovefactor 0.5;
+		Strength 150;
+	}
+	override void Initialize()
+	{
+		self.scale = (0.25, 0.25);
+		self.setClipDistFromTile();
+	}
+
+}

wadsrc/static/zscript/games/duke/actors/rrraenemies/rabbit.zs

@@ -6,6 +6,7 @@ class RedneckRabbit : DukeActor
 		+INTERNAL_BADGUY;
 		+KILLCOUNT;
 		+LOOKALLAROUND;
+		Strength 50;
 	}
 	
 	override void Initialize()

wadsrc/static/zscript/games/duke/actors/rrraenemies/shootout.zs

@@ -0,0 +1,10 @@
+class RedneckWacoWindow : DukeActor
+{
+	default
+	{
+		pic "WACOWINDER";
+		+BADGUY
+		Strength WEAK;
+	}
+
+}