[Scummvm-git-logs] scummvm master -> 9513dfbf56d1a4be10fccec00c0f3785ce73eeb3
antoniou79
noreply at scummvm.org
Sat Jan 20 22:05:10 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4e7c7b1190 BLADERUNNER: CUTCONTENT: Alternative earring comment
9513dfbf56 BLADERUNNER: CUTCONTENT: Sloth comment in Early Q club
Commit: 4e7c7b1190ec0561fc9c26a5ef3119c113d9b22c
https://github.com/scummvm/scummvm/commit/4e7c7b1190ec0561fc9c26a5ef3119c113d9b22c
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-01-21T00:04:56+02:00
Commit Message:
BLADERUNNER: CUTCONTENT: Alternative earring comment
For Sadik's earring in the photo
It's for cut content's normal/hard mode
or if McCoy already got the full earring comment from picking up the earring outside the lab
Changed paths:
engines/bladerunner/script/esper_script.cpp
engines/bladerunner/script/kia_script.cpp
diff --git a/engines/bladerunner/script/esper_script.cpp b/engines/bladerunner/script/esper_script.cpp
index e2cce886678..09652a169f6 100644
--- a/engines/bladerunner/script/esper_script.cpp
+++ b/engines/bladerunner/script/esper_script.cpp
@@ -367,9 +367,14 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
break;
case 20:
- Actor_Voice_Over(2140, kActorVoiceOver);
- Actor_Voice_Over(2150, kActorVoiceOver);
- Actor_Voice_Over(2160, kActorVoiceOver);
+ if (_vm->_cutContent
+ && (Query_Difficulty_Level() != kGameDifficultyEasy || Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring))) {
+ Actor_Voice_Over(4130, kActorVoiceOver); // TLKA
+ } else {
+ Actor_Voice_Over(2140, kActorVoiceOver);
+ Actor_Voice_Over(2150, kActorVoiceOver);
+ Actor_Voice_Over(2160, kActorVoiceOver);
+ }
if (!Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
Actor_Says(kActorMcCoy, 6945, 3);
Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
diff --git a/engines/bladerunner/script/kia_script.cpp b/engines/bladerunner/script/kia_script.cpp
index ad084ffda3b..f470cc69320 100644
--- a/engines/bladerunner/script/kia_script.cpp
+++ b/engines/bladerunner/script/kia_script.cpp
@@ -236,9 +236,14 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
break;
case kClueBombingSuspect:
KIA_Play_Photograph(31);
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 2140);
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 2150);
- KIA_Play_Actor_Dialogue(kActorVoiceOver, 2160);
+ if (_vm->_cutContent
+ && (Query_Difficulty_Level() != kGameDifficultyEasy || Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring))) {
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 4130); // TLKA
+ } else {
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 2140);
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 2150);
+ KIA_Play_Actor_Dialogue(kActorVoiceOver, 2160);
+ }
break;
case kClueDetonatorWire:
KIA_Play_Slice_Model(kModelAnimationDetonatorWire);
Commit: 9513dfbf56d1a4be10fccec00c0f3785ce73eeb3
https://github.com/scummvm/scummvm/commit/9513dfbf56d1a4be10fccec00c0f3785ce73eeb3
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-01-21T00:04:56+02:00
Commit Message:
BLADERUNNER: CUTCONTENT: Sloth comment in Early Q club
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/scene/nr03.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index e8af5017da6..49fa2f8bdce 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -504,7 +504,7 @@ enum Flags {
kFlagMA05toMA04 = 63,
kFlagGaffApproachedMcCoyAboutZuben = 64,
kFlagMcCoyCommentsOnTB05Monitors = 65, // Re-purposed. Original: 65 is never used
- // 66 is never used
+ kFlagMcCoyCommentsOnNR03Sloth = 66, // Re-purposed. Original: 66 is never used
// 67 is never used
kFlagCT02toCT01 = 68,
kFlagCT02toCT03 = 69,
@@ -1168,6 +1168,8 @@ enum Flags {
kFlagPS04WeaponsOrderForm = 727,
kFlagDR01Visited = 728, // Re-purposed. Original: 728 is never used
kFlagNR08DektoraShow = 729
+ // INFO Flags count is set to 800 with _gameInfo->getFlagCount()
+ // (the code technically allows up to 831, but there are checks and asserts for <= _flagCount in GameFlags class)
};
enum Variables {
diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp
index 4986bd3e325..d8d2363d14f 100644
--- a/engines/bladerunner/script/scene/nr03.cpp
+++ b/engines/bladerunner/script/scene/nr03.cpp
@@ -91,7 +91,33 @@ void SceneScriptNR03::SceneLoaded() {
Obstacle_Object("PG3", true);
Obstacle_Object("X2BACKBARBOTTOM01", true);
Obstacle_Object("X2BACKSTAGETOP", true);
- Unclickable_Object("PG3");
+ if (_vm->_cutContent) {
+ if (!Game_Flag_Query(kFlagMcCoyCommentsOnNR03Sloth)) {
+ Clickable_Object("PG3");
+ Clickable_Object("PO3");
+ Clickable_Object("PWG1");
+ Clickable_Object("O1");
+ Clickable_Object("PGM1");
+ Clickable_Object("PW4");
+ Clickable_Object("PUNK1");
+ Clickable_Object("PUNKW2");
+ Clickable_Object("PUNK4");
+ Clickable_Object("AR01MAN2");
+ Clickable_Object("PUNK3+");
+ Clickable_Object("COP4PS03");
+ Clickable_Object("AR01PNKW");
+ Clickable_Object("PUNK WOMAN 3++");
+ Clickable_Object("PUNKMAN2+");
+ Clickable_Object("ASIANTALKRIGHT");
+ Clickable_Object("PUNKW1");
+ Clickable_Object("MAN5");
+ Clickable_Object("MAN7");
+ Clickable_Object("PMAN2");
+ Clickable_Object("NM2");
+ }
+ } else {
+ Unclickable_Object("PG3");
+ }
Unobstacle_Object("X2BACKBARBOTTOM02", true);
Unobstacle_Object("NM2", true);
Unobstacle_Object("MAN5", true);
@@ -104,11 +130,64 @@ bool SceneScriptNR03::MouseClick(int x, int y) {
}
bool SceneScriptNR03::ClickedOn3DObject(const char *objectName, bool a2) {
+#if BLADERUNNER_ORIGINAL_BUGS
if (Object_Query_Click("PG3", objectName)) {
Actor_Face_Object(kActorMcCoy, "PG3", true);
+ // There is no 3770 quote for kActorVoiceOver
+ // This part was not triggered though, since object PG3 was made unclickable
Actor_Voice_Over(3770, kActorVoiceOver);
return true;
}
+#else
+ if (_vm->_cutContent
+ && !Game_Flag_Query(kFlagMcCoyCommentsOnNR03Sloth)
+ && (Object_Query_Click("PG3", objectName)
+ || Object_Query_Click("PO3", objectName)
+ || Object_Query_Click("PWG1", objectName)
+ || Object_Query_Click("O1", objectName)
+ || Object_Query_Click("PGM1", objectName)
+ || Object_Query_Click("PW4", objectName)
+ || Object_Query_Click("PUNK1", objectName)
+ || Object_Query_Click("PUNKW2", objectName)
+ || Object_Query_Click("PUNK4", objectName)
+ || Object_Query_Click("AR01MAN2", objectName)
+ || Object_Query_Click("PUNK3+", objectName)
+ || Object_Query_Click("COP4PS03", objectName)
+ || Object_Query_Click("AR01PNKW", objectName)
+ || Object_Query_Click("PUNK WOMAN 3++", objectName)
+ || Object_Query_Click("PUNKMAN2+", objectName)
+ || Object_Query_Click("ASIANTALKRIGHT", objectName)
+ || Object_Query_Click("PUNKW1", objectName)
+ || Object_Query_Click("MAN5", objectName)
+ || Object_Query_Click("MAN7", objectName)
+ || Object_Query_Click("PMAN2", objectName)
+ || Object_Query_Click("NM2", objectName) )) {
+ Game_Flag_Set(kFlagMcCoyCommentsOnNR03Sloth);
+ Actor_Voice_Over(3760, kActorVoiceOver);
+ Unclickable_Object("PG3");
+ Unclickable_Object("PO3");
+ Unclickable_Object("PWG1");
+ Unclickable_Object("O1");
+ Unclickable_Object("PGM1");
+ Unclickable_Object("PW4");
+ Unclickable_Object("PUNK1");
+ Unclickable_Object("PUNKW2");
+ Unclickable_Object("PUNK4");
+ Unclickable_Object("AR01MAN2");
+ Unclickable_Object("PUNK3+");
+ Unclickable_Object("COP4PS03");
+ Unclickable_Object("AR01PNKW");
+ Unclickable_Object("PUNK WOMAN 3++");
+ Unclickable_Object("PUNKMAN2+");
+ Unclickable_Object("ASIANTALKRIGHT");
+ Unclickable_Object("PUNKW1");
+ Unclickable_Object("MAN5");
+ Unclickable_Object("MAN7");
+ Unclickable_Object("PMAN2");
+ Unclickable_Object("NM2");
+ return true;
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
return false;
}
More information about the Scummvm-git-logs
mailing list