[Scummvm-git-logs] scummvm master -> 349c7487ee253455692881d5f63d22ef69843990

[dafioram]

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:
349c7487ee BLADERUNNER: Make the Moraji encounter easier on easy


Commit: 349c7487ee253455692881d5f63d22ef69843990
    https://github.com/scummvm/scummvm/commit/349c7487ee253455692881d5f63d22ef69843990
Author: David Fioramonti (dafioram at gmail.com)
Date: 2019-06-02T12:10:57-04:00

Commit Message:
BLADERUNNER: Make the Moraji encounter easier on easy

This extending the bomb duration by 10secs while Moraji
is chained.

Additionally, the blast radius is decreased so that the player may survive
closer.

All of this only happens on the uncut version when playing on easy.

Changed paths:
    engines/bladerunner/script/ai/moraji.cpp
    engines/bladerunner/script/scene/dr04.cpp


diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp
index 63998aa..207a78f 100644
--- a/engines/bladerunner/script/ai/moraji.cpp
+++ b/engines/bladerunner/script/ai/moraji.cpp
@@ -47,7 +47,10 @@ bool AIScriptMoraji::Update() {
 	 && !Game_Flag_Query(kFlagDR05BombActivated)
 	) {
 		AI_Countdown_Timer_Reset(kActorMoraji, kActorTimerAIScriptCustomTask2);
-		AI_Countdown_Timer_Start(kActorMoraji, kActorTimerAIScriptCustomTask2, 30);
+		int bombTime = 30; // Original value
+		if (_vm->_cutContent && Query_Difficulty_Level() == kGameDifficultyEasy)
+			bombTime += 10; // Extend the bomb timer duration when in Dermo Design (where Moraji is chained)
+		AI_Countdown_Timer_Start(kActorMoraji, kActorTimerAIScriptCustomTask2, bombTime);
 		Game_Flag_Set(kFlagDR05BombActivated);
 		return true;
 	}
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index 166040d..8664589 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -217,7 +217,10 @@ bool SceneScriptDR04::ClickedOn2DRegion(int region) {
 bool SceneScriptDR04::farEnoughFromExplosion() {
 	float x, y, z;
 	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
-	return (x + 1089.94f) * (x + 1089.94f) + (z - 443.49f) * (z - 443.49f) >= (360.0f * 360.0f);
+	float blastRadius = 360.0f; // Original blast radius
+	if (_vm->_cutContent && Query_Difficulty_Level() == kGameDifficultyEasy)
+		blastRadius = 290.0f; // Allow the player to survive the bomb closer to the Dermo Design entrance
+	return (x + 1089.94f) * (x + 1089.94f) + (z - 443.49f) * (z - 443.49f) >= (blastRadius * blastRadius);
 }
 
 void SceneScriptDR04::SceneFrameAdvanced(int frame) {