[Scummvm-git-logs] scummvm master -> ca2f9487c3d583a5df0e5f99ce8b39087438ceed
sev-
sev at scummvm.org
Mon Mar 12 21:09:57 CET 2018
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b5887e1759 BLADERUNNER: Added EarlyQBartender actor
e1cd47baef BLADERUNNER: Added HawkersParrot actor
f16e054c3a BLADERUNNER: Added TaffyPatron actor
ca51236416 BLADERUNNER: Added LockupGuard actor
ca2f9487c3 BLADERUNNER: Added Teenager actor
Commit: b5887e17598e0fa1ab7bad5312767b0ab9eadd52
https://github.com/scummvm/scummvm/commit/b5887e17598e0fa1ab7bad5312767b0ab9eadd52
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-12T20:29:56+01:00
Commit Message:
BLADERUNNER: Added EarlyQBartender actor
Changed paths:
A engines/bladerunner/script/ai/early_q_bartender.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 43519ab..8a86538 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -56,6 +56,7 @@ MODULE_OBJS = \
script/ai/crazylegs.o \
script/ai/desk_clerk.o \
script/ai/dispatcher.o \
+ script/ai/early_q_bartender.o \
script/ai/fish_dealer.o \
script/ai/gaff.o \
script/ai/generic_walker_a.o \
diff --git a/engines/bladerunner/script/ai/early_q_bartender.cpp b/engines/bladerunner/script/ai/early_q_bartender.cpp
new file mode 100644
index 0000000..f9f9f6f
--- /dev/null
+++ b/engines/bladerunner/script/ai/early_q_bartender.cpp
@@ -0,0 +1,247 @@
+/* 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 {
+
+AIScriptEarlyQBartender::AIScriptEarlyQBartender(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _flag = false;
+ _var1 = 0;
+ _var2 = 1;
+}
+
+void AIScriptEarlyQBartender::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _flag = false;
+ _var1 = 0;
+ _var2 = 1;
+
+ Actor_Put_In_Set(kActorEarlyQBartender, kSetNR05_NR08);
+ Actor_Set_At_XYZ(kActorEarlyQBartender, -717.0f, 0.0f, -468.0f, 416);
+}
+
+bool AIScriptEarlyQBartender::Update() {
+ return false;
+}
+
+void AIScriptEarlyQBartender::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptEarlyQBartender::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptEarlyQBartender::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptEarlyQBartender::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptEarlyQBartender::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptEarlyQBartender::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptEarlyQBartender::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptEarlyQBartender::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptEarlyQBartender::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptEarlyQBartender::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptEarlyQBartender::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptEarlyQBartender::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptEarlyQBartender::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ if (_var1 == 1) {
+ *animation = 753;
+ if (_animationFrame <= 5) {
+ _var2 = 1;
+ }
+ _animationFrame += _var2;
+ if (_animationFrame == 14 && !Random_Query(0, 1)) {
+ _var2 = -1;
+ }
+
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(753)) {
+ _animationFrame = 0;
+ _var1 = 0;
+ }
+ } else if (_var1 == 0) {
+ *animation = 752;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(752)) {
+ _animationFrame = 0;
+
+ if (!Random_Query(0, 6)) {
+ _var1 = 1;
+ }
+ }
+ }
+ break;
+
+ case 1:
+ *animation = 755;
+
+ if (!_animationFrame && _flag) {
+ _animationState = 0;
+ _var1 = 0;
+ } else {
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(755)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 2:
+ *animation = 757;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(757)) {
+ _animationFrame = 0;
+ _animationState = 1;
+ *animation = 755;
+ }
+ break;
+
+ case 3:
+ *animation = 757;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(757)) {
+ _animationFrame = 0;
+ _animationState = 1;
+ *animation = 755;
+ }
+ break;
+
+ case 4:
+ *animation = 754;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(754)) {
+ Actor_Change_Animation_Mode(kActorEarlyQBartender, 0);
+ *animation = 752;
+ _animationFrame = 0;
+ _animationState = 0;
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptEarlyQBartender::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ _animationState = 0;
+ _animationFrame = 0;
+ _var1 = 0;
+ _var2 = 1;
+ break;
+
+ case 3:
+ _animationState = 1;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 12:
+ _animationState = 2;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 13:
+ _animationState = 3;
+ _animationFrame = 0;
+ _flag = 0;
+ break;
+
+ case 23:
+ _animationState = 4;
+ _animationFrame = 0;
+ break;
+
+ default:
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptEarlyQBartender::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptEarlyQBartender::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptEarlyQBartender::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptEarlyQBartender::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index caf9d8b..f5a0eb6 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -68,6 +68,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorAnsweringMachine] = new AIScriptAnsweringMachine(_vm);// 39
_AIScripts[kActorRajif] = new AIScriptRajif(_vm); // 40
_AIScripts[kActorGovernorKolvig] = new AIScriptGovernorKolvig(_vm); // 41
+ _AIScripts[kActorEarlyQBartender] = new AIScriptEarlyQBartender(_vm); // 42
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm); // 47
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm); // 48
_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm); // 49
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 5d679c2..00aad72 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -266,6 +266,12 @@ END_SCRIPT
DECLARE_SCRIPT(GovernorKolvig)
END_SCRIPT
+DECLARE_SCRIPT(EarlyQBartender)
+ int _var1;
+ int _var2;
+ bool _flag;
+END_SCRIPT
+
DECLARE_SCRIPT(HysteriaPatron1)
END_SCRIPT
Commit: e1cd47baef55e6a97935f7e3babc5a1b6d602054
https://github.com/scummvm/scummvm/commit/e1cd47baef55e6a97935f7e3babc5a1b6d602054
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-12T20:35:36+01:00
Commit Message:
BLADERUNNER: Added HawkersParrot actor
Changed paths:
A engines/bladerunner/script/ai/hawkers_parrot.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 8a86538..e8953cf 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -67,6 +67,7 @@ MODULE_OBJS = \
script/ai/grigorian.o \
script/ai/guzza.o \
script/ai/hawkers_barkeep.o \
+ script/ai/hawkers_parrot.o \
script/ai/howie_lee.o \
script/ai/hysteria_patron1.o \
script/ai/hysteria_patron2.o \
diff --git a/engines/bladerunner/script/ai/hawkers_parrot.cpp b/engines/bladerunner/script/ai/hawkers_parrot.cpp
new file mode 100644
index 0000000..5391568
--- /dev/null
+++ b/engines/bladerunner/script/ai/hawkers_parrot.cpp
@@ -0,0 +1,123 @@
+/* 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 {
+
+AIScriptHawkersParrot::AIScriptHawkersParrot(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptHawkersParrot::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptHawkersParrot::Update() {
+ return false;
+}
+
+void AIScriptHawkersParrot::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptHawkersParrot::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptHawkersParrot::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptHawkersParrot::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptHawkersParrot::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptHawkersParrot::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHawkersParrot::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptHawkersParrot::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptHawkersParrot::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptHawkersParrot::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptHawkersParrot::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptHawkersParrot::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptHawkersParrot::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptHawkersParrot::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptHawkersParrot::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptHawkersParrot::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptHawkersParrot::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptHawkersParrot::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptHawkersParrot::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index f5a0eb6..3aa3d88 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[kActorRajif] = new AIScriptRajif(_vm); // 40
_AIScripts[kActorGovernorKolvig] = new AIScriptGovernorKolvig(_vm); // 41
_AIScripts[kActorEarlyQBartender] = new AIScriptEarlyQBartender(_vm); // 42
+ _AIScripts[kActorHawkersParrot] = new AIScriptHawkersParrot(_vm); // 43
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm); // 47
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm); // 48
_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm); // 49
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 00aad72..29ebaab 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -272,6 +272,9 @@ DECLARE_SCRIPT(EarlyQBartender)
bool _flag;
END_SCRIPT
+DECLARE_SCRIPT(HawkersParrot)
+END_SCRIPT
+
DECLARE_SCRIPT(HysteriaPatron1)
END_SCRIPT
Commit: f16e054c3ad731cb66bca70df143707e719fd727
https://github.com/scummvm/scummvm/commit/f16e054c3ad731cb66bca70df143707e719fd727
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-12T20:54:39+01:00
Commit Message:
BLADERUNNER: Added TaffyPatron actor
Changed paths:
A engines/bladerunner/script/ai/taffy_patron.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 e8953cf..4a04e30 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -90,6 +90,7 @@ MODULE_OBJS = \
script/ai/sergeant_walls.o \
script/ai/shoeshine_man.o \
script/ai/steele.o \
+ script/ai/taffy_patron.o \
script/ai/the_bard.o \
script/ai/transient.o \
script/ai/tyrell_guard.o \
diff --git a/engines/bladerunner/script/ai/taffy_patron.cpp b/engines/bladerunner/script/ai/taffy_patron.cpp
new file mode 100644
index 0000000..c7fa3a7
--- /dev/null
+++ b/engines/bladerunner/script/ai/taffy_patron.cpp
@@ -0,0 +1,191 @@
+/* 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 {
+
+AIScriptTaffyPatron::AIScriptTaffyPatron(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptTaffyPatron::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptTaffyPatron::Update() {
+ return false;
+}
+
+void AIScriptTaffyPatron::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptTaffyPatron::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptTaffyPatron::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptTaffyPatron::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptTaffyPatron::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptTaffyPatron::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTaffyPatron::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTaffyPatron::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptTaffyPatron::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptTaffyPatron::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptTaffyPatron::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptTaffyPatron::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptTaffyPatron::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ switch (newGoalNumber) {
+ case 0:
+ Actor_Put_In_Set(kActorTaffyPatron, kSetFreeSlotH);
+ Actor_Set_At_Waypoint(kActorTaffyPatron, 40, 0);
+ return true;
+
+ case 250:
+ Actor_Put_In_Set(kActorTaffyPatron, kSetNR01);
+ Actor_Set_At_XYZ(kActorTaffyPatron, -170.39999, 23.68, -850.0, 324);
+ Async_Actor_Walk_To_XYZ(kActorTaffyPatron, -390.0, 31.549999, -429.0, 24, 1);
+ return true;
+
+ case 255:
+ Actor_Put_In_Set(kActorTaffyPatron, kSetNR01);
+ Actor_Set_At_XYZ(kActorTaffyPatron, -170.39999, 23.68, -850.0, 324);
+ Actor_Change_Animation_Mode(kActorTaffyPatron, 48);
+ return true;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+bool AIScriptTaffyPatron::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ *animation = 406;
+ _animationFrame = 0;
+ break;
+
+ case 1:
+ *animation = 918;
+ _animationFrame++;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(918) - 1) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 2:
+ *animation = 919;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(919) - 1) {
+ _animationFrame++;
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptTaffyPatron::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ _animationState = 0;
+ _animationFrame = 0;
+ break;
+
+ case 2:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+
+ case 48:
+ _animationState = 2;
+ _animationFrame = 0;
+ break;
+
+ default:
+ break;
+ }
+
+ return true;
+}
+
+void AIScriptTaffyPatron::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptTaffyPatron::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptTaffyPatron::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptTaffyPatron::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 3aa3d88..08938c8 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -70,6 +70,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorGovernorKolvig] = new AIScriptGovernorKolvig(_vm); // 41
_AIScripts[kActorEarlyQBartender] = new AIScriptEarlyQBartender(_vm); // 42
_AIScripts[kActorHawkersParrot] = new AIScriptHawkersParrot(_vm); // 43
+ _AIScripts[kActorTaffyPatron] = new AIScriptTaffyPatron(_vm); // 44
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm); // 47
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm); // 48
_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm); // 49
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 29ebaab..c2d55b2 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -275,6 +275,9 @@ END_SCRIPT
DECLARE_SCRIPT(HawkersParrot)
END_SCRIPT
+DECLARE_SCRIPT(TaffyPatron)
+END_SCRIPT
+
DECLARE_SCRIPT(HysteriaPatron1)
END_SCRIPT
Commit: ca51236416c9ac443527752259b9401ccb537520
https://github.com/scummvm/scummvm/commit/ca51236416c9ac443527752259b9401ccb537520
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-12T20:57:35+01:00
Commit Message:
BLADERUNNER: Added LockupGuard actor
Changed paths:
A engines/bladerunner/script/ai/lockup_guard.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 4a04e30..68217ef 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -76,6 +76,7 @@ MODULE_OBJS = \
script/ai/klein.o \
script/ai/lance.o \
script/ai/leon.o \
+ script/ai/lockup_guard.o \
script/ai/maggie.o \
script/ai/male_announcer.o \
script/ai/marcus.o \
diff --git a/engines/bladerunner/script/ai/lockup_guard.cpp b/engines/bladerunner/script/ai/lockup_guard.cpp
new file mode 100644
index 0000000..bdfa472
--- /dev/null
+++ b/engines/bladerunner/script/ai/lockup_guard.cpp
@@ -0,0 +1,123 @@
+/* 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 {
+
+AIScriptLockupGuard::AIScriptLockupGuard(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptLockupGuard::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptLockupGuard::Update() {
+ return false;
+}
+
+void AIScriptLockupGuard::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptLockupGuard::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptLockupGuard::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptLockupGuard::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptLockupGuard::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptLockupGuard::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptLockupGuard::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptLockupGuard::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptLockupGuard::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptLockupGuard::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptLockupGuard::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptLockupGuard::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptLockupGuard::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptLockupGuard::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptLockupGuard::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptLockupGuard::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptLockupGuard::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptLockupGuard::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptLockupGuard::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 08938c8..44c64eb 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -71,6 +71,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorEarlyQBartender] = new AIScriptEarlyQBartender(_vm); // 42
_AIScripts[kActorHawkersParrot] = new AIScriptHawkersParrot(_vm); // 43
_AIScripts[kActorTaffyPatron] = new AIScriptTaffyPatron(_vm); // 44
+ _AIScripts[kActorLockupGuard] = new AIScriptLockupGuard(_vm); // 45
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm); // 47
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm); // 48
_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm); // 49
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index c2d55b2..a675119 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -278,6 +278,9 @@ END_SCRIPT
DECLARE_SCRIPT(TaffyPatron)
END_SCRIPT
+DECLARE_SCRIPT(LockupGuard)
+END_SCRIPT
+
DECLARE_SCRIPT(HysteriaPatron1)
END_SCRIPT
Commit: ca2f9487c3d583a5df0e5f99ce8b39087438ceed
https://github.com/scummvm/scummvm/commit/ca2f9487c3d583a5df0e5f99ce8b39087438ceed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-12T21:00:08+01:00
Commit Message:
BLADERUNNER: Added Teenager actor
Changed paths:
A engines/bladerunner/script/ai/teenager.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 68217ef..b113864 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -92,6 +92,7 @@ MODULE_OBJS = \
script/ai/shoeshine_man.o \
script/ai/steele.o \
script/ai/taffy_patron.o \
+ script/ai/teenager.o \
script/ai/the_bard.o \
script/ai/transient.o \
script/ai/tyrell_guard.o \
diff --git a/engines/bladerunner/script/ai/teenager.cpp b/engines/bladerunner/script/ai/teenager.cpp
new file mode 100644
index 0000000..8d28405
--- /dev/null
+++ b/engines/bladerunner/script/ai/teenager.cpp
@@ -0,0 +1,123 @@
+/* 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 {
+
+AIScriptTeenager::AIScriptTeenager(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptTeenager::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptTeenager::Update() {
+ return false;
+}
+
+void AIScriptTeenager::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptTeenager::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptTeenager::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptTeenager::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptTeenager::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptTeenager::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTeenager::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTeenager::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptTeenager::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptTeenager::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptTeenager::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptTeenager::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptTeenager::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptTeenager::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptTeenager::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptTeenager::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptTeenager::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptTeenager::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptTeenager::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 44c64eb..f193e45 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -72,6 +72,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorHawkersParrot] = new AIScriptHawkersParrot(_vm); // 43
_AIScripts[kActorTaffyPatron] = new AIScriptTaffyPatron(_vm); // 44
_AIScripts[kActorLockupGuard] = new AIScriptLockupGuard(_vm); // 45
+ _AIScripts[kActorTeenager] = new AIScriptTeenager(_vm); // 46
_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm); // 47
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm); // 48
_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm); // 49
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index a675119..7915b66 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -281,6 +281,9 @@ END_SCRIPT
DECLARE_SCRIPT(LockupGuard)
END_SCRIPT
+DECLARE_SCRIPT(Teenager)
+END_SCRIPT
+
DECLARE_SCRIPT(HysteriaPatron1)
END_SCRIPT
More information about the Scummvm-git-logs
mailing list