[Scummvm-git-logs] scummvm master -> 19a91e60d270ae2cc527506c2d6c89eb48845d64
sev-
sev at scummvm.org
Tue Mar 13 00:19:10 CET 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c2e4240f18 BLADERUNNER: Added Tyrell actor
fb9843646d BLADERUNNER: Added Taffy actor
19a91e60d2 BLADERUNNER: Added BlimpGuy actor
Commit: c2e4240f188f578b94512b95eee4e97f944fd12c
https://github.com/scummvm/scummvm/commit/c2e4240f188f578b94512b95eee4e97f944fd12c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-13T00:18:53+01:00
Commit Message:
BLADERUNNER: Added Tyrell actor
Changed paths:
A engines/bladerunner/script/ai/tyrell.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 b113864..5f371e7 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -95,6 +95,7 @@ MODULE_OBJS = \
script/ai/teenager.o \
script/ai/the_bard.o \
script/ai/transient.o \
+ script/ai/tyrell.o \
script/ai/tyrell_guard.o \
script/ai/zuben.o \
script/scene_script.o \
diff --git a/engines/bladerunner/script/ai/tyrell.cpp b/engines/bladerunner/script/ai/tyrell.cpp
new file mode 100644
index 0000000..90fd590
--- /dev/null
+++ b/engines/bladerunner/script/ai/tyrell.cpp
@@ -0,0 +1,268 @@
+/* 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 {
+
+AIScriptTyrell::AIScriptTyrell(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+ _flag = true;
+ _var = 0;
+}
+
+void AIScriptTyrell::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+
+ _flag = true;
+ _var = 0;
+
+ Actor_Set_Goal_Number(kActorTyrell, 0);
+}
+
+bool AIScriptTyrell::Update() {
+ if (Global_Variable_Query(kVariableChapter) > 3 && Actor_Query_Goal_Number(kActorTyrell) < 300)
+ Actor_Set_Goal_Number(kActorTyrell, 300);
+
+ return false;
+}
+
+void AIScriptTyrell::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptTyrell::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptTyrell::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptTyrell::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptTyrell::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptTyrell::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTyrell::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTyrell::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptTyrell::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptTyrell::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptTyrell::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptTyrell::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptTyrell::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ if (newGoalNumber == 300) {
+ Actor_Put_In_Set(kActorTyrell, kSetFreeSlotH);
+ Actor_Set_At_Waypoint(kActorTyrell, 40, 0);
+ }
+
+ return false;
+}
+
+bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
+ switch (_animationState) {
+ case 0:
+ if (_var == 1) {
+ *animation = 767;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(767)) {
+ *animation = 766;
+ _animationFrame = 0;
+ _var = 0;
+ }
+ } else if (_var == 0) {
+ *animation = 766;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(766)) {
+ _animationFrame = 0;
+ if (!Random_Query(0, 3)) {
+ _var = 1;
+ }
+ }
+ }
+ break;
+
+ case 1:
+ *animation = 765;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(765)) {
+ _animationFrame = 0;
+ }
+ break;
+
+ case 2:
+ if (!_animationFrame && _flag) {
+ *animation = 766;
+ _animationState = 0;
+ } else {
+ *animation = 768;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(768)) {
+ _animationFrame = 0;
+ }
+ }
+ break;
+
+ case 3:
+ *animation = 769;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(769)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 768;
+ }
+ break;
+
+ case 4:
+ *animation = 770;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(770)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 768;
+ }
+ break;
+
+ case 5:
+ *animation = 771;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(771)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 768;
+ }
+ break;
+
+ case 6:
+ *animation = 772;
+ _animationFrame++;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(772)) {
+ _animationFrame = 0;
+ _animationState = 2;
+ *animation = 768;
+ }
+ break;
+
+ default:
+ break;
+ }
+ *frame = _animationFrame;
+
+ return true;
+}
+
+bool AIScriptTyrell::ChangeAnimationMode(int mode) {
+ switch (mode) {
+ case 0:
+ if (_animationState >= 2 && _animationState <= 6) {
+ _flag = 1;
+ } else {
+ _animationState = 0;
+ _animationFrame = 0;
+ }
+ break;
+ case 1:
+ _animationState = 1;
+ _animationFrame = 0;
+ break;
+ case 3:
+ _animationState = 2;
+ _animationFrame = 0;
+ _flag = 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 AIScriptTyrell::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptTyrell::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptTyrell::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptTyrell::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index f193e45..2b66173 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -77,6 +77,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm); // 48
_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm); // 49
_AIScripts[kActorShoeshineMan] = new AIScriptShoeshineMan(_vm); // 50
+ _AIScripts[kActorTyrell] = new AIScriptTyrell(_vm); // 51
_AIScripts[kActorGaff] = new AIScriptGaff(_vm); // 53
_AIScripts[kActorBryant] = new AIScriptBryant(_vm); // 54
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm); // 61
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 7915b66..425951c 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -297,6 +297,11 @@ DECLARE_SCRIPT(ShoeshineMan)
bool _state;
END_SCRIPT
+DECLARE_SCRIPT(Tyrell)
+ bool _flag;
+ int _var;
+END_SCRIPT
+
DECLARE_SCRIPT(Gaff)
END_SCRIPT
Commit: fb9843646d4192bdc4deea1d4ec130195e7a9a1a
https://github.com/scummvm/scummvm/commit/fb9843646d4192bdc4deea1d4ec130195e7a9a1a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-13T00:18:53+01:00
Commit Message:
BLADERUNNER: Added Taffy actor
Changed paths:
A engines/bladerunner/script/ai/taffy.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 5f371e7..72919e3 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -91,6 +91,7 @@ MODULE_OBJS = \
script/ai/sergeant_walls.o \
script/ai/shoeshine_man.o \
script/ai/steele.o \
+ script/ai/taffy.o \
script/ai/taffy_patron.o \
script/ai/teenager.o \
script/ai/the_bard.o \
diff --git a/engines/bladerunner/script/ai/taffy.cpp b/engines/bladerunner/script/ai/taffy.cpp
new file mode 100644
index 0000000..df68c2f
--- /dev/null
+++ b/engines/bladerunner/script/ai/taffy.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 {
+
+AIScriptTaffy::AIScriptTaffy(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptTaffy::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptTaffy::Update() {
+ return false;
+}
+
+void AIScriptTaffy::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptTaffy::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptTaffy::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptTaffy::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptTaffy::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptTaffy::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTaffy::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptTaffy::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptTaffy::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptTaffy::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptTaffy::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptTaffy::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptTaffy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptTaffy::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptTaffy::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptTaffy::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptTaffy::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptTaffy::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptTaffy::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 2b66173..717913d 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -80,6 +80,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorTyrell] = new AIScriptTyrell(_vm); // 51
_AIScripts[kActorGaff] = new AIScriptGaff(_vm); // 53
_AIScripts[kActorBryant] = new AIScriptBryant(_vm); // 54
+ _AIScripts[kActorTaffy] = new AIScriptTaffy(_vm); // 55
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm); // 61
_AIScripts[kActorLeon] = new AIScriptLeon(_vm); // 62
_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm); // 63
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 425951c..557b25a 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -308,6 +308,9 @@ END_SCRIPT
DECLARE_SCRIPT(Bryant)
END_SCRIPT
+DECLARE_SCRIPT(Taffy)
+END_SCRIPT
+
DECLARE_SCRIPT(Newscaster)
END_SCRIPT
Commit: 19a91e60d270ae2cc527506c2d6c89eb48845d64
https://github.com/scummvm/scummvm/commit/19a91e60d270ae2cc527506c2d6c89eb48845d64
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-13T00:18:53+01:00
Commit Message:
BLADERUNNER: Added BlimpGuy actor
Changed paths:
A engines/bladerunner/script/ai/blimp_guy.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 72919e3..07c315b 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -52,6 +52,7 @@ MODULE_OBJS = \
script/ai_script.o \
script/ai/answering_machine.o \
script/ai/baker.o \
+ script/ai/blimp_guy.o \
script/ai/bryant.o \
script/ai/crazylegs.o \
script/ai/desk_clerk.o \
diff --git a/engines/bladerunner/script/ai/blimp_guy.cpp b/engines/bladerunner/script/ai/blimp_guy.cpp
new file mode 100644
index 0000000..9dc104e
--- /dev/null
+++ b/engines/bladerunner/script/ai/blimp_guy.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 {
+
+AIScriptBlimpGuy::AIScriptBlimpGuy(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+}
+
+void AIScriptBlimpGuy::Initialize() {
+ _animationFrame = 0;
+ _animationState = 0;
+ _animationStateNext = 0;
+ _animationNext = 0;
+}
+
+bool AIScriptBlimpGuy::Update() {
+ return false;
+}
+
+void AIScriptBlimpGuy::TimerExpired(int timer) {
+ //return false;
+}
+
+void AIScriptBlimpGuy::CompletedMovementTrack() {
+ //return false;
+}
+
+void AIScriptBlimpGuy::ReceivedClue(int clueId, int fromActorId) {
+ //return false;
+}
+
+void AIScriptBlimpGuy::ClickedByPlayer() {
+ //return false;
+}
+
+void AIScriptBlimpGuy::EnteredScene(int sceneId) {
+ // return false;
+}
+
+void AIScriptBlimpGuy::OtherAgentEnteredThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptBlimpGuy::OtherAgentExitedThisScene(int otherActorId) {
+ // return false;
+}
+
+void AIScriptBlimpGuy::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+ // return false;
+}
+
+void AIScriptBlimpGuy::ShotAtAndMissed() {
+ // return false;
+}
+
+bool AIScriptBlimpGuy::ShotAtAndHit() {
+ return false;
+}
+
+void AIScriptBlimpGuy::Retired(int byActorId) {
+ // return false;
+}
+
+int AIScriptBlimpGuy::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+ return 0;
+}
+
+bool AIScriptBlimpGuy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+ return false;
+}
+
+bool AIScriptBlimpGuy::UpdateAnimation(int *animation, int *frame) {
+ return true;
+}
+
+bool AIScriptBlimpGuy::ChangeAnimationMode(int mode) {
+ return true;
+}
+
+void AIScriptBlimpGuy::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+ *animationState = _animationState;
+ *animationFrame = _animationFrame;
+ *animationStateNext = _animationStateNext;
+ *animationNext = _animationNext;
+}
+
+void AIScriptBlimpGuy::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+ _animationState = animationState;
+ _animationFrame = animationFrame;
+ _animationStateNext = animationStateNext;
+ _animationNext = animationNext;
+}
+
+bool AIScriptBlimpGuy::ReachedMovementTrackWaypoint(int waypointId) {
+ return true;
+}
+
+void AIScriptBlimpGuy::FledCombat() {
+ // return false;
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 717913d..156d128 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -81,6 +81,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
_AIScripts[kActorGaff] = new AIScriptGaff(_vm); // 53
_AIScripts[kActorBryant] = new AIScriptBryant(_vm); // 54
_AIScripts[kActorTaffy] = new AIScriptTaffy(_vm); // 55
+ _AIScripts[kActorBlimpGuy] = new AIScriptBlimpGuy(_vm); // 60
_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm); // 61
_AIScripts[kActorLeon] = new AIScriptLeon(_vm); // 62
_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm); // 63
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 557b25a..b3d8237 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -311,6 +311,9 @@ END_SCRIPT
DECLARE_SCRIPT(Taffy)
END_SCRIPT
+DECLARE_SCRIPT(BlimpGuy)
+END_SCRIPT
+
DECLARE_SCRIPT(Newscaster)
END_SCRIPT
More information about the Scummvm-git-logs
mailing list