[Scummvm-git-logs] scummvm master -> a822b48a2ddd1bcdf742935f89ee94942e49539b

[antoniou79]

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:
a822b48a2d BLADERUNNER: Restore Early Q's blond woman dialog trigger


Commit: a822b48a2ddd1bcdf742935f89ee94942e49539b
    https://github.com/scummvm/scummvm/commit/a822b48a2ddd1bcdf742935f89ee94942e49539b
Author: Oleg Barinov (olegbarinov1995 at gmail.com)
Date: 2026-10-24T15:18:33+03:00

Commit Message:
BLADERUNNER: Restore Early Q's blond woman dialog trigger

Enables the BLOND WOMAN dialog option when talking to Early Q in the VIP area. (scene 3 nr05)

Conditions
* McCoy saw Dektora with Clovis (the prime suspect) at the China bar. (clue 0 77 1)
* To get the extended dialog version, McCoy must first ask about JEWELRY.

Notes
* There's no region (and no need) for Dektora on the China bar photo because her face is visible as is.
* The original dialog priorities are already set up so that when talking in the SURLY mode, McCoy asks about JEWELRY before BLOND WOMAN. And this will lead to the extended dialog version in which McCoy pushes back on Early Q saying that Hecuba is her real name.

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


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 49fa2f8bdce..044f7ad1662 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -505,7 +505,7 @@ enum Flags {
 	kFlagGaffApproachedMcCoyAboutZuben        =  64,
 	kFlagMcCoyCommentsOnTB05Monitors          =  65, // Re-purposed. Original: 65 is never used
 	kFlagMcCoyCommentsOnNR03Sloth             =  66, // Re-purposed. Original: 66 is never used
-	// 67 is never used
+	kFlagMcCoyAskedEarlyQAboutJewelry         =  67, // Re-purposed. Original: 67 is never used
 	kFlagCT02toCT01                           =  68,
 	kFlagCT02toCT03                           =  69,
 	kFlagCT03toCT02                           =  70,
diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp
index 604d7e2facc..8f9684132e0 100644
--- a/engines/bladerunner/script/scene/nr05.cpp
+++ b/engines/bladerunner/script/scene/nr05.cpp
@@ -303,16 +303,16 @@ void SceneScriptNR05::talkToEarlyQ() {
 		if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(900, 5, 6, 5); // LUCY
 		}
-		if (Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom)) {
-			// TODO A bug? kClueDektorasDressingRoom is acquired from EarlyQ
-			// at his office (nr04) while being threatened by McCoy.
-			// At which point EarlyQ already tells McCoy who the people on the photograph are.
-			// It makes no sense that McCoy will next find EarlyQ at the VIP area (this area, nr05)
-			// and casually ask him about who the woman is in this photo.
-			// (McCoy won't be able to even find EarlyQ there again).
-			// Maybe it's another photo of Dektora needed here
-			// --- Animoid Row? Why would McCoy suspect that woman?
-			// --- Hawker's Bar? Can we find a Dektora pic in SHP resources?
+		bool canAskAboutBlondWoman;
+		if (_vm->_cutContent) {
+			// Can ask this if McCoy saw her with Clovis (the prime suspect).
+			canAskAboutBlondWoman = Actor_Clue_Query(kActorMcCoy, kClueIzosFriend);
+		} else {
+			// A bug? McCoy can't get this clue prior to this event.
+			// This would also mean that Early Q already told McCoy about her identity.
+			canAskAboutBlondWoman = Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom);
+		}
+		if (canAskAboutBlondWoman) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(910, 5, 5, 5); // BLOND WOMAN
 		}
 	}
@@ -332,6 +332,7 @@ void SceneScriptNR05::talkToEarlyQ() {
 
 	switch (answer) {
 	case 890: // JEWELRY
+		Game_Flag_Set(kFlagMcCoyAskedEarlyQAboutJewelry);
 		Actor_Says(kActorMcCoy, 3505, kAnimationModeTalk);
 		Actor_Modify_Friendliness_To_Other(kActorEarlyQ, kActorMcCoy, -1);
 		Actor_Says(kActorEarlyQ, 420, 12);
@@ -363,20 +364,20 @@ void SceneScriptNR05::talkToEarlyQ() {
 	case 910: // BLOND WOMAN
 		Actor_Says(kActorMcCoy, 3515, 14);
 		Actor_Modify_Friendliness_To_Other(kActorEarlyQ, kActorMcCoy, -1);
-		if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote)) { // cut content? this clue is unobtanium
-			// A BUG?
-			// TODO why is Grigorian's Note needed here, for EarlyQ to reveal who Hecuba is?
-			// TODO could CrazysInvolvement also do here?
-			//      maybe another clue should be required in its place or some additional ones?
-			// Early Q acknowledges he knows Dektora, and also reveals Hecuba is her stage name
-			// (Early Q also mentions Hecuba in the JEWELRY question but does not connect her with Dektora)
-			// This dialogue thread assumes:
-			// - Early Q has told McCoy about JEWELRY (weak, not necessarily)
-			// --- If McCoy has not discussed the JEWELRY topic with EarlyQ yet, 
-			// --- then he should NOT be able to do this AFTER this conversation IF McCoy has the clue condition
-			// --- for this specific bit of dialogue which reveals Hecuba's identity.
-			// --- Otherwiase it would create inconsistency to what is known about Hecuba
-			// - Dektora/Hecuba has *not* performed her act yet
+		bool earlyQRevealsHerName;
+		if (_vm->_cutContent) {
+			// This happens if McCoy has already asked about jewelry. This seems to be the only
+			// contextual requirement for the extended dialog. The original dialog priorities
+			// are already set so this happens when talking in the "Surly" mode.
+			earlyQRevealsHerName = Game_Flag_Query(kFlagMcCoyAskedEarlyQAboutJewelry);
+		} else {
+			// A bug? This clue can't be obtained in the original version. Also, it has no relation 
+			// to Dektora's identity. Instead, it implies Grigorians connection to Crazy-legs Larry 
+			// and the replicants who stole the car.
+			earlyQRevealsHerName = Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote);
+		}
+		if (earlyQRevealsHerName) {
+			// Early Q mentions the jewelry and, after a push back, reveals her real name.
 			Actor_Says(kActorEarlyQ, 580, 12);
 			Actor_Says(kActorMcCoy, 3560, 13);
 			Actor_Says(kActorEarlyQ, 590, 16);
@@ -386,7 +387,7 @@ void SceneScriptNR05::talkToEarlyQ() {
 			Actor_Says(kActorEarlyQ, 620, 15);
 			Actor_Says(kActorMcCoy, 3575, 13);
 		} else {
-			// Early Q denies recongnizing Dektora
+			// Early Q pretends to be not sure who she is.
 			Actor_Says(kActorEarlyQ, 640, 13);
 			Actor_Says(kActorMcCoy, 3580, 15);
 			Actor_Says(kActorEarlyQ, 660, 12);