[Scummvm-git-logs] scummvm master -> f5b7fec67cb4fa81c132802d900a0943d896248e
antoniou79
noreply at scummvm.org
Thu Feb 2 13:31:06 UTC 2023
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:
f5b7fec67c BLADERUNNER: Fix inconsistent dialogue in KIA
Commit: f5b7fec67cb4fa81c132802d900a0943d896248e
https://github.com/scummvm/scummvm/commit/f5b7fec67cb4fa81c132802d900a0943d896248e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-02-02T15:29:22+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;
More information about the Scummvm-git-logs
mailing list