[Scummvm-git-logs] scummvm master -> 8b5335869dba3962dcb34619a1098b1a0aee3409
sev-
sev at scummvm.org
Sat Mar 17 13:23:34 CET 2018
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:
8b5335869d BLADERUNNER: Added EarlyQ actor
Commit: 8b5335869dba3962dcb34619a1098b1a0aee3409
https://github.com/scummvm/scummvm/commit/8b5335869dba3962dcb34619a1098b1a0aee3409
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-17T13:23:15+01:00
Commit Message:
BLADERUNNER: Added EarlyQ actor
Changed paths:
A engines/bladerunner/script/ai/early_q.cpp
engines/bladerunner/module.mk
engines/bladerunner/script/ai_script.cpp
engines/bladerunner/script/ai_script.h
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index de03caa..6589a74 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -61,6 +61,7 @@ MODULE_OBJS = \
script/ai/dektora.o \
script/ai/desk_clerk.o \
script/ai/dispatcher.o \
+ script/ai/early_q.o \
script/ai/early_q_bartender.o \
script/ai/fish_dealer.o \
script/ai/gaff.o \
diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp
new file mode 100644
index 0000000..180493f
--- /dev/null
+++ b/engines/bladerunner/script/ai/early_q.cpp
@@ -0,0 +1,1037 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "bladerunner/script/ai_script.h"
+
+namespace BladeRunner {
+
+AIScriptEarlyQ::AIScriptEarlyQ(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _var1 = 0;
+ _var2 = 0;
+ _var3 = 1;
+ _flag = false;
+}
+
+void AIScriptEarlyQ::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _var1 = 0;
+ _var2 = 0;
+ _var3 = 1;
+ _flag = 0;
+}
+
+bool AIScriptEarlyQ::Update() {
+ if (Global_Variable_Query(kVariableChapter) != 1 || Game_Flag_Query(490)) {
+ if (Global_Variable_Query(kVariableChapter) != 2 || Game_Flag_Query(491)) {
+ if (Global_Variable_Query(kVariableChapter) != 3 || Game_Flag_Query(564)) {
+ return false;
+ } else {
+ Game_Flag_Set(564);
+ Actor_Put_In_Set(kActorEarlyQ, kSetFreeSlotH);
+ Actor_Set_At_Waypoint(kActorEarlyQ, 40, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 200);
+ }
+ } else {
+ Game_Flag_Set(491);
+ Actor_Put_In_Set(kActorEarlyQ, kSetFreeSlotH);
+ Actor_Set_At_Waypoint(kActorEarlyQ, 40, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 100);
+ }
+ } else {
+ Game_Flag_Set(490);
+ Actor_Put_In_Set(kActorEarlyQ, kSetFreeSlotH);
+ Actor_Set_At_Waypoint(kActorEarlyQ, 40, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 0);
+ }
+
+ return true;
+}
+
+void AIScriptEarlyQ::TimerExpired(int timer) {
+ if (Actor_Query_Goal_Number(kActorEarlyQ) == 221 && !timer) {
+ if (Player_Query_Current_Scene() == 58) {
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 222);
+ } else {
+ Actor_Set_Goal_Number(kActorEarlyQ, 220);
+ }
+ }
+ if (Actor_Query_Goal_Number(kActorEarlyQ) != 205 || timer) {
+ if (Actor_Query_Goal_Number(kActorEarlyQ) == 211 && timer == 1) {
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 1);
+ Player_Loses_Control();
+ Actor_Change_Animation_Mode(kActorEarlyQ, 29);
+ Delay(2500);
+ Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, 1);
+ Actor_Change_Animation_Mode(kActorEarlyQ, 6);
+ Delay(100);
+ _vm->_aiScripts->callChangeAnimationMode(kActorMcCoy, 22);
+ Delay(250);
+ _vm->_aiScripts->callChangeAnimationMode(kActorMcCoy, 48);
+ Actor_Retired_Here(kActorMcCoy, 12, 12, 1, -1);
+ } else {
+ return; //false;
+ }
+ } else {
+ Player_Loses_Control();
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 215);
+ }
+
+ return; //true;
+}
+
+void AIScriptEarlyQ::CompletedMovementTrack() {
+ switch (Actor_Query_Goal_Number(kActorEarlyQ)) {
+ case 0:
+ if (Random_Query(1, 2) == 1) {
+ Actor_Set_Goal_Number(kActorEarlyQ, 1);
+ } else {
+ Actor_Set_Goal_Number(kActorEarlyQ, 2);
+ }
+ break;
+
+ case 1:
+ case 2:
+ Actor_Set_Goal_Number(kActorEarlyQ, 0);
+ break;
+
+ case 100:
+ if (Random_Query(1, 2) != 1) {
+ Actor_Set_Goal_Number(kActorEarlyQ, 102);
+ break;
+ }
+ Actor_Set_Goal_Number(kActorEarlyQ, 101);
+ break;
+
+ case 101:
+ Actor_Set_Goal_Number(kActorEarlyQ, 100);
+ break;
+
+ case 102:
+ Actor_Set_Goal_Number(kActorEarlyQ, 100);
+ break;
+
+ case 201:
+ Game_Flag_Set(569);
+ Player_Set_Combat_Mode(0);
+ Actor_Set_Targetable(kActorEarlyQ, 1);
+ Actor_Set_Goal_Number(kActorEarlyQ, 202);
+ break;
+
+ case 203:
+ Actor_Set_Goal_Number(kActorEarlyQ, 204);
+ break;
+
+ case 222:
+ Actor_Set_Goal_Number(kActorEarlyQ, 223);
+ return; //false;
+
+ case 230:
+ Actor_Set_Goal_Number(kActorEarlyQ, 200);
+ return; //false;
+
+ default:
+ return; //false;
+ }
+
+ return; //true;
+}
+
+void AIScriptEarlyQ::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptEarlyQ::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptEarlyQ::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptEarlyQ::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptEarlyQ::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptEarlyQ::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ if (Game_Flag_Query(569) != 1 || otherActorId || combatMode != 1 || Game_Flag_Query(609)) {
+ if (Actor_Query_Goal_Number(kActorEarlyQ) != 211 || otherActorId || combatMode) {
+ return; //false;
+ } else {
+ if (Game_Flag_Query(565) == 1) {
+ Game_Flag_Reset(565);
+ }
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 1);
+ Actor_Set_Goal_Number(kActorEarlyQ, 213);
+ }
+ } else {
+ if (!Game_Flag_Query(565)) {
+ Game_Flag_Set(565);
+ }
+ Game_Flag_Set(609);
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 206);
+ }
+
+ return; //true;
+}
+
+void AIScriptEarlyQ::ShotAtAndMissed() {
+ if (Actor_Query_Goal_Number(kActorEarlyQ) != 211)
+ return; //false;
+
+ Actor_Set_Goal_Number(kActorEarlyQ, 216);
+ return; //true;
+}
+
+bool AIScriptEarlyQ::ShotAtAndHit() {
+ if (Actor_Query_Goal_Number(kActorEarlyQ) < 201 || Actor_Query_Goal_Number(kActorEarlyQ) > 217)
+ return 0;
+
+ Actor_Set_Goal_Number(kActorEarlyQ, 216);
+
+ return true;
+}
+
+void AIScriptEarlyQ::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptEarlyQ::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 0:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 40, 0);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 1:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 291, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 285, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 292, 30);
+ AI_Movement_Track_Append(kActorEarlyQ, 293, 30);
+ AI_Movement_Track_Append(kActorEarlyQ, 294, 30);
+ AI_Movement_Track_Append(kActorEarlyQ, 295, 30);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 2:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 40, 120);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 100:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 40, 0);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 101:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 291, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 285, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 292, 30);
+ AI_Movement_Track_Append(kActorEarlyQ, 293, 30);
+ AI_Movement_Track_Append(kActorEarlyQ, 294, 30);
+ AI_Movement_Track_Append(kActorEarlyQ, 295, 30);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 102:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 40, 120);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 200:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ Actor_Put_In_Set(kActorEarlyQ, kSetFreeSlotH);
+ Actor_Set_At_Waypoint(kActorEarlyQ, 40, 0);
+ if (Game_Flag_Query(47) == 1 && Game_Flag_Query(592) && Game_Flag_Query(593)) {
+ Actor_Set_Goal_Number(kActorEarlyQ, 220);
+ } else if (Game_Flag_Query(47)) {
+ Actor_Set_Goal_Number(kActorEarlyQ, 230);
+ } else {
+ Actor_Set_Goal_Number(kActorEarlyQ, 220);
+ }
+ break;
+
+ case 201:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 40, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 322, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 354, 0);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 203:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 355, 0);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ Actor_Face_Object(kActorMcCoy, "BAR", 1);
+ break;
+
+ case 205:
+ Loop_Actor_Walk_To_Actor(kActorEarlyQ, 0, 36, 0, 0);
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 0);
+ AI_Countdown_Timer_Start(kActorEarlyQ, 0, 4);
+ break;
+
+ case 206:
+ Player_Set_Combat_Mode(kActorSteele);
+ Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, 1);
+ Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, 1);
+ Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatIdle);
+ _vm->_aiScripts->callChangeAnimationMode(kActorMcCoy, 5);
+ Actor_Says(kActorEarlyQ, 130, 3);
+ Actor_Says(kActorMcCoy, 3400, 5);
+ Actor_Says_With_Pause(kActorEarlyQ, 140, 1.0, 3);
+ Actor_Says_With_Pause(kActorEarlyQ, 150, 1.0, 3);
+ Actor_Says(kActorMcCoy, 3405, 5);
+ Actor_Says(kActorEarlyQ, 160, 3);
+ Actor_Says(kActorMcCoy, 3410, 5);
+ _vm->_aiScripts->callChangeAnimationMode(kActorMcCoy, 4);
+ Loop_Actor_Walk_To_XYZ(kActorMcCoy, 31.22f, 0.0f, 267.51f, 0, 1, 0, 0);
+ Actor_Set_Goal_Number(kActorEarlyQ, 207);
+ break;
+
+ case 208:
+ if (Game_Flag_Query(374) == 1) {
+ Actor_Set_Goal_Number(kActorEarlyQ, 210);
+ } else {
+ Actor_Set_Goal_Number(kActorEarlyQ, 209);
+ }
+ break;
+
+ case 210:
+ Actor_Set_Targetable(kActorEarlyQ, 0);
+ Game_Flag_Set(606);
+ Delay(3500);
+ Actor_Change_Animation_Mode(kActorEarlyQ, 76);
+ Delay(2000);
+ Actor_Set_At_XYZ(kActorEarlyQ, 109.0, 0.0, 374.0, 0);
+ Actor_Retired_Here(kActorEarlyQ, 12, 12, 1, -1);
+ Actor_Voice_Over(4180, kActorVoiceOver);
+ Scene_Exits_Enable();
+ break;
+
+ case 211:
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 1);
+ AI_Countdown_Timer_Start(kActorEarlyQ, 1, 5);
+ break;
+
+ case 212:
+ Actor_Says(kActorEarlyQ, 0, 3);
+ Actor_Says(kActorEarlyQ, 10, 3);
+ Actor_Says(kActorEarlyQ, 20, 3);
+ Actor_Clue_Lose(kActorMcCoy, 89);
+ Scene_Exits_Enable();
+ Player_Gains_Control();
+ Game_Flag_Set(627);
+ Actor_Set_Goal_Number(kActorHanoi, 220);
+ break;
+
+ case 215:
+ if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorEarlyQ) > 36) {
+ Loop_Actor_Walk_To_Actor(kActorEarlyQ, kActorMcCoy, 36, kActorMcCoy, kActorMcCoy);
+ }
+ Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, 1);
+ Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, 1);
+ Actor_Change_Animation_Mode(kActorEarlyQ, 23);
+ Scene_Loop_Start_Special(2, 2, 0);
+ Ambient_Sounds_Play_Sound(582, 50, 99, 0, 0);
+ Actor_Set_Goal_Number(kActorMcCoy, 220);
+ break;
+
+ case 216:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ Actor_Change_Animation_Mode(kActorEarlyQ, 48);
+ Delay(250);
+ Actor_Set_At_XYZ(kActorEarlyQ, 109.0, 0.0, 374.0, 0);
+ Actor_Set_Goal_Number(kActorHanoi, 240);
+ Player_Set_Combat_Mode(0);
+ break;
+
+ case 217:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 354, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 322, 0);
+ AI_Movement_Track_Append(kActorEarlyQ, 40, 0);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 220:
+ if (Player_Query_Current_Set() == 13) {
+ Actor_Set_Goal_Number(kActorEarlyQ, 230);
+ } else {
+ Actor_Put_In_Set(kActorEarlyQ, kSetNR05_NR08);
+ Actor_Set_At_XYZ(kActorEarlyQ, -671.56f, 0.0f, -287.02f, 849);
+ }
+ break;
+
+ case 221:
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 0);
+ AI_Countdown_Timer_Start(kActorEarlyQ, 0, 20);
+ break;
+
+ case 222:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Movement_Track_Append(kActorEarlyQ, 429, 0);
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ case 223:
+ if (Player_Query_Current_Scene() == 58) {
+ Actor_Says(kActorEarlyQ, 670, 3);
+ Actor_Says(kActorEarlyQ, 690, 3);
+ Actor_Set_Goal_Number(kActorDektora, 210);
+ Actor_Set_Goal_Number(kActorEarlyQ, 224);
+ Actor_Set_Goal_Number(kActorHanoi, 230);
+ } else {
+ Actor_Set_Goal_Number(kActorEarlyQ, 220);
+ }
+ break;
+
+ case 224:
+ Game_Flag_Set(620);
+ break;
+
+ case 229:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ AI_Countdown_Timer_Reset(kActorEarlyQ, 0);
+ break;
+
+ case 230:
+ AI_Movement_Track_Flush(kActorEarlyQ);
+ if (Random_Query(1, 3) > 1) {
+ AI_Movement_Track_Append(kActorEarlyQ, 322, Random_Query(15, 30));
+ AI_Movement_Track_Append(kActorEarlyQ, 39, Random_Query(15, 45));
+ AI_Movement_Track_Append(kActorEarlyQ, 40, Random_Query(15, 30));
+ } else {
+ AI_Movement_Track_Append(kActorEarlyQ, 322, Random_Query(5, 15));
+ AI_Movement_Track_Append(kActorEarlyQ, 39, Random_Query(5, 15));
+ AI_Movement_Track_Append(kActorEarlyQ, 40, Random_Query(5, 15));
+ AI_Movement_Track_Append(kActorEarlyQ, 39, Random_Query(5, 15));
+ AI_Movement_Track_Append(kActorEarlyQ, 34, Random_Query(10, 20));
+ }
+ AI_Movement_Track_Repeat(kActorEarlyQ);
+ break;
+
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ if (_var2 == 1) {
+ *animation = 370;
+ if (_var1) {
+ _var1--;
+ } else {
+ if (++_animationFrame == 6) {
+ _var1 = Random_Query(8, 15);
+ }
+ if (_animationFrame < 6) {
+ _var1 = 1;
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(370)) {
+ _animationFrame = 0;
+ _var2 = 0;
+ }
+ }
+ } else if (_var2 == 0) {
+ *animation = 369;
+ if (_var1) {
+ _var1--;
+ if (!Random_Query(0, 6)) {
+ _var3 = -_var3;
+ }
+ } else {
+ _animationFrame += _var3;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(369)) {
+ _animationFrame = 0;
+ }
+ if (_animationFrame < 0) {
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(369) - 1;
+ }
+ _var1 = Random_Query(0, 1);
+ if (!_animationFrame) {
+ if (!Random_Query(0, 3)) {
+ _var2 = 1;
+ }
+ }
+ if (!_animationFrame || _animationFrame == 5) {
+ if (Random_Query(0, 1)) {
+ _var1 = Random_Query(2, 8);
+ }
+ }
+ }
+ }
+ break;
+
+ case 1:
+ *animation = 381;
+ _animationFrame++;
+ if (_animationFrame == 18) {
+ Ambient_Sounds_Play_Sound(255, 99, 0, 0, 20);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+ Actor_Change_Animation_Mode(kActorEarlyQ, 74);
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 382;
+ }
+ break;
+
+ case 2:
+ *animation = 382;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(382)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 3:
+ *animation = 371;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(371)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+ }
+ break;
+
+ case 4:
+ *animation = 368;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(368) - 1) {
+ _animationFrame++;
+ }
+ break;
+
+ case 5:
+ *animation = 365;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(365)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 6:
+ *animation = 361;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(361)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 7:
+ *animation = 383;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(383)) {
+ _animationFrame = 0;
+ _animationState = 9;
+ *animation = 384;
+ }
+ break;
+
+ case 8:
+ *animation = 387;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(387)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 9:
+ *animation = 384;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(384)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 10:
+ *animation = 385;
+ if (!_animationFrame && _flag) {
+ _flag = 0;
+ _animationState = 9;
+ _var2 = 0;
+ *animation = 384;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 53);
+ } else {
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(385)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 11:
+ *animation = 386;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(386) - 1) {
+ _animationFrame++;
+ }
+ if (_animationFrame == 1) {
+ Ambient_Sounds_Play_Sound(555, 59, 0, 0, 20);
+ }
+ if (_animationFrame == 8) {
+ Ambient_Sounds_Play_Sound(254, 47, 0, 0, 20);
+ }
+ if (_animationFrame == 11) {
+ Ambient_Sounds_Play_Sound(560, 27, 0, 0, 20);
+ }
+ if (_animationFrame == 14) {
+ Ambient_Sounds_Play_Sound(206, 41, 0, 0, 20);
+ }
+ break;
+
+ case 12:
+ *animation = 360;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(360)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 13:
+ *animation = 362;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(362)) {
+ _animationFrame = 0;
+ _animationState = 12;
+ *animation = 360;
+ }
+ break;
+
+ case 14:
+ *animation = 363;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(363)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 15:
+ *animation = 364;
+ _animationFrame++;
+ if (_animationFrame == 2) {
+ Ambient_Sounds_Play_Sound(12, 60, 0, 0, 20);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(364)) {
+ _animationFrame = 0;
+ _animationState = 12;
+ *animation = 360;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 4);
+ }
+ break;
+
+ case 16:
+ *animation = 366;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(366)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+ }
+ break;
+
+ case 17:
+ *animation = 367;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(367)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+ }
+ break;
+
+ case 18:
+ *animation = 366;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(366)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+ }
+ break;
+
+ case 19:
+ *animation = 367;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(367)) {
+ *animation = 369;
+ _animationFrame = 0;
+ _animationState = 0;
+ Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+ }
+ break;
+
+ case 20:
+ *animation = 372;
+ if (!_animationFrame && _flag) {
+ *animation = 369;
+ _animationFrame = 0;
+ _flag = 0;
+ _animationState = 0;
+ } else {
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(372)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 21:
+ *animation = 373;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(373)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 22:
+ *animation = 374;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(374)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 23:
+ *animation = 375;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(375)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 24:
+ *animation = 376;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(376)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 25:
+ *animation = 377;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(377)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 26:
+ *animation = 378;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(378)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 27:
+ *animation = 379;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(379)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ case 28:
+ *animation = 380;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(380)) {
+ _animationFrame = 0;
+ _animationState = 20;
+ *animation = 372;
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptEarlyQ::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ switch (_animationState) {
+ case 1:
+ Actor_Change_Animation_Mode(kActorEarlyQ, 73);
+ break;
+
+ case 2:
+ Actor_Change_Animation_Mode(kActorEarlyQ, 74);
+ break;
+
+ case 9:
+ Actor_Change_Animation_Mode(kActorEarlyQ, 29);
+ break;
+
+ case 10:
+ case 20:
+ case 21:
+ case 22:
+ case 23:
+ case 24:
+ case 25:
+ case 26:
+ case 27:
+ case 28:
+ _flag = 1;
+ break;
+
+ case 12:
+ case 13:
+ case 15:
+ _animationState = 14;
+ _animationFrame = 0;
+ break;
+
+ case 14:
+ return 1;
+
+ default:
+ _animationState = 0;
+ _animationFrame = 0;
+ break;
+ }
+ break;
+
+ case 1:
+ _animationState = 5;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ _animationState = 20;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 4:
+ if ((unsigned int)(_animationState - 12) > 3 || (_animationState != 12 && _animationState != 13 && _animationState != 15)) {
+ _animationState = 13;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 6:
+ _animationState = 15;
+ _animationFrame = 0;
+ break;
+
+ case 7:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+
+ case 12:
+ _animationState = 21;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 13:
+ _animationState = 22;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 14:
+ _animationState = 23;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 15:
+ _animationState = 24;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 16:
+ _animationState = 25;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 17:
+ _animationState = 26;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 18:
+ _animationState = 27;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 19:
+ _animationState = 28;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 21:
+ if ((unsigned int)(_animationState - 12) > 3 || (_animationState != 12 && _animationState != 13 && _animationState != 15)) {
+ if (Random_Query(0, 1)) {
+ _animationState = 16;
+ } else {
+ _animationState = 17;
+ }
+ _animationFrame = 0;
+ } else {
+ if (Random_Query(0, 1)) {
+ _animationState = 18;
+ } else {
+ _animationState = 19;
+ }
+ _animationFrame = 0;
+ }
+ break;
+
+ case 23:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 29:
+ _animationState = 8;
+ _animationFrame = 0;
+ break;
+
+ case 30:
+ _animationState = 10;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 48:
+ _animationState = 4;
+ _animationFrame = 0;
+ break;
+
+ case 53:
+ _animationState = 9;
+ _animationFrame = 0;
+ break;
+
+ case 73:
+ if (_animationState != 1) {
+ _animationState = 1;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 74:
+ if (_animationState != 2) {
+ _animationState = 2;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 76:
+ _animationState = 11;
+ _animationFrame = 0;
+ break;
+
+ case 85:
+ _animationState = 7;
+ _animationFrame = 0;
+ break;
+
+ default:
+ return true;
+ }
+
+ return true;
+}
+
+void AIScriptEarlyQ::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptEarlyQ::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptEarlyQ::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptEarlyQ::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index a3bb543..f8d0a72 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -57,6 +57,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorRunciter] = new AIScriptRunciter(_vm); // 15
_AIScripts[kActorInsectDealer] = new AIScriptInsectDealer(_vm); // 16
_AIScripts[kActorTyrellGuard] = new AIScriptTyrellGuard(_vm); // 17
+ _AIScripts[kActorEarlyQ] = new AIScriptEarlyQ(_vm); // 18
_AIScripts[kActorZuben] = new AIScriptZuben(_vm); // 19
_AIScripts[kActorMarcus] = new AIScriptMarcus(_vm); // 21
_AIScripts[kActorMia] = new AIScriptMia(_vm); // 22
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 5a28402..2ebe11a 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -244,6 +244,13 @@ DECLARE_SCRIPT(TyrellGuard)
bool _flag1;
END_SCRIPT
+DECLARE_SCRIPT(EarlyQ)
+ int _var1;
+ int _var2;
+ int _var3;
+ bool _flag;
+END_SCRIPT
+
DECLARE_SCRIPT(Zuben)
int _var_45D258;
int _var_45D25C;
@@ -521,6 +528,8 @@ public:
void changeAnimationMode(int actor, int mode);
bool isInsideScript() const { return _inScriptCounter > 0; }
+
+ void callChangeAnimationMode(int actor, int mode) { _AIScripts[actor]->ChangeAnimationMode(mode); }
};
} // End of namespace BladeRunner
More information about the Scummvm-git-logs
mailing list