[Scummvm-git-logs] scummvm bladeRatBridge -> 305cbb475698cd2497710e03a2b99cfdb43fb45b

[dafioram]

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:
020a5a87b1 BLADERUNNER: Don't let the sewer bridge break on easy
305cbb4756 BLADERUNNER: Dead bridge rat won't respawn when playing uncut and easy


Commit: 020a5a87b1120cfb10721fa4016e6a9af93e9f44
    https://github.com/scummvm/scummvm/commit/020a5a87b1120cfb10721fa4016e6a9af93e9f44
Author: David Fioramonti (dafioram at gmail.com)
Date: 2019-05-28T17:57:22-07:00

Commit Message:
BLADERUNNER: Don't let the sewer bridge break on easy

When the player is playing on easy and it is the uncut version
then the sewer bridge won't break when McCoy runs on it or if
McCoy and the rat are both on it.

A bridge breaking death animation will still be shown if the rat kills
the player on the bridge.

Changed paths:
    engines/bladerunner/script/ai/free_slot_a.cpp


diff --git a/engines/bladerunner/script/ai/free_slot_a.cpp b/engines/bladerunner/script/ai/free_slot_a.cpp
index 37e7783..13f966d 100644
--- a/engines/bladerunner/script/ai/free_slot_a.cpp
+++ b/engines/bladerunner/script/ai/free_slot_a.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "bladerunner/script/ai_script.h"
+#include "bladerunner/settings.h"
 
 namespace BladeRunner {
 
@@ -541,6 +542,10 @@ void AIScriptFreeSlotA::FledCombat() {
 }
 
 void AIScriptFreeSlotA::checkIfOnBridge() {
+	if (_vm->_cutContent && _vm->_settings->getDifficulty() == kGameDifficultyEasy) {
+		// Make the bridge indestructible on easy mode for the enhanced version
+		return;
+	}
 	float x, y, z;
 	Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
 	// bug? this should probably check if McCoy is close enough because bridge will break long after rat died and player tries to walk through


Commit: 305cbb475698cd2497710e03a2b99cfdb43fb45b
    https://github.com/scummvm/scummvm/commit/305cbb475698cd2497710e03a2b99cfdb43fb45b
Author: David Fioramonti (dafioram at gmail.com)
Date: 2019-05-28T18:00:21-07:00

Commit Message:
BLADERUNNER: Dead bridge rat won't respawn when playing uncut and easy

If the player kills the rat at the bridge that breaks and goes to
the left screen and then comes back the rat will not respawn when
the player is playing the uncut version on easy.

In every other case there will be a 10% chance that the rat will
respawn.

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


diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp
index d0b9fe3..52a3d7f 100644
--- a/engines/bladerunner/script/scene/ug15.cpp
+++ b/engines/bladerunner/script/scene/ug15.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "bladerunner/script/scene_script.h"
+#include "bladerunner/settings.h"
 
 namespace BladeRunner {
 
@@ -40,7 +41,8 @@ void SceneScriptUG15::InitializeScene() {
 	} else {
 		Setup_Scene_Information(-238.0f, 48.07f,  222.0f, 180);
 		if (Game_Flag_Query(kFlagUG15RatShot)
-		 && Random_Query(1, 10) == 10
+		 && (Random_Query(1, 10) == 10)
+		 && !(_vm->_cutContent && _vm->_settings->getDifficulty() == kGameDifficultyEasy)
 		) {
 			Game_Flag_Reset(kFlagUG15RatShot);
 		}