[Scummvm-git-logs] scummvm branch-2-7 -> 76f831b91297692b4a0d518464cb45b2864d2665
antoniou79
noreply at scummvm.org
Thu Feb 2 22:00:57 UTC 2023
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f2f4bddc30 BLADERUNNER: Fix inconsistent dialogue in KIA
d7e859ab65 BLADERUNNER: RESTOREDCONTENT: Fix McCoy's inner talk if confessed
8f7e71bcec BLADERUNNER: Restore content and localization fixes in RC04
5d856bb3b4 BLADERUNNER: RESTOREDCONTENT: Quote for Lance in UG16
31a4a4f133 BLADERUNNER: RESTORED CONTENT: NR04 quote for DEU-ESP-ITA
76f831b912 BLADERUNNER: RESTOREDCONTENT: Missing quotes for Dispatch, McCoy
Commit: f2f4bddc307ac492d008739e4bf01446f27509b0
https://github.com/scummvm/scummvm/commit/f2f4bddc307ac492d008739e4bf01446f27509b0
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T23:53:23+02:00
Commit Message:
BLADERUNNER: Fix inconsistent dialogue in KIA
Includes minor restored content quotes for Zuben and McCoy dialogue about Runciter and a couple of related bug fixes
Changed paths:
engines/bladerunner/script/ai/zuben.cpp
engines/bladerunner/script/kia_script.cpp
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index 001ed5253e6..a7639829a3c 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -203,21 +203,21 @@ void AIScriptZuben::ReceivedClue(int clueId, int fromActorId) {
void AIScriptZuben::ClickedByPlayer() {
if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenGone) {
- if (Player_Query_Current_Scene() == kSceneCT06) {
- // return true;
- return;
+ if (Player_Query_Current_Scene() != kSceneCT06) {
+ Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
+ Actor_Says(kActorMcCoy, 8529, 13); // Yuck
}
- Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
- Actor_Says(kActorMcCoy, 8529, 13);
+ return;
}
if (Global_Variable_Query(kVariableChapter) > 1
&& Global_Variable_Query(kVariableChapter) < 5
) {
- if (Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) <= 20) {
+ if (Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) <= 20
+ || Game_Flag_Query(kFlagTalkToZuben)) {
Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
- Actor_Says(kActorMcCoy, 8910, 11);
- } else if (!Game_Flag_Query(kFlagTalkToZuben)) {
+ Actor_Says(kActorMcCoy, 8910, 11); // Hey you.
+ } else {
AI_Movement_Track_Pause(kActorZuben);
Actor_Face_Actor(kActorZuben, kActorMcCoy, true);
Actor_Says(kActorZuben, 140, 14);
@@ -228,9 +228,6 @@ void AIScriptZuben::ClickedByPlayer() {
dialogue();
Game_Flag_Set(kFlagTalkToZuben);
AI_Movement_Track_Unpause(kActorZuben);
- } else {
- Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
- Actor_Says(kActorMcCoy, 8910, 11);
}
// return true;
}
@@ -1315,14 +1312,23 @@ void AIScriptZuben::dialogue() {
Actor_Says(kActorMcCoy, 7335, 14);
Actor_Says(kActorZuben, 260, 15);
Actor_Says(kActorMcCoy, 7340, 16);
- Actor_Says(kActorZuben, 340, 15);
- Actor_Says(kActorMcCoy, 7345, 12);
+ if (_vm->_language != Common::DE_DEU) {
+ // In German version Zuben's quote 340 is "boop" (placeholder)
+ // So skip it along with McCoy's response, which is not a placeholder
+ // but makes no sense without Zuben's quote.
+ Actor_Says(kActorZuben, 340, 15); // You promise no hurt.
+ Actor_Says(kActorMcCoy, 7345, 12); // Right, no hurt. No hurt anymore.
+ }
Actor_Clue_Acquire(kActorMcCoy, kClueZubenTalksAboutLucy2, false, kActorZuben);
}
break;
case 1510:
Actor_Says(kActorMcCoy, 7300, 13);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorZuben, 270, 12);
+ Actor_Says(kActorMcCoy, 7350, 18);
+ }
Actor_Says(kActorZuben, 280, 12);
Actor_Says(kActorMcCoy, 7355, 14);
Actor_Says(kActorZuben, 290, 15);
@@ -1330,7 +1336,14 @@ void AIScriptZuben::dialogue() {
Actor_Says(kActorZuben, 300, 14);
Actor_Says(kActorZuben, 310, 13);
Delay(2000);
+#if BLADERUNNER_ORIGINAL_BUGS
Actor_Says(kActorMcCoy, 7360, 11);
+#else
+ // Original re-uses McCoy's quote 7360 (Did he do things to Lucy?)
+ // which McCoy already said just before.
+ // The correct quote here is 7365 (You should have killed him)
+ Actor_Says(kActorMcCoy, 7365, 11);
+#endif
Actor_Says(kActorZuben, 320, 12);
Actor_Says(kActorZuben, 330, 12);
Actor_Clue_Acquire(kActorMcCoy, kClueZubensMotive, false, kActorZuben);
diff --git a/engines/bladerunner/script/kia_script.cpp b/engines/bladerunner/script/kia_script.cpp
index ce093daa3ba..a4602cbf3e4 100644
--- a/engines/bladerunner/script/kia_script.cpp
+++ b/engines/bladerunner/script/kia_script.cpp
@@ -518,12 +518,12 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
KIA_Play_Slice_Model(kModelAnimationGordosLighterReplicant);
if (_vm->_cutContent) {
if (Actor_Clue_Query(kActorMcCoy, kClueZubenSquadPhoto)) {
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 1450);
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 1450); // TLK02 (Act 3 or 4 only)
} else {
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 350); // TLK0A
}
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 1460);
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 1470);
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 1460); // TLK02 (Act 3 or 4 only)
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 1470); // TLK02 (Act 3 or 4 only)
} else {
KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
}
@@ -728,9 +728,28 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
KIA_Play_Actor_Dialogue(kActorZuben, 260);
break;
case kClueZubensMotive:
+#if BLADERUNNER_ORIGINAL_BUGS
+ // Original KIA dialogue is inconsistent with in-game here.
+ // In the actual in-game dialogue in vanilla version
+ // McCoy's quote 7350 ("Runciter?") is not used
+ // and, after Zuben's quote 280 ("He not pay..."),
+ // McCoy's quote 7355 ("All those animals died") quote is used.
+ // Also McCoy asks quote 7360 ("Did he do bad things to Lucy?")
+ // before Zubern's quote 300 ("Girl was forced to do bad things Off-World...").
KIA_Play_Actor_Dialogue(kActorZuben, 280);
KIA_Play_Actor_Dialogue(kActorMcCoy, 7350);
KIA_Play_Actor_Dialogue(kActorZuben, 290);
+#else
+ // Be consistent with the actual spoken dialogue
+ if (_vm->_cutContent) {
+ KIA_Play_Actor_Dialogue(kActorZuben, 270);
+ KIA_Play_Actor_Dialogue(kActorMcCoy, 7350);
+ }
+ KIA_Play_Actor_Dialogue(kActorZuben, 280);
+ KIA_Play_Actor_Dialogue(kActorMcCoy, 7355);
+ KIA_Play_Actor_Dialogue(kActorZuben, 290);
+ KIA_Play_Actor_Dialogue(kActorMcCoy, 7360);
+#endif // BLADERUNNER_ORIGINAL_BUGS
KIA_Play_Actor_Dialogue(kActorZuben, 300);
KIA_Play_Actor_Dialogue(kActorZuben, 310);
break;
Commit: d7e859ab65afee4a6c22f6531083e68ac523b819
https://github.com/scummvm/scummvm/commit/d7e859ab65afee4a6c22f6531083e68ac523b819
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T23:53:32+02:00
Commit Message:
BLADERUNNER: RESTOREDCONTENT: Fix McCoy's inner talk if confessed
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/scene/ct04.cpp
engines/bladerunner/script/scene/ps04.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 0ffc426b056..e8af5017da6 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -626,7 +626,7 @@ enum Flags {
kFlagSteeleInPoliceStation = 185,
kFlagRC01PoliceDone = 186,
kFlagRC02RunciterTalk1 = 187,
- // 188 is never used
+ kFlagMcCoyConfessedKillingHomelessInCT04 = 188, // Original: 188 is never used
// 189 is never used
kFlagRC02ShellCasingsTaken = 190,
// 191 is never used
diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp
index 12f061c4409..8042cd9b54e 100644
--- a/engines/bladerunner/script/scene/ct04.cpp
+++ b/engines/bladerunner/script/scene/ct04.cpp
@@ -108,11 +108,20 @@ bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) {
if (Game_Flag_Query(kFlagCT04HomelessBodyInDumpster)) {
if (Game_Flag_Query(kFlagCT04HomelessBodyThrownAway)) {
+ // Thrown away (garbage collected) happens in Act 3
+ // see transient AI.
Actor_Voice_Over(270, kActorVoiceOver);
Actor_Voice_Over(280, kActorVoiceOver);
} else if (Game_Flag_Query(kFlagCT04HomelessBodyFound)) {
Actor_Voice_Over(250, kActorVoiceOver);
- Actor_Voice_Over(260, kActorVoiceOver);
+ if (!_vm->_cutContent
+ || !Game_Flag_Query(kFlagMcCoyConfessedKillingHomelessInCT04)) {
+ // When McCoy confesses in the Restored Content mode,
+ // the body gets found. So it's gone (but not thrown with the trash).
+ // Since McCoy has confessed though, he shouldn't say the following quote
+ // "I'd screwed up and screwed up bad. But maybe there was still a way to make it right.".
+ Actor_Voice_Over(260, kActorVoiceOver);
+ }
} else {
Actor_Voice_Over(230, kActorVoiceOver);
Actor_Voice_Over(240, kActorVoiceOver);
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp
index c02e90afd16..706fe1993a4 100644
--- a/engines/bladerunner/script/scene/ps04.cpp
+++ b/engines/bladerunner/script/scene/ps04.cpp
@@ -350,7 +350,7 @@ void SceneScriptPS04::dialogueWithGuzza() {
&& Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA)
&& !Game_Flag_Query(kFlagPS04GuzzaTalkDumpToMainframe)
) {
- // McCoy metions Bryant's "vacation",
+ // McCoy mentions Bryant's "vacation",
// Guzza says about the procedure via Mainframe
Actor_Says(kActorMcCoy, 3920, 13);
Actor_Says(kActorGuzza, 570, 32);
@@ -378,6 +378,7 @@ void SceneScriptPS04::dialogueWithGuzza() {
Actor_Face_Heading(kActorGuzza, 400, false);
Actor_Says(kActorGuzza, 620, 32);
if (_vm->_cutContent) {
+ Game_Flag_Set(kFlagMcCoyConfessedKillingHomelessInCT04);
// add a fade-out here while Guzza calls-in for favors
Scene_Loop_Start_Special(kSceneLoopModeOnce, kPS04LoopPanToPS04, true);
Scene_Loop_Set_Default(kPS04LoopMainLoop);
Commit: 8f7e71bcec4fb801c55c2803d90997681e1d89a1
https://github.com/scummvm/scummvm/commit/8f7e71bcec4fb801c55c2803d90997681e1d89a1
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T23:53:40+02:00
Commit Message:
BLADERUNNER: Restore content and localization fixes in RC04
Also added an info note comments to cmdScene() for debugger and to enterChapter() of chapters.cpp
Changed paths:
engines/bladerunner/chapters.cpp
engines/bladerunner/debugger.cpp
engines/bladerunner/script/scene/rc04.cpp
diff --git a/engines/bladerunner/chapters.cpp b/engines/bladerunner/chapters.cpp
index e8a3f595339..d54b5b46a4b 100644
--- a/engines/bladerunner/chapters.cpp
+++ b/engines/bladerunner/chapters.cpp
@@ -27,6 +27,15 @@
namespace BladeRunner {
bool Chapters::enterChapter(int chapter) {
+ // Chapter valid values are: 1 - 5 corresponding to the game Acts.
+ // Before set, _chapter is 0 (see chapters.h -- The mapped resource id is still 1)
+ // Resource id is (see _resourceIds in chapters.h):
+ // 1 for chapter 0, 1 - Act 1
+ // 2 for chapter 2, 3 - Act 2, 3
+ // 3 for chapter 4 - Act 4 (see note and code below, 3 can be used for Act 5 too)
+ // 4 for chapter 5 - Act 5
+ // Note: For resources that only go up to "3" (TLK, VQA), 3 is used for both Acts 4 and 5.
+
int id = _resourceIds[chapter];
if (!_vm->_sliceAnimations->openFrames(id))
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 8bb186717b3..591e08e790f 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -793,6 +793,11 @@ bool Debugger::dbgAttemptToLoadChapterSetScene(int chapterId, int setId, int sce
return true;
}
+// Note: The chapterId that is set with this command affects loading
+// of game resources and the return value of _vm->_settings->getChapter()
+// However, it will NOT change the value of the game's global variable (1) for the current chapter.
+// The user has to explicitly set that as well, after executing this debugger command,
+// using eg. var 1 3 (for chapter 3)
bool Debugger::cmdScene(int argc, const char **argv) {
if (argc != 0 && argc > 4) {
debugPrintf("Changes set and scene.\n");
diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp
index 9d1b8f3e20e..174766f5041 100644
--- a/engines/bladerunner/script/scene/rc04.cpp
+++ b/engines/bladerunner/script/scene/rc04.cpp
@@ -253,7 +253,8 @@ void SceneScriptRC04::dialogueWithBulletBob() {
Actor_Says(kActorBulletBob, 660, 30);
Actor_Says(kActorMcCoy, 5060, 13);
#if BLADERUNNER_ORIGINAL_BUGS
- Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, true, kActorMcCoy); // A bug? Shouldn't the last argument be -1 or kActorBulletBob here?
+ // A bug? Shouldn't the last argument be -1 or kActorBulletBob here?
+ Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, true, kActorMcCoy);
#else
Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, true, kActorBulletBob);
#endif // BLADERUNNER_ORIGINAL_BUGS
@@ -329,6 +330,12 @@ void SceneScriptRC04::dialogueWithBulletBob() {
Actor_Says(kActorBulletBob, 840, 35);
} else {
Actor_Says(kActorBulletBob, 770, 36);
+ if (_vm->_cutContent && _vm->_language != Common::ES_ESP) {
+ // In Spanish, this quote (5095) is a duplicate of quote 5085
+ // with a slightly different take from the voice actor
+ // but it does not fit here.
+ Actor_Says_With_Pause(kActorMcCoy, 5095, 0.0f, 11);
+ }
Actor_Says(kActorBulletBob, 780, 36);
#if BLADERUNNER_ORIGINAL_BUGS
Actor_Says(kActorMcCoy, 5090, 16);
@@ -365,8 +372,8 @@ bool SceneScriptRC04::ClickedOnActor(int actorId) {
&& !Game_Flag_Query(kFlagRC04BobTalk2)
&& Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) > 45
) {
- Actor_Says(kActorBulletBob, 30, 30);
- Actor_Says(kActorMcCoy, 4875, 13);
+ Actor_Says(kActorBulletBob, 30, 30); // B: How come I never heard of you?
+ Actor_Says(kActorMcCoy, 4875, 13); // M: I just got assigned.
Actor_Says(kActorBulletBob, 80, 31);
Actor_Says(kActorMcCoy, 4900, 15);
Actor_Says(kActorBulletBob, 90, 33);
@@ -377,10 +384,16 @@ bool SceneScriptRC04::ClickedOnActor(int actorId) {
&& !Game_Flag_Query(kFlagRC04BobTalk1)
&& Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) < 45
) {
- Actor_Says(kActorBulletBob, 40, 30);
+ Actor_Says(kActorBulletBob, 40, 30); // B: I heard of you.
Actor_Says(kActorMcCoy, 4880, 13);
- Actor_Says(kActorBulletBob, 50, 35);
- Actor_Says(kActorMcCoy, 4875, 16);
+ Actor_Says(kActorBulletBob, 50, 35); // M: You ain't done much.
+ if (_vm->_cutContent) {
+ // use an alternative take of the same quote (4875) "I just got assigned."
+ Actor_Says(kActorMcCoy, 4885, 16);
+ } else {
+ // original vanilla version re-uses this quote
+ Actor_Says(kActorMcCoy, 4875, 16);
+ }
Actor_Says(kActorBulletBob, 60, 36);
Actor_Says(kActorMcCoy, 4890, 13);
Actor_Says(kActorBulletBob, 70, 33);
@@ -394,7 +407,13 @@ bool SceneScriptRC04::ClickedOnActor(int actorId) {
Actor_Says(kActorBulletBob, 1880, 30);
Actor_Says(kActorMcCoy, 8960, 13);
Actor_Says(kActorBulletBob, 1890, 36);
- Actor_Says(kActorBulletBob, 1900, 35);
+ if (_vm->_cutContent && _vm->_language == Common::FR_FRA) {
+ // In French (only) the 1910 quote follows after the 1900 quote.
+ Actor_Says_With_Pause(kActorBulletBob, 1900, 0.0f, 35);
+ Actor_Says(kActorBulletBob, 1910, 30);
+ } else {
+ Actor_Says(kActorBulletBob, 1900, 35);
+ }
Actor_Says(kActorMcCoy, 8965, 16);
Actor_Says(kActorBulletBob, 1920, 36);
Actor_Says(kActorBulletBob, 1930, 33);
Commit: 5d856bb3b4c447b1bc2318f51bfc7d037bd9cc56
https://github.com/scummvm/scummvm/commit/5d856bb3b4c447b1bc2318f51bfc7d037bd9cc56
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T23:53:49+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);
Commit: 31a4a4f133ad4e81ae5181cc1cf00a7efa43bac7
https://github.com/scummvm/scummvm/commit/31a4a4f133ad4e81ae5181cc1cf00a7efa43bac7
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T23:53:59+02:00
Commit Message:
BLADERUNNER: RESTORED CONTENT: NR04 quote for DEU-ESP-ITA
Changed paths:
engines/bladerunner/script/scene/nr04.cpp
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index 90f5a656c96..5b73de20812 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -232,12 +232,19 @@ void SceneScriptNR04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
case kGoalEarlyQNR04PourDrink:
Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
- Actor_Says(kActorEarlyQ, 90, 73);
- Actor_Says(kActorMcCoy, 3390, 3);
+ Actor_Says(kActorEarlyQ, 90, 73); // E: It's your lucky day
+ Actor_Says(kActorMcCoy, 3390, 3); // M: Not interested
Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
- Actor_Says(kActorEarlyQ, 110, 74);
- Actor_Says(kActorMcCoy, 3385, 3);
- Actor_Says(kActorEarlyQ, 120, 74);
+ Actor_Says(kActorEarlyQ, 110, 74); // E: Bull, everyone's interested
+ Actor_Says(kActorMcCoy, 3385, 3); // M: "I want information" (ENG, FRA)
+ // (OR) "Make me an offer" (DEU, ITA, ESP)
+ Actor_Says(kActorEarlyQ, 120, 74); // E: You can have whatever you little heart desires
+ if (_vm->_cutContent
+ && (_vm->_language == Common::ES_ESP
+ || _vm->_language == Common::IT_ITA
+ || _vm->_language == Common::DE_DEU)) {
+ Actor_Says(kActorMcCoy, 3395, 14); // M: "I want information" (DEU, ITA, ESP)
+ }
Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
Actor_Set_Goal_Number(kActorEarlyQ, kGoalEarlyQNR04GoToMcCoy);
//return true;
Commit: 76f831b91297692b4a0d518464cb45b2864d2665
https://github.com/scummvm/scummvm/commit/76f831b91297692b4a0d518464cb45b2864d2665
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T23:54:06+02:00
Commit Message:
BLADERUNNER: RESTOREDCONTENT: Missing quotes for Dispatch, McCoy
Dispatch is in Steele (AI) at end of Act 3, McCoy's quote is in Runciter (AI) for fake tiger
Also fixed the scene id for RC02 in chapter 4 for debugger's array (sceneList)
Changed paths:
engines/bladerunner/debugger.cpp
engines/bladerunner/script/ai/runciter.cpp
engines/bladerunner/script/ai/steele.cpp
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 72837e3c3a1..26db22b29c1 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -745,7 +745,7 @@ const struct SceneList {
{ 4, "MA07", 53, 53 }, { 4, "NR01", 54, 54 }, { 4, "NR02", 11, 55 }, { 4, "NR03", 55, 56 },
{ 4, "NR04", 12, 57 }, { 4, "NR05", 13, 58 }, { 4, "NR06", 56, 59 }, { 4, "NR07", 57, 60 },
{ 4, "NR08", 13, 61 }, { 4, "NR09", 58, 62 }, { 4, "NR10", 59, 63 }, { 4, "NR11", 60, 64 },
- { 4, "PS09", 67, 72 }, { 4, "PS14", 68, 77 }, { 4, "RC01", 69, 78 }, { 4, "RC02", 16, 89 },
+ { 4, "PS09", 67, 72 }, { 4, "PS14", 68, 77 }, { 4, "RC01", 69, 78 }, { 4, "RC02", 16, 79 },
{ 4, "RC03", 70, 80 }, { 4, "RC04", 71, 81 }, { 4, "RC51", 16, 107 }, { 4, "TB02", 17, 82 },
{ 4, "TB03", 17, 83 }, { 4, "TB07", 18, 108 }, { 4, "UG01", 74, 86 }, { 4, "UG02", 75, 87 },
{ 4, "UG03", 76, 88 }, { 4, "UG04", 77, 89 }, { 4, "UG05", 78, 90 }, { 4, "UG06", 79, 91 },
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index aae77ac1f74..64443a061fc 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -175,7 +175,10 @@ void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatM
#endif // BLADERUNNER_ORIGINAL_BUGS
Actor_Says(kActorMcCoy, 4745, -1);
Actor_Says(kActorMcCoy, 4750, -1);
- Actor_Says(kActorRunciter, 520, 17);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorMcCoy, 4755, -1); // M: Was the tiger a fake?
+ }
+ Actor_Says(kActorRunciter, 520, 17); // R: No! The tiger was real. I swear it.
Actor_Says(kActorRunciter, 530, 18);
Actor_Says(kActorRunciter, 540, 16);
}
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 3928d2005e9..12d71f49961 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -1291,6 +1291,9 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Says(kActorSteele, 850, 16);
Actor_Says(kActorDispatcher, 0, kAnimationModeTalk);
Actor_Says(kActorDispatcher, 10, kAnimationModeTalk);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorDispatcher, 20, kAnimationModeTalk);
+ }
Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 2980, 12);
Actor_Says(kActorSteele, 860, 14);
More information about the Scummvm-git-logs
mailing list