[Scummvm-git-logs] scummvm master -> fb882a10ae4db644b31782ee5a2f6b7ba6ae651e
sev-
sev at scummvm.org
Fri Mar 16 21:31:52 CET 2018
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4be622d664 BLADERUNNER: Added GeneralDoll actor
d982eee927 BLADERUNNER: Added Holloway actor
56b3ac20e0 BLADERUNNER: Added Photographer actor
041a22577a BLADERUNNER: Added Mutant1 actor
2b1f1c4947 BLADERUNNER: Fix Mutant1 aggressiveness
071619d14c BLADERUNNER: Added Mutant2 actor
a90c1f055e BLADERUNNER: Use constants
fb882a10ae BLADERUNNER: Added Mutant3 actor
Commit: 4be622d66440b726bc68f6a8fe1ec25d93b290b7
https://github.com/scummvm/scummvm/commit/4be622d66440b726bc68f6a8fe1ec25d93b290b7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Added GeneralDoll actor
Changed paths:
A engines/bladerunner/script/ai/general_doll.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 00df334..de32e47 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -63,6 +63,7 @@ MODULE_OBJS = \
script/ai/early_q_bartender.o \
script/ai/fish_dealer.o \
script/ai/gaff.o \
+ script/ai/general_doll.o \
script/ai/generic_walker_a.o \
script/ai/generic_walker_b.o \
script/ai/generic_walker_c.o \
diff --git a/engines/bladerunner/script/ai/general_doll.cpp b/engines/bladerunner/script/ai/general_doll.cpp
new file mode 100644
index 0000000..7fdc9b0
--- /dev/null
+++ b/engines/bladerunner/script/ai/general_doll.cpp
@@ -0,0 +1,393 @@
+/* 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 {
+
+AIScriptGeneralDoll::AIScriptGeneralDoll(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _flag = 0;
+}
+
+void AIScriptGeneralDoll::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _flag = 0;
+
+ Actor_Put_In_Set(kActorGeneralDoll, kSetFreeSlotG);
+ Actor_Set_At_Waypoint(kActorGeneralDoll, 39, 0);
+ Actor_Set_Goal_Number(kActorGeneralDoll, 100);
+}
+
+bool AIScriptGeneralDoll::Update() {
+ if (Global_Variable_Query(kVariableChapter) == 2
+ && Actor_Query_Goal_Number(kActorGeneralDoll) <= 101
+ && Player_Query_Current_Scene() == kSceneBB05) {
+ Actor_Set_Goal_Number(kActorGeneralDoll, 101);
+ } else if (Global_Variable_Query(kVariableChapter) != 3 || Actor_Query_Goal_Number(kActorGeneralDoll) >= 200) {
+ return false;
+ }
+
+ return true;
+}
+
+void AIScriptGeneralDoll::TimerExpired(int timer) {
+ if (timer != 2)
+ return; //false;
+
+ Actor_Change_Animation_Mode(kActorMcCoy, 48);
+ Actor_Change_Animation_Mode(kActorGeneralDoll, 48);
+ AI_Countdown_Timer_Reset(kActorGeneralDoll, 2);
+
+ return; //true;
+}
+
+void AIScriptGeneralDoll::CompletedMovementTrack() {
+ switch (Actor_Query_Goal_Number(kActorGeneralDoll)) {
+ case 200:
+ Actor_Set_Goal_Number(kActorGeneralDoll, 201);
+ return; //true;
+
+ case 201:
+ Actor_Set_Goal_Number(kActorGeneralDoll, 200);
+ return; //true;
+
+ case 101:
+ if (Player_Query_Current_Scene() == 6) {
+ switch (Random_Query(0, 5)) {
+ case 0:
+ Ambient_Sounds_Play_Speech_Sound(58, 0, 80, 0, 0, 0);
+ break;
+ case 1:
+ Ambient_Sounds_Play_Speech_Sound(58, 10, 80, 0, 0, 0);
+ break;
+ case 2:
+ Ambient_Sounds_Play_Speech_Sound(58, 20, 80, 0, 0, 0);
+ break;
+ case 3:
+ Ambient_Sounds_Play_Speech_Sound(58, 30, 80, 0, 0, 0);
+ break;
+ case 4:
+ Ambient_Sounds_Play_Speech_Sound(58, 40, 80, 0, 0, 0);
+ break;
+ case 5:
+ Ambient_Sounds_Play_Speech_Sound(58, 50, 80, 0, 0, 0);
+ break;
+ }
+ Actor_Set_Goal_Number(kActorGeneralDoll, 102);
+ } else {
+ Actor_Set_Goal_Number(kActorGeneralDoll, 103);
+ }
+ return; //true;
+
+ case 102:
+ Actor_Set_Goal_Number(kActorGeneralDoll, 103);
+ return; //true;
+
+ case 103:
+ Actor_Set_Goal_Number(kActorGeneralDoll, 101);
+ return; //true;
+
+ }
+
+ return; //false
+}
+
+void AIScriptGeneralDoll::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptGeneralDoll::ClickedByPlayer() {
+ Actor_Face_Actor(kActorMcCoy, kActorGeneralDoll, 1);
+ Actor_Voice_Over(30, kActorVoiceOver);
+ Actor_Voice_Over(40, kActorVoiceOver);
+}
+
+void AIScriptGeneralDoll::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptGeneralDoll::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptGeneralDoll::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptGeneralDoll::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptGeneralDoll::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptGeneralDoll::ShotAtAndHit() {
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ Global_Variable_Increment(25, 1);
+ if (!Game_Flag_Query(399) && Global_Variable_Query(25) == 1) {
+ Sound_Play(121, 100, 0, 0, 50);
+ Game_Flag_Set(399);
+ Actor_Set_Goal_Number(kActorGeneralDoll, 104);
+ ChangeAnimationMode(48);
+ Actor_Set_Targetable(kActorGeneralDoll, 0);
+ }
+
+ return false;
+}
+
+void AIScriptGeneralDoll::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptGeneralDoll::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptGeneralDoll::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 100:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ AI_Movement_Track_Append(kActorGeneralDoll, 39, 0);
+ AI_Movement_Track_Repeat(kActorGeneralDoll);
+ break;
+
+ case 101:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ AI_Movement_Track_Append(kActorGeneralDoll, 196, 0);
+ AI_Movement_Track_Repeat(kActorGeneralDoll);
+ break;
+
+ case 102:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ AI_Movement_Track_Append(kActorGeneralDoll, 197, 0);
+ AI_Movement_Track_Repeat(kActorGeneralDoll);
+ break;
+
+ case 103:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ if (Random_Query(1, 2) == 1) {
+ AI_Movement_Track_Append(kActorGeneralDoll, 198, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 329, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 328, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 330, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 331, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 335, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 139, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 138, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 137, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 136, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 135, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 134, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 326, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 327, 0);
+ } else {
+ AI_Movement_Track_Append(kActorGeneralDoll, 136, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 137, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 138, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 139, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 335, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 331, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 327, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 326, 0);
+ }
+ AI_Movement_Track_Repeat(kActorGeneralDoll);
+ break;
+
+ case 104:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ break;
+
+ case 106:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ AI_Movement_Track_Append(kActorGeneralDoll, 196, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 197, 0);
+ AI_Movement_Track_Repeat(kActorGeneralDoll);
+ break;
+
+ case 200:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ Actor_Put_In_Set(kActorGeneralDoll, kSetBB05);
+ Actor_Set_At_Waypoint(kActorGeneralDoll, 134, 0);
+ Actor_Set_Goal_Number(kActorGeneralDoll, 201);
+ break;
+
+ case 201:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ if (Random_Query(1, 2) == 1) {
+ AI_Movement_Track_Append(kActorGeneralDoll, 198, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 329, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 328, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 330, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 331, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 335, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 139, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 138, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 137, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 136, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 135, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 134, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 326, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 327, 0);
+ } else {
+ AI_Movement_Track_Append(kActorGeneralDoll, 136, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 137, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 138, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 139, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 335, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 331, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 327, 0);
+ AI_Movement_Track_Append(kActorGeneralDoll, 326, 0);
+ }
+ AI_Movement_Track_Repeat(kActorGeneralDoll);
+ break;
+
+ case 299:
+ AI_Movement_Track_Flush(kActorGeneralDoll);
+ break;
+
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 834;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(834)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 835;
+ if (!_animationFrame && _flag) {
+ *animation = 834;
+ _animationFrame = 0;
+ _animationState = 0;
+ } else {
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(835)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 2:
+ *animation = 833;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(833)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 3:
+ *animation = 837;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(837)) {
+ *animation = 834;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 4:
+ *animation = 836;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(836) - 1) {
+ _animationFrame++;
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptGeneralDoll::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if (_animationState == 1) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+ case 1:
+ _animationState = 2;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ _animationState = 1;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 43:
+ _animationState = 3;
+ _animationFrame = 0;
+ break;
+
+ case 48:
+ _animationState = 4;
+ _animationFrame = 0;
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptGeneralDoll::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptGeneralDoll::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptGeneralDoll::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptGeneralDoll::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 06f4685..0039d85 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -88,6 +88,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorTaffy] = new AIScriptTaffy(_vm); // 55
_AIScripts[kActorSebastian] = new AIScriptSebastian(_vm); // 56
_AIScripts[kActorRachael] = new AIScriptRachael(_vm); // 57
+ _AIScripts[kActorGeneralDoll] = new AIScriptGeneralDoll(_vm); // 58
_AIScripts[kActorIsabella] = new AIScriptIsabella(_vm); // 59
_AIScripts[kActorBlimpGuy] = new AIScriptBlimpGuy(_vm); // 60
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm); // 61
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index f9ee6f3..75e5124 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -372,6 +372,10 @@ DECLARE_SCRIPT(Rachael)
void dialogue_agenda3();
END_SCRIPT
+DECLARE_SCRIPT(GeneralDoll)
+ bool _flag;
+END_SCRIPT
+
DECLARE_SCRIPT(Isabella)
int _var1;
int _var2;
Commit: d982eee927fd7ddad86e866e5cc07d475a259f36
https://github.com/scummvm/scummvm/commit/d982eee927fd7ddad86e866e5cc07d475a259f36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Added Holloway actor
Changed paths:
A engines/bladerunner/script/ai/holloway.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 de32e47..ccfed5c 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -73,6 +73,7 @@ MODULE_OBJS = \
script/ai/guzza.o \
script/ai/hawkers_barkeep.o \
script/ai/hawkers_parrot.o \
+ script/ai/holloway.o \
script/ai/howie_lee.o \
script/ai/hysteria_patron1.o \
script/ai/hysteria_patron2.o \
diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp
new file mode 100644
index 0000000..5c5f7f8
--- /dev/null
+++ b/engines/bladerunner/script/ai/holloway.cpp
@@ -0,0 +1,374 @@
+/* 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 {
+
+AIScriptHolloway::AIScriptHolloway(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _flag = 0;
+}
+
+void AIScriptHolloway::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _flag = 0;
+
+ Actor_Set_Goal_Number(kActorHolloway, 0);
+}
+
+bool AIScriptHolloway::Update() {
+ if (Actor_Query_Goal_Number(kActorHolloway) == 256)
+ Actor_Set_Goal_Number(kActorHolloway, 257);
+
+ return false;
+}
+
+void AIScriptHolloway::TimerExpired(int timer) {
+ if (!timer) {
+ AI_Countdown_Timer_Reset(kActorHolloway, 0);
+ if (Global_Variable_Query(40) == 1) {
+ Player_Gains_Control();
+ }
+ Actor_Set_Goal_Number(kActorHolloway, 251);
+ }
+}
+
+void AIScriptHolloway::CompletedMovementTrack() {
+ if (Actor_Query_Goal_Number(kActorHolloway) < 245 && Actor_Query_Goal_Number(kActorHolloway) > 239) {
+ Loop_Actor_Walk_To_Actor(kActorHolloway, 0, 24, 0, 0);
+ Actor_Set_Goal_Number(kActorHolloway, 250);
+ }
+}
+
+void AIScriptHolloway::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptHolloway::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptHolloway::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptHolloway::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHolloway::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHolloway::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ if (otherActorId == kActorMcCoy && Actor_Query_Goal_Number(kActorHolloway) == 250) {
+ AI_Countdown_Timer_Reset(kActorHolloway, 0);
+ Actor_Set_Goal_Number(kActorHolloway, 255);
+ }
+}
+
+void AIScriptHolloway::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptHolloway::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptHolloway::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptHolloway::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptHolloway::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 240:
+ Actor_Put_In_Set(kActorHolloway, kSetNR07);
+ Actor_Set_At_XYZ(kActorHolloway, -102.0f, -73.5f, -233.0f, 0);
+ Player_Loses_Control();
+ AI_Movement_Track_Flush(kActorHolloway);
+ AI_Movement_Track_Append(kActorHolloway, 336, 1);
+ AI_Movement_Track_Repeat(kActorHolloway);
+ break;
+
+ case 241:
+ Player_Loses_Control();
+ AI_Movement_Track_Flush(kActorHolloway);
+ AI_Movement_Track_Append(kActorHolloway, 375, 0);
+ AI_Movement_Track_Append(kActorHolloway, 376, 0);
+ AI_Movement_Track_Repeat(kActorHolloway);
+ break;
+
+ case 242:
+ Player_Loses_Control();
+ AI_Movement_Track_Flush(kActorHolloway);
+ AI_Movement_Track_Append(kActorHolloway, 372, 0);
+ AI_Movement_Track_Repeat(kActorHolloway);
+ break;
+
+ case 250:
+ Scene_Exits_Disable();
+ Actor_Says(kActorHolloway, 20, 3);
+ Actor_Face_Actor(kActorHolloway, 0, 1);
+ if (Player_Query_Combat_Mode() == 1) {
+ Actor_Set_Goal_Number(kActorHolloway, 255);
+ } else {
+ Actor_Says(kActorHolloway, 30, 3);
+ Actor_Face_Actor(kActorMcCoy, kActorHolloway, 1);
+ AI_Countdown_Timer_Reset(kActorHolloway, 0);
+ AI_Countdown_Timer_Start(kActorHolloway, 0, 1);
+ }
+ break;
+
+ case 251:
+ Actor_Face_Actor(kActorMcCoy, kActorHolloway, 1);
+ Actor_Says(kActorMcCoy, 6130, 15);
+ Actor_Says(kActorHolloway, 40, 3);
+ Actor_Says(kActorMcCoy, 6135, 13);
+ Actor_Says(kActorHolloway, 50, 3);
+ Actor_Says(kActorMcCoy, 6140, 16);
+ Actor_Says(kActorHolloway, 60, 3);
+ Actor_Says(kActorMcCoy, 6145, 12);
+ Actor_Says(kActorHolloway, 70, 3);
+ Actor_Set_Goal_Number(kActorHolloway, 255);
+ break;
+
+ case 255:
+ Player_Loses_Control();
+ Actor_Change_Animation_Mode(kActorHolloway, 6);
+ break;
+
+ case 257:
+ Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
+ Ambient_Sounds_Remove_All_Looping_Sounds(1);
+ Player_Gains_Control();
+ Outtake_Play(11, 0, 1);
+ if (Global_Variable_Query(40) == 1) {
+ Actor_Set_Goal_Number(kActorDektora, 245);
+ Actor_Change_Animation_Mode(kActorDektora, kAnimationModeIdle);
+ }
+ Player_Gains_Control();
+ Game_Flag_Set(616);
+ Scene_Exits_Enable();
+ Actor_Set_Goal_Number(kActorSteele, 230);
+ Actor_Put_In_Set(kActorHolloway, kSetFreeSlotI);
+ Actor_Set_At_Waypoint(kActorHolloway, 41, 0);
+ Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
+ if (Global_Variable_Query(40) != 1) {
+ Player_Gains_Control();
+ }
+ Game_Flag_Set(334);
+ Set_Enter(kSetUG04, kSetUG18);
+ break;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 717;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(717) - 1) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 719;
+ _animationFrame++;
+ if (_animationFrame == 9) {
+ Ambient_Sounds_Play_Sound(222, 90, 99, 0, 0);
+ }
+ if (_animationFrame == 10) {
+ Actor_Change_Animation_Mode(kActorMcCoy, 48);
+ }
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(719) - 1) {
+ Actor_Change_Animation_Mode(kActorHolloway, 0);
+ _animationFrame = 0;
+ _animationState = 0;
+ *animation = 717;
+ Actor_Set_Goal_Number(kActorHolloway, 256);
+ }
+ break;
+
+ case 2:
+ if (!_animationFrame && _flag) {
+ *animation = 717;
+ _animationState = 0;
+ } else {
+ *animation = 720;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(720) - 1) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 3:
+ *animation = 721;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(721) - 1) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 720;
+ }
+ break;
+
+ case 4:
+ *animation = 721;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(721) - 1) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 720;
+ }
+ break;
+
+ case 5:
+ *animation = 721;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(721) - 1) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 720;
+ }
+ break;
+
+ case 6:
+ *animation = 721;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(721) - 1) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 720;
+ }
+ break;
+
+ case 7:
+ *animation = 716;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(716) - 1) {
+ _animationFrame = 0;
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptHolloway::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if (_animationState > 6) {
+ _animationState = 0;
+ _animationFrame = 0;
+ } else {
+ _flag = 1;
+ }
+ break;
+
+ case 1:
+ _animationState = 7;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ _animationState = 2;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 6:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 12:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 13:
+ _animationState = 4;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 14:
+ _animationState = 5;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 15:
+ _animationState = 6;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ default:
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptHolloway::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptHolloway::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptHolloway::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptHolloway::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 0039d85..45d0f3a 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -65,6 +65,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorKlein] = new AIScriptKlein(_vm); // 30
_AIScripts[kActorMurray] = new AIScriptMurray(_vm); // 31
_AIScripts[kActorHawkersBarkeep] = new AIScriptHawkersBarkeep(_vm); // 32
+ _AIScripts[kActorHolloway] = new AIScriptHolloway(_vm); // 33
_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm); // 34
_AIScripts[kActorMoraji] = new AIScriptMoraji(_vm); // 35
_AIScripts[kActorTheBard] = new AIScriptTheBard(_vm); // 36
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 75e5124..c05372b 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -281,6 +281,10 @@ DECLARE_SCRIPT(HawkersBarkeep)
bool _flag;
END_SCRIPT
+DECLARE_SCRIPT(Holloway)
+ bool _flag;
+END_SCRIPT
+
DECLARE_SCRIPT(SergeantWalls)
END_SCRIPT
Commit: 56b3ac20e007d20c87eb901c0e15c7e7c6c55215
https://github.com/scummvm/scummvm/commit/56b3ac20e007d20c87eb901c0e15c7e7c6c55215
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Added Photographer actor
Changed paths:
A engines/bladerunner/script/ai/photographer.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 ccfed5c..06dae4a 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -95,6 +95,7 @@ MODULE_OBJS = \
script/ai/murray.o \
script/ai/newscaster.o \
script/ai/officer_leary.o \
+ script/ai/photographer.o \
script/ai/rachael.o \
script/ai/rajif.o \
script/ai/runciter.o \
diff --git a/engines/bladerunner/script/ai/photographer.cpp b/engines/bladerunner/script/ai/photographer.cpp
new file mode 100644
index 0000000..dbe443b
--- /dev/null
+++ b/engines/bladerunner/script/ai/photographer.cpp
@@ -0,0 +1,373 @@
+/* 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 {
+
+AIScriptPhotographer::AIScriptPhotographer(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _var1 = 0;
+ _var2 = 0;
+ _flag = false;
+}
+
+void AIScriptPhotographer::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _var1 = 0;
+ _var2 = 0;
+ _flag = false;
+}
+
+bool AIScriptPhotographer::Update() {
+ if (Game_Flag_Query(450) != 1 || Game_Flag_Query(485))
+ return false;
+
+ Actor_Put_In_Set(kActorPhotographer, kSetFreeSlotC);
+ Actor_Set_At_Waypoint(kActorPhotographer, 35, 0);
+ Game_Flag_Set(485);
+ Actor_Set_Goal_Number(kActorPhotographer, 100);
+
+ return true;
+}
+
+void AIScriptPhotographer::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptPhotographer::CompletedMovementTrack() {
+ switch (Actor_Query_Goal_Number(kActorPhotographer)) {
+ case 100:
+ Actor_Set_Goal_Number(kActorPhotographer, 101);
+ break;
+
+ case 101:
+ Actor_Set_Goal_Number(kActorPhotographer, 102);
+ break;
+
+ case 102:
+ Actor_Set_Goal_Number(kActorPhotographer, 101);
+ break;
+
+ default:
+ return; //false;
+ }
+
+ return; //true;
+}
+
+void AIScriptPhotographer::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptPhotographer::ClickedByPlayer() {
+ if (Actor_Clue_Query(kActorMcCoy, 44) != 1 || Actor_Clue_Query(kActorMcCoy, 50) || Game_Flag_Query(707)) {
+ AI_Movement_Track_Pause(37);
+ Actor_Face_Actor(kActorMcCoy, kActorPhotographer, 1);
+ Actor_Face_Actor(kActorPhotographer, kActorMcCoy, 1);
+ Actor_Says(kActorMcCoy, 5310, 11);
+ Actor_Says(kActorPhotographer, 40, 3);
+ AI_Movement_Track_Unpause(37);
+ } else {
+ AI_Movement_Track_Pause(37);
+ Actor_Face_Actor(kActorMcCoy, kActorPhotographer, 1);
+ Actor_Says(kActorMcCoy, 5300, 14);
+ Actor_Face_Actor(kActorPhotographer, kActorMcCoy, 1);
+ Actor_Says(kActorPhotographer, 20, 3);
+ Actor_Says(kActorMcCoy, 5305, 15);
+ Game_Flag_Set(707);
+ AI_Movement_Track_Unpause(37);
+ }
+}
+
+void AIScriptPhotographer::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptPhotographer::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptPhotographer::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptPhotographer::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptPhotographer::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptPhotographer::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptPhotographer::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptPhotographer::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptPhotographer::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 100:
+ AI_Movement_Track_Flush(kActorPhotographer);
+ AI_Movement_Track_Append(kActorPhotographer, 35, 0);
+ AI_Movement_Track_Repeat(kActorPhotographer);
+
+ return true;
+
+ case 101:
+ AI_Movement_Track_Flush(kActorPhotographer);
+ switch (Random_Query(1, 3) - 1) {
+ case 0:
+ AI_Movement_Track_Append(kActorPhotographer, 280, 4);
+ break;
+
+ case 1:
+ AI_Movement_Track_Append(kActorPhotographer, 279, 8);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorPhotographer, 280, 3);
+ break;
+ }
+
+ AI_Movement_Track_Repeat(kActorPhotographer);
+
+ return false;
+
+ case 102:
+ AI_Movement_Track_Flush(kActorPhotographer);
+ AI_Movement_Track_Append(kActorPhotographer, 279, 5);
+ AI_Movement_Track_Repeat(kActorPhotographer);
+ return 1;
+
+ case 199:
+ Actor_Put_In_Set(kActorPhotographer, kSetFreeSlotC);
+ Actor_Set_At_Waypoint(kActorPhotographer, 35, 0);
+ Actor_Put_In_Set(kActorMarcus, kSetFreeSlotI);
+ Actor_Set_At_Waypoint(kActorMarcus, 41, 0);
+
+ if (Game_Flag_Query(102)) {
+ Item_Remove_From_World(103);
+ Item_Remove_From_World(104);
+ Item_Remove_From_World(105);
+ }
+
+ if (!Actor_Clue_Query(kActorMcCoy, 65)) {
+ Actor_Clue_Acquire(kActorSteele, kClueDogCollar1, 1, -1);
+ if (Game_Flag_Query(102)) {
+ Item_Remove_From_World(84);
+ }
+ Global_Variable_Increment(14, 1);
+ }
+
+ return true;
+
+ default:
+ return true;
+ }
+}
+
+bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 745;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(745)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 744;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(744)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 2:
+ *animation = 747;
+ if (!_animationFrame && _flag) {
+ *animation = 745;
+ _animationState = 0;
+ _var2 = 0;
+ _flag = 0;
+ } else {
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(747)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 3:
+ *animation = 749;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(749)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 747;
+ }
+ break;
+
+ case 4:
+ *animation = 749;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(749)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 747;
+ }
+ break;
+
+ case 5:
+ *animation = 750;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(750)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 747;
+ }
+ break;
+
+ case 6:
+ *animation = 746;
+ if (_animationFrame == 11) {
+ Ambient_Sounds_Play_Sound(463, 80, -20, -20, 20);
+ }
+ if (_var1) {
+ --_var1;
+ } else {
+ _animationFrame++;
+ if (_animationFrame == 10) {
+ _var1 = 5;
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(746)) {
+ *animation = 745;
+ _animationState = 0;
+ _animationFrame = 0;
+ Actor_Change_Animation_Mode(kActorPhotographer, 0);
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptPhotographer::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if (_animationState > 5) {
+ _animationState = 0;
+ _var2 = 0;
+ _animationFrame = 0;
+ } else {
+ _flag = 1;
+ }
+ break;
+
+ case 1:
+ _animationState = 1;
+ _var2 = 0;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ _animationState = 2;
+ _var2 = 0;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 12:
+ _animationState = 3;
+ _var2 = 0;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 13:
+ _animationState = 4;
+ _var2 = 0;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 14:
+ _animationState = 5;
+ _var2 = 0;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 43:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+
+ default:
+ break;
+ }
+ return true;
+}
+
+void AIScriptPhotographer::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptPhotographer::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptPhotographer::ReachedMovementTrackWaypoint(int waypointId) {
+ if (waypointId == 276 || waypointId == 278 || waypointId == 280)
+ ChangeAnimationMode(43);
+
+ return true;
+}
+
+void AIScriptPhotographer::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 45d0f3a..47c3f40 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -69,6 +69,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm); // 34
_AIScripts[kActorMoraji] = new AIScriptMoraji(_vm); // 35
_AIScripts[kActorTheBard] = new AIScriptTheBard(_vm); // 36
+ _AIScripts[kActorPhotographer] = new AIScriptPhotographer(_vm); // 37
_AIScripts[kActorDispatcher] = new AIScriptDispatcher(_vm); // 38
_AIScripts[kActorAnsweringMachine] = new AIScriptAnsweringMachine(_vm);// 39
_AIScripts[kActorRajif] = new AIScriptRajif(_vm); // 40
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index c05372b..169d3a0 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -296,6 +296,12 @@ END_SCRIPT
DECLARE_SCRIPT(TheBard)
END_SCRIPT
+DECLARE_SCRIPT(Photographer)
+ int _var1;
+ int _var2;
+ bool _flag;
+END_SCRIPT
+
DECLARE_SCRIPT(Dispatcher)
END_SCRIPT
Commit: 041a22577adb027a87d3f7e6886df2fa17a85cbe
https://github.com/scummvm/scummvm/commit/041a22577adb027a87d3f7e6886df2fa17a85cbe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Added Mutant1 actor
Changed paths:
A engines/bladerunner/script/ai/mutant1.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 06dae4a..1c27aea 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -93,6 +93,7 @@ MODULE_OBJS = \
script/ai/mia.o \
script/ai/moraji.o \
script/ai/murray.o \
+ script/ai/mutant1.o \
script/ai/newscaster.o \
script/ai/officer_leary.o \
script/ai/photographer.o \
diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp
new file mode 100644
index 0000000..ec8b7ea
--- /dev/null
+++ b/engines/bladerunner/script/ai/mutant1.cpp
@@ -0,0 +1,624 @@
+/* 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 {
+
+AIScriptMutant1::AIScriptMutant1(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _flag = false;
+}
+
+void AIScriptMutant1::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _flag = 0;
+
+ Actor_Put_In_Set(kActorMutant1, kSetFreeSlotG);
+ Actor_Set_At_Waypoint(kActorMutant1, 39, 0);
+ Actor_Set_Goal_Number(kActorMutant1, 400);
+}
+
+bool AIScriptMutant1::Update() {
+ if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Goal_Number(kActorMutant1) != 590) {
+ if (Actor_Query_Which_Set_In(kActorMutant1) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorMutant1, 590);
+ }
+
+ return false;
+ }
+
+ if (Global_Variable_Query(kVariableChapter) != 4) {
+ return false;
+ }
+
+ switch (Actor_Query_Goal_Number(kActorMutant1)) {
+ case 400:
+ if (!Game_Flag_Query(523) && Game_Flag_Query(524) == 1) {
+ Actor_Set_Goal_Number(kActorMutant1, 401);
+ Actor_Set_Goal_Number(kActorMutant2, 401);
+ Actor_Set_Goal_Number(kActorMutant3, 401);
+ Actor_Set_Targetable(kActorMutant1, 1);
+ Actor_Set_Targetable(kActorMutant2, 1);
+ Actor_Set_Targetable(kActorMutant3, 1);
+ Game_Flag_Set(523);
+ }
+ break;
+
+ case 401:
+ if (Actor_Query_Which_Set_In(kActorMutant1) == Player_Query_Current_Set()
+ && (Actor_Query_Friendliness_To_Other(kActorMutant1, kActorMcCoy) < 30
+ || Actor_Query_Combat_Aggressiveness(70) >= 60)) {
+ Actor_Set_Goal_Number(kActorMutant1, 410);
+ }
+ break;
+
+ case 404:
+ if (!Game_Flag_Query(630)) {
+ Actor_Set_Goal_Number(kActorMutant1, 403);
+ }
+ break;
+
+ case 410:
+ if (Actor_Query_Which_Set_In(kActorMutant1) != Player_Query_Current_Set()) {
+ Non_Player_Actor_Combat_Mode_Off(70);
+ Actor_Set_Goal_Number(kActorMutant1, 403);
+ }
+ break;
+
+ case 599:
+ if (Actor_Query_Which_Set_In(kActorMutant1) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorMutant1, 411);
+ }
+ break;
+ }
+
+ if (Game_Flag_Query(630) == 1 && Actor_Query_Goal_Number(kActorMutant1) != 599) {
+ Actor_Set_Goal_Number(kActorMutant1, 404);
+ }
+
+ return false;
+}
+
+void AIScriptMutant1::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptMutant1::CompletedMovementTrack() {
+ if (Actor_Query_Goal_Number(kActorMutant1) == 401)
+ Actor_Set_Goal_Number(kActorMutant1, 403);
+}
+
+void AIScriptMutant1::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptMutant1::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptMutant1::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptMutant1::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMutant1::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMutant1::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ if (Actor_Query_Which_Set_In(kActorMutant1) == Player_Query_Current_Set() && Actor_Query_Goal_Number(kActorMutant1) != 599) {
+ if (otherActorId != kActorMcCoy) {
+ if (otherActorId > 72 || (otherActorId != kActorFreeSlotA && otherActorId != kActorMutant2 && otherActorId != kActorMutant3)) {
+ Actor_Modify_Combat_Aggressiveness(70, -10);
+ } else {
+ Actor_Modify_Combat_Aggressiveness(70, 10);
+ }
+ } else if (combatMode) {
+ Actor_Modify_Combat_Aggressiveness(70, 10);
+ } else {
+ Actor_Modify_Combat_Aggressiveness(70, -10);
+ }
+ }
+}
+
+void AIScriptMutant1::ShotAtAndMissed() {
+ if (Actor_Query_Goal_Number(kActorMutant1) != 410) {
+ Actor_Modify_Combat_Aggressiveness(70, 10);
+ Actor_Modify_Friendliness_To_Other(kActorMutant1, kActorMcCoy, -10);
+ }
+}
+
+bool AIScriptMutant1::ShotAtAndHit() {
+ if (Actor_Query_Goal_Number(kActorMutant1) != 410) {
+ Actor_Modify_Combat_Aggressiveness(70, 10);
+ Actor_Modify_Friendliness_To_Other(kActorMutant1, kActorMcCoy, -10);
+ }
+
+ return false;
+}
+
+void AIScriptMutant1::Retired(int byActorId) {
+ Actor_Set_Goal_Number(kActorMutant1, 599);
+}
+
+int AIScriptMutant1::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptMutant1::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 400:
+ AI_Movement_Track_Flush(kActorMutant1);
+ AI_Movement_Track_Append(kActorMutant1, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+
+ if (Game_Flag_Query(169) == 1) {
+ Actor_Set_Combat_Aggressiveness(kActorMutant1, 70);
+ Actor_Set_Friendliness_To_Other(kActorMutant1, kActorMcCoy, 20);
+ }
+ return true;
+
+ case 401:
+ Actor_Set_Targetable(kActorMutant1, 1);
+ AI_Movement_Track_Flush(kActorMutant1);
+ AI_Movement_Track_Append(kActorMutant1, 39, 0);
+
+ switch (Random_Query(1, 8)) {
+ case 1:
+ AI_Movement_Track_Append(kActorMutant1, 182, 0);
+ AI_Movement_Track_Append(kActorMutant1, 183, 2);
+ AI_Movement_Track_Append(kActorMutant1, 184, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorMutant1, 296, 0);
+ AI_Movement_Track_Append(kActorMutant1, 297, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorMutant1, 176, 0);
+ AI_Movement_Track_Append(kActorMutant1, 177, 0);
+ AI_Movement_Track_Append(kActorMutant1, 178, 2);
+ AI_Movement_Track_Append(kActorMutant1, 177, 0);
+ AI_Movement_Track_Append(kActorMutant1, 176, 1);
+ AI_Movement_Track_Append(kActorMutant1, 39, 45);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 4:
+ AI_Movement_Track_Append(kActorMutant1, 298, 0);
+ AI_Movement_Track_Append(kActorMutant1, 300, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorMutant1, 301, 0);
+ AI_Movement_Track_Append(kActorMutant1, 302, 2);
+ AI_Movement_Track_Append(kActorMutant1, 303, 0);
+ AI_Movement_Track_Append(kActorMutant1, 304, 0);
+ AI_Movement_Track_Append(kActorMutant1, 305, 0);
+ AI_Movement_Track_Append(kActorMutant1, 304, 0);
+ AI_Movement_Track_Append(kActorMutant1, 306, 0);
+ AI_Movement_Track_Append(kActorMutant1, 39, 60);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 6:
+ AI_Movement_Track_Append(kActorMutant1, 307, 0);
+ AI_Movement_Track_Append(kActorMutant1, 308, 0);
+ AI_Movement_Track_Append(kActorMutant1, 309, 1);
+ AI_Movement_Track_Append(kActorMutant1, 310, 3);
+ AI_Movement_Track_Append(kActorMutant1, 311, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 7:
+ switch (Random_Query(1, 5)) {
+ case 1:
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 534, 2);
+ AI_Movement_Track_Append(kActorMutant1, 535, 3);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 535, 2);
+ AI_Movement_Track_Append(kActorMutant1, 534, 3);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorMutant1, 536, 0);
+ AI_Movement_Track_Append(kActorMutant1, 537, 0);
+ AI_Movement_Track_Append(kActorMutant1, 538, 2);
+ AI_Movement_Track_Append(kActorMutant1, 537, 0);
+ AI_Movement_Track_Append(kActorMutant1, 536, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 4:
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 534, 3);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 535, 1);
+ AI_Movement_Track_Append(kActorMutant1, 533, 0);
+ AI_Movement_Track_Append(kActorMutant1, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+
+ default:
+ return true;
+ }
+ break;
+
+ case 8:
+ if (Game_Flag_Query(623) == 1) {
+ AI_Movement_Track_Append(kActorMutant1, 418, 0);
+ AI_Movement_Track_Append(kActorMutant1, 417, 0);
+ AI_Movement_Track_Append(kActorMutant1, 539, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ } else {
+ Actor_Set_Goal_Number(kActorMutant1, 403);
+ }
+ break;
+
+ default:
+ AI_Movement_Track_Append(kActorMutant1, 39, 60);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ break;
+ }
+ return true;
+
+ case 403:
+ Actor_Set_Targetable(kActorMutant1, 0);
+ Actor_Set_Goal_Number(kActorMutant1, 401);
+ return true;
+
+ case 404:
+ AI_Movement_Track_Flush(kActorMutant1);
+ AI_Movement_Track_Append(kActorMutant1, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ return true;
+
+ case 410:
+ switch (Actor_Query_Which_Set_In(kActorMutant1)) {
+ case 74:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case 75:
+ case 76:
+ case 81:
+ case 82:
+ case 85:
+ return true;
+
+ case 77:
+ case 78:
+ case 79:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case 80:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 12, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case 83:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case 84:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case 86:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+ }
+ return true;
+
+ case 411:
+ AI_Movement_Track_Flush(kActorMutant1);
+ Actor_Set_Intelligence(kActorMutant1, 40);
+ Actor_Set_Health(kActorMutant1, 10 * Query_Difficulty_Level() + 30, 10 * Query_Difficulty_Level() + 30);
+
+ if (Game_Flag_Query(169) == 1) {
+ Actor_Set_Combat_Aggressiveness(kActorMutant1, 70);
+ Actor_Set_Friendliness_To_Other(kActorMutant1, kActorMcCoy, 20);
+ } else {
+ Actor_Set_Combat_Aggressiveness(kActorMutant1, 40);
+ Actor_Set_Friendliness_To_Other(kActorMutant1, kActorMcCoy, 45);
+ }
+
+ Actor_Modify_Friendliness_To_Other(kActorMutant2, kActorMcCoy, -10);
+ Actor_Modify_Friendliness_To_Other(kActorMutant3, kActorMcCoy, -20);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, 10);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 15);
+ Actor_Set_Goal_Number(kActorMutant1, 403);
+ return true;
+
+ case 590:
+ AI_Movement_Track_Flush(kActorMutant1);
+ AI_Movement_Track_Append(kActorMutant1, 39, 100);
+ AI_Movement_Track_Repeat(kActorMutant1);
+ return true;
+
+ case 599:
+ AI_Movement_Track_Flush(kActorMutant1);
+ Actor_Change_Animation_Mode(kActorMutant1, 48);
+ Actor_Modify_Friendliness_To_Other(kActorMutant2, kActorMcCoy, -10);
+ Actor_Modify_Friendliness_To_Other(kActorMutant3, kActorMcCoy, -20);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, 10);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 15);
+ return true;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 894;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(894)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ case 2:
+ *animation = 893;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(893)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 3:
+ if (!_animationFrame && _flag) {
+ *animation = 894;
+ _animationState = 0;
+ } else {
+ *animation = 896;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(896)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 4:
+ *animation = 896;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(896)) {
+ _animationFrame = 0;
+ _animationState = 3;
+ *animation = 896;
+ }
+ break;
+
+ case 5:
+ *animation = 897;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(897)) {
+ _animationFrame = 0;
+ _animationState = 3;
+ *animation = 896;
+ }
+ break;
+
+ case 6:
+ *animation = 898;
+ _animationFrame++;
+ if (_animationFrame == 5) {
+ int snd;
+
+ if (Random_Query(1, 2) == 1) {
+ snd = 9010;
+ } else {
+ snd = 9015;
+ }
+ Sound_Play_Speech_Line(kActorMutant1, snd, 75, 0, 99);
+ }
+ if (_animationFrame == 9) {
+ Actor_Combat_AI_Hit_Attempt(kActorMutant1);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(898)) {
+ Actor_Change_Animation_Mode(kActorMutant1, 0);
+ }
+ break;
+
+ case 7:
+ *animation = 899;
+ _animationFrame++;
+ if (_animationFrame == 1) {
+ Ambient_Sounds_Play_Sound(371, 99, 0, 0, 25);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(899)) {
+ Actor_Change_Animation_Mode(kActorMutant1, 0);
+ }
+ break;
+
+ case 8:
+ *animation = 900;
+ _animationFrame++;
+ if (_animationFrame == 1) {
+ Sound_Play(368, 100, 0, 0, 50);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(900)) {
+ Actor_Change_Animation_Mode(kActorMutant1, 88);
+ }
+ break;
+
+ case 9:
+ *animation = 900;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(900) - 1;
+ break;
+
+ case 10:
+ *animation = 899;
+ _animationFrame++;
+ if (_animationFrame == 9) {
+ Sound_Play(371, 100, 0, 0, 50);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(899)) {
+ Actor_Change_Animation_Mode(kActorMutant1, 0);
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptMutant1::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if (_animationState >= 3 && _animationState <= 5) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ case 7:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 2:
+ _animationState = 2;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 4:
+ if (_animationState >= 3 && _animationState <= 5) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 6:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+
+ case 8:
+ _animationState = 2;
+ _animationFrame = 0;
+ break;
+
+ case 12:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 13:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+ case 21:
+ case 22:
+ _animationState = 10;
+ _animationFrame = 0;
+ break;
+
+ case 48:
+ _animationState = 8;
+ _animationFrame = 0;
+ break;
+
+ case 88:
+ _animationState = 9;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(900) - 1;
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptMutant1::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptMutant1::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptMutant1::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptMutant1::FledCombat() {
+ Actor_Set_Goal_Number(kActorMutant1, 403);
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 47c3f40..4923b05 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -100,6 +100,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorGenwalkerA] = new AIScriptGenericWalkerA(_vm); // 67
_AIScripts[kActorGenwalkerB] = new AIScriptGenericWalkerB(_vm); // 68
_AIScripts[kActorGenwalkerC] = new AIScriptGenericWalkerC(_vm); // 69
+ _AIScripts[kActorMutant1] = new AIScriptMutant1(_vm); // 70
}
AIScripts::~AIScripts() {
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 169d3a0..d8225bc 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -455,6 +455,10 @@ DECLARE_SCRIPT(GenericWalkerC)
bool preparePath();
END_SCRIPT
+DECLARE_SCRIPT(Mutant1)
+ bool _flag;
+END_SCRIPT
+
#undef DECLARE_SCRIPT
#undef END_SCRIPT
Commit: 2b1f1c49470693acc72ba749df280c1badaba606
https://github.com/scummvm/scummvm/commit/2b1f1c49470693acc72ba749df280c1badaba606
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Fix Mutant1 aggressiveness
Changed paths:
engines/bladerunner/script/ai/mutant1.cpp
diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp
index ec8b7ea..f597e76 100644
--- a/engines/bladerunner/script/ai/mutant1.cpp
+++ b/engines/bladerunner/script/ai/mutant1.cpp
@@ -156,8 +156,8 @@ void AIScriptMutant1::ShotAtAndMissed() {
bool AIScriptMutant1::ShotAtAndHit() {
if (Actor_Query_Goal_Number(kActorMutant1) != 410) {
- Actor_Modify_Combat_Aggressiveness(70, 10);
- Actor_Modify_Friendliness_To_Other(kActorMutant1, kActorMcCoy, -10);
+ Actor_Modify_Combat_Aggressiveness(70, 15);
+ Actor_Modify_Friendliness_To_Other(kActorMutant1, kActorMcCoy, -15);
}
return false;
Commit: 071619d14c82b52f03288394be19edf687a41022
https://github.com/scummvm/scummvm/commit/071619d14c82b52f03288394be19edf687a41022
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Added Mutant2 actor
Changed paths:
A engines/bladerunner/script/ai/mutant2.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 1c27aea..7815e61 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -94,6 +94,7 @@ MODULE_OBJS = \
script/ai/moraji.o \
script/ai/murray.o \
script/ai/mutant1.o \
+ script/ai/mutant2.o \
script/ai/newscaster.o \
script/ai/officer_leary.o \
script/ai/photographer.o \
diff --git a/engines/bladerunner/script/ai/mutant2.cpp b/engines/bladerunner/script/ai/mutant2.cpp
new file mode 100644
index 0000000..6a51c71
--- /dev/null
+++ b/engines/bladerunner/script/ai/mutant2.cpp
@@ -0,0 +1,559 @@
+/* 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 {
+
+AIScriptMutant2::AIScriptMutant2(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _flag = 0;
+ _var1 = 1;
+}
+
+void AIScriptMutant2::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _flag = 0;
+ _var1 = 1;
+
+ Actor_Put_In_Set(kActorMutant2, kSetFreeSlotG);
+ Actor_Set_At_Waypoint(kActorMutant2, 39, 0);
+ Actor_Set_Goal_Number(kActorMutant2, 400);
+}
+
+bool AIScriptMutant2::Update() {
+ if (Global_Variable_Query(kVariableChapter) == 4) {
+ switch (Actor_Query_Goal_Number(kActorMutant2)) {
+ case 599:
+ if (Actor_Query_Which_Set_In(kActorMutant2) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorMutant2, 403);
+ }
+ break;
+
+ case 401:
+ if (Actor_Query_Which_Set_In(kActorMutant2) == Player_Query_Current_Set()
+ && (Actor_Query_Friendliness_To_Other(kActorMutant2, kActorMcCoy) < 20
+ || Actor_Query_Combat_Aggressiveness(kActorMutant2) >= 60)) {
+ Actor_Set_Goal_Number(kActorMutant2, 410);
+ }
+ break;
+
+ case 404:
+ if (!Game_Flag_Query(630)) {
+ Actor_Set_Goal_Number(kActorMutant2, 403);
+ }
+ break;
+
+ case 410:
+ if (Actor_Query_Which_Set_In(kActorMutant2) != Player_Query_Current_Set()) {
+ Non_Player_Actor_Combat_Mode_Off(kActorMutant2);
+ Actor_Set_Goal_Number(kActorMutant2, 403);
+ }
+ break;
+ }
+
+ if (Game_Flag_Query(630) == 1 && Actor_Query_Goal_Number(kActorMutant2) != 599) {
+ Actor_Set_Goal_Number(kActorMutant2, 404);
+ }
+ } else if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Goal_Number(kActorMutant2) != 590) {
+ if (Actor_Query_Which_Set_In(kActorMutant2) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorMutant2, 590);
+ }
+ }
+
+ return false;
+}
+
+void AIScriptMutant2::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptMutant2::CompletedMovementTrack() {
+ if (Actor_Query_Goal_Number(kActorMutant2) == 401)
+ Actor_Set_Goal_Number(kActorMutant2, 403);
+}
+
+void AIScriptMutant2::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptMutant2::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptMutant2::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptMutant2::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMutant2::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMutant2::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ if (Actor_Query_Which_Set_In(kActorMutant2) == Player_Query_Current_Set() && Actor_Query_Goal_Number(kActorMutant2) != 599) {
+ if (otherActorId != kActorMcCoy) {
+ if (otherActorId > 72 || (otherActorId != kActorFreeSlotA && otherActorId != kActorMutant1 && otherActorId != kActorMutant3)) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, -10);
+ } else {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, 5);
+ }
+ } else if (combatMode) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, -10);
+ } else {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, 10);
+ }
+ }
+}
+
+void AIScriptMutant2::ShotAtAndMissed() {
+ if (Actor_Query_Goal_Number(kActorMutant2) != 410) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, -5);
+ Actor_Modify_Friendliness_To_Other(kActorMutant2, kActorMcCoy, -5);
+ }
+}
+
+bool AIScriptMutant2::ShotAtAndHit() {
+ if (Actor_Query_Goal_Number(kActorMutant2) != 410) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, -10);
+ Actor_Modify_Friendliness_To_Other(kActorMutant2, kActorMcCoy, -10);
+ }
+
+ return false;
+}
+
+void AIScriptMutant2::Retired(int byActorId) {
+ Actor_Set_Goal_Number(kActorMutant2, 599);
+}
+
+int AIScriptMutant2::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptMutant2::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 400:
+ AI_Movement_Track_Flush(kActorMutant2);
+ AI_Movement_Track_Append(kActorMutant2, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+
+ if (Game_Flag_Query(169) == 1) {
+ Actor_Set_Combat_Aggressiveness(kActorMutant2, 60);
+ Actor_Set_Friendliness_To_Other(kActorMutant2, kActorMcCoy, 30);
+ }
+ return true;
+
+ case 401:
+ Actor_Set_Targetable(kActorMutant2, 1);
+ AI_Movement_Track_Flush(kActorMutant2);
+ AI_Movement_Track_Append(kActorMutant2, 39, 0);
+
+ switch (Random_Query(1, 8)) {
+ case 1:
+ AI_Movement_Track_Append(kActorMutant2, 182, 0);
+ AI_Movement_Track_Append(kActorMutant2, 183, 2);
+ AI_Movement_Track_Append(kActorMutant2, 184, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorMutant2, 296, 0);
+ AI_Movement_Track_Append(kActorMutant2, 297, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorMutant2, 176, 0);
+ AI_Movement_Track_Append(kActorMutant2, 177, 0);
+ AI_Movement_Track_Append(kActorMutant2, 178, 2);
+ AI_Movement_Track_Append(kActorMutant2, 177, 0);
+ AI_Movement_Track_Append(kActorMutant2, 176, 1);
+ AI_Movement_Track_Append(kActorMutant2, 39, 45);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+ case 4:
+ AI_Movement_Track_Append(kActorMutant2, 298, 0);
+ AI_Movement_Track_Append(kActorMutant2, 300, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorMutant2, 301, 0);
+ AI_Movement_Track_Append(kActorMutant2, 302, 2);
+ AI_Movement_Track_Append(kActorMutant2, 303, 0);
+ AI_Movement_Track_Append(kActorMutant2, 304, 0);
+ AI_Movement_Track_Append(kActorMutant2, 305, 0);
+ AI_Movement_Track_Append(kActorMutant2, 304, 0);
+ AI_Movement_Track_Append(kActorMutant2, 306, 5);
+ AI_Movement_Track_Append(kActorMutant2, 39, 40);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 6:
+ AI_Movement_Track_Append(kActorMutant2, 307, 0);
+ AI_Movement_Track_Append(kActorMutant2, 308, 0);
+ AI_Movement_Track_Append(kActorMutant2, 309, 1);
+ AI_Movement_Track_Append(kActorMutant2, 310, 2);
+ AI_Movement_Track_Append(kActorMutant2, 311, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 7:
+ switch (Random_Query(1, 3)) { // eeh? bug?
+ case 1:
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 534, 1);
+ AI_Movement_Track_Append(kActorMutant2, 535, 1);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 535, 2);
+ AI_Movement_Track_Append(kActorMutant2, 534, 1);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorMutant2, 536, 0);
+ AI_Movement_Track_Append(kActorMutant2, 537, 0);
+ AI_Movement_Track_Append(kActorMutant2, 538, 2);
+ AI_Movement_Track_Append(kActorMutant2, 537, 0);
+ AI_Movement_Track_Append(kActorMutant2, 536, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 4:
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 534, 3);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 535, 1);
+ AI_Movement_Track_Append(kActorMutant2, 533, 0);
+ AI_Movement_Track_Append(kActorMutant2, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ default:
+ return true;
+ }
+ break;
+
+ case 8:
+ AI_Movement_Track_Append(kActorMutant2, 176, 0);
+ AI_Movement_Track_Append(kActorMutant2, 177, 0);
+ AI_Movement_Track_Append(kActorMutant2, 176, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+
+ default:
+ AI_Movement_Track_Append(kActorMutant2, 39, 60);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ break;
+ }
+ return true;
+
+ case 403:
+ Actor_Set_Targetable(kActorMutant2, 0);
+ Actor_Set_Goal_Number(kActorMutant2, 401);
+ return true;
+
+ case 404:
+ AI_Movement_Track_Flush(kActorMutant2);
+ AI_Movement_Track_Append(kActorMutant2, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ return true;
+
+ case 410:
+ switch (Actor_Query_Which_Set_In(kActorMutant2)) {
+ case kSetUG01:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant2, 0, 0, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG04:
+ case kSetUG05:
+ case kSetUG06:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant2, 0, 0, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG10:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant2, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG12:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant2, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG14:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant2, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+ }
+ return true;
+
+ case 590:
+ AI_Movement_Track_Flush(kActorMutant2);
+ AI_Movement_Track_Append(kActorMutant2, 39, 100);
+ AI_Movement_Track_Repeat(kActorMutant2);
+ return true;
+
+ case 599:
+ AI_Movement_Track_Flush(kActorMutant2);
+ Actor_Change_Animation_Mode(kActorMutant2, 48);
+ Actor_Set_Intelligence(kActorMutant2, 20);
+ Actor_Set_Health(71, 10 * Query_Difficulty_Level() + 50, 10 * Query_Difficulty_Level() + 50);
+
+ if (Game_Flag_Query(169) == 1) {
+ Actor_Set_Combat_Aggressiveness(kActorMutant2, 60);
+ Actor_Set_Friendliness_To_Other(kActorMutant2, kActorMcCoy, 30);
+ } else {
+ Actor_Set_Combat_Aggressiveness(kActorMutant2, 40);
+ Actor_Set_Friendliness_To_Other(kActorMutant2, kActorMcCoy, 50);
+ }
+
+ Actor_Modify_Friendliness_To_Other(kActorMutant1, kActorMcCoy, -15);
+ Actor_Modify_Friendliness_To_Other(kActorMutant3, kActorMcCoy, -20);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant1, 10);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 15);
+ return true;
+ }
+
+ return false;
+}
+
+bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 903;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(903)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 901;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(901)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 2:
+ *animation = 902;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(902)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 3:
+ if (!_animationFrame && _flag) {
+ *animation = 903;
+ _animationState = 0;
+ } else {
+ *animation = 905;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(905)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 4:
+ *animation = 905;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(905)) {
+ _animationFrame = 0;
+ _animationState = 3;
+ *animation = 904;
+ }
+ break;
+
+ case 5:
+ *animation = 906;
+ _animationFrame++;
+ if (_animationFrame == 7) {
+ int snd;
+ if (Random_Query(1, 2) == 1) {
+ snd = 9010;
+ } else {
+ snd = 9015;
+ }
+ Sound_Play_Speech_Line(kActorMutant2, snd, 75, 0, 99);
+ }
+ if (_animationFrame == 9) {
+ Actor_Combat_AI_Hit_Attempt(kActorMutant2);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(906)) {
+ Actor_Change_Animation_Mode(kActorMutant2, 0);
+ }
+ break;
+
+ case 6:
+ *animation = 907;
+ _animationFrame++;
+ if (_animationFrame == 1) {
+ Sound_Play(401, 100, 0, 0, 50);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+ Actor_Change_Animation_Mode(kActorMutant2, 88);
+ }
+ break;
+
+ case 7:
+ *animation = 907;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(907) - 2;
+ break;
+
+ case 8:
+ *animation = 907;
+ _animationFrame += _var1;
+ if (_animationFrame == 4) {
+ _var1 = -1;
+ Sound_Play(399, 100, 0, 0, 50);
+ } else {
+ if (!_animationFrame) {
+ Actor_Change_Animation_Mode(kActorMutant2, 0);
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptMutant2::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if (_animationState >= 3 && _animationState <= 4) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ case 7:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 2:
+ case 8:
+ _animationState = 2;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 4:
+ if (_animationState >= 3 && _animationState <= 4) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 6:
+ _animationState = 5;
+ _animationFrame = 0;
+ break;
+
+ case 12:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 21:
+ case 22:
+ _animationState = 8;
+ _animationFrame = 0;
+ _var1 = 1;
+ break;
+
+ case 48:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+
+ case 88:
+ _animationState = 7;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(907) - 1;
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptMutant2::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptMutant2::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptMutant2::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptMutant2::FledCombat() {
+ Actor_Set_Goal_Number(kActorMutant2, 403);
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 4923b05..9a6ed69 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -101,6 +101,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorGenwalkerB] = new AIScriptGenericWalkerB(_vm); // 68
_AIScripts[kActorGenwalkerC] = new AIScriptGenericWalkerC(_vm); // 69
_AIScripts[kActorMutant1] = new AIScriptMutant1(_vm); // 70
+ _AIScripts[kActorMutant2] = new AIScriptMutant2(_vm); // 71
}
AIScripts::~AIScripts() {
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index d8225bc..075f488 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -459,6 +459,11 @@ DECLARE_SCRIPT(Mutant1)
bool _flag;
END_SCRIPT
+DECLARE_SCRIPT(Mutant2)
+ int _var1;
+ bool _flag;
+END_SCRIPT
+
#undef DECLARE_SCRIPT
#undef END_SCRIPT
Commit: a90c1f055ead07cd2ff76fd114f5651f32af0142
https://github.com/scummvm/scummvm/commit/a90c1f055ead07cd2ff76fd114f5651f32af0142
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Use constants
Changed paths:
engines/bladerunner/script/ai/mutant1.cpp
diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp
index f597e76..9ecaf9d 100644
--- a/engines/bladerunner/script/ai/mutant1.cpp
+++ b/engines/bladerunner/script/ai/mutant1.cpp
@@ -325,36 +325,28 @@ bool AIScriptMutant1::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case 410:
switch (Actor_Query_Which_Set_In(kActorMutant1)) {
- case 74:
+ case kSetUG01:
Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
break;
- case 75:
- case 76:
- case 81:
- case 82:
- case 85:
- return true;
-
- case 77:
- case 78:
- case 79:
+ case kSetUG04:
+ case kSetUG05:
+ case kSetUG06:
Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
break;
- case 80:
+ case kSetUG07:
Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 12, 4, 7, 8, -1, -1, -1, 10, 300, 0);
break;
- case 83:
+ case kSetUG10:
Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
break;
- case 84:
+ case kSetUG12:
Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
break;
-
- case 86:
+ case kSetUG14:
Non_Player_Actor_Combat_Mode_On(kActorMutant1, 0, 0, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
break;
}
Commit: fb882a10ae4db644b31782ee5a2f6b7ba6ae651e
https://github.com/scummvm/scummvm/commit/fb882a10ae4db644b31782ee5a2f6b7ba6ae651e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-16T21:31:33+01:00
Commit Message:
BLADERUNNER: Added Mutant3 actor
Changed paths:
A engines/bladerunner/script/ai/mutant3.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 7815e61..6782703 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -95,6 +95,7 @@ MODULE_OBJS = \
script/ai/murray.o \
script/ai/mutant1.o \
script/ai/mutant2.o \
+ script/ai/mutant3.o \
script/ai/newscaster.o \
script/ai/officer_leary.o \
script/ai/photographer.o \
diff --git a/engines/bladerunner/script/ai/mutant3.cpp b/engines/bladerunner/script/ai/mutant3.cpp
new file mode 100644
index 0000000..76a9a0e
--- /dev/null
+++ b/engines/bladerunner/script/ai/mutant3.cpp
@@ -0,0 +1,613 @@
+/* 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 {
+
+AIScriptMutant3::AIScriptMutant3(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _var1 = 1;
+ _flag = 0;
+}
+
+void AIScriptMutant3::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _var1 = 1;
+ _flag = 0;
+
+ Actor_Put_In_Set(kActorMutant3, kSetFreeSlotG);
+ Actor_Set_At_Waypoint(kActorMutant3, 39, 0);
+ Actor_Set_Goal_Number(kActorMutant3, 400);
+}
+
+bool AIScriptMutant3::Update() {
+ if (Global_Variable_Query(kVariableChapter) == 4) {
+ switch (Actor_Query_Goal_Number(kActorMutant3)) {
+ case 599:
+ if (Actor_Query_Which_Set_In(kActorMutant3) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorMutant3, 403);
+ }
+ break;
+
+ case 401:
+ if (Actor_Query_Which_Set_In(kActorMutant3) == Player_Query_Current_Set()
+ && (Actor_Query_Friendliness_To_Other(kActorMutant3, kActorMcCoy) < 40
+ || Actor_Query_Combat_Aggressiveness(kActorMutant3) >= 60)) {
+ Actor_Set_Goal_Number(kActorMutant3, 410);
+ }
+ break;
+
+ case 404:
+ if (!Game_Flag_Query(630)) {
+ Actor_Set_Goal_Number(kActorMutant3, 401);
+ }
+ break;
+
+ case 410:
+ if (Actor_Query_Which_Set_In(kActorMutant3) != Player_Query_Current_Set()) {
+ Non_Player_Actor_Combat_Mode_Off(kActorMutant3);
+ Actor_Set_Goal_Number(kActorMutant3, 403);
+ }
+ break;
+ }
+
+ if (Game_Flag_Query(630) == 1 && Actor_Query_Goal_Number(kActorMutant3) != 599) {
+ Actor_Set_Goal_Number(kActorMutant3, 404);
+ }
+ } else if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Goal_Number(kActorMutant3) != 590) {
+ if (Actor_Query_Which_Set_In(kActorMutant3) != Player_Query_Current_Set()) {
+ Actor_Set_Goal_Number(kActorMutant3, 590);
+ }
+ }
+ return false;
+}
+
+void AIScriptMutant3::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptMutant3::CompletedMovementTrack() {
+ switch (Actor_Query_Goal_Number(kActorMutant3)) {
+ case 201:
+ Actor_Set_Goal_Number(kActorMutant3, 400);
+ break;
+
+ case 401:
+ Actor_Set_Goal_Number(kActorMutant3, 403);
+ break;
+ }
+}
+
+void AIScriptMutant3::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptMutant3::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptMutant3::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptMutant3::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMutant3::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptMutant3::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ if (Actor_Query_Which_Set_In(kActorMutant3) == Player_Query_Current_Set() && Actor_Query_Goal_Number(kActorMutant3) != 599) {
+ if (otherActorId != kActorMcCoy) {
+ if (otherActorId > 72 || (otherActorId != kActorFreeSlotA && otherActorId != kActorMutant1 && otherActorId != kActorMutant2)) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, -10);
+ } else {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 5);
+ }
+ } else if (combatMode) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 10);
+ } else {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, -10);
+ }
+ }
+}
+
+void AIScriptMutant3::ShotAtAndMissed() {
+ if (Actor_Query_Goal_Number(kActorMutant3) != 410) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 15);
+ Actor_Modify_Friendliness_To_Other(kActorMutant3, 0, -15);
+ }
+}
+
+bool AIScriptMutant3::ShotAtAndHit() {
+ if (Actor_Query_Goal_Number(kActorMutant3) != 410) {
+ Actor_Modify_Combat_Aggressiveness(kActorMutant3, 20);
+ Actor_Modify_Friendliness_To_Other(kActorMutant3, 0, -20);
+ }
+ return false;
+}
+
+void AIScriptMutant3::Retired(int byActorId) {
+ Actor_Set_Goal_Number(kActorMutant3, 599);
+}
+
+int AIScriptMutant3::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptMutant3::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 201:
+ AI_Movement_Track_Flush(kActorMutant3);
+ AI_Movement_Track_Append(kActorMutant3, 305, 3);
+ AI_Movement_Track_Append(kActorMutant3, 306, 0);
+ AI_Movement_Track_Append(kActorMutant3, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 400:
+ AI_Movement_Track_Flush(kActorMutant3);
+ AI_Movement_Track_Append(kActorMutant3, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+
+ if (Game_Flag_Query(169) == 1) {
+ Actor_Set_Combat_Aggressiveness(kActorMutant3, 80);
+ Actor_Set_Friendliness_To_Other(kActorMutant3, kActorMcCoy, 20);
+ }
+ break;
+
+ case 401:
+ Actor_Set_Targetable(kActorMutant3, 1);
+ AI_Movement_Track_Flush(kActorMutant3);
+ AI_Movement_Track_Append(kActorMutant3, 39, 0);
+
+ switch (Random_Query(1, 8)) {
+ case 1:
+ AI_Movement_Track_Append(kActorMutant3, 182, 0);
+ AI_Movement_Track_Append(kActorMutant3, 183, 2);
+ AI_Movement_Track_Append(kActorMutant3, 184, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorMutant3, 296, 0);
+ AI_Movement_Track_Append(kActorMutant3, 297, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorMutant3, 176, 0);
+ AI_Movement_Track_Append(kActorMutant3, 177, 0);
+ AI_Movement_Track_Append(kActorMutant3, 178, 2);
+ AI_Movement_Track_Append(kActorMutant3, 177, 0);
+ AI_Movement_Track_Append(kActorMutant3, 176, 1);
+ AI_Movement_Track_Append(kActorMutant3, 39, 45);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 4:
+ AI_Movement_Track_Append(kActorMutant3, 298, 0);
+ AI_Movement_Track_Append(kActorMutant3, 300, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorMutant3, 301, 0);
+ AI_Movement_Track_Append(kActorMutant3, 302, 2);
+ AI_Movement_Track_Append(kActorMutant3, 303, 0);
+ AI_Movement_Track_Append(kActorMutant3, 304, 2);
+ AI_Movement_Track_Append(kActorMutant3, 305, 0);
+ AI_Movement_Track_Append(kActorMutant3, 304, 0);
+ AI_Movement_Track_Append(kActorMutant3, 306, 0);
+ AI_Movement_Track_Append(kActorMutant3, 39, 60);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 6:
+ AI_Movement_Track_Append(kActorMutant3, 307, 0);
+ AI_Movement_Track_Append(kActorMutant3, 308, 0);
+ AI_Movement_Track_Append(kActorMutant3, 309, 1);
+ AI_Movement_Track_Append(kActorMutant3, 310, 3);
+ AI_Movement_Track_Append(kActorMutant3, 311, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 7:
+ switch (Random_Query(1, 5)) {
+ case 1:
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 534, 0);
+ AI_Movement_Track_Append(kActorMutant3, 535, 0);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 2:
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 535, 1);
+ AI_Movement_Track_Append(kActorMutant3, 534, 3);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 3:
+ AI_Movement_Track_Append(kActorMutant3, 536, 0);
+ AI_Movement_Track_Append(kActorMutant3, 537, 0);
+ AI_Movement_Track_Append(kActorMutant3, 538, 2);
+ AI_Movement_Track_Append(kActorMutant3, 537, 0);
+ AI_Movement_Track_Append(kActorMutant3, 536, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 4:
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 534, 3);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 5:
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 535, 1);
+ AI_Movement_Track_Append(kActorMutant3, 533, 0);
+ AI_Movement_Track_Append(kActorMutant3, 532, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+ }
+ break;
+
+ case 8:
+ AI_Movement_Track_Append(kActorMutant3, 176, 0);
+ AI_Movement_Track_Append(kActorMutant3, 177, 0);
+ AI_Movement_Track_Append(kActorMutant3, 176, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ default:
+ AI_Movement_Track_Append(kActorMutant3, 39, 60);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+ }
+ break;
+
+ case 403:
+ Actor_Set_Targetable(kActorMutant3, 0);
+ Actor_Set_Goal_Number(kActorMutant3, 401);
+ break;
+
+ case 404:
+ AI_Movement_Track_Flush(kActorMutant3);
+ AI_Movement_Track_Append(kActorMutant3, 39, 0);
+ AI_Movement_Track_Repeat(kActorMutant3);
+ break;
+
+ case 410:
+ switch (Actor_Query_Which_Set_In(kActorMutant3)) {
+ case kSetUG01:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant3, 0, 1, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG04:
+ case kSetUG05:
+ case kSetUG06:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant3, 0, 1, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG10:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant3, 0, 1, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+ case kSetUG12:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant3, 0, 1, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+
+ case kSetUG14:
+ Non_Player_Actor_Combat_Mode_On(kActorMutant3, 0, 1, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+ break;
+ }
+ break;
+
+ case 590:
+ AI_Movement_Track_Flush(kActorMutant3);
+ AI_Movement_Track_Append(kActorMutant3, 39, 100);
+ AI_Movement_Track_Repeat(kActorMutant3);
+
+ case 599:
+ AI_Movement_Track_Flush(kActorMutant3);
+ Actor_Change_Animation_Mode(kActorMutant3, 48);
+ Actor_Set_Intelligence(kActorMutant3, 40);
+ Actor_Set_Health(kActorMutant3, 10 * Query_Difficulty_Level() + 50, 10 * Query_Difficulty_Level() + 50);
+
+ if (Game_Flag_Query(169) == 1) {
+ Actor_Set_Combat_Aggressiveness(kActorMutant3, 80);
+ Actor_Set_Friendliness_To_Other(kActorMutant3, kActorMcCoy, 20);
+ } else {
+ Actor_Set_Combat_Aggressiveness(kActorMutant3, 50);
+ Actor_Set_Friendliness_To_Other(kActorMutant3, kActorMcCoy, 40);
+ }
+
+ Actor_Modify_Friendliness_To_Other(kActorMutant1, kActorMcCoy, 20);
+ Actor_Modify_Friendliness_To_Other(kActorMutant2, kActorMcCoy, 15);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant1, 10);
+ Actor_Modify_Combat_Aggressiveness(kActorMutant2, 10);
+ break;
+
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 910;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(910)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 1:
+ *animation = 908;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(908)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 2:
+ *animation = 909;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(909)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 3:
+ if (!_animationFrame && _flag) {
+ *animation = 910;
+ _animationState = 0;
+ } else {
+ *animation = 912;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(912)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 4:
+ *animation = 912;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(912)) {
+ _animationFrame = 0;
+ _animationState = 3;
+ *animation = 911;
+ }
+ break;
+
+ case 5:
+ *animation = 913;
+ _animationFrame++;
+ if (_animationFrame == 9) {
+ int snd;
+ if (Random_Query(1, 2) == 1) {
+ snd = 9010;
+ } else {
+ snd = 9015;
+ }
+ Sound_Play_Speech_Line(kActorMutant3, snd, 75, 0, 99);
+ }
+ if (_animationFrame == 11) {
+ Actor_Combat_AI_Hit_Attempt(kActorMutant3);
+ }
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+ Actor_Change_Animation_Mode(kActorMutant3, 0);
+ }
+ break;
+
+ case 6:
+ *animation = 917;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(917)) {
+ Actor_Change_Animation_Mode(kActorMutant3, 88);
+ }
+ break;
+
+ case 7:
+ *animation = 917;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(917) - 1;
+ break;
+
+ case 8:
+ *animation = 914;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(914)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 9:
+ *animation = 916;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(916)) {
+ _animationFrame = 0;
+ _animationState = 8;
+ *animation = 914;
+ }
+ break;
+
+ case 10:
+ *animation = 915;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(915)) {
+ *animation = 910;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ case 11:
+ *animation = 917;
+ _animationFrame += _var1;
+ if (_animationFrame == 3) {
+ Sound_Play(400, 100, 0, 0, 50);
+ _var1 = -1;
+ } else {
+ if (!_animationFrame) {
+ Actor_Change_Animation_Mode(kActorMutant3, 0);
+ }
+ }
+ break;
+
+ default:
+ *animation = 406;
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptMutant3::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ switch (_animationState) {
+ case 3:
+ case 4:
+ _flag = 1;
+ break;
+
+ case 8:
+ _animationState = 10;
+ _animationFrame = 0;
+
+ break;
+
+ case 10:
+ return true;
+
+ default:
+ _animationState = 0;
+ _animationFrame = 0;
+ break;
+ }
+ break;
+
+ case 1:
+ case 7:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 2:
+ case 8:
+ _animationState = 2;
+ _animationFrame = 0;
+ break;
+
+ case 3:
+ case 12:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 4:
+ if (_animationState >= 3 && _animationState <= 4) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 6:
+ _animationState = 5;
+ _animationFrame = 0;
+ break;
+
+ case 21:
+ case 22:
+ _animationState = 11;
+ _animationFrame = 0;
+ _var1 = 1;
+ break;
+
+ case 88:
+ _animationState = 7;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(917) - 1;
+ break;
+
+ case 43:
+ if ((unsigned int)(_animationState - 8) > 1) {
+ _animationState = 9;
+ _animationFrame = 0;
+ }
+ break;
+
+ case 48:
+ _animationState = 6;
+ _animationFrame = 0;
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptMutant3::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptMutant3::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptMutant3::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptMutant3::FledCombat() {
+ Actor_Set_Goal_Number(kActorMutant3, 403);
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 9a6ed69..7b28e2d 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -102,6 +102,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorGenwalkerC] = new AIScriptGenericWalkerC(_vm); // 69
_AIScripts[kActorMutant1] = new AIScriptMutant1(_vm); // 70
_AIScripts[kActorMutant2] = new AIScriptMutant2(_vm); // 71
+ _AIScripts[kActorMutant3] = new AIScriptMutant3(_vm); // 72
}
AIScripts::~AIScripts() {
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 075f488..32bbce0 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -464,6 +464,11 @@ DECLARE_SCRIPT(Mutant2)
bool _flag;
END_SCRIPT
+DECLARE_SCRIPT(Mutant3)
+ int _var1;
+ bool _flag;
+END_SCRIPT
+
#undef DECLARE_SCRIPT
#undef END_SCRIPT
More information about the Scummvm-git-logs
mailing list