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

antoniou79 antoniou at cti.gr
Tue Sep 3 13:38:31 CEST 2019


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:
dde41f1432 BLADERUNNER: Restored content - Fix bracelet purchase regression


Commit: dde41f1432f236a5a09a16299cf2e84e47f2274b
    https://github.com/scummvm/scummvm/commit/dde41f1432f236a5a09a16299cf2e84e47f2274b
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-09-03T14:12:21+03:00

Commit Message:
BLADERUNNER: Restored content - Fix bracelet purchase regression

Changed paths:
    engines/bladerunner/script/scene/ar01.cpp
    engines/bladerunner/script/scene/ar02.cpp


diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index edc18bb..d7ed9bc 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -483,7 +483,7 @@ void SceneScriptAR01::dialogueWithFishDealerBuyGoldfish() {
 	Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(530);
 	Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(540);
 
-	if (Global_Variable_Query(kVariableChinyen) >= 75
+	if (Global_Variable_Query(kVariableChinyen) >= 105
 	    || Query_Difficulty_Level() == kGameDifficultyEasy
 	) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(530, 7, 5, 3); // BUY
@@ -497,7 +497,7 @@ void SceneScriptAR01::dialogueWithFishDealerBuyGoldfish() {
 	if (answerValue == 530) { // BUY
 		Actor_Says(kActorMcCoy, 7000, 12);
 		if (Query_Difficulty_Level() != kGameDifficultyEasy) {
-			Global_Variable_Decrement(kVariableChinyen, 75);
+			Global_Variable_Decrement(kVariableChinyen, 105);
 		}
 		Actor_Clue_Acquire(kActorMcCoy, kClueGoldfish, true, kActorFishDealer);
 		Actor_Modify_Friendliness_To_Other(kActorFishDealer, kActorMcCoy, 5);
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index 81846a3..de462bb 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -445,6 +445,11 @@ void SceneScriptAR02::dialogueWithInsectDealer1() {
 void SceneScriptAR02::dialogueWithInsectDealerBuyBracelet() {
 	Dialogue_Menu_Clear_List();
 
+	if (_vm->_cutContent) {
+		Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(530);
+		Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(540);
+	}
+
 	if (Global_Variable_Query(kVariableChinyen) >= 15
 	    || Query_Difficulty_Level() == kGameDifficultyEasy
 	) {
@@ -483,7 +488,7 @@ void SceneScriptAR02::dialogueWithInsectDealerBuySlug() {
 	Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(530);
 	Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(540);
 
-	if (Global_Variable_Query(kVariableChinyen) >= 85
+	if (Global_Variable_Query(kVariableChinyen) >= 125
 	    || Query_Difficulty_Level() == kGameDifficultyEasy
 	) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(530, 7, 5, 3); // BUY
@@ -497,7 +502,7 @@ void SceneScriptAR02::dialogueWithInsectDealerBuySlug() {
 	if (answerValue == 530) { // BUY
 		Actor_Says(kActorMcCoy, 7000, 12);
 		if (Query_Difficulty_Level() != kGameDifficultyEasy) {
-			Global_Variable_Decrement(kVariableChinyen, 85);
+			Global_Variable_Decrement(kVariableChinyen, 125);
 		}
 		Actor_Clue_Acquire(kActorMcCoy, kClueSlug, true, kActorInsectDealer);
 		Actor_Modify_Friendliness_To_Other(kActorInsectDealer, kActorMcCoy, 5);
@@ -584,7 +589,7 @@ void SceneScriptAR02::dialogueWithHassanBuySnake() {
 	Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(530);
 	Dialogue_Menu_Clear_Never_Repeat_Was_Selected_Flag(540);
 
-	if (Global_Variable_Query(kVariableChinyen) >= 105
+	if (Global_Variable_Query(kVariableChinyen) >= 175
 	    || Query_Difficulty_Level() == kGameDifficultyEasy
 	) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(530, 7, 5, 3); // BUY
@@ -598,7 +603,7 @@ void SceneScriptAR02::dialogueWithHassanBuySnake() {
 	if (answerValue == 530) { // BUY
 		Actor_Says(kActorMcCoy, 7000, 12);
 		if (Query_Difficulty_Level() != kGameDifficultyEasy) {
-			Global_Variable_Decrement(kVariableChinyen, 105);
+			Global_Variable_Decrement(kVariableChinyen, 175);
 		}
 		Actor_Clue_Acquire(kActorMcCoy, kClueGarterSnake, true, kActorHasan);
 		Actor_Modify_Friendliness_To_Other(kActorHasan, kActorMcCoy, 5);





More information about the Scummvm-git-logs mailing list