[Scummvm-git-logs] scummvm master -> 001df3d1f5e88cac9fad04f30b050aeeea9ccd0b

[antoniou79]

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

Summary:
001df3d1f5 BLADERUNNER: RESTOREDCONTENT: Quote for Lance in UG16


Commit: 001df3d1f5e88cac9fad04f30b050aeeea9ccd0b
    https://github.com/scummvm/scummvm/commit/001df3d1f5e88cac9fad04f30b050aeeea9ccd0b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T22:39:25+02:00

Commit Message:
BLADERUNNER: RESTOREDCONTENT: Quote for Lance in UG16

Quote does not apply in German version of the game

Also fixed UG16's setId in debugger sceneList array

Changed paths:
    engines/bladerunner/debugger.cpp
    engines/bladerunner/script/scene/ug16.cpp


diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 591e08e790f..72837e3c3a1 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -751,7 +751,7 @@ const struct SceneList {
 	{ 4, "UG03", 76, 88 },   { 4, "UG04", 77, 89 },  { 4, "UG05", 78, 90 },   { 4, "UG06", 79, 91 },
 	{ 4, "UG07", 80, 92 },   { 4, "UG08", 81, 93 },  { 4, "UG09", 82, 94 },   { 4, "UG10", 83, 95 },
 	{ 4, "UG12", 84, 96 },   { 4, "UG13", 85, 97 },  { 4, "UG14", 86, 98 },   { 4, "UG15", 87, 99 },
-	{ 4, "UG16", 16, 100 },  { 4, "UG17", 88, 101 }, { 4, "UG18", 89, 102 },  { 4, "UG19", 90, 103 },
+	{ 4, "UG16", 19, 100 },  { 4, "UG17", 88, 101 }, { 4, "UG18", 89, 102 },  { 4, "UG19", 90, 103 },
 
 	{ 0, nullptr, 0, 0 }
 };
diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp
index f43473ac053..023919bb2a3 100644
--- a/engines/bladerunner/script/scene/ug16.cpp
+++ b/engines/bladerunner/script/scene/ug16.cpp
@@ -277,7 +277,7 @@ void SceneScriptUG16::dialogueWithLuther() {
 		Actor_Says(kActorLance, 120, 13);
 		Actor_Says(kActorMcCoy, 5785, 13);
 		Actor_Says(kActorLuther, 130, 6);
-		Actor_Says(kActorMcCoy, 5825, 13);
+		Actor_Says(kActorMcCoy, 5825, 13); // Used in GUZZA topic too ("Keep talking")
 		Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, -5);
 		if (Game_Flag_Query(kFlagLutherLanceIsReplicant)) {
 			Actor_Says(kActorLuther, 140, 13);
@@ -287,6 +287,7 @@ void SceneScriptUG16::dialogueWithLuther() {
 			Actor_Says(kActorMcCoy, 5790, 13);
 			Actor_Says(kActorLuther, 170, 14);
 			Game_Flag_Set(kFlagUG16LutherLanceTalkReplicants);
+			// TODO Check why friendliness modification is reverted here?
 			Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, 5);
 		} else {
 			Actor_Says(kActorLuther, 180, 14);
@@ -302,8 +303,15 @@ void SceneScriptUG16::dialogueWithLuther() {
 	case 1410: // WORK
 		Actor_Says(kActorMcCoy, 5735, 13);
 		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
-		Actor_Says(kActorLance, 160, 17);
-		Actor_Says(kActorLuther, 200, 14);
+		Actor_Says(kActorLance, 160, 17);     // Eldon shafted us. So, now we're returning the favor.
+		if (_vm->_cutContent && _vm->_language != Common::DE_DEU) {
+			// Quote 170 for kActorLance was unused.
+			// ("We're gonna figure out a way to beat that four year lifespan if it kills us.")
+			// In DEU it repeats the second part of quote 160, so it can be skipped.
+			// In ENG, ITA, FRE, ESP it is an additional quote.
+			Actor_Says(kActorLance, 170, 15); // We're gonna figure out a way (...)
+		}
+		Actor_Says(kActorLuther, 200, 14);    // We promised Clovis we'd be finished with this (...)
 		break;
 
 	case 1420: // LIFESPAN
@@ -352,7 +360,7 @@ void SceneScriptUG16::dialogueWithLuther() {
 		Actor_Says(kActorMcCoy, 5820, 13);
 		Actor_Says(kActorLance, 300, 17);
 		Actor_Says(kActorLuther, 330, 14);
-		Actor_Says(kActorMcCoy, 5825, 13);
+		Actor_Says(kActorMcCoy, 5825, 13); // Used in REPLICANTS topic too ("Keep talking")
 		Actor_Says(kActorLuther, 340, 13);
 		Actor_Says(kActorLance, 310, 13);
 		Actor_Says(kActorLuther, 350, 13);
@@ -384,7 +392,7 @@ void SceneScriptUG16::dialogueWithLuther() {
 		Actor_Says(kActorLance, 410, 14);
 		Actor_Says(kActorLance, 420, 17);
 #if BLADERUNNER_ORIGINAL_BUGS
-		// This quote is repeated (also used in RUNCITER question
+		// This quote is repeated (also used in RUNCITER topic)
 		// "That probably had something to do with you guys getting fired."
 		// It makes little sense to be here.
 		Actor_Says(kActorMcCoy, 5835, 13);