BLADERUNNER: Added Clovis actor

3 files changed, 1509 insertions, 0 deletions

diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
new file mode 100644
index 0000000000..9c8976e02d
--- /dev/null
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -0,0 +1,1496 @@
+/* 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 {
+
+AIScriptClovis::AIScriptClovis(BladeRunnerEngine *vm) : AIScriptBase(vm) {
+	_var1 = 0;
+	_var2 = 0;
+	_var3 = 1;
+	_var4 = 0;
+	_var5 = 0;
+	_flag = 0;
+}
+
+void AIScriptClovis::Initialize() {
+	_animationFrame = 0;
+	_animationState = 0;
+	_animationStateNext = 0;
+	_animationNext = 0;
+
+	_var1 = 0;
+	_var2 = 0;
+	_var3 = 1;
+	_var4 = 0;
+	_var5 = 0;
+	_flag = 0;
+
+	Actor_Set_Goal_Number(kActorClovis, 100);
+}
+
+bool AIScriptClovis::Update() {
+	if (Actor_Query_Goal_Number(kActorClovis) == 104) {
+		Actor_Set_Goal_Number(kActorClovis, 105);
+		return true;
+	} else if (Global_Variable_Query(kVariableChapter) == 3 && Actor_Query_Goal_Number(kActorClovis) < 350) {
+		Actor_Set_Goal_Number(kActorClovis, 350);
+		return true;
+	} else if (Global_Variable_Query(kVariableChapter) != 4 || Game_Flag_Query(542)) {
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Goal_Number(kActorClovis) < 500) {
+			Actor_Set_Goal_Number(kActorClovis, 500);
+		}
+		if (Actor_Query_Goal_Number(kActorClovis) == 511 && Game_Flag_Query(657)) {
+			Actor_Set_Goal_Number(kActorClovis, 512);
+		}
+		if (Game_Flag_Query(653) != 1 || Game_Flag_Query(696) || Game_Flag_Query(697) != 1) {
+			return true;
+		} else {
+			Actor_Set_Goal_Number(kActorClovis, 517);
+			Game_Flag_Set(696);
+			return true;
+		}
+	} else {
+		Game_Flag_Set(542);
+		Actor_Set_Goal_Number(kActorClovis, 400);
+		return true;
+	}
+}
+
+void AIScriptClovis::TimerExpired(int timer) {
+	//return false;
+}
+
+void AIScriptClovis::CompletedMovementTrack() {
+	switch (Actor_Query_Goal_Number(kActorClovis)) {
+	case 100:
+		Actor_Set_Goal_Number(kActorClovis, 103);
+		break;
+
+	case 101:
+		Actor_Set_Goal_Number(kActorClovis, 102);
+		break;
+
+	case 401:
+		AI_Movement_Track_Flush(kActorClovis);
+
+		if (Player_Query_Current_Scene() == 92) {
+			Actor_Set_Goal_Number(kActorClovis, 402);
+		} else {
+			Actor_Set_Goal_Number(kActorClovis, 400);
+		}
+		break;
+
+	default:
+		return; //false;
+	}
+
+	return; //true;
+}
+
+void AIScriptClovis::ReceivedClue(int clueId, int fromActorId) {
+	//return false;
+}
+
+void AIScriptClovis::ClickedByPlayer() {
+	if (Actor_Query_Goal_Number(kActorClovis) == 599) {
+		Actor_Face_Actor(kActorMcCoy, kActorClovis, 1);
+		Actor_Says(kActorMcCoy, 8630, 16);
+	}
+}
+
+void AIScriptClovis::EnteredScene(int sceneId) {
+	// return false;
+}
+
+void AIScriptClovis::OtherAgentEnteredThisScene(int otherActorId) {
+	// return false;
+}
+
+void AIScriptClovis::OtherAgentExitedThisScene(int otherActorId) {
+	// return false;
+}
+
+void AIScriptClovis::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
+	if (Game_Flag_Query(653) != 1 || !Actor_Query_In_Set(kActorMcCoy, kSetKP07)) {
+		return; //false;
+	}
+
+	Game_Flag_Set(697);
+	Game_Flag_Set(714);
+
+	return; //true;
+}
+
+void AIScriptClovis::ShotAtAndMissed() {
+	// return false;
+}
+
+bool AIScriptClovis::ShotAtAndHit() {
+	if (!Game_Flag_Query(697)) {
+		if (Actor_Query_Goal_Number(kActorClovis) == 515) {
+			ADQ_Flush();
+			Actor_Set_Goal_Number(kActorClovis, 599);
+			shotAnim();
+			Actor_Set_Targetable(kActorClovis, 0);
+			ADQ_Add(kActorMcCoy, 2340, -1);
+			Music_Stop(3);
+		} else if (Actor_Query_Goal_Number(kActorClovis) == 513 || Actor_Query_Goal_Number(kActorClovis) == 518) {
+			ADQ_Flush();
+			Actor_Set_Goal_Number(kActorClovis, 599);
+			shotAnim();
+			Actor_Set_Targetable(kActorClovis, 0);
+			Music_Stop(3);
+		}
+}
+	return false;
+}
+
+void AIScriptClovis::Retired(int byActorId) {
+	if (Game_Flag_Query(653) == 1) {
+		if (Actor_Query_In_Set(kActorClovis, kSetKP07)) {
+			Global_Variable_Decrement(51, 1);
+			Actor_Set_Goal_Number(kActorClovis, 599);
+
+			if (!Global_Variable_Query(51)) {
+				Player_Loses_Control();
+				Delay(2000);
+				Player_Set_Combat_Mode(0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, 1, 0, 0);
+				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
+				Ambient_Sounds_Remove_All_Looping_Sounds(1);
+				Game_Flag_Set(579);
+				Game_Flag_Reset(653);
+				Set_Enter(kSetKP05_KP06, kSetKP03);
+			}
+		}
+	}
+}
+
+int AIScriptClovis::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+	if (otherActorId != kActorMcCoy)
+		return 0;
+
+	switch (clueId) {
+	case 212:
+	case 230:
+		return 6;
+	break;
+	case 214:
+	case 239:
+	case 240:
+		return -2;
+	case 215:
+	case 217:
+	case 218:
+	case 219:
+	case 220:
+	case 221:
+	case 241:
+		return 4;
+	case 216:
+		return 2;
+	case 222:
+		return -3;
+	case 223:
+	case 224:
+		return -10;
+	case 226:
+	case 227:
+	case 228:
+	case 242:
+		return -5;
+	default:
+		return 0;
+	}
+	return 0;
+}
+
+bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+	switch (newGoalNumber) {
+	case 100:
+		AI_Movement_Track_Flush(kActorClovis);
+		AI_Movement_Track_Append(kActorClovis, 33, 0);
+		AI_Movement_Track_Repeat(kActorClovis);
+		return true;
+
+	case 101:
+		AI_Movement_Track_Flush(kActorClovis);
+		AI_Movement_Track_Append(kActorClovis, 319, 0);
+		AI_Movement_Track_Append(kActorClovis, 320, 0);
+		AI_Movement_Track_Repeat(kActorClovis);
+		return true;
+
+	case 102:
+		Actor_Start_Speech_Sample(kActorClovis, 0);
+		AI_Movement_Track_Flush(kActorClovis);
+		AI_Movement_Track_Append(kActorClovis, 321, 0);
+		AI_Movement_Track_Repeat(kActorClovis);
+		return true;
+
+	case 103:
+		Actor_Set_Goal_Number(kActorSadik, 107);
+		Actor_Says(kActorClovis, 10, 15);
+		Actor_Says(kActorSadik, 0, 3);
+		Actor_Face_Actor(kActorClovis, kActorSadik, 1);
+		Actor_Says(kActorClovis, 20, 13);
+		Actor_Says(kActorClovis, 30, 12);
+		Actor_Face_Actor(kActorSadik, kActorClovis, 1);
+		Actor_Says(kActorSadik, 10, 3);
+		Actor_Says(kActorClovis, 40, 17);
+		Actor_Says(kActorSadik, 20, 3);
+		Actor_Face_Actor(kActorClovis, 0, 1);
+		Actor_Face_Actor(kActorSadik, 0, 1);
+		Actor_Says(kActorClovis, 50, 14);
+		Actor_Change_Animation_Mode(kActorClovis, 53);
+		return true;
+
+	case 105:
+		Actor_Says(kActorClovis, 60, 30);
+		Actor_Says(kActorSadik, 30, 3);
+		Actor_Says(kActorClovis, 70, 30);
+		Actor_Says(kActorClovis, 80, 30);
+		Actor_Change_Animation_Mode(kActorClovis, 29);
+		Actor_Says(kActorSadik, 40, 3);
+		Actor_Says(kActorSadik, 50, 3);
+		Actor_Says(kActorClovis, 90, 13);
+		Actor_Face_Current_Camera(5, 1);
+		Actor_Says(kActorClovis, 100, 17);
+		Delay(1000);
+		if (!Game_Flag_Query(48)) {
+			Actor_Clue_Acquire(kActorMcCoy, kClueStaggeredbyPunches, 1, kActorSadik);
+		}
+		Game_Flag_Set(383);
+		Game_Flag_Reset(509);
+		Global_Variable_Set(kVariableChapter, 3);
+		Actor_Set_Goal_Number(kActorClovis, 200);
+		Actor_Set_Goal_Number(kActorSadik, 200);
+		Actor_Clue_Acquire(kActorMcCoy, kClueAct2Ended, 1, -1);
+		Player_Gains_Control();
+		Chapter_Enter(3, 6, 20);
+		Game_Flag_Set(550);
+		Game_Flag_Set(679);
+		return true;
+
+	case 300:
+		Actor_Put_In_Set(kActorClovis, kSetUG18);
+		Actor_Set_At_XYZ(kActorClovis, -52.26f, 0.0f, 611.02f, 900);
+		Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
+		return true;
+
+	case 301:
+	case 302:
+	case 303:
+	case 310:
+		return true;
+
+	case 350:
+		Actor_Put_In_Set(kActorClovis, kSetFreeSlotA);
+		Actor_Set_At_Waypoint(kActorClovis, 33, 0);
+		return true;
+
+	case 400:
+		AI_Movement_Track_Flush(kActorClovis);
+		Actor_Put_In_Set(kActorClovis, kSetFreeSlotA);
+		Actor_Set_At_Waypoint(kActorClovis, 33, 0);
+		return true;
+
+	case 401:
+		AI_Movement_Track_Flush(kActorClovis);
+		AI_Movement_Track_Append(kActorClovis, 341, 0);
+		AI_Movement_Track_Append(kActorClovis, 342, 0);
+		AI_Movement_Track_Repeat(kActorClovis);
+		return true;
+
+	case 402:
+		Player_Loses_Control();
+		Actor_Force_Stop_Walking(kActorMcCoy);
+		Actor_Face_Actor(kActorMcCoy, kActorClovis, 1);
+		Loop_Actor_Walk_To_Actor(kActorClovis, kActorMcCoy, 48, 0, 1);
+		Actor_Face_Actor(kActorClovis, kActorMcCoy, 1);
+		Actor_Change_Animation_Mode(kActorClovis, 6);
+		if (Player_Query_Combat_Mode()) {
+			Actor_Change_Animation_Mode(kActorMcCoy, 49);
+		} else {
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
+		}
+		Delay(3000);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, kActorClovis);
+		return true;
+
+	case 500:
+		Actor_Set_Goal_Number(kActorClovis, 510);
+		return true;
+
+	case 510:
+		if (Game_Flag_Query(653) == 1) {
+			Actor_Set_Goal_Number(kActorClovis, 513);
+		} else {
+			Actor_Set_Goal_Number(kActorClovis, 511);
+			Game_Flag_Set(685);
+		}
+		return true;
+
+	case 511:
+		Actor_Put_In_Set(kActorClovis, kSetKP05_KP06);
+		Actor_Set_At_XYZ(kActorClovis, -1072.0f, 8.26f, -708.0f, 530);
+		return true;
+
+	case 512:
+		Actor_Says(kActorClovis, 110, 3);
+		Actor_Says(kActorMcCoy, 2255, 3);
+		Actor_Says(kActorClovis, 120, 3);
+		Actor_Says(kActorClovis, 130, 3);
+		Actor_Says(kActorClovis, 140, 3);
+		Actor_Says(kActorMcCoy, 2260, 3);
+		Actor_Says(kActorClovis, 150, 3);
+		Actor_Set_Goal_Number(kActorClovis, 513);
+		return true;
+
+	case 513:
+		Actor_Put_In_Set(kActorClovis, kSetKP07);
+		Actor_Set_Targetable(kActorClovis, 1);
+		if (Game_Flag_Query(653) == 1) {
+			Global_Variable_Set(51, 0);
+			Global_Variable_Increment(51, 1);
+			Actor_Set_At_XYZ(kActorClovis, 45.0f, -41.52f, -85.0f, 750);
+		} else {
+			Actor_Set_At_XYZ(kActorClovis, 84.85f, -50.56f, -68.87f, 800);
+			Actor_Face_Heading(kActorClovis, 1022, 0);
+		}
+		someAnim();
+		return true;
+
+	case 514:
+		Actor_Says(kActorMcCoy, 2345, 16);
+		Actor_Says(kActorClovis, 170, -1);
+		Actor_Says(kActorClovis, 180, 3);
+		Actor_Says(kActorMcCoy, 2350, 17);
+		if (!Game_Flag_Query(714)) {
+			Actor_Says(kActorMcCoy, 2355, 11);
+		}
+		Actor_Says(kActorClovis, 190, -1);
+		Actor_Says(kActorClovis, 200, 3);
+		Actor_Says(kActorMcCoy, 2360, 18);
+		Actor_Says(kActorClovis, 210, 3);
+		Actor_Says(kActorClovis, 220, -1);
+		Actor_Set_Goal_Number(kActorClovis, 515);
+		return true;
+
+	case 515:
+		ADQ_Add(kActorClovis, 240, -1);
+		ADQ_Add(kActorClovis, 250, -1);
+		ADQ_Add(kActorClovis, 260, -1);
+		ADQ_Add(kActorClovis, 270, -1);
+		ADQ_Add_Pause(1000);
+		ADQ_Add(kActorClovis, 280, -1);
+		ADQ_Add(kActorClovis, 290, -1);
+		ADQ_Add(kActorClovis, 300, -1);
+		return true;
+
+	case 516:
+		Actor_Says(kActorMcCoy, 8501, 3);
+		Actor_Says(kActorClovis, 1260, 3);
+		Actor_Says(kActorMcCoy, 8502, 3);
+		Actor_Says(kActorClovis, 1270, 3);
+		Actor_Says(kActorMcCoy, 8504, 3);
+		Actor_Says(kActorClovis, 1290, 3);
+		Actor_Says(kActorMcCoy, 8505, 3);
+		Actor_Says(kActorClovis, 1300, 3);
+		Actor_Says(kActorClovis, 1310, 3);
+		Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
+		Ambient_Sounds_Remove_All_Looping_Sounds(1);
+		Outtake_Play(20, 0, -1);
+		if (Global_Variable_Query(kVariableAffectionTowards) == 3 && Game_Flag_Query(46)) {
+			Outtake_Play(21, 0, -1);
+		} else if (Global_Variable_Query(kVariableAffectionTowards) == 2 && Game_Flag_Query(47)) {
+			Outtake_Play(22, 0, -1);
+		}
+		Outtake_Play(23, 0, -1);
+		Game_Over();
+		return true;
+
+	case 517:
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorLucy, kSetKP07)) {
+			Actor_Set_Goal_Number(kActorLucy, 599);
+			Global_Variable_Decrement(51, 1);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorLuther, kSetKP07)) {
+			Actor_Set_Goal_Number(kActorLuther, 599);
+			Global_Variable_Decrement(51, 1);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorDektora, kSetKP07)) {
+			Non_Player_Actor_Combat_Mode_On(kActorDektora, 0, 0, 0, 19, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorZuben, kSetKP07)) {
+			Non_Player_Actor_Combat_Mode_On(kActorZuben, 0, 0, 0, 19, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorSadik, kSetKP07)) {
+			Non_Player_Actor_Combat_Mode_On(kActorSadik, 0, 1, 0, 19, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorIzo, kSetKP07)) {
+			Non_Player_Actor_Combat_Mode_On(kActorIzo, 0, 0, 0, 19, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorGordo, kSetKP07)) {
+			Non_Player_Actor_Combat_Mode_On(kActorGordo, 0, 1, 0, 19, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+		}
+		if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_In_Set(kActorClovis, kSetKP07)) {
+			Non_Player_Actor_Combat_Mode_On(kActorClovis, 0, 0, 0, 19, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+		}
+		return true;
+
+	case 518:
+		Actor_Set_At_XYZ(kActorClovis, 84.85f, -50.56f, -68.87f, 800);
+		Actor_Face_Heading(kActorClovis, 1022, 0);
+		Actor_Set_Targetable(kActorClovis, 1);
+		Game_Flag_Set(685);
+		someAnim();
+		return true;
+
+	default:
+		break;
+	}
+	return false;
+}
+
+bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
+	bool flag;
+
+	switch (_animationState) {
+	case 0:
+		if (_var1 == 1) {
+			*animation = 227;
+			if (_var2) {
+				_var2--;
+			} else if (++_animationFrame == 7) {
+				_var2 = Random_Query(5, 15);
+			} else {
+				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(227)) {
+					_animationFrame = 0;
+					_var1 = 0;
+				}
+			}
+		} else if (_var1 == 0) {
+			*animation = 228;
+			if (_var2) {
+				_animationFrame += _var3;
+				if (_animationFrame > _var5) {
+					_animationFrame = _var5;
+					_var3 = -1;
+				} else {
+					if (_animationFrame < _var4) {
+						_animationFrame = _var4;
+						_var3 = 1;
+					}
+				}
+				_var2--;
+			} else {
+				_animationFrame += _var3;
+				if (_animationFrame == 13 && Random_Query(0, 1)) {
+					_var3 = -1;
+					_var4 = 9;
+					_var5 = 13;
+					_var2 = Random_Query(4, 15);
+				} else {
+					if (_animationFrame == 6) {
+						if (Random_Query(0, 1)) {
+							_var3 = -1;
+							_var4 = 3;
+							_var5 = 6;
+							_var2 = Random_Query(4, 15);
+						}
+					}
+				}
+				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(228)) {
+					_animationFrame = 0;
+				} else {
+					if (_animationFrame < 0) {
+						_animationFrame = Slice_Animation_Query_Number_Of_Frames(228) - 1;
+					}
+				}
+				if (!_animationFrame) {
+					if (Random_Query(0, 1) > 0) {
+						_var1 = 1;
+					} else {
+						if (Random_Query(0, 2) > 0) {
+							_var3 = 1;
+							_var4 = 0;
+							_var5 = 0;
+							_var2 = Random_Query(5, 15);
+						}
+					}
+				}
+			}
+		}
+		break;
+
+	case 1:
+		if (!_var1) {
+			*animation = 228;
+		}
+		if (_var1 == 1) {
+			*animation = 227;
+		}
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+			_animationFrame += 3;
+			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+				_animationFrame = 0;
+				*animation = _animationNext;
+				_animationState = _animationStateNext;
+			}
+		} else {
+			_animationFrame -= 3;
+			if (_animationFrame <= 0) {
+				_animationFrame = 0;
+				*animation = _animationNext;
+				_animationState = _animationStateNext;
+			}
+		}
+		break;
+
+	case 2:
+		*animation = 238;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(238)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(238) - 1;
+			}
+		}
+		break;
+
+	case 3:
+		*animation = 239;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(239)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(239) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			_animationState = 2;
+			_animationFrame = 0;
+			*animation = 238;
+			if (Actor_Query_Goal_Number(kActorClovis) == 103) {
+				Actor_Set_Goal_Number(kActorClovis, 104);
+			}
+		}
+		break;
+
+	case 4:
+		*animation = 240;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(240)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(240) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			*animation = 227;
+			_animationState = 0;
+			Actor_Change_Animation_Mode(kActorClovis, 0);
+		}
+		break;
+
+	case 5:
+		*animation = 230;
+		if (!_animationFrame && _flag) {
+			_animationState = 0;
+		} else {
+			_animationFrame++;
+			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(230)) {
+				_animationFrame = 0;
+			}
+		}
+		break;
+
+	case 6:
+		*animation = 231;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(231)) {
+			_animationFrame = 0;
+			_animationState = 5;
+			*animation = 230;
+		}
+		break;
+
+	case 7:
+		*animation = 232;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(232)) {
+			_animationFrame = 0;
+			_animationState = 5;
+			*animation = 230;
+		}
+		break;
+
+	case 8:
+		*animation = 233;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(233)) {
+			_animationFrame = 0;
+			_animationState = 5;
+			*animation = 230;
+		}
+		break;
+
+	case 9:
+		*animation = 234;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(234)) {
+			_animationFrame = 0;
+			_animationState = 5;
+			*animation = 230;
+		}
+		break;
+
+	case 10:
+		*animation = 235;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(235)) {
+			_animationFrame = 0;
+			_animationState = 5;
+			*animation = 230;
+		}
+		break;
+
+	case 11:
+		*animation = 236;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(236)) {
+			_animationFrame = 0;
+			_animationState = 5;
+			*animation = 230;
+		}
+		break;
+
+	case 12:
+		*animation = 241;
+		if (!_animationFrame && _flag) {
+			_animationState = 2;
+			_animationFrame = 0;
+			Actor_Change_Animation_Mode(kActorClovis, 53);
+		} else {
+			_animationFrame++;
+			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(241)) {
+				_animationFrame = 0;
+			}
+		}
+		break;
+
+	case 13:
+		*animation = 208;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(208)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(208) - 1;
+			}
+		}
+		break;
+
+	case 14:
+		*animation = 217;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(217)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(217) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			*animation = 208;
+			_animationState = 13;
+		}
+		break;
+
+	case 15:
+		*animation = 218;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(218)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(218) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			*animation = 227;
+			_animationState = 0;
+		}
+		break;
+
+	case 16:
+		*animation = 219;
+		_animationFrame++;
+		if (_animationFrame == 2) {
+			int snd;
+
+			if (Random_Query(1, 2) == 1) {
+				snd = 9010;
+			} else {
+				snd = 9015;
+			}
+			Sound_Play_Speech_Line(5, snd, 75, 0, 99);
+		}
+		if (_animationFrame == 4) {
+			Actor_Combat_AI_Hit_Attempt(5);
+		}
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			_animationState = 13;
+			*animation = 208;
+			Actor_Change_Animation_Mode(kActorClovis, 4);
+		}
+		break;
+
+	case 17:
+		*animation = 211;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(211)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(211) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			_animationState = 13;
+			*animation = 208;
+			Actor_Change_Animation_Mode(kActorClovis, 4);
+		}
+		break;
+
+	case 18:
+		*animation = 212;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(212)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(212) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			_animationState = 13;
+			*animation = 208;
+			Actor_Change_Animation_Mode(kActorClovis, 4);
+		}
+		break;
+
+	case 19:
+		*animation = 224;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(224)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(224) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			*animation = 227;
+			_animationState = 0;
+			Actor_Change_Animation_Mode(kActorClovis, 0);
+		}
+		break;
+
+	case 20:
+		*animation = 225;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(225)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(225) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			*animation = 227;
+			_animationState = 0;
+			Actor_Change_Animation_Mode(kActorClovis, 0);
+		}
+		break;
+
+	case 21:
+		*animation = 220;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(220)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(220) - 1;
+			}
+		}
+		break;
+
+	case 22:
+		*animation = 221;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(221)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(221) - 1;
+			}
+		}
+		break;
+
+	case 23:
+		*animation = 213;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(213)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(213) - 1;
+			}
+		}
+		break;
+
+	case 24:
+		*animation = 217;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(217)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(217) - 1;
+			}
+		}
+		break;
+
+	case 25:
+		*animation = 222;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(222)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(222) - 1;
+			}
+		}
+		break;
+
+	case 26:
+		*animation = 223;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(223)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(223) - 1;
+			}
+		}
+		break;
+
+	case 27:
+		*animation = 215;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(215)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(215) - 1;
+			}
+		}
+		break;
+
+	case 28:
+		*animation = 216;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(216)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(216) - 1;
+			}
+		}
+		break;
+
+	case 29:
+		*animation = 209;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(209)) {
+			flag = true;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(209) - 1;
+				flag = true;
+			} else {
+				flag = false;
+			}
+		}
+		if (flag) {
+			_animationState = 13;
+			*animation = 208;
+			Actor_Change_Animation_Mode(kActorClovis, 4);
+		}
+		break;
+
+	case 30:
+		*animation = 210;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(210)) {
+			flag = 1;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(210) - 1;
+				flag = 1;
+			} else {
+				flag = 0;
+			}
+		}
+		if (flag) {
+			_animationState = 13;
+			*animation = 208;
+			Actor_Change_Animation_Mode(kActorClovis, 4);
+		}
+		break;
+
+	case 31:
+		*animation = 242;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(242)) {
+			flag = 1;
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(242) - 1;
+				flag = 1;
+			} else {
+				flag = 0;
+			}
+		}
+		if (flag) {
+			*animation = 227;
+			_animationState = 0;
+			Actor_Change_Animation_Mode(kActorClovis, 0);
+		}
+		break;
+
+	case 32:
+		*animation = 243;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(243)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(243) - 1;
+			}
+		}
+		break;
+
+	case 33:
+		*animation = 244;
+		if (!_animationFrame && _flag) {
+			_animationState = 32;
+			_animationFrame = 0;
+			Actor_Change_Animation_Mode(kActorClovis, 54);
+		} else {
+			_animationFrame++;
+			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(244)) {
+				_animationFrame = 0;
+			} else {
+				if (_animationFrame < 0) {
+					_animationFrame = Slice_Animation_Query_Number_Of_Frames(244) - 1;
+				}
+			}
+		}
+		break;
+
+	case 34:
+		*animation = 245;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(245)) {
+			_animationState = 33;
+			_animationFrame = 0;
+			*animation = 244;
+			Actor_Change_Animation_Mode(kActorClovis, 54);
+		}
+		break;
+
+	case 35:
+		_animationFrame++;
+		*animation = 247;
+		Actor_Change_Animation_Mode(kActorClovis, 54);
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(247)) {
+			_animationFrame = 0;
+			_animationState = 33;
+			*animation = 244;
+		}
+		break;
+
+	case 36:
+		*animation = 248;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(248)) {
+			_animationFrame = 0;
+			_animationState = 37;
+			*animation = 249;
+		}
+		break;
+
+	case 37:
+		*animation = 249;
+		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(249) - 1) {
+			_animationFrame++;
+		}
+		break;
+
+	case 38:
+		*animation = 250;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(250)) {
+			_animationFrame = 0;
+			_animationState = 39;
+			*animation = 251;
+		}
+		break;
+
+	case 39:
+		*animation = 251;
+		_animationFrame++;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(251)) {
+			_animationFrame = 0;
+		} else {
+			if (_animationFrame < 0) {
+				_animationFrame = Slice_Animation_Query_Number_Of_Frames(251) - 1;
+			}
+		}
+		break;
+
+	case 40:
+		*animation = 252;
+		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(252) - 1) {
+			_animationFrame++;
+		}
+		break;
+
+	case 41:
+		*animation = 226;
+		_animationFrame++;
+		if (_animationFrame == Slice_Animation_Query_Number_Of_Frames(226) - 1) {
+			Actor_Change_Animation_Mode(kActorClovis, 88);
+			_animationState = 42;
+			_animationFrame = Slice_Animation_Query_Number_Of_Frames(226) - 1;
+		}
+		break;
+
+	case 42:
+		*animation = 226;
+		_animationFrame = Slice_Animation_Query_Number_Of_Frames(226) - 1;
+		break;
+
+	default:
+		break;
+	}
+	*frame = _animationFrame;
+
+	return true;
+}
+
+bool AIScriptClovis::ChangeAnimationMode(int mode) {
+	switch (mode) {
+	case 0:
+		if (!Game_Flag_Query(685)) {
+			switch (_animationState) {
+			case 2:
+				Actor_Change_Animation_Mode(kActorClovis, 53);
+				break;
+			case 4:
+				break;
+			case 5:
+			case 6:
+			case 7:
+			case 8:
+			case 9:
+			case 10:
+			case 11:
+				_flag = 1;
+				break;
+			case 12:
+				_flag = 1;
+				break;
+			case 13:
+				_animationState = 15;
+				_animationFrame = 0;
+				break;
+			default:
+				_animationState = 0;
+				_animationFrame = 0;
+				_var1 = 0;
+				break;
+			}
+			break;
+		}
+		_animationState = 32;
+		_animationFrame = 0;
+		break;
+
+	case 1:
+		_animationState = 21;
+		_animationFrame = 0;
+		break;
+
+	case 2:
+		_animationState = 22;
+		_animationFrame = 0;
+		break;
+
+	case 3:
+	case 9:
+		if (Game_Flag_Query(685)) {
+			_animationFrame = 0;
+			_animationState = 34;
+		} else {
+			if (_animationState < 5 || _animationState > 11) {
+				_animationState = 1;
+				_animationStateNext = 5;
+				_animationNext = 230;
+				_flag = 0;
+			}
+		}
+		break;
+
+	case 4:
+		switch (_animationState) {
+		case 13:
+		case 14:
+			break;
+		case 23:
+		case 24:
+		case 27:
+		case 28:
+			_animationState = 13;
+			_animationFrame = 0;
+			break;
+		default:
+			_animationState = 1;
+			_animationStateNext = 14;
+			_animationNext = 217;
+			break;
+		}
+		break;
+
+	case 5:
+	case 18:
+	case 19:
+	case 23:
+	case 24:
+	case 25:
+	case 26:
+	case 27:
+	case 28:
+		break;
+
+	case 6:
+		_animationState = 16;
+		_animationFrame = 0;
+		break;
+
+	case 7:
+		_animationState = 21;
+		_animationFrame = 0;
+		break;
+
+	case 8:
+		_animationState = 22;
+		_animationFrame = 0;
+		break;
+
+	case 10:
+	case 12:
+		if (_animationState < 5 || _animationState > 11) {
+			_animationState = 1;
+			_animationStateNext = 6;
+			_animationNext = 231;
+			_flag = 0;
+		}
+		break;
+
+	case 11:
+	case 14:
+		if (_animationState < 5 || _animationState > 11) {
+			_animationState = 1;
+			_animationStateNext = 8;
+			_animationNext = 233;
+			_flag = 0;
+		}
+		break;
+
+	case 13:
+		if (_animationState < 5 || _animationState > 11) {
+			_animationState = 1;
+			_animationStateNext = 7;
+			_animationNext = 232;
+			_flag = 0;
+		}
+		break;
+
+	case 15:
+		if (_animationState < 5 || _animationState > 11) {
+			_animationState = 1;
+			_animationStateNext = 9;
+			_animationNext = 234;
+			_flag = 0;
+		}
+		break;
+
+	case 16:
+		if (_animationState < 5 || _animationState > 11) {
+			_animationState = 1;
+			_animationStateNext = 10;
+			_animationNext = 235;
+			_flag = 0;
+		}
+		break;
+
+	case 17:
+		if (_animationState < 5 || _animationState > 11) {
+			_animationState = 1;
+			_animationStateNext = 11;
+			_animationNext = 236;
+			_flag = 0;
+		}
+		break;
+
+	case 20:
+		_animationState = 31;
+		_animationFrame = 0;
+		break;
+
+	case 21:
+		if ((unsigned int)(_animationState - 13) > 3) {
+			if ((unsigned int)(_animationState - 32) > 8) {
+				if (Random_Query(0, 1)) {
+					_animationState = 20;
+				} else {
+					_animationState = 19;
+				}
+				_animationFrame = 0;
+			} else {
+				_animationState = 40;
+				_animationFrame = 0;
+			}
+		} else {
+			if (Random_Query(0, 1)) {
+				_animationState = 18;
+			} else {
+				_animationState = 17;
+			}
+			_animationFrame = 0;
+		}
+		break;
+
+	case 22:
+		if (Random_Query(0, 1)) {
+			_animationState = 17;
+		} else {
+			_animationState = 18;
+		}
+		_animationFrame = 0;
+		break;
+
+	case 29:
+		_animationState = 4;
+		_animationFrame = 0;
+		break;
+
+	case 30:
+		_animationState = 12;
+		_animationFrame = 0;
+		_flag = 0;
+		break;
+
+	case 88:
+		_animationState = 42;
+		_animationFrame = Slice_Animation_Query_Number_Of_Frames(226) - 1;
+		break;
+
+	case 48:
+		_animationState = 41;
+		_animationFrame = 0;
+		break;
+
+	case 53:
+		switch (_animationState) {
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+		case 9:
+		case 10:
+		case 11:
+			_animationState = 3;
+			_animationFrame = 0;
+			break;
+		default:
+			break;
+		}
+		break;
+
+	case 54:
+		_animationFrame = 0;
+		_animationState = 32;
+		break;
+	}
+
+	return true;
+}
+
+void AIScriptClovis::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+	*animationState     = _animationState;
+	*animationFrame     = _animationFrame;
+	*animationStateNext = _animationStateNext;
+	*animationNext      = _animationNext;
+}
+
+void AIScriptClovis::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+	_animationState     = animationState;
+	_animationFrame     = animationFrame;
+	_animationStateNext = animationStateNext;
+	_animationNext      = animationNext;
+}
+
+bool AIScriptClovis::ReachedMovementTrackWaypoint(int waypointId) {
+	return true;
+}
+
+void AIScriptClovis::FledCombat() {
+	// return false;
+}
+
+void AIScriptClovis::shotAnim() {
+	if ((unsigned int)(_animationState - 13) > 3) {
+		if ((unsigned int)(_animationState - 32) <= 8) {
+			_animationState = 40;
+			_animationFrame = 0;
+		} else {
+			if (Random_Query(0, 1)) {
+				_animationState = 20;
+			} else {
+				_animationState = 19;
+			}
+			_animationFrame = 0;
+		}
+	} else {
+		if (Random_Query(0, 1)) {
+			_animationState = 18;
+		} else {
+			_animationState = 17;
+		}
+		_animationFrame = 0;
+	}
+}
+
+void AIScriptClovis::someAnim() {
+	if (Game_Flag_Query(685)) {
+		_animationState = 32;
+		_animationFrame = 0;
+		return;
+	}
+
+	switch (_animationState) {
+	case 2:
+		Actor_Change_Animation_Mode(kActorClovis, 53);
+		break;
+	case 4:
+		break;
+	case 5:
+	case 6:
+	case 7:
+	case 8:
+	case 9:
+	case 10:
+	case 11:
+		_flag = 1;
+		break;
+	case 12:
+		_flag = 1;
+		break;
+	case 13:
+		_animationState = 15;
+		_animationFrame = 0;
+		break;
+	default:
+		_animationState = 0;
+		_animationFrame = 0;
+		_var1 = 0;
+		break;
+	}
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index c67e83d5b7..cd4e18b0b5 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -44,6 +44,7 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
 	_AIScripts[kActorGordo] = new AIScriptGordo(_vm);                     //  2
 	_AIScripts[kActorDektora] = new AIScriptDektora(_vm);                 //  3
 	_AIScripts[kActorGuzza] = new AIScriptGuzza(_vm);                     //  4
+	_AIScripts[kActorClovis] = new AIScriptClovis(_vm);                   //  4
 	_AIScripts[kActorCrazylegs] = new AIScriptCrazylegs(_vm);             //  9
 	_AIScripts[kActorGrigorian] = new AIScriptGrigorian(_vm);             // 11
 	_AIScripts[kActorTransient] = new AIScriptTransient(_vm);             // 12
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 4479a274a4..eaf5e47780 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -159,6 +159,18 @@ DECLARE_SCRIPT(Guzza)
 	bool _flag;
 END_SCRIPT
 
+DECLARE_SCRIPT(Clovis)
+	int _var1;
+	int _var2;
+	int _var3;
+	int _var4;
+	int _var5;
+	bool _flag;
+
+	void shotAnim();
+	void someAnim();
+END_SCRIPT
+
 DECLARE_SCRIPT(Crazylegs)
 	bool _flag;
 END_SCRIPT