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

[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:
ea528e81ac BLADERUNNER: CUTCONTENT: Fix untriggered easy mode for Izo


Commit: ea528e81acea0a62aed3416e433cac8e4e61520b
    https://github.com/scummvm/scummvm/commit/ea528e81acea0a62aed3416e433cac8e4e61520b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-08-07T14:58:04+03:00

Commit Message:
BLADERUNNER: CUTCONTENT: Fix untriggered easy mode for Izo

When reaching Izo with no clues to discuss, in Easy Mode, Izo takes the photo anyway

This is only enabled for Restored Content as of yet.

The steps "required" to reach Izo with no clues are:
- It's for Easy Mode only
- It's for Restored Content mode only
- Don't pick up the shell casings at Runciters (Act 1)
- Don't find Lucy's anklet jewelry via ESPER
- Don't interview Grigorian at all
- Don't pick up the dragonfly jewelry outside the Gravity lab (Act 2)
- Find the Kingston Kitchen takeout box either from the Gravity lab scene or via ESPER (Act 2)
- Don't find Sadik's face via ESPER before talking to Izo (Act 2)
- Visit Animoid Row and talk directly to Izo (don't interview the Peruvian lady nor Bullet Bob).

This case is a bit odd since, with this fix, which only applies to Easy Mode,
it's easier and faster to trigger Izo's taking the photo when McCoy has no clues,
than if he has at least one. However, a more complex logic would require
a lot of additional interference with the code, which is not desireable.

Changed paths:
    engines/bladerunner/script/scene/hc01.cpp


diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index c2b559e915d..94948863a6e 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -333,10 +333,23 @@ void SceneScriptHC01::dialogueWithIzo() {
 		} else {
 			Actor_Says(kActorIzo, 250, 13);
 			Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -1);
-			if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47
-			 && Query_Difficulty_Level() == kGameDifficultyEasy
-			) {
-				takePhotoAndRunAway();
+			if (!_vm->_cutContent) {
+				// Original untriggered code (Easy Mode shortcut)
+				if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47
+				 && Query_Difficulty_Level() == kGameDifficultyEasy) {
+					// NOTE This code is unreachable in the original.
+					//      When we end up in the else clause, Izo friendliness has to be >= 50.
+					//      Essentially it's 50, which is the starting value.
+					//      Then we deduct 1 from it, so it will be 49.
+					//      And then we check if it's < 47, which is impossible regardless of the game difficulty setting.
+					//      Also, subsequently, this else clause is never re-entered, since Izo friendliness is now 49, thus < 50.
+					takePhotoAndRunAway();
+				}
+			} else {
+				// Enabled triggering of the Easy Mode shortcut
+				if (Query_Difficulty_Level() == kGameDifficultyEasy) {
+					takePhotoAndRunAway();
+				}
 			}
 		}
 		return;