libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BLADERUNNER: RESTOREDCONTENT: NR06 and MA06 extra machine voices

Browse Source 
NR06 door announcer and MA06 elevator voice print identification

Also includes fix for bad flag for statues' comment in NR06
This commit is contained in:
antoniou79 2021-06-30 22:41:21 +03:00
parent 4dcbd07148
commit 73a7cbde44
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engines/bladerunner/script/scene/dr06.cpp
View File

@ -37,7 +37,7 @@ void SceneScriptDR06::InitializeScene() {
) {
Scene_Exit_Add_2D_Exit(1, 0, 272, 46, 477, 2);
}
if (_vm->_cutContent && !Game_Flag_Query(kFlagMcCoyCommentsOnFans)) {
if (_vm->_cutContent && !Game_Flag_Query(kFlagMcCoyCommentsOnStatues)) {
Scene_2D_Region_Add(0, 300, 80, 360, 190); // statue 1
Scene_2D_Region_Add(1, 60, 120, 155, 260); // statue 2
Scene_2D_Region_Add(2, 378, 270, 420, 320); // statue 3
@ -98,19 +98,19 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
} else {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -684.94f, 136.6f, -1136.12f, 0, true, false, false)) {
Actor_Face_Object(kActorMcCoy, "X2_MON01A04", true);
Actor_Says(kActorAnsweringMachine, 10, 3);
Actor_Says(kActorAnsweringMachine, 20, 3);
Actor_Says(kActorAnsweringMachine, 30, 3);
Actor_Says(kActorAnsweringMachine, 10, kAnimationModeTalk);
Actor_Says(kActorAnsweringMachine, 20, kAnimationModeTalk);
Actor_Says(kActorAnsweringMachine, 30, kAnimationModeTalk);
Actor_Says(kActorMcCoy, 1025, 13);
Actor_Says(kActorSebastian, 0, 3);
Actor_Says(kActorSebastian, 10, 3);
Actor_Says(kActorSebastian, 20, 3);
Actor_Says(kActorSebastian, 30, 3);
Actor_Says(kActorSebastian, 40, 3);
Actor_Says(kActorSebastian, 50, 3);
Actor_Says(kActorAnsweringMachine, 40, 3);
Actor_Says(kActorSebastian, 0, kAnimationModeTalk);
Actor_Says(kActorSebastian, 10, kAnimationModeTalk);
Actor_Says(kActorSebastian, 20, kAnimationModeTalk);
Actor_Says(kActorSebastian, 30, kAnimationModeTalk);
Actor_Says(kActorSebastian, 40, kAnimationModeTalk);
Actor_Says(kActorSebastian, 50, kAnimationModeTalk);
Actor_Says(kActorAnsweringMachine, 40, kAnimationModeTalk);
Actor_Says(kActorMcCoy, 1030, 13);
Actor_Says(kActorAnsweringMachine, 50, 3);
Actor_Says(kActorAnsweringMachine, 50, kAnimationModeTalk);
Actor_Clue_Acquire(kActorMcCoy, kClueAnsweringMachineMessage, true, kActorAnsweringMachine);
}
}
@ -253,6 +253,9 @@ void SceneScriptDR06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
void SceneScriptDR06::PlayerWalkedIn() {
if (Game_Flag_Query(kFlagDR04toDR06)) {
if (_vm->_cutContent) {
ADQ_Add(kActorAnsweringMachine, 60, kAnimationModeTalk);
}
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -729.57f, 136.6f, -1016.0f, 0, false, false, false);
}
Game_Flag_Reset(kFlagDR04toDR06);

21
engines/bladerunner/script/scene/ma06.cpp
View File

@ -126,10 +126,13 @@ void SceneScriptMA06::PlayerWalkedIn() {
Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 10, 0, 1u);
Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 10, 0, 1u);
Actor_Says(kActorAnsweringMachine, 80, 3); // your floor number please
if (_vm->_cutContent) {
Actor_Says(kActorAnsweringMachine, 70, kAnimationModeTalk); // voice print identification
}
Actor_Says(kActorAnsweringMachine, 80, kAnimationModeTalk); // your floor number please
Actor_Says(kActorMcCoy, 2940, 18); // McCoy: McCoy 88F
Game_Flag_Set(kFlagMA06ToMA02); // to McCoy's Apartment
Actor_Says(kActorAnsweringMachine, 90, 3); // 88 thank you
Actor_Says(kActorAnsweringMachine, 90, kAnimationModeTalk); // 88 thank you
Actor_Face_Actor(kActorMcCoy, kActorRachael, true);
Actor_Says(kActorMcCoy, 2710, 14); // Excuse me
@ -168,7 +171,10 @@ void SceneScriptMA06::PlayerWalkedIn() {
Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 10, 0, 1u);
Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 10, 0, 1u);
Actor_Says(kActorAnsweringMachine, 80, 3); // your floor number please
if (_vm->_cutContent) {
Actor_Says(kActorAnsweringMachine, 70, kAnimationModeTalk); // voice print identification
}
Actor_Says(kActorAnsweringMachine, 80, kAnimationModeTalk); // your floor number please
Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsInsideElevatorStartTalkAct4);
//
Delay(500);
@ -256,7 +262,10 @@ void SceneScriptMA06::activateElevator() {
break;
}
Actor_Says(kActorAnsweringMachine, 80, kAnimationModeTalk);
if (_vm->_cutContent) {
Actor_Says(kActorAnsweringMachine, 70, kAnimationModeTalk); // voice print identification
}
Actor_Says(kActorAnsweringMachine, 80, kAnimationModeTalk); // your floor number please
Player_Gains_Control();
int floorLevel = Elevator_Activate(kElevatorMA);
#if BLADERUNNER_ORIGINAL_BUGS
@ -279,7 +288,7 @@ void SceneScriptMA06::activateElevator() {
} else {
Sound_Play(kSfxELEBAD1, 100, 0, 0, 50);
Delay(500);
Actor_Says(kActorAnsweringMachine, 610, 3);
Actor_Says(kActorAnsweringMachine, 610, kAnimationModeTalk);
}
} else { // floorLevel == 0
Actor_Says(kActorMcCoy, 2940, 18);
@ -293,7 +302,7 @@ void SceneScriptMA06::activateElevator() {
Actor_Says(kActorMcCoy, 8527, kAnimationModeTalk);
} else {
Game_Flag_Set(kFlagMA06ToMA02);
Actor_Says(kActorAnsweringMachine, 90, 3);
Actor_Says(kActorAnsweringMachine, 90, kAnimationModeTalk);
}
}
}