- pig cop converted

source/games/duke/src/actors_d.cpp

@@ -69,10 +69,6 @@ void check_fta_sounds_d(DDukeActor* actor)
 	case DTILE_LIZMANJUMP:
 		S_PlayActorSound(CAPT_RECOG, actor);
 		break;
-	case DTILE_PIGCOP:
-	case DTILE_PIGCOPDIVE:
-		S_PlayActorSound(PIG_RECOG, actor);
-		break;
 	case DTILE_RECON:
 		S_PlayActorSound(RECO_RECOG, actor);
 		break;

source/games/duke/src/spawn_d.cpp

@@ -276,10 +276,8 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 		break;
 	case DTILE_OCTABRAINSTAYPUT:
 	case DTILE_LIZTROOPSTAYPUT:
-	case DTILE_PIGCOPSTAYPUT:
 	case DTILE_LIZMANSTAYPUT:
 	case DTILE_BOSS1STAYPUT:
-	case DTILE_PIGCOPDIVE:
 	case DTILE_COMMANDERSTAYPUT:
 	case DTILE_BOSS4STAYPUT:
 		act->actorstayput = act->sector();
@@ -299,7 +297,6 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 	case DTILE_LIZTROOP:
 	case DTILE_OCTABRAIN:
 	case DTILE_COMMANDER:
-	case DTILE_PIGCOP:
 	case DTILE_LIZMAN:
 	case DTILE_LIZMANSPITTING:
 	case DTILE_LIZMANFEEDING:

source/games/duke/src/vmexports.cpp

@@ -14,7 +14,6 @@ int PicForName(int intname)
 	if (classnameToTile.CountUsed() == 0)
 	{
 		static std::pair<const char*, const char*> classes[] = {
-			{"DukePigCop", "PIGCOP"},
 			{"DukeSmallSmoke", "SMALLSMOKE"},
 			{"RedneckBowlingBallSprite", "BOWLINGBALLSPRITE"},
 			{"DukeSteam", "STEAM"},

wadsrc/static/filter/dukelike/rmapinfo.spawnclasses

@@ -249,5 +249,9 @@ spawnclasses
 	100 = DukeAtomicHealth
 	1656 = DukeShrinkerExplosion
 	661 = DukeWaterBubble
-	
+
+	2000 = DukePigCop
+	2001 = DukePigCopStayPut
+	2045 = DukePigCopDive
+
 }

wadsrc/static/zscript.txt

@@ -111,6 +111,7 @@ version "4.10"
 #include "zscript/games/duke/actors/batteryammo.zs"
 #include "zscript/games/duke/actors/sixpak.zs"
 #include "zscript/games/duke/actors/atomichealth.zs"
+#include "zscript/games/duke/actors/pigcop.zs"
 
 #include "zscript/games/duke/actors/flamethrowerflame.zs"
 #include "zscript/games/duke/actors/firefly.zs"

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

@@ -0,0 +1,38 @@
+class DukePigCop : DukeActor
+{
+	default
+	{
+		pic "PIGCOP";
+	}
+	
+	override void PlayFTASound()
+	{
+		self.PlayActorSound("PIG_RECOG");
+	}
+}
+
+class DukePigCopStayput: DukePigCop
+{
+	default
+	{
+		pic "PIGCOPSTAYPUT";
+	}
+	
+	override void initialize()
+	{
+		super.initialize();
+		self.actorstayput = self.sector;	// make this a flag once everything has been exported.
+	}
+}
+
+class DukePigCopDive : DukePigCopStayput
+{
+	default
+	{
+		pic "PIGCOPDIVE";
+	}
+	
+	override void PlayFTASound()
+	{
+	}
+}

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

@@ -9,7 +9,7 @@ class DukeRecon : DukeActor
 	Sound PainSnd;
 	Sound RoamSnd;
 	int shift;
-	String spawntype;	// should be 'class<DukeActor>' but the spawned types have not been converted yet.
+	String spawntype;	// should be 'class<DukeActor>' but the spawned types have not all been converted yet.
 	
 	override void initialize()
 	{