[Scummvm-git-logs] scummvm master -> 3875f5b249e5ae13a12bed891923943dbb935e84

antoniou79 noreply at scummvm.org
Tue Oct 27 08:25:04 UTC 2026


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
3875f5b249 BLADERUNNER: Restore Dektora's scorpions and moonbus dialogs (#7986)


Commit: 3875f5b249e5ae13a12bed891923943dbb935e84
    https://github.com/scummvm/scummvm/commit/3875f5b249e5ae13a12bed891923943dbb935e84
Author: Oleg Barinov (olegbarinov1995 at gmail.com)
Date: 2026-10-27T10:24:58+02:00

Commit Message:
BLADERUNNER: Restore Dektora's scorpions and moonbus dialogs (#7986)

Restored content by fixing triggers for Dektora's SCORPIONS and MOONBUS dialogs

Support other languages, by restoring a missing cue in SCORPIONS dialog

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/scene/nr04.cpp
    engines/bladerunner/script/scene/nr07.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 044f7ad1662..fbcadbf5ce4 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -197,7 +197,7 @@ enum Clues {
 	kClueEarlyQInterview                   =  92, // Restored Content: Audio Recording. Original: (Intangible) - Identity Reveal for Dektora
 	kClueStrangeScale1                     =  93, // Object
 	kClueDektoraInterview1                 =  94, // Audio Recording
-	kClueSuspectDektora                    =  95, // (Intangible) - UNOBTAINED - Not checked in KIA - added to many actors DBs
+	kClueSuspectDektora                    =  95, // (Intangible) - Acquired in Restored Content. Original: Unobtained - Not checked in KIA - added to many actors DBs
 	kClueDektoraInterview2                 =  96, // Audio Recording - About belt and dragonflies
 	kClueDektoraInterview3                 =  97, // Audio Recording - About vase (flowers)
 	kClueDektorasCard                      =  98, // Object
@@ -948,7 +948,7 @@ enum Flags {
 	kFlagBB12toBB08                           = 507, // is never checked
 	kFlagNR07Entered                          = 508,
 	kFlagBB11SadikFight                       = 509,
-	kFlagNotUsed510                           = 510, // is never set
+	kFlagNotUsed510                           = 510, // has no use
 	kFlagDR05ExplodedEntered                  = 511,
 	// 512 is never used
 	// 513 is never used
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index c1bba56d64e..1e8830f8b9b 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -286,6 +286,14 @@ void SceneScriptNR04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 			Actor_Says(kActorEarlyQ, 240, 30);
 			Actor_Says(kActorMcCoy, 3435, kAnimationModeTalk);
 			Actor_Says(kActorEarlyQ, 250, 30);
+			if (_vm->_cutContent
+				&& (Actor_Clue_Query(kActorMcCoy, kClueGaffsInformation) // if McCoy heard about the moonbus from Gaff
+					|| Actor_Clue_Query(kActorMcCoy, kClueCrystalsCase)) // or from Steele
+			) {
+				// In the speech 250 Early Q mentions Dektora and her replicant friends who are gonna help
+				// them get Off-World. This clue is one of the ways to ask Dektora about the moonbus.
+				Actor_Clue_Acquire(kActorMcCoy, kClueSuspectDektora, false, kActorEarlyQ);
+			}
 			Actor_Says(kActorMcCoy, 3440, kAnimationModeTalk);
 			Actor_Says(kActorEarlyQ, 280, 30);
 			Actor_Says(kActorMcCoy, 3445, kAnimationModeTalk);
diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp
index c8a4993de05..54732099e89 100644
--- a/engines/bladerunner/script/scene/nr07.cpp
+++ b/engines/bladerunner/script/scene/nr07.cpp
@@ -74,15 +74,34 @@ bool SceneScriptNR07::ClickedOnActor(int actorId) {
 		if (Game_Flag_Query(kFlagNR07McCoyIsCop)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(1100, -1, 3, 8); // VOIGT-KAMPFF
 			DM_Add_To_List_Never_Repeat_Once_Selected(1110, 8, -1, -1); // CRYSTAL
-			if (Actor_Clue_Query(kActorMcCoy, kClueSuspectDektora)) { // cut content? clue is not obtainable
-				// TODO - restore trigger
+			bool canAskAboutMoonbus = Actor_Clue_Query(kActorMcCoy, kClueSuspectDektora);
+			if (!canAskAboutMoonbus && _vm->_cutContent) {
+				// Can also ask this if McCoy saw Clovis at the moonbus and with Dektora.
+				canAskAboutMoonbus = (
+					Actor_Clue_Query(kActorMcCoy, kClueGaffsInformation)
+						|| Actor_Clue_Query(kActorMcCoy, kClueCrystalsCase))
+					&& Actor_Clue_Query(kActorMcCoy, kClueClovisAtMoonbus)
+					&& (Actor_Clue_Query(kActorMcCoy, kClueIzosFriend)
+						|| Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom));
+			}
+			if (canAskAboutMoonbus) {
 				DM_Add_To_List_Never_Repeat_Once_Selected(1120, 3, 6, 7); // MOONBUS
 			}
 			if (Actor_Clue_Query(kActorMcCoy, kClueCarRegistration1)) {
 				DM_Add_To_List_Never_Repeat_Once_Selected(1130, 3, 5, 7); // BLACK SEDAN
 			}
-			if (Game_Flag_Query(kFlagNotUsed510)) { // cut content? flag is never set
-				// TODO - restore trigger
+			bool canAskAboutScorpions;
+			if (_vm->_cutContent) {
+				// Can ask this if Dektora bought the scorpions and McCoy saw her with the box
+				// or he saw the box in the outer dressing room (it's there in all cases).
+				canAskAboutScorpions = Game_Flag_Query(kFlagAR02DektoraBoughtScorpions)
+					&& ((Actor_Clue_Query(kActorMcCoy, kClueWomanInAnimoidRow) && Actor_Clue_Query(kActorMcCoy, kClueScorpions))
+						|| Actor_Clue_Query(kActorMcCoy, kClueScorpionbox));
+			} else {
+				// This flag is never set.
+				canAskAboutScorpions = Game_Flag_Query(kFlagNotUsed510);
+			}
+			if (canAskAboutScorpions) {
 				DM_Add_To_List_Never_Repeat_Once_Selected(1140, 1, 4, 7); // SCORPIONS
 			}
 		} else {
@@ -455,7 +474,6 @@ void SceneScriptNR07::talkAboutSteele() {
 }
 
 void SceneScriptNR07::talkAboutMoonbus() {
-	// TODO cut content - restore trigger
 	Actor_Says(kActorMcCoy, 3705, 19);
 	Actor_Says(kActorDektora, 760, kAnimationModeSit); // Excuse me?
 
@@ -497,7 +515,6 @@ void SceneScriptNR07::talkAboutBlackSedan() {
 }
 
 void SceneScriptNR07::talkAboutScorpions() {
-	// TODO cut content - restore trigger
 	Actor_Says(kActorMcCoy, 3620, 19);
 	Actor_Says(kActorDektora, 840, 30);
 	Actor_Says(kActorMcCoy, 3745, 9);
@@ -507,11 +524,14 @@ void SceneScriptNR07::talkAboutScorpions() {
 	Actor_Says(kActorDektora, 870, kAnimationModeSit);
 #else
 	if (Game_Flag_Query(kFlagDektoraIsReplicant)) {
-		Actor_Says_With_Pause(kActorDektora, 850, 1.0f, 30); // I didn't know what they were called
-		// Note: this plays a bit loud and maybe in inconsistent tone, but surely belongs here
-		Actor_Says(kActorDektora, 870, 31);
+		Actor_Says_With_Pause(kActorDektora, 850, 1.0f, 30); // Oh, those. I didn't know what they were called.
 	} else {
 		Actor_Says(kActorDektora, 860, 31);
+		if (_vm->_language == Common::ES_ESP || _vm->_language == Common::FR_FRA || _vm->_language == Common::IT_ITA) {
+			// These localizations have the ending of 860 in a separate voice line. The Italian version,
+			// unlike the others, uses the present tense (a feedback from an Italian speaker is welcome).
+			Actor_Says(kActorDektora, 870, 31);
+		}
 	}
 #endif // BLADERUNNER_ORIGINAL_BUGS
 	Actor_Says(kActorMcCoy, 3750, 11);




More information about the Scummvm-git-logs mailing list