BLADERUNNER: Merged chapter & scene debugger command

9 files changed, 103 insertions, 97 deletions

diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 9863dd9aee..57b49b0f19 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -63,7 +63,6 @@ Debugger::Debugger(BladeRunnerEngine *vm) : GUI::Debugger() {
 	_viewZBuffer = false;
 
 	registerCmd("anim", WRAP_METHOD(Debugger, cmdAnimation));
-	registerCmd("chapter", WRAP_METHOD(Debugger, cmdChapter));
 	registerCmd("draw", WRAP_METHOD(Debugger, cmdDraw));
 	registerCmd("flag", WRAP_METHOD(Debugger, cmdFlag));
 	registerCmd("goal", WRAP_METHOD(Debugger, cmdGoal));
@@ -145,23 +144,6 @@ bool Debugger::cmdDraw(int argc, const char **argv) {
 	return true;
 }
 
-bool Debugger::cmdChapter(int argc, const char **argv) {
-	if (argc != 2) {
-		debugPrintf("Changes chapter of the game without changing scene.\n");
-		debugPrintf("Usage: %s <chapter>\n", argv[0]);
-		return true;
-	}
-
-	int chapter = atoi(argv[1]);
-	if (chapter >= 1 && chapter <= 5) {
-		_vm->_settings->setChapter(chapter);
-	} else {
-		debugPrintf("Chapter must be between 1 and 5\n");
-	}
-
-	return true;
-}
-
 bool Debugger::cmdFlag(int argc, const char **argv) {
 	if (argc != 2 && argc != 3) {
 		debugPrintf("Get or set game flag (boolean value).\n");
@@ -247,7 +229,7 @@ bool Debugger::cmdLoop(int argc, const char **argv) {
 bool Debugger::cmdPosition(int argc, const char **argv) {
 	if (argc != 2 && argc != 3 && argc != 7) {
 		debugPrintf("Get or set position of the actor.\n");
-		debugPrintf("Usage: %s <actorId> [(<setId> <x> <y> <z> <facing>)|<otherActorId>]\n", argv[0]);
+		debugPrintf("Usage: %s <actorId> [(<setId> <x> <y> <z> <facing>) | <otherActorId>]\n", argv[0]);
 		return true;
 	}
 
@@ -389,29 +371,48 @@ const struct SceneList {
 };
 
 bool Debugger::cmdScene(int argc, const char **argv) {
-	if (argc != 0 && argc > 3) {
+	if (argc != 0 && argc > 4) {
 		debugPrintf("Changes set and scene.\n");
-		debugPrintf("Usage: %s [<setId> <sceneId>] | [[<chapterId>] <sceneName>]\n", argv[0]);
+		debugPrintf("Usage: %s [(<chapterId> <setId> <sceneId>) | (<chapterId> <sceneName>) | <sceneName>]\n", argv[0]);
 		return true;
 	}
 
-	// scene <setId> <sceneId>
-	if (argc == 3 && Common::isDigit(*argv[1]) && Common::isDigit(*argv[2])) {
-		int setId = atoi(argv[1]);
-		int sceneId = atoi(argv[2]);
+	// scene <chapterId> <setId> <sceneId>
+	if (argc == 4 && Common::isDigit(*argv[1]) && Common::isDigit(*argv[2]) && Common::isDigit(*argv[3])) {
+		int chapterId = atoi(argv[1]);
+		int setId = atoi(argv[2]);
+		int sceneId = atoi(argv[3]);
+
+		if (chapterId < 1 || chapterId > 5) {
+			debugPrintf("chapterID must be between 1 and 5\n");
+			return true;
+		}
+
+		int chapterIdNormalized = chapterId;
+
+		if (chapterId == 3 || chapterId == 5) {
+			chapterIdNormalized = chapterId - 1;
+		}
+
 		// Sanity check
 		uint i;
 		for (i = 0; sceneList[i].chapter != 0; i++) {
-			if (sceneList[i].chapter == _vm->_settings->getChapter() && sceneList[i].set == setId
-					&& sceneList[i].scene == sceneId)
+			if (sceneList[i].chapter == chapterIdNormalized &&
+			    sceneList[i].set == setId &&
+			    sceneList[i].scene == sceneId
+			) {
 				break;
+			}
 		}
 
-		if (sceneList[i].chapter == 0) {	// end of list
-			debugPrintf("Scene does not exist in this chapter.\n");
+		if (sceneList[i].chapter == 0) { // end of list
+			debugPrintf("chapterId, setId and sceneId combination is not valid.\n");
 			return true;
 		}
 
+		if (chapterId != _vm->_settings->getChapter()) {
+			_vm->_settings->setChapter(chapterId);
+		}
 		_vm->_settings->setNewSetAndScene(setId, sceneId);
 		return false;
 	} else if (argc > 1) {
@@ -423,7 +424,7 @@ bool Debugger::cmdScene(int argc, const char **argv) {
 			chapterId = atoi(argv[1]);
 
 			if (chapterId < 1 || chapterId > 5) {
-				debugPrintf("Chapter must be between 1 and 5\n");
+				debugPrintf("chapterId must be between 1 and 5\n");
 				return true;
 			}
 
@@ -464,7 +465,7 @@ bool Debugger::cmdScene(int argc, const char **argv) {
 			break;
 	}
 
-	debugPrintf("chapter = %i\nset = %i\nscene = %i '%s'\n", _vm->_settings->getChapter(), _vm->_scene->getSetId(),
+	debugPrintf("chapterID = %i\nsetId = %i\nsceneId = %i\nsceneName = '%s'\n", _vm->_settings->getChapter(), _vm->_scene->getSetId(),
 				_vm->_scene->getSceneId(), sceneList[i].name);
 	return true;
 }
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 605bde51cb..09b326c460 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -558,6 +558,7 @@ enum Flags {
 	kFlagPS05TV4 = 692,
 	kFlagRC51Discovered = 709,
 	kFlagMA04WatchedTV = 711,
+	kFlagMcCoyShotAtZuben = 712,
 	kFlagCT02McCoyFell = 719,
 	kFlagCT02McCoyCombatReady = 720,
 	kFlagZubenBountyPaid = 723
@@ -575,6 +576,7 @@ enum Variables {
 	kVariableWalkLoopRun = 38,
 	kVariableAffectionTowards = 45, // 0 none, 1 steele, 2 dektora, 3 lucy
 	kVariableDNAEvidences = 48,
+	kVariableReplicants = 51,
 	kVariableNextTvNews = 52
 };
 
@@ -705,7 +707,7 @@ enum Scenes {
 	kSceneKP04 = 44,
 	kSceneKP05 = 45,
 	kSceneKP06 = 46,
-	kSceneKP07 = 47,
+	kSceneKP07 = 47, // Kipple - Moonbus inside
 	kSceneMA01 = 48, // McCoy's Apartment - Roof
 	kSceneMA02 = 49, // McCoy's Apartment - Living room
 	kSceneMA04 = 50, // McCoy's Apartment - Sleeping room
@@ -771,7 +773,8 @@ enum Scenes {
 	kSceneBB12 = 120
 };
 
-enum Sets {
+enum Sets
+{
 	kSetAR01_AR02 = 0,
 	kSetBB02_BB04_BB06_BB51 = 1,
 	kSetBB06_BB07 = 2, //BB06
@@ -972,7 +975,10 @@ enum GoalZuben {
 	kGoalZubenDefault = 0,
 	kGoalZubenCT01Leave = 1,
 	kGoalZubenCT02Flee = 2,
+	kGoalZubenCT07Spared = 4,
+	kGoalZubenCT07Leave = 5,
 	kGoalZubenDie = 6,
+	kGoalZubenSpared = 7,
 	kGoalZubenCT02PushPot = 8,
 	kGoalZubenCT02RunToDoor = 9,
 	kGoalZubenCT02OpenDoor = 10,
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index 58180f3699..04fd7cd818 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -166,10 +166,10 @@ bool AIScriptClovis::ShotAtAndHit() {
 void AIScriptClovis::Retired(int byActorId) {
 	if (Game_Flag_Query(653)) {
 		if (Actor_Query_In_Set(kActorClovis, kSetKP07)) {
-			Global_Variable_Decrement(51, 1);
+			Global_Variable_Decrement(kVariableReplicants, 1);
 			Actor_Set_Goal_Number(kActorClovis, 599);
 
-			if (!Global_Variable_Query(51)) {
+			if (Global_Variable_Query(kVariableReplicants) == 0) {
 				Player_Loses_Control();
 				Delay(2000);
 				Player_Set_Combat_Mode(false);
@@ -366,8 +366,8 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Put_In_Set(kActorClovis, kSetKP07);
 		Actor_Set_Targetable(kActorClovis, true);
 		if (Game_Flag_Query(653)) {
-			Global_Variable_Set(51, 0);
-			Global_Variable_Increment(51, 1);
+			Global_Variable_Set(kVariableReplicants, 0);
+			Global_Variable_Increment(kVariableReplicants, 1);
 			Actor_Set_At_XYZ(kActorClovis, 45.0f, -41.52f, -85.0f, 750);
 		} else {
 			Actor_Set_At_XYZ(kActorClovis, 84.85f, -50.56f, -68.87f, 800);
@@ -428,11 +428,11 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 517:
 		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorLucy, kSetKP07)) {
 			Actor_Set_Goal_Number(kActorLucy, 599);
-			Global_Variable_Decrement(51, 1);
+			Global_Variable_Decrement(kVariableReplicants, 1);
 		}
 		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorLuther, kSetKP07)) {
 			Actor_Set_Goal_Number(kActorLuther, 599);
-			Global_Variable_Decrement(51, 1);
+			Global_Variable_Decrement(kVariableReplicants, 1);
 		}
 		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorDektora, kSetKP07)) {
 			Non_Player_Actor_Combat_Mode_On(kActorDektora, kActorCombatStateIdle, false, kActorMcCoy, 19, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, 0, 100, 10, 300, false);
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index 28bdf3c83d..f32dce8433 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -284,10 +284,10 @@ void AIScriptDektora::Retired(int byActorId) {
 	}
 
 	if (Actor_Query_In_Set(kActorDektora, kSetKP07)) {
-		Global_Variable_Decrement(51, 1);
+		Global_Variable_Decrement(kVariableReplicants, 1);
 		Actor_Set_Goal_Number(kActorDektora, 599);
 
-		if (!Global_Variable_Query(51)) {
+		if (Global_Variable_Query(kVariableReplicants) == 0) {
 			Player_Loses_Control();
 			Delay(2000);
 			Player_Set_Combat_Mode(false);
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index c44497176a..da50c894a8 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -257,9 +257,9 @@ void AIScriptGordo::Retired(int byActorId) {
 		Scene_Exits_Enable();
 	}
 	if (Actor_Query_In_Set(kActorGordo, kSetKP07)) {
-		Global_Variable_Decrement(51, 1);
+		Global_Variable_Decrement(kVariableReplicants, 1);
 		Actor_Set_Goal_Number(kActorGordo, 599);
-		if (Global_Variable_Query(51) == 0) {
+		if (Global_Variable_Query(kVariableReplicants) == 0) {
 			Player_Loses_Control();
 			Delay(2000);
 			Player_Set_Combat_Mode(false);
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index c57866216a..d897d1af85 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -223,24 +223,23 @@ void AIScriptIzo::Retired(int byActorId) {
 		return; //false;
 	}
 
-	Global_Variable_Decrement(51, 1);
+	Global_Variable_Decrement(kVariableReplicants, 1);
 	Actor_Set_Goal_Number(kActorIzo, 599);
 
-	if (Global_Variable_Query(51)) {
-		return; //false;
+	if (Global_Variable_Query(kVariableReplicants) == 0) {
+		Player_Loses_Control();
+		Delay(2000);
+		Player_Set_Combat_Mode(0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, 1, 0, 0);
+		Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
+		Ambient_Sounds_Remove_All_Looping_Sounds(1);
+		Game_Flag_Set(579);
+		Game_Flag_Reset(653);
+		Set_Enter(kSetKP05_KP06, kSetKP03);
+		return; //true;
 	}
 
-	Player_Loses_Control();
-	Delay(2000);
-	Player_Set_Combat_Mode(0);
-	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, 1, 0, 0);
-	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
-	Ambient_Sounds_Remove_All_Looping_Sounds(1);
-	Game_Flag_Set(579);
-	Game_Flag_Reset(653);
-	Set_Enter(kSetKP05_KP06, kSetKP03);
-
-	return; //true;
+	return; //false;
 }
 
 int AIScriptIzo::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp
index 9fdb889b6c..b5aabc2b3b 100644
--- a/engines/bladerunner/script/ai/sadik.cpp
+++ b/engines/bladerunner/script/ai/sadik.cpp
@@ -184,10 +184,10 @@ void AIScriptSadik::Retired(int byActorId) {
 		Scene_Exits_Enable();
 	}
 	if (Actor_Query_In_Set(kActorSadik, kSetKP07)) {
-		Global_Variable_Decrement(51, 1);
+		Global_Variable_Decrement(kVariableReplicants, 1);
 		Actor_Set_Goal_Number(kActorSadik, 599);
 
-		if (!Global_Variable_Query(51)) {
+		if (Global_Variable_Query(kVariableReplicants) == 0) {
 			Player_Loses_Control();
 			Delay(2000);
 			Player_Set_Combat_Mode(0);
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index da4091787d..cfa146cd5e 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -124,8 +124,8 @@ void AIScriptZuben::CompletedMovementTrack() {
 		Set_Enter(kSetCT03_CT04, kSceneCT03);
 	}
 
-	if (Actor_Query_Goal_Number(kActorZuben) == 3) {
-		Actor_Set_Goal_Number(kActorZuben, 5);
+	if (Actor_Query_Goal_Number(kActorZuben) == 3) { // not set anywhere
+		Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT07Leave);
 		//return true;
 	} else if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06Hide && Game_Flag_Query(kFlagCT02McCoyFell)) {
 		AI_Countdown_Timer_Reset(kActorZuben, 0);
@@ -140,14 +140,14 @@ void AIScriptZuben::CompletedMovementTrack() {
 		Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT02OpenDoor);
 		//return true;
 	} else {
-		if (Actor_Query_Goal_Number(kActorZuben) == 5) {
+		if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT07Leave) {
 			Music_Stop(2);
 			Sound_Play(574, 40, 100, 100, 50);
 			Delay(2000);
 			Game_Flag_Set(144);
 			Game_Flag_Set(kFlagZubenSpared);
 			Game_Flag_Set(31);
-			Actor_Set_Goal_Number(kActorZuben, 7);
+			Actor_Set_Goal_Number(kActorZuben, kGoalZubenSpared);
 			Actor_Set_Goal_Number(kActorGaff, 1);
 			Set_Enter(kSetCT06, kSceneCT06);
 		}
@@ -218,13 +218,13 @@ void AIScriptZuben::OtherAgentExitedThisScene(int otherActorId) {
 }
 
 void AIScriptZuben::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
-	if (otherActorId == kActorMcCoy && !combatMode && Game_Flag_Query(kFlagCT07ZubenAttack) && !Game_Flag_Query(712)) {
+	if (otherActorId == kActorMcCoy && !combatMode && Game_Flag_Query(kFlagCT07ZubenAttack) && !Game_Flag_Query(kFlagMcCoyShotAtZuben)) {
 		Non_Player_Actor_Combat_Mode_Off(kActorZuben);
 		Game_Flag_Reset(kFlagCT07ZubenAttack);
 		AI_Movement_Track_Flush(kActorZuben);
 		Actor_Says(kActorMcCoy, 455, 18);
 		Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, 5);
-		Actor_Set_Goal_Number(kActorZuben, 4);
+		Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT07Spared);
 		// return true;
 	}
 	// return false;
@@ -235,8 +235,8 @@ void AIScriptZuben::ShotAtAndMissed() {
 }
 
 bool AIScriptZuben::ShotAtAndHit() {
-	Game_Flag_Set(712);
-	if (Actor_Query_Goal_Number(kActorZuben) == 5 && !Actor_Clue_Query(kActorZuben, kClueMcCoyShotZubenInTheBack)) {
+	Game_Flag_Set(kFlagMcCoyShotAtZuben);
+	if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT07Leave && !Actor_Clue_Query(kActorZuben, kClueMcCoyShotZubenInTheBack)) {
 		Actor_Clue_Acquire(kActorZuben, kClueMcCoyShotZubenInTheBack, true, -1);
 		Actor_Clue_Lose(kActorZuben, kClueMcCoyLetZubenEscape);
 		Actor_Start_Speech_Sample(kActorMcCoy, 490);
@@ -252,22 +252,22 @@ void AIScriptZuben::Retired(int byActorId) {
 		// return false;
 		return;
 	}
-	Global_Variable_Decrement(51, 1);
+	Global_Variable_Decrement(kVariableReplicants, 1);
 	Actor_Set_Goal_Number(kActorZuben, kGoalZubenDead);
-	if (Global_Variable_Query(51)) {
-		// return false;
+	if (Global_Variable_Query(kVariableReplicants) == 0) {
+		Player_Loses_Control();
+		Delay(2000);
+		Player_Set_Combat_Mode(false);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0);
+		Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
+		Ambient_Sounds_Remove_All_Looping_Sounds(1);
+		Game_Flag_Set(579);
+		Game_Flag_Reset(653);
+		Set_Enter(kSetKP05_KP06, kSceneKP06);
+		// return true;
 		return;
 	}
-	Player_Loses_Control();
-	Delay(2000);
-	Player_Set_Combat_Mode(false);
-	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0);
-	Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
-	Ambient_Sounds_Remove_All_Looping_Sounds(1);
-	Game_Flag_Set(579);
-	Game_Flag_Reset(653);
-	Set_Enter(kSetKP05_KP06, kSceneKP06);
-	// return true;
+	// return false;
 }
 
 int AIScriptZuben::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
@@ -294,7 +294,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		AI_Countdown_Timer_Start(kActorZuben, 0, 70);
 		AI_Movement_Track_Repeat(kActorZuben);
 		return false;
-	case 4:
+	case kGoalZubenCT07Spared:
 		AI_Movement_Track_Flush(kActorZuben);
 		Actor_Face_Actor(kActorZuben, kActorMcCoy, true);
 		Music_Stop(3);
@@ -313,9 +313,9 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Actor_Clue_Acquire(kActorZuben, kClueMcCoyIsABladeRunner, 1, -1);
 		}
 		Actor_Clue_Acquire(kActorZuben, kClueMcCoyLetZubenEscape, 1, -1);
-		Actor_Set_Goal_Number(kActorZuben, 5);
+		Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT07Leave);
 		return false;
-	case 5:
+	case kGoalZubenCT07Leave:
 		AI_Movement_Track_Flush(kActorZuben);
 		AI_Movement_Track_Append_Run(kActorZuben, 94, 0);
 		AI_Movement_Track_Append_Run(kActorZuben, 33, 0);
diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index 23c05c72d4..c78dcf6f47 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -31,36 +31,36 @@ void SceneScriptKP07::InitializeScene() {
 	if (Game_Flag_Query(653)) {
 		if (Game_Flag_Query(kFlagDektoraIsReplicant) && Actor_Query_Goal_Number(kActorDektora) < 599) {
 			Actor_Set_Targetable(kActorDektora, true);
-			Global_Variable_Increment(51, 1);
-			Actor_Put_In_Set(kActorDektora, 48);
+			Global_Variable_Increment(kVariableReplicants, 1);
+			Actor_Put_In_Set(kActorDektora, kSetKP07);
 			Actor_Set_At_XYZ(kActorDektora, -52.0f, -41.52f, -5.0f, 289);
 		}
-		if (Actor_Query_Goal_Number(kActorZuben) < 599) {
-			Global_Variable_Increment(51, 1);
+		if (Actor_Query_Goal_Number(kActorZuben) < kGoalZubenDead) {
+			Global_Variable_Increment(kVariableReplicants, 1);
 			Actor_Set_Targetable(kActorZuben, true);
-			Actor_Put_In_Set(kActorZuben, 48);
+			Actor_Put_In_Set(kActorZuben, kSetKP07);
 			Actor_Set_At_XYZ(kActorZuben, -26.0f, -41.52f, -135.0f, 0);
 		}
 		if (Game_Flag_Query(kFlagIzoIsReplicant) && Actor_Query_Goal_Number(kActorIzo) < 599) {
-			Global_Variable_Increment(51, 1);
+			Global_Variable_Increment(kVariableReplicants, 1);
 			Actor_Set_Targetable(kActorIzo, true);
-			Actor_Put_In_Set(kActorIzo, 48);
+			Actor_Put_In_Set(kActorIzo, kSetKP07);
 			Actor_Set_At_XYZ(kActorIzo, -38.0f, -41.52f, -175.0f, 500);
 		}
 		if (Game_Flag_Query(kFlagGordoIsReplicant) && Actor_Query_Goal_Number(kActorGordo) < 599) {
-			Global_Variable_Increment(51, 1);
+			Global_Variable_Increment(kVariableReplicants, 1);
 			Actor_Set_Targetable(kActorGordo, true);
-			Actor_Put_In_Set(kActorGordo, 48);
+			Actor_Put_In_Set(kActorGordo, kSetKP07);
 			Actor_Set_At_XYZ(kActorGordo, 61.0f, -41.52f, -3.0f, 921);
 		}
 		if (Game_Flag_Query(kFlagLucyIsReplicant) && Actor_Query_Goal_Number(kActorLucy) < 599) {
-			Global_Variable_Increment(51, 1);
-			Actor_Put_In_Set(kActorLucy, 48);
+			Global_Variable_Increment(kVariableReplicants, 1);
+			Actor_Put_In_Set(kActorLucy, kSetKP07);
 			Actor_Set_At_XYZ(kActorLucy, 78.0f, -41.52f, -119.0f, 659);
 		}
 		if (Actor_Query_Goal_Number(kActorLuther) < 599) {
-			Global_Variable_Increment(51, 1);
-			Actor_Put_In_Set(kActorLuther, 48);
+			Global_Variable_Increment(kVariableReplicants, 1);
+			Actor_Put_In_Set(kActorLuther, kSetKP07);
 			Actor_Set_At_XYZ(kActorLuther, -47.0f, 0.0f, 151.0f, 531);
 		}
 	}
@@ -149,7 +149,7 @@ void SceneScriptKP07::PlayerWalkedIn() {
 			Actor_Says(kActorClovis, 1250, 3);
 			if (Actor_Query_Goal_Number(kActorSadik) == 416) {
 				Actor_Put_In_Set(kActorSadik, 48);
-				Global_Variable_Increment(51, 1);
+				Global_Variable_Increment(kVariableReplicants, 1);
 				Actor_Set_At_XYZ(kActorSadik, -12.0f, -41.58f, 72.0f, 0);
 				Actor_Face_Actor(kActorSadik, kActorClovis, true);
 			}