[Scummvm-git-logs] scummvm master -> d42b39817d89421b932f2b4079a2bed0b737754c

peterkohaut peterkohaut at users.noreply.github.com
Wed Mar 29 02:02:12 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d42b39817d BLADERUNNER: introduced some game constants


Commit: d42b39817d89421b932f2b4079a2bed0b737754c
    https://github.com/scummvm/scummvm/commit/d42b39817d89421b932f2b4079a2bed0b737754c
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-03-29T01:55:06+02:00

Commit Message:
BLADERUNNER: introduced some game constants

Game script are more readable now
Fixed name of Officer Leary

Changed paths:
  A engines/bladerunner/script/ai/officer_leary.cpp
  R engines/bladerunner/script/ai/officer_leroy.cpp
    engines/bladerunner/actor.cpp
    engines/bladerunner/actor.h
    engines/bladerunner/actor_clues.cpp
    engines/bladerunner/actor_walk.cpp
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/bladerunner.h
    engines/bladerunner/combat.cpp
    engines/bladerunner/crimes_database.cpp
    engines/bladerunner/crimes_database.h
    engines/bladerunner/module.mk
    engines/bladerunner/script/ai.cpp
    engines/bladerunner/script/ai.h
    engines/bladerunner/script/ai/mccoy.cpp
    engines/bladerunner/script/ai/runciter.cpp
    engines/bladerunner/script/esper.cpp
    engines/bladerunner/script/init.cpp
    engines/bladerunner/script/scene/ar01.cpp
    engines/bladerunner/script/scene/ar02.cpp
    engines/bladerunner/script/scene/bb01.cpp
    engines/bladerunner/script/scene/bb02.cpp
    engines/bladerunner/script/scene/bb03.cpp
    engines/bladerunner/script/scene/bb04.cpp
    engines/bladerunner/script/scene/bb05.cpp
    engines/bladerunner/script/scene/bb06.cpp
    engines/bladerunner/script/scene/bb07.cpp
    engines/bladerunner/script/scene/bb08.cpp
    engines/bladerunner/script/scene/bb09.cpp
    engines/bladerunner/script/scene/bb10.cpp
    engines/bladerunner/script/scene/bb11.cpp
    engines/bladerunner/script/scene/bb12.cpp
    engines/bladerunner/script/scene/bb51.cpp
    engines/bladerunner/script/scene/ct01.cpp
    engines/bladerunner/script/scene/ct02.cpp
    engines/bladerunner/script/scene/ct03.cpp
    engines/bladerunner/script/scene/ct04.cpp
    engines/bladerunner/script/scene/ct05.cpp
    engines/bladerunner/script/scene/ct06.cpp
    engines/bladerunner/script/scene/ct07.cpp
    engines/bladerunner/script/scene/ct08.cpp
    engines/bladerunner/script/scene/ct09.cpp
    engines/bladerunner/script/scene/ct10.cpp
    engines/bladerunner/script/scene/ct11.cpp
    engines/bladerunner/script/scene/ct12.cpp
    engines/bladerunner/script/scene/ct51.cpp
    engines/bladerunner/script/scene/dr01.cpp
    engines/bladerunner/script/scene/dr02.cpp
    engines/bladerunner/script/scene/dr03.cpp
    engines/bladerunner/script/scene/dr04.cpp
    engines/bladerunner/script/scene/dr05.cpp
    engines/bladerunner/script/scene/dr06.cpp
    engines/bladerunner/script/scene/hc01.cpp
    engines/bladerunner/script/scene/hc02.cpp
    engines/bladerunner/script/scene/hc03.cpp
    engines/bladerunner/script/scene/hc04.cpp
    engines/bladerunner/script/scene/hf01.cpp
    engines/bladerunner/script/scene/hf02.cpp
    engines/bladerunner/script/scene/hf03.cpp
    engines/bladerunner/script/scene/hf04.cpp
    engines/bladerunner/script/scene/hf05.cpp
    engines/bladerunner/script/scene/hf06.cpp
    engines/bladerunner/script/scene/kp01.cpp
    engines/bladerunner/script/scene/kp02.cpp
    engines/bladerunner/script/scene/kp03.cpp
    engines/bladerunner/script/scene/kp04.cpp
    engines/bladerunner/script/scene/kp05.cpp
    engines/bladerunner/script/scene/kp06.cpp
    engines/bladerunner/script/scene/kp07.cpp
    engines/bladerunner/script/scene/ma01.cpp
    engines/bladerunner/script/scene/ma02.cpp
    engines/bladerunner/script/scene/ma04.cpp
    engines/bladerunner/script/scene/ma05.cpp
    engines/bladerunner/script/scene/ma06.cpp
    engines/bladerunner/script/scene/ma07.cpp
    engines/bladerunner/script/scene/nr01.cpp
    engines/bladerunner/script/scene/nr02.cpp
    engines/bladerunner/script/scene/nr03.cpp
    engines/bladerunner/script/scene/nr04.cpp
    engines/bladerunner/script/scene/nr05.cpp
    engines/bladerunner/script/scene/nr06.cpp
    engines/bladerunner/script/scene/nr07.cpp
    engines/bladerunner/script/scene/nr08.cpp
    engines/bladerunner/script/scene/nr09.cpp
    engines/bladerunner/script/scene/nr10.cpp
    engines/bladerunner/script/scene/nr11.cpp
    engines/bladerunner/script/scene/ps01.cpp
    engines/bladerunner/script/scene/ps02.cpp
    engines/bladerunner/script/scene/ps03.cpp
    engines/bladerunner/script/scene/ps04.cpp
    engines/bladerunner/script/scene/ps05.cpp
    engines/bladerunner/script/scene/ps06.cpp
    engines/bladerunner/script/scene/ps07.cpp
    engines/bladerunner/script/scene/ps09.cpp
    engines/bladerunner/script/scene/ps10.cpp
    engines/bladerunner/script/scene/ps11.cpp
    engines/bladerunner/script/scene/ps12.cpp
    engines/bladerunner/script/scene/ps13.cpp
    engines/bladerunner/script/scene/ps14.cpp
    engines/bladerunner/script/scene/ps15.cpp
    engines/bladerunner/script/scene/rc01.cpp
    engines/bladerunner/script/scene/rc02.cpp
    engines/bladerunner/script/scene/rc03.cpp
    engines/bladerunner/script/scene/rc04.cpp
    engines/bladerunner/script/scene/rc51.cpp
    engines/bladerunner/script/scene/tb02.cpp
    engines/bladerunner/script/scene/tb03.cpp
    engines/bladerunner/script/scene/tb05.cpp
    engines/bladerunner/script/scene/tb06.cpp
    engines/bladerunner/script/scene/tb07.cpp
    engines/bladerunner/script/scene/ug01.cpp
    engines/bladerunner/script/scene/ug02.cpp
    engines/bladerunner/script/scene/ug03.cpp
    engines/bladerunner/script/scene/ug04.cpp
    engines/bladerunner/script/scene/ug05.cpp
    engines/bladerunner/script/scene/ug06.cpp
    engines/bladerunner/script/scene/ug07.cpp
    engines/bladerunner/script/scene/ug08.cpp
    engines/bladerunner/script/scene/ug09.cpp
    engines/bladerunner/script/scene/ug10.cpp
    engines/bladerunner/script/scene/ug12.cpp
    engines/bladerunner/script/scene/ug13.cpp
    engines/bladerunner/script/scene/ug14.cpp
    engines/bladerunner/script/scene/ug15.cpp
    engines/bladerunner/script/scene/ug16.cpp
    engines/bladerunner/script/scene/ug17.cpp
    engines/bladerunner/script/scene/ug18.cpp
    engines/bladerunner/script/scene/ug19.cpp
    engines/bladerunner/script/script.cpp
    engines/bladerunner/script/script.h
    engines/bladerunner/script/vk.cpp
    engines/bladerunner/suspects_database.cpp
    engines/bladerunner/suspects_database.h
    engines/bladerunner/text_resource.cpp


diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index f783791..fa9e2c3 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -122,9 +122,9 @@ void Actor::setup(int actorId) {
 	_animationMode = -1;
 	_screenRectangle = Common::Rect(-1, -1, -1, -1);
 
-	_combatAnimationMode = 4;
-	_unknown1 = 7;
-	_unknown2 = 8;
+	_animationModeCombatIdle = kAnimationModeCombatIdle;
+	_animationModeCombatWalk = kAnimationModeCombatWalk;
+	_animationModeCombatRun = kAnimationModeCombatRun;
 
 	int actorCount = (int)_vm->_gameInfo->getActorCount();
 	for (int i = 0; i != actorCount; ++i)
@@ -138,8 +138,9 @@ void Actor::setup(int actorId) {
 }
 
 void Actor::changeAnimationMode(int animationMode, bool force) {
-	if (force)
+	if (force) {
 		_animationMode = -1;
+	}
 
 	if (animationMode != _animationMode) {
 		_vm->_aiScripts->ChangeAnimationMode(_id, animationMode);
@@ -276,7 +277,7 @@ void Actor::movementTrackNext(bool omitAiScript) {
 				delay = 1;
 			}
 			if (delay > 1) {
-				changeAnimationMode(0, false);
+				changeAnimationMode(kAnimationModeIdle, false);
 			}
 			countdownTimerStart(3, delay);
 		}
@@ -321,7 +322,7 @@ void Actor::movementTrackWaypointReached() {
 			if (_vm->_aiScripts->ReachedMovementTrackWaypoint(_id, _movementTrackWalkingToWaypointId)) {
 				seconds = _movementTrackDelayOnNextWaypoint;
 				if (seconds > 1) {
-					changeAnimationMode(0, false);
+					changeAnimationMode(kAnimationModeIdle, false);
 					seconds = _movementTrackDelayOnNextWaypoint; // todo: analyze if movement is changed in some aiscript->ChangeAnimationMode?
 				}
 				countdownTimerStart(3, seconds);
@@ -577,19 +578,19 @@ bool Actor::tick(bool forceDraw, Common::Rect *screenRect) {
 			this->_targetFacing = -1;
 
 			bool walked = _walkInfo->tick(_id, -positionChange.y, false);
+
 			Vector3 pos;
 			int facing;
 			_walkInfo->getCurrentPosition(_id, &pos, &facing);
-
 			setAtXYZ(pos, facing, false, this->_isMoving, false);
 			if (walked) {
-				_vm->_actors[_id]->changeAnimationMode(0);
+				_vm->_actors[_id]->changeAnimationMode(kAnimationModeIdle);
 
 				this->movementTrackWaypointReached();
 				if (this->inCombat()) {
-					this->changeAnimationMode(this->_combatAnimationMode, false);
+					this->changeAnimationMode(this->_animationModeCombatIdle, false);
 				} else {
-					this->changeAnimationMode(0, false);
+					this->changeAnimationMode(kAnimationModeIdle, false);
 				}
 			}
 		} else {
@@ -784,11 +785,11 @@ void Actor::stopWalking(bool value) {
 	}
 
 	if (isWalking()) {
-		_walkInfo->stop(_id, true, _combatAnimationMode, 0);
+		_walkInfo->stop(_id, true, _animationModeCombatIdle, 0);
 	} else if (inCombat()) {
-		changeAnimationMode(_combatAnimationMode, false);
+		changeAnimationMode(_animationModeCombatIdle, false);
 	} else {
-		changeAnimationMode(0, false);
+		changeAnimationMode(kAnimationModeIdle, false);
 	}
 }
 
@@ -952,15 +953,15 @@ void Actor::setHealth(int hp, int maxHp) {
 	}
 }
 
-void Actor::combatModeOn(int a2, int a3, int otherActorId, int a5, int combatAnimationMode, int a7, int a8, int a9, int a10, int a11, int ammoDamage, int a13, int a14) {
-	_combatAnimationMode = combatAnimationMode;
-	_unknown1 = a7;
-	_unknown2 = a8;
+void Actor::combatModeOn(int a2, int a3, int otherActorId, int a5, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int a9, int a10, int a11, int ammoDamage, int a13, int a14) {
+	_animationModeCombatIdle = animationModeCombatIdle;
+	_animationModeCombatWalk = animationModeCombatWalk;
+	_animationModeCombatRun = animationModeCombatRun;
 	_inCombat = true;
 	if (_id > 0)
 		_combatInfo->combatOn(_id, a2, a3, otherActorId, a5, a9, a10, a11, ammoDamage, a13, a14);
 	stopWalking(false);
-	changeAnimationMode(_combatAnimationMode, false);
+	changeAnimationMode(_animationModeCombatIdle, false);
 	int i;
 	for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
 		Actor *otherActor = _vm->_actors[i];
@@ -975,7 +976,7 @@ void Actor::combatModeOff() {
 		_combatInfo->combatOff();
 	_inCombat = false;
 	stopWalking(false);
-	changeAnimationMode(0, false);
+	changeAnimationMode(kAnimationModeIdle, false);
 	int i;
 	for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
 		Actor *otherActor = _vm->_actors[i];
diff --git a/engines/bladerunner/actor.h b/engines/bladerunner/actor.h
index 40bcae5..ecbddfe 100644
--- a/engines/bladerunner/actor.h
+++ b/engines/bladerunner/actor.h
@@ -92,7 +92,9 @@ private:
 	int _width;
 	int _height;
 	int _animationMode;
-	int _combatAnimationMode;
+	int _animationModeCombatIdle;
+	int _animationModeCombatWalk;
+	int _animationModeCombatRun;
 	int _fps;
 	int _frame_ms;
 	int _animationId;
@@ -106,9 +108,6 @@ private:
 
 	float _scale;
 
-	int _unknown1;
-	int _unknown2;
-
 	Vector3 _actorSpeed;
 
 public:
diff --git a/engines/bladerunner/actor_clues.cpp b/engines/bladerunner/actor_clues.cpp
index f9a4389..f6b0848 100644
--- a/engines/bladerunner/actor_clues.cpp
+++ b/engines/bladerunner/actor_clues.cpp
@@ -92,7 +92,6 @@ bool ActorClues::isAcquired(int clueId) {
 	if (clueIndex == -1) {
 		return false;
 	}
-
 	return _clues[clueIndex]._flags & 0x01;
 }
 
diff --git a/engines/bladerunner/actor_walk.cpp b/engines/bladerunner/actor_walk.cpp
index 6287ac8..54f6c2d 100644
--- a/engines/bladerunner/actor_walk.cpp
+++ b/engines/bladerunner/actor_walk.cpp
@@ -30,7 +30,6 @@
 #include "bladerunner/scene_objects.h"
 #include "bladerunner/set.h"
 
-
 namespace BladeRunner {
 
 ActorWalk::ActorWalk(BladeRunnerEngine *vm) {
@@ -79,9 +78,9 @@ bool ActorWalk::setup(int actorId, bool run, const Vector3 &from, const Vector3
 
 	int animationMode;
 	if (_vm->_actors[actorId]->inCombat()) {
-		animationMode = run ? 8 : 7;
+		animationMode = run ? kAnimationModeCombatRun : kAnimationModeCombatWalk;
 	} else {
-		animationMode = run ? 2 : 1;
+		animationMode = run ? kAnimationModeRun : kAnimationModeWalk;
 	}
 
 	_vm->_actors[actorId]->changeAnimationMode(animationMode);
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index ec54a7c..b3885e8 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -268,8 +268,8 @@ bool BladeRunnerEngine::startup(bool hasSavegames) {
 	if (!_textKIA->open("KIA"))
 		return false;
 
-	_textSpindest = new TextResource(this);
-	if (!_textSpindest->open("SPINDEST"))
+	_textSpinnerDestinations = new TextResource(this);
+	if (!_textSpinnerDestinations->open("SPINDEST"))
 		return false;
 
 	_textVK = new TextResource(this);
@@ -351,7 +351,7 @@ void BladeRunnerEngine::initChapterAndScene() {
 	}
 
 	for (int i = 0, end = _gameInfo->getActorCount(); i != end; ++i) {
-		_actors[i]->changeAnimationMode(0);
+		_actors[i]->changeAnimationMode(kAnimationModeIdle);
 	}
 
 	for (int i = 1, end = _gameInfo->getActorCount(); i != end; ++i) { // skip first actor, probably player
@@ -410,8 +410,8 @@ void BladeRunnerEngine::shutdown() {
 	delete _textKIA;
 	_textKIA = nullptr;
 
-	delete _textSpindest;
-	_textSpindest = nullptr;
+	delete _textSpinnerDestinations;
+	_textSpinnerDestinations = nullptr;
 
 	delete _textVK;
 	_textVK = nullptr;
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index fd62f35..3fc8a23 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -36,6 +36,15 @@
 
 namespace BladeRunner {
 
+enum AnimationModes : int {
+	kAnimationModeIdle = 0,
+	kAnimationModeWalk = 1,
+	kAnimationModeRun = 2,
+	kAnimationModeCombatIdle = 4,
+	kAnimationModeCombatWalk = 7,
+	kAnimationModeCombatRun = 8
+};
+
 class Actor;
 class ADQ;
 class AIScripts;
@@ -105,7 +114,7 @@ public:
 	TextResource    *_textCrimes;
 	TextResource    *_textCluetype;
 	TextResource    *_textKIA;
-	TextResource    *_textSpindest;
+	TextResource    *_textSpinnerDestinations;
 	TextResource    *_textVK;
 	TextResource    *_textOptions;
 
diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp
index 7564faa..79ea2ad 100644
--- a/engines/bladerunner/combat.cpp
+++ b/engines/bladerunner/combat.cpp
@@ -50,7 +50,7 @@ Combat::~Combat() {
 
 void Combat::activate() {
 	if(_enabled) {
-		_vm->_playerActor->combatModeOn(-1, -1, -1, -1, 4, 7, 8, -1, -1, -1, _vm->_combat->_ammoDamage[_vm->_settings->getAmmoType()], 0, 0);
+		_vm->_playerActor->combatModeOn(-1, -1, -1, -1, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, _vm->_combat->_ammoDamage[_vm->_settings->getAmmoType()], 0, 0);
 		_active = true;
 	}
 }
diff --git a/engines/bladerunner/crimes_database.cpp b/engines/bladerunner/crimes_database.cpp
index c142a05..0caa683 100644
--- a/engines/bladerunner/crimes_database.cpp
+++ b/engines/bladerunner/crimes_database.cpp
@@ -49,24 +49,24 @@ CrimesDatabase::~CrimesDatabase() {
 	delete[] _crimes;
 }
 
-void CrimesDatabase::setCrime(int crimeId, int value) {
-	_crimes[crimeId] = value;
+void CrimesDatabase::setCrime(int clueId, int crimeId) {
+	_crimes[clueId] = crimeId;
 }
 
-int CrimesDatabase::getCrime(int crimeId) {
-	return _crimes[crimeId];
+int CrimesDatabase::getCrime(int clueId) {
+	return _crimes[clueId];
 }
 
-void CrimesDatabase::setAssetType(int assetId, int assetType) {
-	_assetTypes[assetId] = assetType;
+void CrimesDatabase::setAssetType(int clueId, int assetType) {
+	_assetTypes[clueId] = assetType;
 }
 
-int CrimesDatabase::getAssetType(int assetId) {
-	return _assetTypes[assetId];
+int CrimesDatabase::getAssetType(int clueId) {
+	return _assetTypes[clueId];
 }
 
-const char *CrimesDatabase::getClueText(int id) {
-	return _cluesText->getText(id);
+const char *CrimesDatabase::getClueText(int clueId) {
+	return _cluesText->getText(clueId);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/crimes_database.h b/engines/bladerunner/crimes_database.h
index fc82bf2..830b58d 100644
--- a/engines/bladerunner/crimes_database.h
+++ b/engines/bladerunner/crimes_database.h
@@ -38,13 +38,13 @@ public:
 	CrimesDatabase(BladeRunnerEngine *vm, const char *cluesResource, int crimesCount);
 	~CrimesDatabase();
 
-	void setCrime(int crimeId, int value);
-	int getCrime(int crimeId);
+	void setCrime(int clueId, int crimeId);
+	int getCrime(int clueId);
 
-	void setAssetType(int assetId, int assetType);
-	int getAssetType(int assetId);
+	void setAssetType(int clueId, int assetType);
+	int getAssetType(int clueId);
 
-	const char *getClueText(int id);
+	const char *getClueText(int clueId);
 };
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index 408d5ae..ec861fc 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -46,7 +46,7 @@ MODULE_OBJS = \
 	script/ai.o \
 	script/ai/mccoy.o \
 	script/ai/runciter.o \
-	script/ai/officer_leroy.o \
+	script/ai/officer_leary.o \
 	script/scene.o \
 	script/scene/ar01.o \
 	script/scene/ar02.o \
diff --git a/engines/bladerunner/script/ai.cpp b/engines/bladerunner/script/ai.cpp
index d51200d..57ef099 100644
--- a/engines/bladerunner/script/ai.cpp
+++ b/engines/bladerunner/script/ai.cpp
@@ -37,9 +37,9 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorsCount) : _vm(vm), _inScrip
 		_actorUpdating[i] = false;
 	}
 
-	_AIScripts[0]  = new AIScriptMcCoy(_vm);
-	_AIScripts[15] = new AIScriptRunciter(_vm);
-	_AIScripts[23] = new AIScriptOfficerLeroy(_vm);
+	_AIScripts[kActorMcCoy]  = new AIScriptMcCoy(_vm);
+	_AIScripts[kActorRunciter] = new AIScriptRunciter(_vm);
+	_AIScripts[kActorOfficerLeary] = new AIScriptOfficerLeary(_vm);
 }
 
 AIScripts::~AIScripts() {
@@ -53,8 +53,9 @@ AIScripts::~AIScripts() {
 
 void AIScripts::Initialize(int actor) {
 	assert(actor < _actorsCount);
-	if (_AIScripts[actor])
+	if (_AIScripts[actor]) {
 		_AIScripts[actor]->Initialize();
+	}
 }
 
 void AIScripts::Update(int actor) {
diff --git a/engines/bladerunner/script/ai.h b/engines/bladerunner/script/ai.h
index 056b22a..a68820e 100644
--- a/engines/bladerunner/script/ai.h
+++ b/engines/bladerunner/script/ai.h
@@ -127,7 +127,7 @@ DECLARE_SCRIPT(Runciter)
 	int var_45CD88;
 END_SCRIPT
 
-DECLARE_SCRIPT(OfficerLeroy)
+DECLARE_SCRIPT(OfficerLeary)
 	int var_45D5B0_animation_state;
 	int var_45D5B4_animation_frame;
 	int var_45D5B8;
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index fb9561c..bda6b09 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -38,7 +38,7 @@ void AIScriptMcCoy::Initialize() {
 	dword_45A0F8 = -1;
 	dword_45A0FC = 0;
 	off_45A100 = 0;
-	Actor_Set_Goal_Number(0, 0);
+	Actor_Set_Goal_Number(kActorMcCoy, 0);
 }
 
 bool AIScriptMcCoy::Update() {
@@ -46,26 +46,26 @@ bool AIScriptMcCoy::Update() {
 		Sound_Play(dword_45A0F8, 100, 0, 0, 50);
 		dword_45A0F8 = -1;
 	}
-	switch (Actor_Query_Goal_Number(0)) {
+	switch (Actor_Query_Goal_Number(kActorMcCoy)) {
 	case 101:
-		Actor_Set_Goal_Number(0, 102);
+		Actor_Set_Goal_Number(kActorMcCoy, 102);
 		return true;
 	case 102:
-		if (Actor_Query_Inch_Distance_From_Waypoint(0, 316) < 36 && !Game_Flag_Query(375)) {
-			Actor_Change_Animation_Mode(0, 21);
+		if (Actor_Query_Inch_Distance_From_Waypoint(kActorMcCoy, 316) < 36 && !Game_Flag_Query(375)) {
+			Actor_Change_Animation_Mode(kActorMcCoy, 21);
 			Game_Flag_Set(375);
 		}
-		if (Actor_Query_Inch_Distance_From_Waypoint(0, 316) < 4) {
-			Actor_Set_Goal_Number(0, 103);
+		if (Actor_Query_Inch_Distance_From_Waypoint(kActorMcCoy, 316) < 4) {
+			Actor_Set_Goal_Number(kActorMcCoy, 103);
 		}
 		return true;
 	case 201:
-		Actor_Set_Goal_Number(0, 0);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
 		if (Player_Query_Current_Set() == 55) {
-			Loop_Actor_Walk_To_XYZ(0, -166.0f, -70.19f, -501.0f, 0, 0, false, 0);
-			Actor_Face_Heading(0, 300, false);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -166.0f, -70.19f, -501.0f, 0, 0, false, 0);
+			Actor_Face_Heading(kActorMcCoy, 300, false);
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, -461.0f, 0.0f, -373.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -461.0f, 0.0f, -373.0f, 0, 0, false, 0);
 		}
 		Player_Gains_Control();
 		return true;
@@ -77,15 +77,15 @@ bool AIScriptMcCoy::Update() {
 		}
 		break;
 	case 221:
-		Actor_Set_Goal_Number(0, 0);
-		Actor_Set_Goal_Number(18, 212);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
+		Actor_Set_Goal_Number(kActorEarlyQ, 212);
 		return true;
 	case 309:
 		sub_4053E0();
 		break;
 	case 391:
-		Actor_Retired_Here(0, 12, 48, 1, -1);
-		Actor_Set_Goal_Number(0, 599);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorMcCoy, 599);
 		break;
 	case 231:
 		sub_4053E0();
@@ -153,9 +153,9 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		Global_Variable_Increment(48, 1);
 		break;
 	}
-	if (Global_Variable_Query(49) > 6 && Global_Variable_Query(1) > 3 && !Actor_Clue_Query(0, 126)) {
+	if (Global_Variable_Query(49) > 6 && Global_Variable_Query(1) > 3 && !Actor_Clue_Query(kActorMcCoy, kClueGuzzaFramedMcCoy)) {
 		Delay(500);
-		Actor_Voice_Over(3320, 99);
+		Actor_Voice_Over(3320, kActorVoiceOver);
 		switch (clueId) {
 		case 66:
 		case 80:
@@ -163,40 +163,40 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		case 83:
 		case 121:
 		case 128:
-			Actor_Voice_Over(3340, 99);
-			Actor_Voice_Over(3350, 99);
-			Actor_Voice_Over(3360, 99);
-			Actor_Voice_Over(3370, 99);
-			Actor_Voice_Over(3380, 99);
+			Actor_Voice_Over(3340, kActorVoiceOver);
+			Actor_Voice_Over(3350, kActorVoiceOver);
+			Actor_Voice_Over(3360, kActorVoiceOver);
+			Actor_Voice_Over(3370, kActorVoiceOver);
+			Actor_Voice_Over(3380, kActorVoiceOver);
 			break;
 		case 124:
-			Actor_Voice_Over(3330, 99);
+			Actor_Voice_Over(3330, kActorVoiceOver);
 			break;
 		case 120:
-			Actor_Voice_Over(3390, 99);
-			Actor_Voice_Over(3400, 99);
-			Actor_Voice_Over(3420, 99);
+			Actor_Voice_Over(3390, kActorVoiceOver);
+			Actor_Voice_Over(3400, kActorVoiceOver);
+			Actor_Voice_Over(3420, kActorVoiceOver);
 			break;
 		}
-		Actor_Clue_Acquire(0, 126, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzaFramedMcCoy, 1, -1);
 		if (clueId == 125) {
-			Actor_Voice_Over(2780, 99);
-			Actor_Voice_Over(2800, 99);
-			Actor_Voice_Over(2810, 99);
-		} else if (Actor_Clue_Query(0, 125)) {
-			Actor_Voice_Over(3430, 99);
-			Actor_Voice_Over(3440, 99);
-			Actor_Voice_Over(3450, 99);
-			Actor_Voice_Over(3460, 99);
-			Actor_Voice_Over(3470, 99);
-			Actor_Voice_Over(3480, 99);
-			Actor_Voice_Over(3490, 99);
-			Actor_Voice_Over(3500, 99);
+			Actor_Voice_Over(2780, kActorVoiceOver);
+			Actor_Voice_Over(2800, kActorVoiceOver);
+			Actor_Voice_Over(2810, kActorVoiceOver);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueFolder)) {
+			Actor_Voice_Over(3430, kActorVoiceOver);
+			Actor_Voice_Over(3440, kActorVoiceOver);
+			Actor_Voice_Over(3450, kActorVoiceOver);
+			Actor_Voice_Over(3460, kActorVoiceOver);
+			Actor_Voice_Over(3470, kActorVoiceOver);
+			Actor_Voice_Over(3480, kActorVoiceOver);
+			Actor_Voice_Over(3490, kActorVoiceOver);
+			Actor_Voice_Over(3500, kActorVoiceOver);
 		} else {
-			Actor_Voice_Over(3510, 99);
-			Actor_Voice_Over(3520, 99);
-			Actor_Voice_Over(3530, 99);
-			Actor_Voice_Over(3540, 99);
+			Actor_Voice_Over(3510, kActorVoiceOver);
+			Actor_Voice_Over(3520, kActorVoiceOver);
+			Actor_Voice_Over(3530, kActorVoiceOver);
+			Actor_Voice_Over(3540, kActorVoiceOver);
 		}
 	}
 }
@@ -223,24 +223,24 @@ void AIScriptMcCoy::ShotAtAndHit() {
 }
 
 void AIScriptMcCoy::Retired(int byActorId) {
-	if (byActorId == 1 && Actor_Query_In_Set(1, 42)) {
-		if (Actor_Query_In_Set(3, 42) && Actor_Query_Goal_Number(3) != 599) {
-			Non_Player_Actor_Combat_Mode_On(1, 3, 1, 3, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
-		} else if (Actor_Query_In_Set(6, 42) && Actor_Query_Goal_Number(6) != 599) {
-			Non_Player_Actor_Combat_Mode_On(1, 3, 1, 6, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (byActorId == kActorSteele && Actor_Query_In_Set(kActorSteele, 42)) {
+		if (Actor_Query_In_Set(kActorDektora, 42) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+			Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, kActorDektora, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+		} else if (Actor_Query_In_Set(kActorLucy, 42) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+			Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, kActorLucy, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 		}
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(23, 41) && Actor_Query_In_Set(3, 41) && Actor_Query_Goal_Number(3) != 599) {
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 3, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerLeary, 41) && Actor_Query_In_Set(kActorDektora, 41) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorDektora, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(24, 41) && Actor_Query_In_Set(3, 41) && Actor_Query_Goal_Number(3) != 599) {
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 3, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerGrayford, 41) && Actor_Query_In_Set(kActorDektora, 41) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorDektora, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(23, 41) && Actor_Query_In_Set(6, 41) && Actor_Query_Goal_Number(6) != 599) {
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 6, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerLeary, 41) && Actor_Query_In_Set(kActorLucy, 41) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorLucy, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(24, 41) && Actor_Query_In_Set(6, 41) && Actor_Query_Goal_Number(6) != 599) {
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 6, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerGrayford, 41) && Actor_Query_In_Set(kActorLucy, 41) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorLucy, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
 }
 
@@ -262,26 +262,26 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		sub_405920();
 		return true;
 	case 100:
-		Actor_Set_At_Waypoint(0, 315, 263);
+		Actor_Set_At_Waypoint(kActorMcCoy, 315, 263);
 		dword_45A0D0_animation_state = 53;
 		dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		return true;
 	case 102:
-		Async_Actor_Walk_To_Waypoint(0, 316, 0, 1);
+		Async_Actor_Walk_To_Waypoint(kActorMcCoy, 316, 0, 1);
 		return true;
 	case 103:
-		Actor_Face_Actor(0, 8, true);
+		Actor_Face_Actor(kActorMcCoy, kActorSadik, true);
 		return true;
 	case 231:
 		Player_Set_Combat_Mode(false);
 		Preload(18);
 		Set_Enter(59, 63);
 		Player_Loses_Control();
-		Actor_Force_Stop_Walking(0);
-		Actor_Put_In_Set(0, 59);
-		Actor_Set_At_XYZ(0, 14.0f, 110.84f, -300.0f, 926);
-		Actor_Change_Animation_Mode(0, 48);
+		Actor_Force_Stop_Walking(kActorMcCoy);
+		Actor_Put_In_Set(kActorMcCoy, 59);
+		Actor_Set_At_XYZ(kActorMcCoy, 14.0f, 110.84f, -300.0f, 926);
+		Actor_Change_Animation_Mode(kActorMcCoy, 48);
 		dword_45A0D0_animation_state = 27;
 		dword_45A0D4_animation_frame = 0;
 		flt_462714 = 2.84f;
@@ -289,11 +289,11 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		off_45A100 = -6.0f;
 		return true;
 	case 230:
-		dword_45A0FC = Actor_Query_Goal_Number(1) == 215;
-		Actor_Change_Animation_Mode(0, 6);
+		dword_45A0FC = Actor_Query_Goal_Number(kActorSteele) == 215;
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		return true;
 	case 220:
-		Actor_Change_Animation_Mode(0, 75);
+		Actor_Change_Animation_Mode(kActorMcCoy, 75);
 		return true;
 	case 212:
 		Global_Variable_Set(47, 0);
@@ -304,33 +304,33 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
 		return true;
 	case 211:
-		Actor_Face_Heading(0, 512, false);
-		Actor_Face_Heading(0, 768, true);
+		Actor_Face_Heading(kActorMcCoy, 512, false);
+		Actor_Face_Heading(kActorMcCoy, 768, true);
 		if (Random_Query(0, 1)) {
-			Actor_Change_Animation_Mode(0, 18);
+			Actor_Change_Animation_Mode(kActorMcCoy, 18);
 		} else {
-			Actor_Change_Animation_Mode(0, 16);
+			Actor_Change_Animation_Mode(kActorMcCoy, 16);
 		}
 		Delay(150);
-		Actor_Change_Animation_Mode(0, 0);
-		Actor_Set_Goal_Number(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
 		Player_Gains_Control();
 		return true;
 	case 210:
-		Actor_Put_In_Set(0, 54);
-		Actor_Set_At_XYZ(0, -204.0, 24.0, -817.0, 256);
-		Actor_Set_Invisible(0, false);
+		Actor_Put_In_Set(kActorMcCoy, 54);
+		Actor_Set_At_XYZ(kActorMcCoy, -204.0, 24.0, -817.0, 256);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		if (Game_Flag_Query(627)) {
-			Actor_Set_Goal_Number(0, 212);
+			Actor_Set_Goal_Number(kActorMcCoy, 212);
 		} else {
 			dword_45A0D0_animation_state = 53;
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
-			Actor_Set_Invisible(0, false);
+			Actor_Set_Invisible(kActorMcCoy, false);
 		}
 		return true;
 	case 200:
 		Player_Loses_Control();
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		return true;
 	case 301:
 		dword_45A0D0_animation_state = 62;
@@ -350,39 +350,39 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Sound_Play(403, 30, 0, 0, 50);
 		Delay(1000);
 		Sound_Play(123, 50, 0, 0, 50);
-		Actor_Says(4, 1380, 3);
-		Actor_Says(0, 6610, 13);
-		Actor_Says(4, 1390, 3);
-		Actor_Says(0, 6615, 18);
-		Actor_Says(4, 1420, 3);
-		Actor_Says(0, 6625, 11);
-		Actor_Says(4, 1430, 3);
-		Actor_Says(0, 6630, 12);
-		Actor_Says(0, 6635, 17);
-		Actor_Says(0, 6640, 13);
-		Actor_Says(0, 6645, 19);
-		Actor_Says(0, 6650, 18);
-		Actor_Says(0, 6655, 11);
-		Actor_Says(4, 1440, 3);
-		Actor_Says(0, 6660, 17);
-		Actor_Says(0, 6665, 13);
+		Actor_Says(kActorGuzza, 1380, 3);
+		Actor_Says(kActorMcCoy, 6610, 13);
+		Actor_Says(kActorGuzza, 1390, 3);
+		Actor_Says(kActorMcCoy, 6615, 18);
+		Actor_Says(kActorGuzza, 1420, 3);
+		Actor_Says(kActorMcCoy, 6625, 11);
+		Actor_Says(kActorGuzza, 1430, 3);
+		Actor_Says(kActorMcCoy, 6630, 12);
+		Actor_Says(kActorMcCoy, 6635, 17);
+		Actor_Says(kActorMcCoy, 6640, 13);
+		Actor_Says(kActorMcCoy, 6645, 19);
+		Actor_Says(kActorMcCoy, 6650, 18);
+		Actor_Says(kActorMcCoy, 6655, 11);
+		Actor_Says(kActorGuzza, 1440, 3);
+		Actor_Says(kActorMcCoy, 6660, 17);
+		Actor_Says(kActorMcCoy, 6665, 13);
 		Delay(1000);
-		Actor_Says(4, 1450, 3);
-		Actor_Says(0, 6670, 14);
-		Actor_Says(0, 6675, 11);
-		Actor_Says(4, 1460, 3);
-		Actor_Says(0, 6680, 12);
-		Actor_Says(4, 1470, 3);
-		Actor_Says(0, 6685, 13);
+		Actor_Says(kActorGuzza, 1450, 3);
+		Actor_Says(kActorMcCoy, 6670, 14);
+		Actor_Says(kActorMcCoy, 6675, 11);
+		Actor_Says(kActorGuzza, 1460, 3);
+		Actor_Says(kActorMcCoy, 6680, 12);
+		Actor_Says(kActorGuzza, 1470, 3);
+		Actor_Says(kActorMcCoy, 6685, 13);
 		Delay(500);
-		Actor_Says(0, 6695, 16);
-		Actor_Says(0, 6700, 17);
-		Actor_Says(4, 1480, 3);
-		Actor_Says(0, 6705, 11);
+		Actor_Says(kActorMcCoy, 6695, 16);
+		Actor_Says(kActorMcCoy, 6700, 17);
+		Actor_Says(kActorGuzza, 1480, 3);
+		Actor_Says(kActorMcCoy, 6705, 11);
 		Sound_Play(123, 50, 0, 0, 50);
 		return true;
 	case 390:
-		Actor_Force_Stop_Walking(0);
+		Actor_Force_Stop_Walking(kActorMcCoy);
 		Player_Loses_Control();
 		flt_462710 = 48.07f;
 		off_45A100 = -4.0f;
@@ -393,22 +393,22 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		}
 		return true;
 	case 400:
-		Actor_Set_Health(0, 50, 50);
+		Actor_Set_Health(kActorMcCoy, 50, 50);
 		Game_Flag_Set(373);
 		v5 = Global_Variable_Query(45);
 		if (v5 == 1) {
-			Actor_Modify_Friendliness_To_Other(1, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		} else if (v5 == 2) {
-			Actor_Modify_Friendliness_To_Other(1, 0, -5);
-			Actor_Modify_Friendliness_To_Other(5, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
 		} else if (v5 == 3) {
-			Actor_Modify_Friendliness_To_Other(1, 0, -5);
-			Actor_Modify_Friendliness_To_Other(5, 0, 5);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 5);
 		}
 		if (Game_Flag_Query(666)) {
-			Actor_Modify_Friendliness_To_Other(1, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		}
-		if (Actor_Query_Friendliness_To_Other(1, 0) < Actor_Query_Friendliness_To_Other(5, 0)) {
+		if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) < Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy)) {
 			Game_Flag_Set(653);
 		}
 		v7 = Global_Variable_Query(45);
@@ -438,7 +438,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 500:
 		Music_Stop(3);
 		Player_Set_Combat_Mode(false);
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		dword_45A0D0_animation_state = 0;
 		dword_45A0D4_animation_frame = 0;
 		Game_Flag_Set(465);
@@ -455,7 +455,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 52;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(52)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
@@ -473,7 +473,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 50;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(50)) {
-			Actor_Change_Animation_Mode(0, 53);
+			Actor_Change_Animation_Mode(kActorMcCoy, 53);
 			*animation = 51;
 		}
 		break;
@@ -486,26 +486,26 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame--;
 		}
 		if (dword_45A0D4_animation_frame <= 0) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D0_animation_state = 0;
 			dword_45A0D4_animation_frame = 0;
 			Game_Flag_Reset(627);
 			Scene_Exits_Enable();
 			Player_Set_Combat_Mode_Access(true);
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 		}
 		break;
 	case 67:
 		*animation = 53;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(53)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D0_animation_state = 0;
 			dword_45A0D4_animation_frame = 0;
-			if (Actor_Query_Goal_Number(0) == 220) {
-				Actor_Change_Animation_Mode(0, 48);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 220) {
+				Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			}
 		}
 		break;
@@ -513,7 +513,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 40;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(40)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
@@ -526,7 +526,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 		}
 		break;
 	case 64:
@@ -561,8 +561,8 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			if (Actor_Query_Goal_Number(0) == 200) {
-				Actor_Set_Goal_Number(0, 201);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 200) {
+				Actor_Set_Goal_Number(kActorMcCoy, 201);
 			}
 		}
 		break;
@@ -620,12 +620,12 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(49)) {
 			dword_45A0D4_animation_frame = 0;
-			if (Actor_Query_Which_Set_In(0) == 87) {
+			if (Actor_Query_Which_Set_In(kActorMcCoy) == 87) {
 				dword_45A0D0_animation_state = 27;
 			} else {
 				*animation = 19;
 				dword_45A0D0_animation_state = 0;
-				Actor_Change_Animation_Mode(0, 0);
+				Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			}
 		}
 		break;
@@ -633,7 +633,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 32;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame == 7) {
-			Actor_Change_Animation_Mode(66, 52);
+			Actor_Change_Animation_Mode(kActorMaggie, 52);
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 19;
@@ -644,15 +644,15 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 18;
 		dword_45A0D4_animation_frame--;
 		if (dword_45A0D4_animation_frame <= 0) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			if (Actor_Query_Goal_Number(0) == 100) {
-				Actor_Set_Goal_Number(0, 101);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 100) {
+				Actor_Set_Goal_Number(kActorMcCoy, 101);
 			}
-			if (Actor_Query_Goal_Number(0) == 210) {
-				Actor_Set_Goal_Number(0, 211);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 210) {
+				Actor_Set_Goal_Number(kActorMcCoy, 211);
 			}
 		}
 		break;
@@ -670,7 +670,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(28)) {
 			Player_Set_Combat_Mode(true);
 			sub_405800();
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			dword_45A0D4_animation_frame = 0;
 			Player_Gains_Control();
 		}
@@ -683,7 +683,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 34;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(34)) {
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			sub_405660();
@@ -708,7 +708,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		break;
 	case 46:
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		*animation = 36;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(36)) {
@@ -716,14 +716,14 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			Player_Gains_Control();
 			sub_405660();
-			Actor_Face_Heading(0, (Actor_Query_Facing_1024(0) + 512) & 1023, false);
+			Actor_Face_Heading(kActorMcCoy, (Actor_Query_Facing_1024(kActorMcCoy) + 512) & 1023, false);
 		}
 		break;
 	case 45:
 		*animation = 35;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(35)) {
-			Actor_Set_Invisible(0, true);
+			Actor_Set_Invisible(kActorMcCoy, true);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			sub_405660();
@@ -737,7 +737,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(30)) {
 			*animation = 19;
 			sub_405660();
-			Actor_Set_At_XYZ(0, -203.41f, -621.3f, 724.57f, 538);
+			Actor_Set_At_XYZ(kActorMcCoy, -203.41f, -621.3f, 724.57f, 538);
 			Player_Gains_Control();
 		}
 		break;
@@ -749,13 +749,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		switch (dword_45A0D4_animation_frame) {
 		case 9:
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 			break;
 		case 4:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		case 1:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		}
 		break;
@@ -767,13 +767,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		switch (dword_45A0D4_animation_frame) {
 		case 9:
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 			break;
 		case 4:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		case 1:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		}
 		break;
@@ -785,9 +785,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 9) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 4) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(359)) {
 			sub_4059D0(-0.2f);
@@ -801,9 +801,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 8) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 3) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(358)) {
 			sub_405940(0.5f);
@@ -817,9 +817,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 8) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 3) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(359)) {
 			sub_4059D0(-0.2f);
@@ -833,9 +833,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 9) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 4) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(358)) {
 			sub_405940(0.5f);
@@ -848,10 +848,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 4;
 		if (dword_45A0D4_animation_frame == 6) {
-			Sound_Left_Footstep_Run(0);
+			Sound_Left_Footstep_Run(kActorMcCoy);
 		}
 		if (dword_45A0D4_animation_frame == 0) {
-			Sound_Right_Footstep_Run(0);
+			Sound_Right_Footstep_Run(kActorMcCoy);
 		}
 		break;
 	case 36:
@@ -861,10 +861,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 3;
 		if (dword_45A0D4_animation_frame == 15) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		}
 		if (dword_45A0D4_animation_frame == 6) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		break;
 	case 32:
@@ -879,9 +879,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 14;
 		if (dword_45A0D4_animation_frame == 5) {
-			Sound_Left_Footstep_Run(0);
+			Sound_Left_Footstep_Run(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 12) {
-			Sound_Right_Footstep_Run(0);
+			Sound_Right_Footstep_Run(kActorMcCoy);
 		}
 		break;
 	case 30:
@@ -891,9 +891,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 		}
 		if (dword_45A0D4_animation_frame == 2) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 10) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		}
 		break;
 	case 29:
@@ -904,7 +904,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0E0 = 1;
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			*animation = 18;
 			dword_45A0D0_animation_state = 27;
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
@@ -926,8 +926,8 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			dword_45A0D0_animation_state = 50;
 			sub_4054F0();
-			if (Actor_Query_Goal_Number(0) == 220) {
-				Actor_Set_Goal_Number(0, 221);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 220) {
+				Actor_Set_Goal_Number(kActorMcCoy, 221);
 			}
 		}
 		break;
@@ -938,7 +938,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		}
 		break;
 	case 25:
@@ -948,7 +948,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		}
 		break;
 	case 24:
@@ -958,7 +958,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Change_Animation_Mode(0, 4);
+			Actor_Change_Animation_Mode(kActorMcCoy, 4);
 		}
 		break;
 	case 23:
@@ -968,7 +968,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Change_Animation_Mode(0, 4);
+			Actor_Change_Animation_Mode(kActorMcCoy, 4);
 		}
 		break;
 	case 22:
@@ -979,14 +979,14 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 	case 21:
 		*animation = 12;
 		dword_45A0D4_animation_frame++;
-		if (dword_45A0D4_animation_frame == 1 && Actor_Query_Goal_Number(0) == 230 && dword_45A0FC == 1) {
+		if (dword_45A0D4_animation_frame == 1 && Actor_Query_Goal_Number(kActorMcCoy) == 230 && dword_45A0FC == 1) {
 			dword_45A0F8 = 27;
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(12)) {
 			dword_45A0D0_animation_state = 17;
 			dword_45A0D4_animation_frame = 0;
 			*animation = 12;
-			if (Actor_Query_Goal_Number(0) == 230) {
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 230) {
 				dword_45A0D4_animation_frame = 0;
 				dword_45A0D0_animation_state = 21;
 				dword_45A0FC = 1;
@@ -1386,7 +1386,7 @@ bool AIScriptMcCoy::ChangeAnimationMode(int mode) {
 		}
 		return true;
 	case 20:
-		v2 = Actor_Query_Which_Set_In(0);
+		v2 = Actor_Query_Which_Set_In(kActorMcCoy);
 		if (v2 == 27) {
 			dword_45A0D0_animation_state = 51;
 			dword_45A0D4_animation_frame = 0;
@@ -1665,33 +1665,33 @@ void AIScriptMcCoy::FledCombat() {}
 
 void AIScriptMcCoy::sub_4053E0() {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	flt_462710 = flt_462710 + off_45A100;
 	if (flt_462714 < flt_462710) {
 		off_45A100 = off_45A100 - 0.2f;
 	} else {
 		flt_462710 = flt_462714;
-		Actor_Set_Goal_Number(0, 0);
-		Actor_Retired_Here(0, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, -1);
 	}
-	return Actor_Set_At_XYZ(0, x, flt_462710, z, Actor_Query_Facing_1024(0));
+	return Actor_Set_At_XYZ(kActorMcCoy, x, flt_462710, z, Actor_Query_Facing_1024(kActorMcCoy));
 }
 
 void AIScriptMcCoy::sub_4054F0() {
-	if (Actor_Query_Which_Set_In(0) == 87 && Actor_Query_Goal_Number(0) != 390 && !Game_Flag_Query(682)) {
+	if (Actor_Query_Which_Set_In(kActorMcCoy) == 87 && Actor_Query_Goal_Number(kActorMcCoy) != 390 && !Game_Flag_Query(682)) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 		if ((z < 220.0f) && (-210.0f < x) && (-70.0f > x)) {
 			Game_Flag_Set(682);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
-			Actor_Set_Goal_Number(0, 390);
-			Actor_Query_XYZ(64, &x, &y, &z);
+			Actor_Set_Goal_Number(kActorMcCoy, 390);
+			Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
 			if (-200.0 < x && -62.0f > x) {
-				Actor_Set_Goal_Number(64, 309);
+				Actor_Set_Goal_Number(kActorFreeSlotA, 309);
 			}
 		} else {
-			Actor_Set_Goal_Number(0, 391);
+			Actor_Set_Goal_Number(kActorMcCoy, 391);
 		}
 	}
 }
@@ -1801,7 +1801,7 @@ void AIScriptMcCoy::sub_405800() {
 }
 
 void AIScriptMcCoy::sub_4058B0() {
-	int v0 = Actor_Query_Which_Set_In(0);
+	int v0 = Actor_Query_Which_Set_In(kActorMcCoy);
 	if (v0 == 27) {
 		dword_45A0D0_animation_state = 51;
 		dword_45A0D4_animation_frame = 0;
@@ -1820,8 +1820,8 @@ void AIScriptMcCoy::sub_405920() {
 
 void AIScriptMcCoy::sub_405940(float a1) {
 	float x, y, z;
-	int currentAngle = Actor_Query_Facing_1024(0);
-	Actor_Query_XYZ(0, &x, &y, &z);
+	int currentAngle = Actor_Query_Facing_1024(kActorMcCoy);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	int angle = currentAngle - 12;
 	y = y + a1;
 	if (angle < 0) {
@@ -1830,13 +1830,13 @@ void AIScriptMcCoy::sub_405940(float a1) {
 	if (angle > 1023) {
 		angle -= 1024;
 	}
-	Actor_Set_At_XYZ(0, x, y, z, angle);
+	Actor_Set_At_XYZ(kActorMcCoy, x, y, z, angle);
 }
 
 void AIScriptMcCoy::sub_4059D0(float a1) {
 	float x, y, z;
-	int currentAngle = Actor_Query_Facing_1024(0);
-	Actor_Query_XYZ(0, &x, &y, &z);
+	int currentAngle = Actor_Query_Facing_1024(kActorMcCoy);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	int angle = currentAngle + 15;
 	y = y + a1;
 	if (angle < 0) {
@@ -1845,7 +1845,7 @@ void AIScriptMcCoy::sub_4059D0(float a1) {
 	if (angle > 1023) {
 		angle -= 1024;
 	}
-	return Actor_Set_At_XYZ(0, x, y, z, angle);
+	return Actor_Set_At_XYZ(kActorMcCoy, x, y, z, angle);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai/officer_leary.cpp b/engines/bladerunner/script/ai/officer_leary.cpp
new file mode 100644
index 0000000..5c48d06
--- /dev/null
+++ b/engines/bladerunner/script/ai/officer_leary.cpp
@@ -0,0 +1,1205 @@
+/* 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.h"
+
+namespace BladeRunner {
+
+void AIScriptOfficerLeary::Initialize() {
+	var_45D5B0_animation_state = 0;
+	var_45D5B4_animation_frame = 0;
+	var_462880 = 0;
+	var_45D5B8 = 0;
+	var_45D5BC = 0;
+
+	Actor_Put_In_Set(kActorOfficerLeary, 69);
+	Actor_Set_At_XYZ(kActorOfficerLeary, -261.80f, 6.00f, 79.58f, 512);
+	Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+	Actor_Set_Frame_Rate_FPS(kActorOfficerLeary, 8);
+}
+
+bool AIScriptOfficerLeary::Update() {
+	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(kActorOfficerLeary) < 300) {
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 300);
+	} else if (Global_Variable_Query(1) == 5 && Actor_Query_Goal_Number(kActorOfficerLeary) < 400) {
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 400);
+	} else if (!Game_Flag_Query(182) && Game_Flag_Query(147) == 1 && Game_Flag_Query(163) == 1 && Player_Query_Current_Scene() != 78 && Global_Variable_Query(1) < 3) {
+		Game_Flag_Set(186);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 3);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) != 1 && Actor_Query_Goal_Number(kActorOfficerLeary) != 2 && Game_Flag_Query(199) == 1) {
+		Game_Flag_Reset(199);
+	} else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(kActorOfficerLeary, kClueMcCoyIsStupid)) {
+		Actor_Clue_Acquire(kActorOfficerLeary, kClueMcCoyIsStupid, 1, -1);
+	} else if (Game_Flag_Query(629) == 1) {
+		Game_Flag_Reset(629);
+	} else if (Game_Flag_Query(623) == 1 && !Game_Flag_Query(664)) {
+		Game_Flag_Set(664);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 310 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) {
+		Non_Player_Actor_Combat_Mode_Off(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 599 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) {
+		Actor_Set_Health(kActorOfficerLeary, 40, 40);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 305) {
+		switch (Actor_Query_Which_Set_In(kActorOfficerLeary)) {
+		case 7:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 20:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 33:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 53:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 54:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 70:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 74:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 77:
+		case 78:
+		case 79:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 81:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 83:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 84:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		case 86:
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			}
+			break;
+		}
+	}
+	return false;
+}
+
+void AIScriptOfficerLeary::TimerExpired(int timer) {
+	if (timer == 1) {
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		if (Actor_Query_In_Set(kActorMcCoy, 41)) {
+			Actor_Set_Goal_Number(kActorOfficerLeary, 430);
+			Actor_Set_Goal_Number(kActorOfficerGrayford, 430);
+		} else {
+			Game_Flag_Set(684);
+		}
+	} else if (timer == 2) {
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 2);
+		sub_431420();
+	}
+}
+
+void AIScriptOfficerLeary::CompletedMovementTrack() {
+	int v0;
+	unsigned int v1;
+
+	v0 = Actor_Query_Goal_Number(kActorOfficerLeary);
+	if (v0 == 1) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 2);
+		return;
+	}
+	//todo: tidyup
+	v1 = v0 - 305;
+	if (v1 > 3) {
+		return;
+	}
+	if (!v1) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 306);
+		return;
+	}
+	if (v1 != 2) {
+		if (v1 == 3) {
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+			Actor_Set_Goal_Number(kActorOfficerLeary, 309);
+		}
+		return;
+	}
+	Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 12, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, -1, -1, 15, 300, 0);
+}
+
+void AIScriptOfficerLeary::ReceivedClue(int clueId, int fromActorId) {
+	if (clueId == 222) {
+		Actor_Modify_Friendliness_To_Other(kActorOfficerLeary, kActorMcCoy, 5);
+	}
+	if (clueId == 215) {
+		Actor_Modify_Friendliness_To_Other(kActorOfficerLeary, kActorMcCoy, -4);
+	}
+}
+
+void AIScriptOfficerLeary::ClickedByPlayer() {}
+
+void AIScriptOfficerLeary::EnteredScene(int sceneId) {}
+
+void AIScriptOfficerLeary::OtherAgentEnteredThisScene(int otherActorId) {}
+
+void AIScriptOfficerLeary::OtherAgentExitedThisScene(int otherActorId) {}
+
+void AIScriptOfficerLeary::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {}
+
+void AIScriptOfficerLeary::ShotAtAndMissed() {}
+
+void AIScriptOfficerLeary::ShotAtAndHit() {
+	if (Actor_Query_Goal_Number(kActorOfficerLeary) == 307) {
+		Actor_Set_Health(kActorOfficerLeary, 50, 50);
+	}
+}
+
+void AIScriptOfficerLeary::Retired(int byActorId) {
+	Actor_Set_Goal_Number(kActorOfficerLeary, 599);
+	Game_Flag_Set(607);
+}
+
+int AIScriptOfficerLeary::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+	if (otherActorId != kActorMcCoy) {
+		return 0;
+	}
+	switch (clueId) {
+	case 242:
+		return -6;
+	case 240:
+		return -2;
+	case 239:
+		return -5;
+	case 228:
+		return 2;
+	case 227:
+		return 4;
+	case 226:
+		return 4;
+	case 225:
+		return 3;
+	case 224:
+		return 3;
+	case 223:
+		return 2;
+	case 222:
+		return 3;
+	case 215:
+		return -5;
+	}
+	return 0;
+}
+
+bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+	switch (newGoalNumber) {
+	case 1:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		if (Random_Query(1, 2) == 1) {
+			AI_Movement_Track_Append(kActorOfficerLeary, 57, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 58, 7);
+		} else {
+			AI_Movement_Track_Append(kActorOfficerLeary, 58, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 57, 7);
+		}
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		return true;
+	case 2:
+		if (Random_Query(1, 3) == 1) {
+			if (Random_Query(1, 2) == 1 && !Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA)) {
+				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewA, 0, -1);
+			} else if (!Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
+				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewB, 0, -1);
+			}
+		}
+		if (Game_Flag_Query(182)) {
+			if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+			} else {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 1);
+			}
+		} else {
+			Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+		}
+		return true;
+	case 3:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 39, Random_Query(120, 240));
+		AI_Movement_Track_Append(kActorOfficerLeary, 35, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		return true;
+	case 99:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		return false;
+	case 102:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 107, 0);
+		AI_Movement_Track_Append(kActorOfficerLeary, 108, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		return true;
+	case 300:
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+		return true;
+	case 305:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		switch (Random_Query(1, 10)) {
+		case 1:
+			AI_Movement_Track_Append(kActorOfficerLeary, 398, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 399, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 400, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 401, 0);
+			AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 402, 3, 276);
+			AI_Movement_Track_Append(kActorOfficerLeary, 403, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 404, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 2:
+			AI_Movement_Track_Append(kActorOfficerLeary, 385, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 242, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 386, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 387, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 3:
+			AI_Movement_Track_Append(kActorOfficerLeary, 390, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 391, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 392, 5);
+			AI_Movement_Track_Append(kActorOfficerLeary, 345, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 393, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 4:
+			AI_Movement_Track_Append(kActorOfficerLeary, 381, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 382, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 383, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 382, 3);
+			AI_Movement_Track_Append(kActorOfficerLeary, 384, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 5:
+			AI_Movement_Track_Append(kActorOfficerLeary, 388, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 389, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 6:
+			AI_Movement_Track_Append(kActorOfficerLeary, 385, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 242, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 386, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 387, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 7:
+			AI_Movement_Track_Append(kActorOfficerLeary, 394, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 395, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 396, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 397, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 396, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 395, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 430, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			break;
+		case 8:
+			switch (Random_Query(1, 7)) {
+			case 1:
+				AI_Movement_Track_Append(kActorOfficerLeary, 302, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 407, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 408, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				break;
+			case 2:
+				AI_Movement_Track_Append(kActorOfficerLeary, 536, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 537, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 538, 1);
+				AI_Movement_Track_Append(kActorOfficerLeary, 537, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 536, 0);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				break;
+			case 3:
+				AI_Movement_Track_Append(kActorOfficerLeary, 296, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 409, 2);
+				AI_Movement_Track_Append(kActorOfficerLeary, 296, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				break;
+			case 4:
+				AI_Movement_Track_Append(kActorOfficerLeary, 411, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 412, 5);
+				AI_Movement_Track_Append(kActorOfficerLeary, 411, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				break;
+			case 5:
+				AI_Movement_Track_Append(kActorOfficerLeary, 413, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 414, 0);
+				AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 431, 0, 1017);
+				AI_Movement_Track_Append(kActorOfficerLeary, 432, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				break;
+			case 6:
+				AI_Movement_Track_Append(kActorOfficerLeary, 415, 0);
+				AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 620);
+				AI_Movement_Track_Append(kActorOfficerLeary, 417, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 418, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				break;
+			case 7:
+				AI_Movement_Track_Append(kActorOfficerLeary, 405, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 406, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				return false;
+			default:
+				return false;
+			}
+			//no break
+		case 9:
+			if (Random_Query(1, 2) - 1 == 1) {
+				AI_Movement_Track_Append(kActorOfficerLeary, 433, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 434, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 435, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
+				return false;
+			}
+			AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 422, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 421, 1);
+			AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 422, 4, 182);
+			AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			//no break
+		case 10:
+			AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 307, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 309, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
+			return false;
+		default:
+			return false;
+		}
+		//no break
+	case 306:
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+		return true;
+	case 307:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 556);
+		Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		return true;
+	case 308:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append_Run_With_Facing(kActorOfficerLeary, 440, 2, 355);
+		AI_Movement_Track_Append_Run_With_Facing(kActorOfficerLeary, 441, 0, 825);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		return true;
+	case 400:
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 35, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
+		return true;
+	case 420:
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 1, 120);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
+		return true;
+	case 425:
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 1, 60);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
+		return true;
+	case 430:
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
+		Actor_Set_Goal_Number(kActorOfficerGrayford, 410);
+		return false;
+	default:
+		return false;
+	}
+}
+
+bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
+	int v57;
+	int a1;
+
+	switch (var_45D5B0_animation_state) {
+	case 32:
+		*animation = 603;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(603)) {
+			*animation = 589;
+			var_45D5B0_animation_state = 0;
+			var_45D5B8 = 0;
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 31:
+		*animation = 604;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(604)) {
+			*animation = 601;
+			var_45D5B0_animation_state = 1;
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 30:
+		*animation = 587;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(587)) {
+			*animation = 589;
+			var_45D5B0_animation_state = 0;
+			var_45D5B4_animation_frame = 0;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 29:
+		*animation = 586;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(586)) {
+			*animation = 589;
+			var_45D5B0_animation_state = 0;
+			var_45D5B4_animation_frame = 0;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 28:
+		*animation = 576;
+		if (var_45D5B4_animation_frame < Slice_Animation_Query_Number_Of_Frames(576) - 1) {
+			++var_45D5B4_animation_frame;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 27:
+		*animation = 588;
+		if (var_45D5B4_animation_frame < Slice_Animation_Query_Number_Of_Frames(588) - 1) {
+			++var_45D5B4_animation_frame;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 26:
+		*animation = 573;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(573)) {
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			*animation = 571;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 25:
+		*animation = 572;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(572)) {
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			*animation = 571;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 24:
+		*animation = 581;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame == 4) {
+			if (Random_Query(1, 2) == 1) {
+				Sound_Play_Speech_Line(kActorOfficerLeary, 9010, 75, 0, 99);
+			} else {
+				Sound_Play_Speech_Line(kActorOfficerLeary, 9015, 75, 0, 99);
+			}
+		}
+		if (var_45D5B4_animation_frame == 5) {
+			Actor_Combat_AI_Hit_Attempt(kActorOfficerLeary);
+		}
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(581)) {
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			*animation = 571;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 23:
+		*animation = 580;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(580)) {
+			*animation = 589;
+			var_45D5B0_animation_state = 0;
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 22:
+		*animation = 579;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(579)) {
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			*animation = 571;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 21:
+		*animation = 571;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(571)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 20:
+		*animation = 571;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame > Slice_Animation_Query_Number_Of_Frames(571) - 1) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 19:
+		*animation = 600;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(600)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 18:
+		*animation = 599;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(599)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 17:
+		*animation = 598;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(598)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 16:
+		*animation = 597;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(597)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 15:
+		*animation = 596;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(596)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 14:
+		*animation = 595;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(595)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 13:
+		*animation = 594;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(594)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 12:
+		*animation = 593;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(593)) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			*animation = 592;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 11:
+		if (var_45D5BC && var_45D5B4_animation_frame <= 2) {
+			var_45D5BC = 0;
+			var_45D5B0_animation_state = 0;
+			var_45D5B4_animation_frame = 0;
+			*animation = 589;
+			var_45D5B8 = Random_Query(0, 1);
+			*frame = var_45D5B4_animation_frame;
+			return true;
+		}
+
+		*animation = 592;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(592)) {
+			var_45D5B4_animation_frame = 0;
+			if (var_45D5BC) {
+				var_45D5BC = 0;
+				var_45D5B0_animation_state = 0;
+				var_45D5B4_animation_frame = 0;
+				*animation = 589;
+				var_45D5B8 = Random_Query(0, 1);
+			} else {
+				var_45D5B0_animation_state = Random_Query(0, 8) + 11;
+			}
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 10:
+		*animation = 578;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(578)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 9:
+		*animation = 577;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(577)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 8:
+		*animation = 575;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(575)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 7:
+		*animation = 574;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(574)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 6:
+		*animation = 585;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(585)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 5:
+		*animation = 584;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(584)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 4:
+		*animation = 583;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(583)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 3:
+		*animation = 582;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(582)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 2:
+		if (Game_Flag_Query(199)) {
+			*animation = 603;
+			var_45D5B4_animation_frame++;
+			if (var_45D5B4_animation_frame > Slice_Animation_Query_Number_Of_Frames(603) - 1) {
+				Game_Flag_Reset(199);
+				var_45D5B4_animation_frame = 0;
+				var_45D5B0_animation_state = var_462880;
+				*animation = var_462884;
+			}
+		} else {
+			if (var_45D5B8 == 0) {
+				*animation = 589;
+			}
+			if (var_45D5B8 == 1) {
+				*animation = 590;
+			}
+			if (var_45D5B8 == 2) {
+				*animation = 591;
+			}
+			if (var_45D5B4_animation_frame > Slice_Animation_Query_Number_Of_Frames(*animation) / 2) {
+				a1 = *animation;
+				var_45D5B4_animation_frame += 3;
+				v57 = var_45D5B4_animation_frame;
+				if (v57 > Slice_Animation_Query_Number_Of_Frames(a1) - 1) {
+					var_45D5B4_animation_frame = 0;
+					var_45D5B0_animation_state = var_462880;
+					*animation = var_462884;
+				}
+			} else {
+				var_45D5B4_animation_frame -= 3;
+				if (var_45D5B4_animation_frame < 0) {
+					var_45D5B4_animation_frame = 0;
+					var_45D5B0_animation_state = var_462880;
+					*animation = var_462884;
+				}
+			}
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 1:
+		*animation = 601;
+		var_45D5B4_animation_frame++;
+		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(601)) {
+			var_45D5B4_animation_frame = 0;
+		}
+		if (!Game_Flag_Query(199)) {
+			var_45D5B0_animation_state = 32;
+			var_45D5B4_animation_frame = 0;
+			*animation = 603;
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	case 0:
+		if (Game_Flag_Query(199) && !Game_Flag_Query(392)) {
+			var_45D5B0_animation_state = 31;
+			var_45D5B4_animation_frame = 0;
+			*animation = 604;
+		} else if (var_45D5B8 == 1) {
+			*animation = 590;
+			var_45D5B4_animation_frame++;
+			if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(590)) {
+				var_45D5B8 = Random_Query(0, 2);
+				var_45D5B4_animation_frame = 0;
+			}
+		} else if (var_45D5B8 == 2) {
+			*animation = 591;
+			var_45D5B4_animation_frame++;
+			if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(591)) {
+				var_45D5B8 = Random_Query(0, 2);
+				var_45D5B4_animation_frame = 0;
+			}
+		} else if (var_45D5B8 == 0) {
+			*animation = 589;
+			var_45D5B4_animation_frame++;
+			if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(589)) {
+				var_45D5B8 = Random_Query(0, 2);
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	default:
+		*animation = 399;
+		*frame = var_45D5B4_animation_frame;
+		return true;
+	}
+}
+
+bool AIScriptOfficerLeary::ChangeAnimationMode(int mode) {
+	int v1;
+
+	switch (mode) {
+	case kAnimationModeIdle:
+		switch (var_45D5B0_animation_state) {
+		case 21:
+		case 24:
+			var_45D5B0_animation_state = 23;
+			var_45D5B4_animation_frame = 0;
+			break;
+		case 20:
+			v1 = var_45D5B4_animation_frame;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			var_45D5B4_animation_frame = v1;
+			var_45D5B0_animation_state = 21;
+			break;
+		case 11:
+		case 12:
+		case 13:
+		case 14:
+		case 15:
+		case 16:
+		case 17:
+		case 18:
+		case 19:
+			var_45D5BC = 1;
+			break;
+		case 0:
+		case 23:
+			break;
+		default:
+			var_45D5B0_animation_state = 0;
+			var_45D5B4_animation_frame = 0;
+			var_45D5B8 = Random_Query(0, 1);
+			break;
+		}
+		break;
+	case kAnimationModeWalk:
+		var_45D5B0_animation_state = 3;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeRun:
+		var_45D5B0_animation_state = 4;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 3:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 11;
+			var_462884 = 592;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 11;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case kAnimationModeCombatIdle:
+		switch (var_45D5B0_animation_state) {
+		case 21:
+		case 22:
+		case 24:
+			break;
+		case 7:
+		case 8:
+		case 9:
+		case 10:
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			break;
+		case 0:
+			var_45D5B0_animation_state = 22;
+			var_45D5B4_animation_frame = 0;
+			break;
+		default:
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			break;
+		}
+		break;
+	case 6:
+		var_45D5B0_animation_state = 24;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeCombatWalk:
+		var_45D5B0_animation_state = 7;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeCombatRun:
+		var_45D5B0_animation_state = 8;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 12:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 12;
+			var_462884 = 593;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 12;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 13:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 13;
+			var_462884 = 594;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 13;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 14:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 14;
+			var_462884 = 595;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 14;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 15:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 15;
+			var_462884 = 596;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 15;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 16:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 16;
+			var_462884 = 597;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 16;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 17:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 17;
+			var_462884 = 598;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 17;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 18:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 18;
+			var_462884 = 599;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 18;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 19:
+		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
+			var_45D5B0_animation_state = 2;
+			var_462880 = 19;
+			var_462884 = 600;
+			if (Game_Flag_Query(199) == 1) {
+				var_45D5B4_animation_frame = 0;
+			}
+		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 19;
+			var_45D5B4_animation_frame = 0;
+			var_45D5BC = 0;
+		}
+		break;
+	case 21:
+		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 24) {
+			if (Random_Query(0, 1)) {
+				var_45D5B0_animation_state = 25;
+			} else {
+				var_45D5B0_animation_state = 26;
+			}
+			var_45D5B4_animation_frame = 0;
+		} else {
+			if (Random_Query(0, 1)) {
+				var_45D5B0_animation_state = 29;
+			} else {
+				var_45D5B0_animation_state = 30;
+			}
+			var_45D5B4_animation_frame = 0;
+		}
+		break;
+	case 22:
+		if (Random_Query(0, 1)) {
+			var_45D5B0_animation_state = 25;
+		} else {
+			var_45D5B0_animation_state = 26;
+		}
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 27:
+		Game_Flag_Reset(199);
+		break;
+	case 28:
+		Game_Flag_Set(199);
+		break;
+	case 44:
+		var_45D5B0_animation_state = 5;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 45:
+		var_45D5B0_animation_state = 6;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 46:
+		var_45D5B0_animation_state = 9;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 47:
+		var_45D5B0_animation_state = 10;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 48:
+		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 22 || var_45D5B0_animation_state == 24) {
+			var_45D5B0_animation_state = 28;
+			var_45D5B4_animation_frame = 0;
+		} else {
+			var_45D5B0_animation_state = 27;
+			var_45D5B4_animation_frame = 0;
+		}
+		break;
+	case 58:
+		var_45D5B0_animation_state = 20;
+		var_45D5B4_animation_frame = 0;
+		break;
+	}
+	return true;
+}
+
+void AIScriptOfficerLeary::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
+	*animationState = var_45D5B0_animation_state;
+	*animationFrame = var_45D5B4_animation_frame;
+	*a3 = var_462880;
+	*a4 = var_462884;
+}
+
+void AIScriptOfficerLeary::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
+	var_45D5B0_animation_state = animationState;
+	var_45D5B4_animation_frame = animationFrame;
+	var_462880 = a3;
+	var_462884 = a4;
+}
+
+bool AIScriptOfficerLeary::ReachedMovementTrackWaypoint(int waypointId) {
+	if (waypointId == 57 || waypointId == 58) {
+		sub_431408();
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 2);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 2, 6);
+	}
+	return true;
+}
+
+void AIScriptOfficerLeary::FledCombat() {
+	Actor_Set_Goal_Number(kActorOfficerLeary, 300);
+}
+
+bool AIScriptOfficerLeary::sub_431408() {
+	Game_Flag_Set(199);
+	return true;
+}
+
+bool AIScriptOfficerLeary::sub_431420() {
+	Game_Flag_Reset(199);
+	return true;
+}
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai/officer_leroy.cpp b/engines/bladerunner/script/ai/officer_leroy.cpp
deleted file mode 100644
index 9dc4165..0000000
--- a/engines/bladerunner/script/ai/officer_leroy.cpp
+++ /dev/null
@@ -1,1214 +0,0 @@
-/* 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.h"
-
-namespace BladeRunner {
-
-void AIScriptOfficerLeroy::Initialize() {
-	var_45D5B0_animation_state = 0;
-	var_45D5B4_animation_frame = 0;
-	var_462880 = 0;
-	var_45D5B8 = 0;
-	var_45D5BC = 0;
-
-	Actor_Put_In_Set(23, 69);
-	Actor_Set_At_XYZ(23, -261.80f, 6.00f, 79.58f, 512);
-	Actor_Set_Goal_Number(23, 0);
-	Actor_Set_Frame_Rate_FPS(23, 8);
-}
-
-bool AIScriptOfficerLeroy::Update() {
-	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(23) < 300) {
-		AI_Movement_Track_Flush(23);
-		Actor_Set_Goal_Number(23, 300);
-	} else if (Global_Variable_Query(1) == 5 && Actor_Query_Goal_Number(23) < 400) {
-		AI_Movement_Track_Flush(23);
-		Actor_Set_Goal_Number(23, 400);
-	} else if (!Game_Flag_Query(182) && Game_Flag_Query(147) == 1 && Game_Flag_Query(163) == 1 && Player_Query_Current_Scene() != 78 && Global_Variable_Query(1) < 3) {
-		Game_Flag_Set(186);
-		Actor_Set_Goal_Number(23, 3);
-	} else if (Actor_Query_Goal_Number(23) != 1 && Actor_Query_Goal_Number(23) != 2 && Game_Flag_Query(199) == 1) {
-		Game_Flag_Reset(199);
-	} else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(23, 239)) {
-		Actor_Clue_Acquire(23, 239, 1, -1);
-	} else if (Game_Flag_Query(629) == 1) {
-		Game_Flag_Reset(629);
-	} else if (Game_Flag_Query(623) == 1 && !Game_Flag_Query(664)) {
-		Game_Flag_Set(664);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 310 && Actor_Query_Which_Set_In(23) != Player_Query_Current_Set()) {
-		Non_Player_Actor_Combat_Mode_Off(23);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 599 && Actor_Query_Which_Set_In(23) != Player_Query_Current_Set()) {
-		Actor_Set_Health(23, 40, 40);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 305) {
-		switch (Actor_Query_Which_Set_In(23)) {
-		case 7:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 20:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 33:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 53:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 54:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 70:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 74:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 77:
-		case 78:
-		case 79:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 81:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 83:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 84:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		case 86:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0);
-			}
-			break;
-		}
-	}
-	return false;
-}
-
-void AIScriptOfficerLeroy::TimerExpired(int timer) {
-	if (timer == 1) {
-		AI_Countdown_Timer_Reset(23, 1);
-		if (Actor_Query_In_Set(0, 41)) {
-			Actor_Set_Goal_Number(23, 430);
-			Actor_Set_Goal_Number(24, 430);
-		} else {
-			Game_Flag_Set(684);
-		}
-	} else if (timer == 2) {
-		AI_Countdown_Timer_Reset(23, 2);
-		sub_431420();
-	}
-}
-
-void AIScriptOfficerLeroy::CompletedMovementTrack() {
-	int v0;
-	unsigned int v1;
-
-	v0 = Actor_Query_Goal_Number(23);
-	if (v0 == 1) {
-		Actor_Set_Goal_Number(23, 2);
-		return;
-	}
-	//todo: tidyup
-	v1 = v0 - 305;
-	if (v1 > 3) {
-		return;
-	}
-	if (!v1) {
-		Actor_Set_Goal_Number(23, 306);
-		return;
-	}
-	if (v1 != 2) {
-		if (v1 == 3) {
-			Actor_Change_Animation_Mode(23, 4);
-			Actor_Face_Actor(23, 0, true);
-			Actor_Set_Goal_Number(23, 309);
-		}
-		return;
-	}
-	Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 12, 4, 7, 8, 0, -1, -1, 15, 300, 0);
-}
-
-void AIScriptOfficerLeroy::ReceivedClue(int clueId, int fromActorId) {
-	if (clueId == 222) {
-		Actor_Modify_Friendliness_To_Other(23, 0, 5);
-	}
-	if (clueId == 215) {
-		Actor_Modify_Friendliness_To_Other(23, 0, -4);
-	}
-}
-
-void AIScriptOfficerLeroy::ClickedByPlayer() {}
-
-void AIScriptOfficerLeroy::EnteredScene(int sceneId) {}
-
-void AIScriptOfficerLeroy::OtherAgentEnteredThisScene(int otherActorId) {}
-
-void AIScriptOfficerLeroy::OtherAgentExitedThisScene(int otherActorId) {}
-
-void AIScriptOfficerLeroy::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {}
-
-void AIScriptOfficerLeroy::ShotAtAndMissed() {}
-
-void AIScriptOfficerLeroy::ShotAtAndHit() {
-	if (Actor_Query_Goal_Number(23) == 307) {
-		Actor_Set_Health(23, 50, 50);
-	}
-}
-
-void AIScriptOfficerLeroy::Retired(int byActorId) {
-	Actor_Set_Goal_Number(23, 599);
-	Game_Flag_Set(607);
-}
-
-int AIScriptOfficerLeroy::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
-	if (otherActorId) {
-		return 0;
-	}
-	switch (clueId) {
-	case 242:
-		return -6;
-	case 240:
-		return -2;
-	case 239:
-		return -5;
-	case 228:
-		return 2;
-	case 227:
-		return 4;
-	case 226:
-		return 4;
-	case 225:
-		return 3;
-	case 224:
-		return 3;
-	case 223:
-		return 2;
-	case 222:
-		return 3;
-	case 215:
-		return -5;
-	}
-	return 0;
-}
-
-bool AIScriptOfficerLeroy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
-	switch (newGoalNumber) {
-	case 1:
-		AI_Movement_Track_Flush(23);
-		if (Random_Query(1, 2) == 1) {
-			AI_Movement_Track_Append(23, 57, 7);
-			AI_Movement_Track_Append(23, 58, 7);
-		} else {
-			AI_Movement_Track_Append(23, 58, 7);
-			AI_Movement_Track_Append(23, 57, 7);
-		}
-		AI_Movement_Track_Repeat(23);
-		return true;
-	case 2:
-		if (Random_Query(1, 3) == 1) {
-			if (Random_Query(1, 2) == 1 && !Actor_Clue_Query(23, 16)) {
-				Actor_Clue_Acquire(23, 16, 0, -1);
-			} else if (!Actor_Clue_Query(23, 17)) {
-				Actor_Clue_Acquire(23, 17, 0, -1);
-			}
-		}
-		if (Game_Flag_Query(182)) {
-			if (Actor_Clue_Query(23, 16) && Actor_Clue_Query(23, 17)) {
-				Actor_Set_Goal_Number(23, 0);
-			} else {
-				Actor_Set_Goal_Number(23, 1);
-			}
-		} else {
-			Actor_Set_Goal_Number(23, 0);
-		}
-		return true;
-	case 3:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 39, Random_Query(120, 240));
-		AI_Movement_Track_Append(23, 35, 0);
-		AI_Movement_Track_Repeat(23);
-		return true;
-	case 99:
-		AI_Movement_Track_Flush(23);
-		return false;
-	case 102:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 107, 0);
-		AI_Movement_Track_Append(23, 108, 0);
-		AI_Movement_Track_Repeat(23);
-		return true;
-	case 300:
-		Actor_Set_Goal_Number(23, 305);
-		return true;
-	case 305:
-		AI_Movement_Track_Flush(23);
-		switch (Random_Query(1, 10)) {
-		case 1:
-			AI_Movement_Track_Append(23, 398, 15);
-			AI_Movement_Track_Append(23, 399, 0);
-			AI_Movement_Track_Append(23, 400, 0);
-			AI_Movement_Track_Append(23, 401, 0);
-			AI_Movement_Track_Append_With_Facing(23, 402, 3, 276);
-			AI_Movement_Track_Append(23, 403, 0);
-			AI_Movement_Track_Append(23, 404, 15);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 2:
-			AI_Movement_Track_Append(23, 385, 10);
-			AI_Movement_Track_Append(23, 242, 2);
-			AI_Movement_Track_Append(23, 386, 2);
-			AI_Movement_Track_Append(23, 387, 15);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 3:
-			AI_Movement_Track_Append(23, 390, 10);
-			AI_Movement_Track_Append(23, 391, 0);
-			AI_Movement_Track_Append(23, 392, 5);
-			AI_Movement_Track_Append(23, 345, 0);
-			AI_Movement_Track_Append(23, 393, 15);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 4:
-			AI_Movement_Track_Append(23, 381, 15);
-			AI_Movement_Track_Append(23, 382, 0);
-			AI_Movement_Track_Append(23, 383, 15);
-			AI_Movement_Track_Append(23, 382, 3);
-			AI_Movement_Track_Append(23, 384, 0);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 5:
-			AI_Movement_Track_Append(23, 388, 10);
-			AI_Movement_Track_Append(23, 389, 10);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 6:
-			AI_Movement_Track_Append(23, 385, 10);
-			AI_Movement_Track_Append(23, 242, 2);
-			AI_Movement_Track_Append(23, 386, 2);
-			AI_Movement_Track_Append(23, 387, 15);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 7:
-			AI_Movement_Track_Append(23, 394, 15);
-			AI_Movement_Track_Append(23, 395, 0);
-			AI_Movement_Track_Append(23, 396, 0);
-			AI_Movement_Track_Append(23, 397, 15);
-			AI_Movement_Track_Append(23, 396, 0);
-			AI_Movement_Track_Append(23, 395, 0);
-			AI_Movement_Track_Append(23, 430, 15);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
-			break;
-		case 8:
-			switch (Random_Query(1, 7)) {
-			case 1:
-				AI_Movement_Track_Append(23, 302, 0);
-				AI_Movement_Track_Append(23, 407, 0);
-				AI_Movement_Track_Append(23, 408, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				break;
-			case 2:
-				AI_Movement_Track_Append(23, 536, 0);
-				AI_Movement_Track_Append(23, 537, 0);
-				AI_Movement_Track_Append(23, 538, 1);
-				AI_Movement_Track_Append(23, 537, 0);
-				AI_Movement_Track_Append(23, 536, 0);
-				AI_Movement_Track_Repeat(23);
-				break;
-			case 3:
-				AI_Movement_Track_Append(23, 296, 10);
-				AI_Movement_Track_Append(23, 409, 2);
-				AI_Movement_Track_Append(23, 296, 10);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				break;
-			case 4:
-				AI_Movement_Track_Append(23, 411, 10);
-				AI_Movement_Track_Append(23, 412, 5);
-				AI_Movement_Track_Append(23, 411, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				break;
-			case 5:
-				AI_Movement_Track_Append(23, 413, 10);
-				AI_Movement_Track_Append(23, 414, 0);
-				AI_Movement_Track_Append_With_Facing(23, 431, 0, 1017);
-				AI_Movement_Track_Append(23, 432, 10);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				break;
-			case 6:
-				AI_Movement_Track_Append(23, 415, 0);
-				AI_Movement_Track_Append_With_Facing(23, 416, 0, 620);
-				AI_Movement_Track_Append(23, 417, 0);
-				AI_Movement_Track_Append(23, 418, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				break;
-			case 7:
-				AI_Movement_Track_Append(23, 405, 10);
-				AI_Movement_Track_Append(23, 406, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				return false;
-			default:
-				return false;
-			}
-			//no break
-		case 9:
-			if (Random_Query(1, 2) - 1 == 1) {
-				AI_Movement_Track_Append(23, 433, 10);
-				AI_Movement_Track_Append(23, 434, 0);
-				AI_Movement_Track_Append(23, 435, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
-				return false;
-			}
-			AI_Movement_Track_Append(23, 420, 10);
-			AI_Movement_Track_Append(23, 422, 2);
-			AI_Movement_Track_Append(23, 421, 1);
-			AI_Movement_Track_Append_With_Facing(23, 422, 4, 182);
-			AI_Movement_Track_Append(23, 420, 10);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
-			//no break
-		case 10:
-			AI_Movement_Track_Append(23, 310, 0);
-			AI_Movement_Track_Append(23, 307, 0);
-			AI_Movement_Track_Append(23, 309, 0);
-			AI_Movement_Track_Append(23, 310, 0);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
-			return false;
-		default:
-			return false;
-		}
-		//no break
-	case 306:
-		Actor_Set_Goal_Number(23, 305);
-		return true;
-	case 307:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append_With_Facing(23, 416, 0, 556);
-		Actor_Change_Animation_Mode(23, 4);
-		AI_Movement_Track_Repeat(23);
-		return true;
-	case 308:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append_Run_With_Facing(23, 440, 2, 355);
-		AI_Movement_Track_Append_Run_With_Facing(23, 441, 0, 825);
-		AI_Movement_Track_Repeat(23);
-		return true;
-	case 400:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 35, 0);
-		AI_Movement_Track_Repeat(23);
-		Actor_Set_Goal_Number(23, 410);
-		return true;
-	case 420:
-		AI_Countdown_Timer_Reset(23, 1);
-		AI_Countdown_Timer_Start(23, 1, 120);
-		Actor_Set_Goal_Number(23, 410);
-		return true;
-	case 425:
-		AI_Countdown_Timer_Reset(23, 1);
-		AI_Countdown_Timer_Start(23, 1, 60);
-		Actor_Set_Goal_Number(23, 410);
-		return true;
-	case 430:
-		Actor_Set_Goal_Number(23, 410);
-		Actor_Set_Goal_Number(24, 410);
-		return false;
-	default:
-		return false;
-	}
-}
-
-bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
-	int v57;
-	int a1;
-
-	switch (var_45D5B0_animation_state) {
-	case 32:
-		*animation = 603;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(603)) {
-			*animation = 589;
-			var_45D5B0_animation_state = 0;
-			var_45D5B8 = 0;
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 31:
-		*animation = 604;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(604)) {
-			*animation = 601;
-			var_45D5B0_animation_state = 1;
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 30:
-		*animation = 587;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(587)) {
-			*animation = 589;
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-			Actor_Change_Animation_Mode(23, 0);
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 29:
-		*animation = 586;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(586)) {
-			*animation = 589;
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-			Actor_Change_Animation_Mode(23, 0);
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 28:
-		*animation = 576;
-		if (var_45D5B4_animation_frame < Slice_Animation_Query_Number_Of_Frames(576) - 1) {
-			++var_45D5B4_animation_frame;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 27:
-		*animation = 588;
-		if (var_45D5B4_animation_frame < Slice_Animation_Query_Number_Of_Frames(588) - 1) {
-			++var_45D5B4_animation_frame;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 26:
-		*animation = 573;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(573)) {
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 25:
-		*animation = 572;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(572)) {
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 24:
-		*animation = 581;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame == 4) {
-			if (Random_Query(1, 2) == 1) {
-				Sound_Play_Speech_Line(23, 9010, 75, 0, 99);
-			} else {
-				Sound_Play_Speech_Line(23, 9015, 75, 0, 99);
-			}
-		}
-		if (var_45D5B4_animation_frame == 5) {
-			Actor_Combat_AI_Hit_Attempt(23);
-		}
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(581)) {
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 23:
-		*animation = 580;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(580)) {
-			*animation = 589;
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 22:
-		*animation = 579;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(579)) {
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			*animation = 571;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 21:
-		*animation = 571;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(571)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 20:
-		*animation = 571;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame > Slice_Animation_Query_Number_Of_Frames(571) - 1) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 19:
-		*animation = 600;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(600)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 18:
-		*animation = 599;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(599)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 17:
-		*animation = 598;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(598)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 16:
-		*animation = 597;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(597)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 15:
-		*animation = 596;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(596)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 14:
-		*animation = 595;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(595)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 13:
-		*animation = 594;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(594)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 12:
-		*animation = 593;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(593)) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			*animation = 592;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 11:
-		if (var_45D5BC && var_45D5B4_animation_frame <= 2) {
-			var_45D5BC = 0;
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-			*animation = 589;
-			var_45D5B8 = Random_Query(0, 1);
-			*frame = var_45D5B4_animation_frame;
-			return true;
-		}
-
-		*animation = 592;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(592)) {
-			var_45D5B4_animation_frame = 0;
-			if (var_45D5BC) {
-				var_45D5BC = 0;
-				var_45D5B0_animation_state = 0;
-				var_45D5B4_animation_frame = 0;
-				*animation = 589;
-				var_45D5B8 = Random_Query(0, 1);
-			} else {
-				var_45D5B0_animation_state = Random_Query(0, 8) + 11;
-			}
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 10:
-		*animation = 578;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(578)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 9:
-		*animation = 577;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(577)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 8:
-		*animation = 575;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(575)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 7:
-		*animation = 574;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(574)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 6:
-		*animation = 585;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(585)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 5:
-		*animation = 584;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(584)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 4:
-		*animation = 583;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(583)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 3:
-		*animation = 582;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(582)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 2:
-		if (Game_Flag_Query(199)) {
-			*animation = 603;
-			var_45D5B4_animation_frame++;
-			if (var_45D5B4_animation_frame > Slice_Animation_Query_Number_Of_Frames(603) - 1) {
-				Game_Flag_Reset(199);
-				var_45D5B4_animation_frame = 0;
-				var_45D5B0_animation_state = var_462880;
-				*animation = var_462884;
-			}
-		} else {
-			if (var_45D5B8 == 0) {
-				*animation = 589;
-			}
-			if (var_45D5B8 == 1) {
-				*animation = 590;
-			}
-			if (var_45D5B8 == 2) {
-				*animation = 591;
-			}
-			if (var_45D5B4_animation_frame > Slice_Animation_Query_Number_Of_Frames(*animation) / 2) {
-				a1 = *animation;
-				var_45D5B4_animation_frame += 3;
-				v57 = var_45D5B4_animation_frame;
-				if (v57 > Slice_Animation_Query_Number_Of_Frames(a1) - 1) {
-					var_45D5B4_animation_frame = 0;
-					var_45D5B0_animation_state = var_462880;
-					*animation = var_462884;
-				}
-			} else {
-				var_45D5B4_animation_frame -= 3;
-				if (var_45D5B4_animation_frame < 0) {
-					var_45D5B4_animation_frame = 0;
-					var_45D5B0_animation_state = var_462880;
-					*animation = var_462884;
-				}
-			}
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 1:
-		*animation = 601;
-		var_45D5B4_animation_frame++;
-		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(601)) {
-			var_45D5B4_animation_frame = 0;
-		}
-		if (!Game_Flag_Query(199)) {
-			var_45D5B0_animation_state = 32;
-			var_45D5B4_animation_frame = 0;
-			*animation = 603;
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	case 0:
-		if (Game_Flag_Query(199) && !Game_Flag_Query(392)) {
-			var_45D5B0_animation_state = 31;
-			var_45D5B4_animation_frame = 0;
-			*animation = 604;
-		} else if (var_45D5B8 == 1) {
-			*animation = 590;
-			var_45D5B4_animation_frame++;
-			if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(590)) {
-				var_45D5B8 = Random_Query(0, 2);
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B8 == 2) {
-			*animation = 591;
-			var_45D5B4_animation_frame++;
-			if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(591)) {
-				var_45D5B8 = Random_Query(0, 2);
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B8 == 0) {
-			*animation = 589;
-			var_45D5B4_animation_frame++;
-			if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(589)) {
-				var_45D5B8 = Random_Query(0, 2);
-				var_45D5B4_animation_frame = 0;
-			}
-		}
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	default:
-		*animation = 399;
-		*frame = var_45D5B4_animation_frame;
-		return true;
-	}
-}
-
-bool AIScriptOfficerLeroy::ChangeAnimationMode(int mode) {
-	int v1;
-
-	switch (mode) {
-	case 28:
-		Game_Flag_Set(199);
-		break;
-	case 27:
-		Game_Flag_Reset(199);
-		break;
-	case 22:
-		if (Random_Query(0, 1)) {
-			var_45D5B0_animation_state = 25;
-		} else {
-			var_45D5B0_animation_state = 26;
-		}
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 21:
-		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 24) {
-			if (Random_Query(0, 1)) {
-				var_45D5B0_animation_state = 25;
-			} else {
-				var_45D5B0_animation_state = 26;
-			}
-			var_45D5B4_animation_frame = 0;
-		} else {
-			if (Random_Query(0, 1)) {
-				var_45D5B0_animation_state = 29;
-			} else {
-				var_45D5B0_animation_state = 30;
-			}
-			var_45D5B4_animation_frame = 0;
-		}
-		break;
-	case 19:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 19;
-			var_462884 = 600;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 19;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 18:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 18;
-			var_462884 = 599;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 18;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 17:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 17;
-			var_462884 = 598;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 17;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 16:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 16;
-			var_462884 = 597;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 16;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 15:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 15;
-			var_462884 = 596;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 15;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 14:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 14;
-			var_462884 = 595;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 14;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 13:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 13;
-			var_462884 = 594;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 13;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 12:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 12;
-			var_462884 = 593;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 12;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 8:
-		var_45D5B0_animation_state = 8;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 7:
-		var_45D5B0_animation_state = 7;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 6:
-		var_45D5B0_animation_state = 24;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 4:
-		switch (var_45D5B0_animation_state) {
-		case 21:
-		case 22:
-		case 24:
-			return true;
-		case 7:
-		case 8:
-		case 9:
-		case 10:
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 0:
-			var_45D5B0_animation_state = 22;
-			var_45D5B4_animation_frame = 0;
-			break;
-		default:
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			break;
-		}
-		break;
-	case 3:
-		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
-			var_45D5B0_animation_state = 2;
-			var_462880 = 11;
-			var_462884 = 592;
-			if (Game_Flag_Query(199) == 1) {
-				var_45D5B4_animation_frame = 0;
-			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 11;
-			var_45D5B4_animation_frame = 0;
-			var_45D5BC = 0;
-		}
-		break;
-	case 2:
-		var_45D5B0_animation_state = 4;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 1:
-		var_45D5B0_animation_state = 3;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 0:
-		switch (var_45D5B0_animation_state) {
-		case 21:
-		case 24:
-			var_45D5B0_animation_state = 23;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 20:
-			v1 = var_45D5B4_animation_frame;
-			Actor_Change_Animation_Mode(23, 4);
-			var_45D5B4_animation_frame = v1;
-			var_45D5B0_animation_state = 21;
-			break;
-		case 11:
-		case 12:
-		case 13:
-		case 14:
-		case 15:
-		case 16:
-		case 17:
-		case 18:
-		case 19:
-			var_45D5BC = 1;
-			break;
-		case 0:
-		case 23:
-			return true;
-		default:
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-			var_45D5B8 = Random_Query(0, 1);
-			break;
-		}
-		break;
-	case 5:
-	case 9:
-	case 10:
-	case 11:
-	case 20:
-	case 23:
-	case 24:
-	case 25:
-	case 26:
-		return true;
-	default:
-		switch (mode) {
-		case 58:
-			var_45D5B0_animation_state = 20;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 48:
-			if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 22 || var_45D5B0_animation_state == 24) {
-				var_45D5B0_animation_state = 28;
-				var_45D5B4_animation_frame = 0;
-			} else {
-				var_45D5B0_animation_state = 27;
-				var_45D5B4_animation_frame = 0;
-			}
-			break;
-		case 47:
-			var_45D5B0_animation_state = 10;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 46:
-			var_45D5B0_animation_state = 9;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 45:
-			var_45D5B0_animation_state = 6;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 44:
-			var_45D5B0_animation_state = 5;
-			var_45D5B4_animation_frame = 0;
-			break;
-		default:
-			return true;
-		}
-		break;
-	}
-	return true;
-}
-
-void AIScriptOfficerLeroy::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
-	*animationState = var_45D5B0_animation_state;
-	*animationFrame = var_45D5B4_animation_frame;
-	*a3 = var_462880;
-	*a4 = var_462884;
-}
-
-void AIScriptOfficerLeroy::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
-	var_45D5B0_animation_state = animationState;
-	var_45D5B4_animation_frame = animationFrame;
-	var_462880 = a3;
-	var_462884 = a4;
-}
-
-bool AIScriptOfficerLeroy::ReachedMovementTrackWaypoint(int waypointId) {
-	if (waypointId == 57 || waypointId == 58) {
-		sub_431408();
-		AI_Countdown_Timer_Reset(23, 2);
-		AI_Countdown_Timer_Start(23, 2, 6);
-	}
-	return true;
-}
-
-void AIScriptOfficerLeroy::FledCombat() {
-	Actor_Set_Goal_Number(23, 300);
-}
-
-bool AIScriptOfficerLeroy::sub_431408() {
-	Game_Flag_Set(199);
-	return true;
-}
-
-bool AIScriptOfficerLeroy::sub_431420() {
-	Game_Flag_Reset(199);
-	return true;
-}
-} // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index 998f385..d34b4a8 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -33,15 +33,15 @@ void AIScriptRunciter::Initialize() {
 	var_45CD80 = 1;
 	var_45CD84 = 0;
 	var_45CD88 = 0;
-	Actor_Set_Goal_Number(15, 0);
+	Actor_Set_Goal_Number(kActorRunciter, 0);
 }
 
 bool AIScriptRunciter::Update() {
-	if (Actor_Query_Goal_Number(15) == 0 && Game_Flag_Query(186)) {
-		Actor_Set_Goal_Number(15, 2);
+	if (Actor_Query_Goal_Number(kActorRunciter) == 0 && Game_Flag_Query(186)) {
+		Actor_Set_Goal_Number(kActorRunciter, 2);
 	}
-	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(15) < 300) {
-		Actor_Set_Goal_Number(15, 300);
+	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(kActorRunciter) < 300) {
+		Actor_Set_Goal_Number(kActorRunciter, 300);
 	}
 	return false;
 }
@@ -49,24 +49,24 @@ bool AIScriptRunciter::Update() {
 void AIScriptRunciter::TimerExpired(int timer) {}
 
 void AIScriptRunciter::CompletedMovementTrack() {
-	if (Actor_Query_Goal_Number(15) == 1) {
+	if (Actor_Query_Goal_Number(kActorRunciter) == 1) {
 		if (Player_Query_Current_Scene() == 79) {
 			switch (Random_Query(1, 5)) {
 			case 2:
 			case 3:
-				ADQ_Add(15, 530, -1);
+				ADQ_Add(kActorRunciter, 530, -1);
 				break;
 			case 1:
 			case 5:
-				ADQ_Add(15, 80, -1);
+				ADQ_Add(kActorRunciter, 80, -1);
 				break;
 			case 4:
-				ADQ_Add(15, 930, -1);
+				ADQ_Add(kActorRunciter, 930, -1);
 				break;
 			}
 		}
-		Actor_Set_Goal_Number(15, 99);
-		Actor_Set_Goal_Number(15, 1);
+		Actor_Set_Goal_Number(kActorRunciter, 99);
+		Actor_Set_Goal_Number(kActorRunciter, 1);
 		//return true;
 	}
 	//return false;
@@ -83,48 +83,48 @@ void AIScriptRunciter::OtherAgentEnteredThisScene(int otherActorId) {}
 void AIScriptRunciter::OtherAgentExitedThisScene(int otherActorId) {}
 
 void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
-	if (Actor_Query_Goal_Number(15) == 300 && combatMode == 1 && !Game_Flag_Query(705)) {
-		Actor_Set_Targetable(15, true);
-		Actor_Face_Actor(15, 0, true);
-		Actor_Says(15, 420, 12);
-		Actor_Face_Actor(0, 15, true);
-		Actor_Change_Animation_Mode(0, 5);
-		if (Actor_Clue_Query(0, 158)) {
-			Actor_Says(0, 4770, -1);
-			Actor_Says(15, 590, 13);
-			Actor_Says(0, 4775, -1);
-			Actor_Says(15, 600, 17);
+	if (Actor_Query_Goal_Number(kActorRunciter) == 300 && combatMode == 1 && !Game_Flag_Query(705)) {
+		Actor_Set_Targetable(kActorRunciter, true);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 420, 12);
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		Actor_Change_Animation_Mode(kActorMcCoy, 5);
+		if (Actor_Clue_Query(kActorMcCoy, kClueZubensMotive)) {
+			Actor_Says(kActorMcCoy, 4770, -1);
+			Actor_Says(kActorRunciter, 590, 13);
+			Actor_Says(kActorMcCoy, 4775, -1);
+			Actor_Says(kActorRunciter, 600, 17);
 			Sound_Play(492, 100, 0, 100, 50);
-			Actor_Says(0, 4780, -1);
-			Actor_Says(15, 610, 18);
-			Actor_Says(0, 4785, -1);
-			Actor_Says(15, 620, 15);
+			Actor_Says(kActorMcCoy, 4780, -1);
+			Actor_Says(kActorRunciter, 610, 18);
+			Actor_Says(kActorMcCoy, 4785, -1);
+			Actor_Says(kActorRunciter, 620, 15);
 			if (Game_Flag_Query(46)) {
-				Actor_Says(15, 630, 12);
-				Actor_Says(15, 640, 17);
-				Actor_Says(0, 4790, -1);
-				Actor_Says(15, 650, 18);
-				Actor_Says(15, 660, 19);
-				Actor_Clue_Acquire(0, 280, 1, 15);
+				Actor_Says(kActorRunciter, 630, 12);
+				Actor_Says(kActorRunciter, 640, 17);
+				Actor_Says(kActorMcCoy, 4790, -1);
+				Actor_Says(kActorRunciter, 650, 18);
+				Actor_Says(kActorRunciter, 660, 19);
+				Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersConfession1, 1, kActorRunciter);
 			} else {
-				Actor_Says(15, 670, 18);
-				Actor_Says(0, 4795, -1);
-				Actor_Says(15, 730, 17);
+				Actor_Says(kActorRunciter, 670, 18);
+				Actor_Says(kActorMcCoy, 4795, -1);
+				Actor_Says(kActorRunciter, 730, 17);
 			}
-		} else if (Actor_Clue_Query(0, 76)) {
-			Actor_Says(0, 4730, -1);
-			Actor_Says(15, 480, 17);
-			Actor_Says(0, 4735, -1);
-			Actor_Says(15, 490, 16);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
+			Actor_Says(kActorMcCoy, 4730, -1);
+			Actor_Says(kActorRunciter, 480, 17);
+			Actor_Says(kActorMcCoy, 4735, -1);
+			Actor_Says(kActorRunciter, 490, 16);
 			Sound_Play(492, 100, 0, 100, 50);
-			Actor_Says(0, 4740, -1);
-			Actor_Says(15, 500, 18);
-			Actor_Says(15, 510, 19);
-			Actor_Says(0, 4745, -1);
-			Actor_Says(0, 4750, -1);
-			Actor_Says(15, 520, 17);
-			Actor_Says(15, 530, 18);
-			Actor_Says(15, 540, 16);
+			Actor_Says(kActorMcCoy, 4740, -1);
+			Actor_Says(kActorRunciter, 500, 18);
+			Actor_Says(kActorRunciter, 510, 19);
+			Actor_Says(kActorMcCoy, 4745, -1);
+			Actor_Says(kActorMcCoy, 4750, -1);
+			Actor_Says(kActorRunciter, 520, 17);
+			Actor_Says(kActorRunciter, 530, 18);
+			Actor_Says(kActorRunciter, 540, 16);
 		}
 		Game_Flag_Set(705);
 	}
@@ -133,19 +133,19 @@ void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatM
 void AIScriptRunciter::ShotAtAndMissed() {}
 
 void AIScriptRunciter::ShotAtAndHit() {
-	Actor_Set_Targetable(15, false);
-	Actor_Change_Animation_Mode(15, 48);
-	Actor_Set_Goal_Number(15, 599);
+	Actor_Set_Targetable(kActorRunciter, false);
+	Actor_Change_Animation_Mode(kActorRunciter, 48);
+	Actor_Set_Goal_Number(kActorRunciter, 599);
 	Delay(2000);
-	if (Actor_Clue_Query(0, 158)) {
-		Actor_Voice_Over(2050, 99);
-		Actor_Voice_Over(2060, 99);
+	if (Actor_Clue_Query(kActorMcCoy, kClueZubensMotive)) {
+		Actor_Voice_Over(2050, kActorVoiceOver);
+		Actor_Voice_Over(2060, kActorVoiceOver);
 	} else {
-		Actor_Voice_Over(2070, 99);
-		Actor_Voice_Over(2080, 99);
-		Actor_Voice_Over(2090, 99);
+		Actor_Voice_Over(2070, kActorVoiceOver);
+		Actor_Voice_Over(2080, kActorVoiceOver);
+		Actor_Voice_Over(2090, kActorVoiceOver);
 	}
-	Actor_Modify_Friendliness_To_Other(5, 0, 3);
+	Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
 }
 
 void AIScriptRunciter::Retired(int byActorId) {}
@@ -156,38 +156,38 @@ int AIScriptRunciter::GetFriendlinessModifierIfGetsClue(int otherActorId, int cl
 
 bool AIScriptRunciter::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	if (newGoalNumber == 0) {
-		Actor_Put_In_Set(15, 16);
-		Actor_Set_At_Waypoint(15, 92, 567);
+		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Set_At_Waypoint(kActorRunciter, 92, 567);
 		return false;
 	}
 	if (newGoalNumber == 1) {
-		AI_Movement_Track_Flush(15);
+		AI_Movement_Track_Flush(kActorRunciter);
 		if (Random_Query(0, 1) == 1) {
 			if (Random_Query(0, 1) == 0) {
-				AI_Movement_Track_Append_With_Facing(15, 89, Random_Query(6, 10), 567);
+				AI_Movement_Track_Append_With_Facing(kActorRunciter, 89, Random_Query(6, 10), 567);
 			}
-			AI_Movement_Track_Append_With_Facing(15, 93, Random_Query(2, 6), 1002);
-			AI_Movement_Track_Append(15, 92, 5);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 93, Random_Query(2, 6), 1002);
+			AI_Movement_Track_Append(kActorRunciter, 92, 5);
 		} else {
-			AI_Movement_Track_Append_With_Facing(15, 91, Random_Query(3, 10), 120);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 91, Random_Query(3, 10), 120);
 			if (Random_Query(1, 3) == 1) {
-				AI_Movement_Track_Append_With_Facing(15, 93, Random_Query(2, 6), 1002);
+				AI_Movement_Track_Append_With_Facing(kActorRunciter, 93, Random_Query(2, 6), 1002);
 			}
-			AI_Movement_Track_Append_With_Facing(15, 90, Random_Query(5, 10), 170);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 90, Random_Query(5, 10), 170);
 		}
-		AI_Movement_Track_Repeat(15);
+		AI_Movement_Track_Repeat(kActorRunciter);
 		return true;
 	}
 	if (newGoalNumber == 2) {
-		AI_Movement_Track_Flush(15);
-		AI_Movement_Track_Append(15, 39, 120);
-		AI_Movement_Track_Append(15, 40, 0);
-		AI_Movement_Track_Repeat(15);
+		AI_Movement_Track_Flush(kActorRunciter);
+		AI_Movement_Track_Append(kActorRunciter, 39, 120);
+		AI_Movement_Track_Append(kActorRunciter, 40, 0);
+		AI_Movement_Track_Repeat(kActorRunciter);
 		return false;
 	}
 	if (newGoalNumber == 300) {
-		Actor_Put_In_Set(15, 16);
-		Actor_Set_At_Waypoint(15, 93, 1007);
+		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Set_At_Waypoint(kActorRunciter, 93, 1007);
 		return false;
 	}
 	return false;
@@ -242,7 +242,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 			var_45CD70_animation_state = 0;
 			var_45CD74_animation_frame = 0;
 			var_45CD78 = 0;
-			Actor_Change_Animation_Mode(15, 0);
+			Actor_Change_Animation_Mode(kActorRunciter, kAnimationModeCombatIdle);
 		}
 		*frame = var_45CD74_animation_frame;
 		break;
@@ -464,53 +464,67 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 }
 
 bool AIScriptRunciter::ChangeAnimationMode(int mode) {
-
 	switch (mode) {
-	case 23:
-		var_45CD70_animation_state = 12;
-		var_45CD74_animation_frame = 0;
+	case kAnimationModeCombatIdle:
+		if (var_45CD70_animation_state >= 2 && var_45CD70_animation_state <= 11) {
+			var_45CD88 = 1;
+		} else {
+			var_45CD70_animation_state = 0;
+			var_45CD74_animation_frame = 0;
+			var_45CD78 = 0;
+		}
 		break;
-	case 19:
+	case kAnimationModeWalk:
+		if (var_45CD70_animation_state > 1) {
+			var_45CD70_animation_state = 1;
+			var_45CD74_animation_frame = 0;
+		} else if (!var_45CD70_animation_state) {
+			var_45CD70_animation_state = 13;
+			var_462800 = 1;
+			var_462804 = 526;
+		}
+		break;
+	case 3:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 11;
-			var_462804 = 541;
+			var_462800 = 2;
+			var_462804 = 526;
 		}
 		var_45CD88 = 0;
 		break;
-	case 18:
+	case 12:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 10;
-			var_462804 = 540;
+			var_462800 = 4;
+			var_462804 = 534;
 		}
 		var_45CD88 = 0;
 		break;
-	case 17:
+	case 13:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 9;
-			var_462804 = 539;
+			var_462800 = 5;
+			var_462804 = 535;
 		}
 		var_45CD88 = 0;
 		break;
-	case 16:
+	case 14:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 8;
-			var_462804 = 538;
+			var_462800 = 6;
+			var_462804 = 536;
 		}
 		var_45CD88 = 0;
 		break;
@@ -525,87 +539,57 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
 		}
 		var_45CD88 = 0;
 		break;
-	case 14:
+	case 16:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 6;
-			var_462804 = 536;
+			var_462800 = 8;
+			var_462804 = 538;
 		}
 		var_45CD88 = 0;
 		break;
-	case 13:
+	case 17:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 5;
-			var_462804 = 535;
+			var_462800 = 9;
+			var_462804 = 539;
 		}
 		var_45CD88 = 0;
 		break;
-	case 12:
+	case 18:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 4;
-			var_462804 = 534;
+			var_462800 = 10;
+			var_462804 = 540;
 		}
 		var_45CD88 = 0;
 		break;
-	case 3:
+	case 19:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 2;
-			var_462804 = 526;
+			var_462800 = 11;
+			var_462804 = 541;
 		}
 		var_45CD88 = 0;
 		break;
-	case 1:
-		if (var_45CD70_animation_state > 1) {
-			var_45CD70_animation_state = 1;
-			var_45CD74_animation_frame = 0;
-		} else if (!var_45CD70_animation_state) {
-			var_45CD70_animation_state = 13;
-			var_462800 = 1;
-			var_462804 = 526;
-		}
-		break;
-	case 0:
-		if (var_45CD70_animation_state >= 2 && var_45CD70_animation_state <= 11) {
-			var_45CD88 = 1;
-		} else {
-			var_45CD70_animation_state = 0;
-			var_45CD74_animation_frame = 0;
-			var_45CD78 = 0;
-		}
-		break;
-	case 2:
-	case 4:
-	case 5:
-	case 6:
-	case 7:
-	case 8:
-	case 9:
-	case 10:
-	case 11:
-	case 20:
-	case 21:
-	case 22:
+	case 23:
+		var_45CD70_animation_state = 12;
+		var_45CD74_animation_frame = 0;
 		break;
-	default:
-		if (mode == 48) {
-			var_45CD70_animation_state = 14;
-			var_45CD74_animation_frame = 0;
-		}
+	case 48:
+		var_45CD70_animation_state = 14;
+		var_45CD74_animation_frame = 0;
 		break;
 	}
 	return true;
@@ -627,23 +611,21 @@ void AIScriptRunciter::SetAnimationState(int animationState, int animationFrame,
 
 bool AIScriptRunciter::ReachedMovementTrackWaypoint(int waypointId) {
 	switch (waypointId) {
-	case 93:
-		Actor_Face_Heading(15, 1002, true);
+	case 89:
+		Actor_Face_Heading(kActorRunciter, 567, true);
 		break;
-	case 92:
-		Actor_Face_Heading(15, 664, true);
+	case 90:
+		Actor_Face_Heading(kActorRunciter, 170, true);
 		break;
 	case 91:
-		Actor_Face_Heading(15, 120, true);
+		Actor_Face_Heading(kActorRunciter, 120, true);
 		break;
-	case 90:
-		Actor_Face_Heading(15, 170, true);
+	case 92:
+		Actor_Face_Heading(kActorRunciter, 664, true);
 		break;
-	case 89:
-		Actor_Face_Heading(15, 567, true);
+	case 93:
+		Actor_Face_Heading(kActorRunciter, 1002, true);
 		break;
-	default:
-		return true;
 	}
 	return true;
 }
diff --git a/engines/bladerunner/script/esper.cpp b/engines/bladerunner/script/esper.cpp
index 778542f..873841b 100644
--- a/engines/bladerunner/script/esper.cpp
+++ b/engines/bladerunner/script/esper.cpp
@@ -28,120 +28,120 @@ namespace BladeRunner {
 
 void ScriptESPER::SCRIPT_ESPER_DLL_Initialize() {
 	int v0 = 0;
-	if (Actor_Clue_Query(0, 12)) {
-		if (!Actor_Clue_Query(0, 28)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 180, 3);
-			Actor_Clue_Acquire(0, 28, 1, 15);
+	if (Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueRuncitersViewA)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 180, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersViewA, 1, kActorRunciter);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("RC02_FA.IMG", 0, 0);
-		if (!Actor_Clue_Query(0, 29)) {
-			Actor_Clue_Acquire(0, 29, 1, 15);
+		if (!Actor_Clue_Query(kActorMcCoy, kClueRuncitersViewB)) {
+			Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersViewB, 1, kActorRunciter);
 		}
 		ESPER_Add_Photo("RC02_FA.IMG", 1, 1);
 	}
-	if (Actor_Clue_Query(0, 89)) {
-		if (!Actor_Clue_Query(0, 245)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 170, 3);
-			Actor_Clue_Acquire(0, 245, 1, -1);
+	if (Actor_Clue_Query(kActorMcCoy, kClueEarlyQsClub)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueOuterDressingRoom)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 170, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueOuterDressingRoom, 1, -1);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("NR060000.IMG", 2, 2);
 	}
-	if (Actor_Clue_Query(0, 88)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom)) {
 		ESPER_Add_Photo("NR070000.IMG", 3, 3);
 	}
-	if (Actor_Clue_Query(0, 246)) {
+	if (Actor_Clue_Query(kActorMcCoy, kCluePhotoOfMcCoy1)) {
 		ESPER_Add_Photo("HC01AR11.IMG", 4, 4);
 	}
-	if (Actor_Clue_Query(0, 247)) {
+	if (Actor_Clue_Query(kActorMcCoy, kCluePhotoOfMcCoy2)) {
 		ESPER_Add_Photo("HC01AR12.IMG", 5, 5);
 	}
-	if (Actor_Clue_Query(0, 260)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChinaBar)) {
 		ESPER_Add_Photo("HC02CB1.IMG", 6, 6);
 	}
-	if (Actor_Clue_Query(0, 257)) {
-		if (!Actor_Clue_Query(0, 78)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 170, 3);
-			Actor_Clue_Acquire(0, 78, 1, 32);
+	if (Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityDisc)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityPhoto)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 170, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityPhoto, 1, kActorHawkersBarkeep);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("HC02CB2.IMG", 7, 7);
 	}
-	if (Actor_Clue_Query(0, 45)) {
-		if (!Actor_Clue_Query(0, 259)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 170, 3);
-			Actor_Clue_Acquire(0, 259, 1, 17);
+	if (Actor_Clue_Query(kActorMcCoy, kClueTyrellSecurity)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueTyrellSecurityPhoto)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 170, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSecurityPhoto, 1, kActorTyrellGuard);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("TB060000.IMG", 8, 8);
 	}
-	if (Actor_Clue_Query(0, 86)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueMoonbus1)) {
 		ESPER_Add_Photo("KP06.IMG", 9, 9);
 	}
 	if (v0) {
-		Actor_Says(39, 200, 3);
+		Actor_Says(kActorAnsweringMachine, 200, 3);
 	}
 }
 
 void ScriptESPER::SCRIPT_ESPER_DLL_Photo_Selected(int photo) {
 	switch (photo) {
 	case 9:
-		Actor_Says(39, 270, 3);
+		Actor_Says(kActorAnsweringMachine, 270, 3);
 		ESPER_Define_Special_Region(22, 1208, 330, 1218, 340, 1050, 160, 1279, 550, 956, 203, 1278, 497, "KP06ESP1");
 		ESPER_Define_Special_Region(23, 854, 371, 858, 375, 790, 320, 940, 560, 722, 220, 1000, 505, "KP06ESP2");
 		ESPER_Define_Special_Region(24, 615, 325, 648, 365, 440, 220, 820, 959, 326, 140, 948, 474, "KP06ESP3");
 		ESPER_Define_Special_Region(25, 373, 417, 382, 426, 310, 370, 480, 560, 228, 323, 493, 509, "KP06ESP4");
 		break;
 	case 8:
-		Actor_Says(39, 230, 3);
+		Actor_Says(kActorAnsweringMachine, 230, 3);
 		ESPER_Define_Special_Region(18, 166, 623, 177, 632, 38, 528, 320, 770, 26, 530, 313, 771, "TB06ESP1");
 		ESPER_Define_Special_Region(19, 156, 356, 164, 360, 60, 280, 250, 460, 14, 251, 257, 459, "TB06ESP2");
 		ESPER_Define_Special_Region(20, 395, 158, 410, 185, 270, 70, 760, 640, 125, 0, 560, 307, "TB06ESP3");
 		ESPER_Define_Special_Region(21, 343, 269, 352, 276, 290, 200, 410, 340, 157, 118, 565, 405, "TB06ESP4");
 		break;
 	case 7:
-		Actor_Says(39, 250, 3);
+		Actor_Says(kActorAnsweringMachine, 250, 3);
 		ESPER_Define_Special_Region(16, 1171, 457, 1184, 466, 1060, 370, 1279, 730, 910, 300, 1279, 678, "HC02ESP3");
 		ESPER_Define_Special_Region(17, 328, 398, 340, 413, 250, 350, 460, 640, 100, 236, 530, 612, "HC02ESP4");
 		break;
 	case 6:
-		Actor_Says(39, 250, 3);
+		Actor_Says(kActorAnsweringMachine, 250, 3);
 		ESPER_Define_Special_Region(14, 879, 221, 882, 225, 640, 0, 1000, 512, 265, 146, 1014, 813, "HC02ESP5");
 		ESPER_Define_Special_Region(15, 660, 550, 678, 572, 560, 480, 850, 910, 265, 146, 1014, 813, "HC02ESP2");
 		break;
 	case 5:
-		Actor_Says(39, 240, 3);
+		Actor_Says(kActorAnsweringMachine, 240, 3);
 		ESPER_Define_Special_Region(13, 720, 485, 728, 491, 640, 390, 780, 630, 257, 94, 1013, 804, "HC01ESP3");
 		break;
 	case 4:
-		Actor_Says(39, 240, 3);
+		Actor_Says(kActorAnsweringMachine, 240, 3);
 		ESPER_Define_Special_Region(11, 420, 436, 434, 450, 350, 380, 520, 680, 257, 94, 1013, 804, "HC01ESP1");
 		ESPER_Define_Special_Region(12, 407, 489, 410, 509, 370, 450, 500, 560, 257, 94, 1013, 804, "HC01ESP2");
 		break;
 	case 3:
-		Actor_Says(39, 260, 3);
+		Actor_Says(kActorAnsweringMachine, 260, 3);
 		ESPER_Define_Special_Region(10, 893, 298, 901, 306, 770, 230, 980, 500, 340, 216, 942, 747, "NR07ESP1");
 		ESPER_Define_Special_Region(9, 479, 381, 482, 385, 430, 320, 520, 470, 265, 200, 815, 720, "NR07ESP2");
 		break;
 	case 2:
-		Actor_Says(39, 260, 3);
+		Actor_Says(kActorAnsweringMachine, 260, 3);
 		ESPER_Define_Special_Region(7, 102, 809, 108, 861, 20, 720, 200, 930, 191, 95, 1085, 870, "NR06ESP1");
 		ESPER_Define_Special_Region(8, 661, 437, 664, 443, 530, 320, 720, 600, 330, 200, 945, 750, "NR06ESP2");
 		break;
 	case 1:
-		Actor_Says(39, 220, 3);
+		Actor_Says(kActorAnsweringMachine, 220, 3);
 		ESPER_Define_Special_Region(3, 560, 210, 580, 220, 450, 130, 680, 540, 0, 0, 1279, 959, "RC02ESP4");
 		ESPER_Define_Special_Region(4, 584, 482, 595, 493, 460, 400, 660, 540, 0, 0, 1279, 959, "RC02ESP5");
 		ESPER_Define_Special_Region(5, 669, 322, 675, 329, 620, 230, 740, 390, 0, 0, 1279, 959, "RC02ESP6");
 		ESPER_Define_Special_Region(6, 698, 236, 748, 274, 600, 160, 850, 420, 160, 0, 1279, 750, "RC02ESP7");
 		break;
 	case 0:
-		Actor_Says(39, 220, 3);
+		Actor_Says(kActorAnsweringMachine, 220, 3);
 		ESPER_Define_Special_Region(0, 490, 511, 496, 517, 400, 440, 580, 580, 380, 260, 900, 710, "RC02ESP1");
 		ESPER_Define_Special_Region(1, 473, 342, 479, 349, 400, 300, 580, 580, 350, 250, 900, 710, "RC02ESP2");
 		ESPER_Define_Special_Region(2, 444, 215, 461, 223, 380, 120, 570, 340, 354, 160, 577, 354, "RC02ESP3");
@@ -156,34 +156,34 @@ bool ScriptESPER::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 	case 9:
 		switch (region) {
 		case 22:
-			Actor_Says(0, 8705, 3);
-			if (!Actor_Clue_Query(0, 274)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8705, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbusReflection)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 274, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueMoonbusReflection, 1, -1);
 			}
 			break;
 		case 23:
-			Actor_Voice_Over(4240, 99);
-			if (!Actor_Clue_Query(0, 275)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4240, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueMcCoyAtMoonbus)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 275, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueMcCoyAtMoonbus, 1, -1);
 			}
 			break;
 		case 24:
-			Actor_Voice_Over(4220, 99);
-			if (!Actor_Clue_Query(0, 276)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4220, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueClovisAtMoonbus)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 276, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueClovisAtMoonbus, 1, -1);
 			}
 			break;
 		case 25:
-			if (!Actor_Clue_Query(0, 277)) {
-				Actor_Says(0, 6945, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueSadikAtMoonbus)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 277, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueSadikAtMoonbus, 1, -1);
 			}
 			break;
 		}
@@ -191,190 +191,190 @@ bool ScriptESPER::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 	case 8:
 		switch (region) {
 		case 18:
-			Actor_Says(0, 8775, 3);
-			if (!Actor_Clue_Query(0, 263)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8775, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueKingstonKitchenBox2)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 263, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueKingstonKitchenBox2, 1, -1);
 			}
 			break;
 		case 19:
-			Actor_Voice_Over(4160, 99);
-			if (!Actor_Clue_Query(0, 262)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4160, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueDogCollar2)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 262, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDogCollar2, 1, -1);
 			}
 			break;
 		case 20:
-			Actor_Voice_Over(2140, 99);
-			Actor_Voice_Over(2150, 99);
-			Actor_Voice_Over(2160, 99);
-			if (!Actor_Clue_Query(0, 47)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(2140, kActorVoiceOver);
+			Actor_Voice_Over(2150, kActorVoiceOver);
+			Actor_Voice_Over(2160, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 47, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueBombingSuspect, 1, -1);
 			}
 			break;
 		case 21:
-			Actor_Says(0, 8890, 3);
-			if (!Actor_Clue_Query(0, 261)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8890, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kCluePlasticExplosive)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 261, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kCluePlasticExplosive, 1, -1);
 			}
 			break;
 		}
 		return false;
 	case 7:
 		if (region == 16) {
-			Actor_Voice_Over(4080, 99);
-			if (!Actor_Clue_Query(0, 255)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4080, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueIzo)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 255, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueIzo, 1, -1);
 			}
 		} else if (region == 17) {
-			Actor_Voice_Over(4210, 99);
-			if (!Actor_Clue_Query(0, 256)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4210, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueGuzza)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 256, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueGuzza, 1, -1);
 			}
 		}
 		return false;
 	case 6:
 		if (region == 14) {
-			Actor_Says(0, 6975, 3);
-			if (!Actor_Clue_Query(0, 254)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 6975, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityCamera)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 254, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityCamera, 1, -1);
 			}
 		} else if (region == 15) {
-			Actor_Voice_Over(4220, 99);
-			if (!Actor_Clue_Query(0, 77)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4220, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueIzosFriend)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 77, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueIzosFriend, 1, -1);
 			}
 		}
 		return false;
 	case 5:
 		if (region == 13) {
-			Actor_Says(0, 8830, 3);
-			if (!Actor_Clue_Query(0, 253)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8830, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueStrangeScale2)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 253, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueStrangeScale2, 1, -1);
 			}
 		}
 		return false;
 	case 4:
 		if (region == 11) {
-			Actor_Voice_Over(4090, 99);
-			if (!Actor_Clue_Query(0, 251)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4090, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueWomanInAnimoidRow)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 251, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueWomanInAnimoidRow, 1, -1);
 			}
 		} else if (region == 12) {
-			Actor_Voice_Over(4180, 99);
-			if (!Actor_Clue_Query(0, 252)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4180, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueScorpions)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 252, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueScorpions, 1, -1);
 			}
 		}
 		return false;
 	case 3:
 		if (region == 9) {
-			Actor_Voice_Over(4230, 99);
-			if (!Actor_Clue_Query(0, 249)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4230, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueClovisflowers)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 249, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueClovisflowers, 1, -1);
 			}
 			return true;
 		} else if (region == 10) {
-			Actor_Voice_Over(4040, 99);
-			if (!Actor_Clue_Query(0, 250)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4040, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueLucyWithDektora)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 250, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueLucyWithDektora, 1, -1);
 			}
 			return true;
 		}
 		return false;
 	case 2:
 		if (region == 8) {
-			Actor_Voice_Over(4260, 99);
-			if (!Actor_Clue_Query(0, 248)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4260, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueEarlyQAndLucy)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 248, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueEarlyQAndLucy, 1, -1);
 			}
 		} else if (region == 7) {
-			Actor_Voice_Over(4190, 99);
-			if (!Actor_Clue_Query(0, 258)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4190, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueScorpionbox)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 258, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueScorpionbox, 1, -1);
 			}
 		}
 		return true;
 	case 1:
 		if (region == 3) {
-			Actor_Voice_Over(4080, 99);
-			if (!Actor_Clue_Query(0, 243)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4080, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueAnimalMurderSuspect)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 243, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueAnimalMurderSuspect, 1, -1);
 			}
 		} else if (region == 4) {
-			Actor_Voice_Over(4110, 99);
-			if (!Actor_Clue_Query(0, 244)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4110, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueMilitaryBoots)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 244, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueMilitaryBoots, 1, -1);
 			}
 		} else if (region == 5) {
-			Actor_Voice_Over(4120, 99);
-			if (!Actor_Clue_Query(0, 31)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4120, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kCluePartialLicenseNumber)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 31, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kCluePartialLicenseNumber, 1, -1);
 			}
 		} else if (region == 6) {
-			Actor_Voice_Over(4070, 99);
-			if (!Actor_Clue_Query(0, 30)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4070, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueCarColorAndMake)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 30, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueCarColorAndMake, 1, -1);
 			}
 		}
 		return true;
 	case 0:
 		if (region == 0) {
-			Actor_Voice_Over(4050, 99);
-			if (!Actor_Clue_Query(0, 14)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4050, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueDragonflyAnklet)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 14, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyAnklet, 1, -1);
 			}
 		} else if (region == 1) {
-			Actor_Voice_Over(4040, 99);
-			if (!Actor_Clue_Query(0, 13)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4040, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 13, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueLucy, 1, -1);
 			}
 		} else if (region == 2) {
-			Actor_Voice_Over(4060, 99);
-			if (!Actor_Clue_Query(0, 9)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4060, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 9, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueSushiMenu, 1, -1);
 			}
 		}
 		return true;
diff --git a/engines/bladerunner/script/init.cpp b/engines/bladerunner/script/init.cpp
index 64136ba..e1b8ee8 100644
--- a/engines/bladerunner/script/init.cpp
+++ b/engines/bladerunner/script/init.cpp
@@ -115,95 +115,419 @@ void ScriptInit::Init_Game_Flags() {
 
 void ScriptInit::Init_Clues() {
 	for (int i = 0; i != 288; ++i) {
-		Actor_Clue_Add_To_Database(0, i, 0, false, false, -1);
+		Actor_Clue_Add_To_Database(kActorMcCoy, i, 0, false, false, -1);
 	}
 }
 
-struct clue_weigth {
+struct ClueWeight {
 	int clue;
 	int weight;
 };
 
-static clue_weigth clues_actor_1[44] = {
-	{222, 100}, {227, 100}, {223, 100}, {224, 100}, {226, 100}, {228, 100}, {231, 100}, {162, 100},
-	{164, 100}, {166, 100}, {168, 100}, {170, 100}, {172, 100}, {174, 100}, {176, 100}, {239, 90},
-	{241, 90}, {242, 90}, {179, 90}, {180, 90}, {181, 90}, {8, 85}, {240, 85}, {216, 85},
-	{217, 85}, {178, 80}, {5, 65}, {9, 65}, {215, 65}, {218, 65}, {219, 65}, {220, 65},
-	{229, 65}, {211, 65}, {80, 65}, {108, 65}, {134, 65}, {135, 65}, {212, 55}, {221, 55},
-	{230, 55}, {6, 30}, {7, 30}, {65, 30}
+static ClueWeight ClueWeightsForSteele[44] = {
+	{kClueMcCoyRetiredZuben, 100},
+	{kClueMcCoyShotZubenintheback, 100},
+	{kClueMcCoyRetiredLucy, 100},
+	{kClueMcCoyRetiredDektora, 100},
+	{kClueMcCoyRetiredSadik, 100},
+	{kClueMcCoyRetiredLutherLance, 100},
+	{kClueClovisOrdersMcCoysDeath, 100},
+	{kClueVKDektoraReplicant, 100},
+	{kClueVKBobGorskyReplicant, 100},
+	{kClueVKLutherLanceReplicant, 100},
+	{kClueVKGrigorianReplicant, 100},
+	{kClueVKIzoReplicant, 100},
+	{kClueVKCrazylegsReplicant, 100},
+	{kClueVKRunciterReplicant, 100},
+	{kClueVKEarlyQReplicant, 100},
+	{kClueMcCoyIsStupid, 90},
+	{kClueMcCoyIsKind, 90},
+	{kClueMcCoyIsInsane, 90},
+	{kClueGrigorianInterviewA, 90},
+	{kClueGrigorianInterviewB1, 90},
+	{kClueGrigorianInterviewB2, 90},
+	{kClueChopstickWrapper, 85},
+	{kClueMcCoyIsAnnoying, 85},
+	{kClueMcCoyWarnedIzo, 85},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 85},
+	{kClueCrimeSceneNotes, 80},
+	{kClueShellCasings, 65},
+	{kClueSushiMenu, 65},
+	{kClueMcCoyLetZubenEscape, 65},
+	{kClueMcCoyHelpedDektora, 65},
+	{kClueMcCoyHelpedLucy, 65},
+	{kClueMcCoyHelpedGordo, 65},
+	{kClueMcCoyBetrayal, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueWeaponsOrderForm, 65},
+	{kClueHollowayInterview, 65},
+	{kClueRunciterConfession1, 65},
+	{kClueRunciterConfession2, 65},
+	{kClueMcCoyKilledRunciter1, 55},
+	{kClueMcCoyShotGuzza, 55},
+	{kClueMcCoyKilledRunciter2, 55},
+	{kClueCandy, 30},
+	{kClueToyDog, 30},
+	{kClueDogCollar1, 30}
 };
 
-static clue_weigth clues_actor_2[28] = {
-	{227, 70}, {240, 65}, {241, 70}, {242, 95}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 95}, {217, 70}, {218, 70}, {219, 70}, {220, 70}, {221, 65}, {222, 70}, {223, 70},
-	{224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {232, 70}, {116, 65},
-	{117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForGordo[28] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 65},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 95},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 95},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyShotGuzza, 65},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_3[46] = {
-	{227, 70}, {240, 45}, {241, 70}, {242, 65}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 65}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {221, 45}, {222, 70}, {223, 70},
-	{224, 70}, {225, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {95, 70},
-	{232, 70}, {239, 65}, {19, 65}, {25, 55}, {60, 60}, {69, 60}, {70, 60}, {92, 70},
-	{103, 65}, {121, 65}, {130, 70}, {147, 70}, {148, 65}, {149, 65}, {150, 65}, {151, 65},
-	{152, 65}, {116, 65}, {117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForDektora[46] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyShotGuzza, 45},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredGordo, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueSuspectDektora, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 65},
+	{kClueHowieLeeInterview, 55},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyQInterview, 70},
+	{kClueGordoInterview3, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueGordoBlabs, 70},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNALutherLance, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_4[23] = {
-	{241, 90}, {242, 90}, {240, 70}, {214, 75}, {216, 75}, {218, 75}, {219, 75}, {220, 75},
-	{215, 70}, {217, 70}, {222, 70}, {223, 70}, {224, 70}, {226, 70}, {228, 70}, {230, 70},
-	{73, 65}, {211, 65}, {80, 65}, {108, 65}, {134, 65}, {135, 65}, {212, 55}
+static ClueWeight ClueWeightsForGuzza[23] = {
+	{kClueMcCoyIsKind, 90},
+	{kClueMcCoyIsInsane, 90},
+	{kClueMcCoyIsAnnoying, 70},
+	{kClueMcCoyIsABladeRunner, 75},
+	{kClueMcCoyWarnedIzo, 75},
+	{kClueMcCoyHelpedDektora, 75},
+	{kClueMcCoyHelpedLucy, 75},
+	{kClueMcCoyHelpedGordo, 75},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueSightingSadikBradbury, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueWeaponsOrderForm, 65},
+	{kClueHollowayInterview, 65},
+	{kClueRunciterConfession1, 65},
+	{kClueRunciterConfession2, 65},
+	{kClueMcCoyKilledRunciter1, 55}
 };
 
-static clue_weigth clues_actor_5[46] = {
-	{227, 70}, {241, 70}, {212, 70}, {213, 70}, {214, 70}, {215, 70}, {217, 70}, {220, 70},
-	{219, 70}, {218, 70}, {222, 70}, {223, 70}, {224, 70}, {226, 70}, {228, 70}, {229, 70},
-	{230, 70}, {232, 70}, {130, 70}, {147, 70}, {145, 70}, {242, 65}, {216, 65}, {239, 65},
-	{19, 65}, {95, 65}, {103, 65}, {107, 65}, {121, 65}, {148, 65}, {149, 65}, {150, 65},
-	{151, 65}, {152, 65}, {116, 65}, {117, 65}, {211, 65}, {60, 60}, {69, 60}, {70, 60},
-	{92, 60}, {25, 55}, {133, 55}, {207, 55}, {240, 45}, {221, 45}
+static ClueWeight ClueWeightsForClovis[46] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueGordoBlabs, 70},
+	{kClueDNATyrell, 70},
+	{kCluePowerSource, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 65},
+	{kClueSuspectDektora, 65},
+	{kClueGordoInterview3, 65},
+	{kClueDektoraInterview4, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNALutherLance, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyQInterview, 60},
+	{kClueHowieLeeInterview, 55},
+	{kClueDektoraConfession, 55},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyShotGuzza, 45}
 };
 
-static clue_weigth clues_actor_6[47] = {
-	{227, 70}, {240, 45}, {241, 70}, {242, 65}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 65}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {221, 45}, {222, 70}, {223, 70},
-	{224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {232, 70}, {239, 65},
-	{19, 65}, {25, 55}, {60, 60}, {69, 60}, {70, 60}, {92, 60}, {95, 65}, {103, 65},
-	{107, 65}, {121, 55}, {130, 70}, {133, 70}, {147, 70}, {148, 65}, {149, 65}, {150, 65},
-	{151, 65}, {152, 65}, {116, 65}, {117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForLucy[47] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyShotGuzza, 45},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 65},
+	{kClueHowieLeeInterview, 55},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyQInterview, 60},
+	{kClueSuspectDektora, 65},
+	{kClueGordoInterview3, 65},
+	{kClueDektoraInterview4, 65},
+	{kClueIzosStashRaided, 55},
+	{kClueGordoBlabs, 70},
+	{kClueDektoraConfession, 70},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNALutherLance, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_7_and_8[47] = {
-	{227, 70}, {240, 45}, {241, 70}, {242, 65}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 65}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {221, 45}, {222, 70}, {223, 70},
-	{224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {232, 70}, {239, 65},
-	{19, 45}, {25, 45}, {60, 45}, {69, 45}, {70, 45}, {92, 45}, {95, 45}, {103, 45},
-	{107, 45}, {121, 45}, {130, 45}, {133, 45}, {147, 70}, {148, 70}, {149, 70}, {150, 70},
-	{151, 70}, {152, 70}, {116, 65}, {117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForIzoAndSadik[47] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyShotGuzza, 45},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 45},
+	{kClueHowieLeeInterview, 45},
+	{kClueIzoInterview, 45},
+	{kClueGordoInterview1, 45},
+	{kClueGordoInterview2, 45},
+	{kClueEarlyQInterview, 45},
+	{kClueSuspectDektora, 45},
+	{kClueGordoInterview3, 45},
+	{kClueDektoraInterview4, 45},
+	{kClueIzosStashRaided, 45},
+	{kClueGordoBlabs, 45},
+	{kClueDektoraConfession, 45},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 70},
+	{kClueDNAChew, 70},
+	{kClueDNAMoraji, 70},
+	{kClueDNALutherLance, 70},
+	{kClueDNAMarcus, 70},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_9[49] = {
-	{241, 70}, {212, 70}, {214, 70}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {222, 70},
-	{223, 70}, {224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {130, 70},
-	{133, 70}, {147, 70}, {148, 70}, {149, 70}, {150, 70}, {151, 70}, {152, 70}, {145, 70},
-	{227, 65}, {240, 65}, {242, 65}, {213, 65}, {215, 65}, {216, 65}, {221, 65}, {239, 65},
-	{95, 65}, {103, 65}, {107, 65}, {121, 65}, {116, 65}, {117, 65}, {211, 65}, {99, 65},
-	{236, 65}, {60, 60}, {69, 60}, {70, 60}, {232, 55}, {92, 55}, {207, 55}, {19, 50},
-	{25, 40}
+static ClueWeight ClueWeightsForCrazylegs[49] = {
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueGordoBlabs, 70},
+	{kClueDektoraConfession, 70},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 70},
+	{kClueDNAChew, 70},
+	{kClueDNAMoraji, 70},
+	{kClueDNALutherLance, 70},
+	{kClueDNAMarcus, 70},
+	{kCluePowerSource, 70},
+	{kClueMcCoyShotZubenintheback, 65},
+	{kClueMcCoyIsAnnoying, 65},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoysDescription, 65},
+	{kClueMcCoyLetZubenEscape, 65},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyShotGuzza, 65},
+	{kClueMcCoyIsStupid, 65},
+	{kClueSuspectDektora, 65},
+	{kClueGordoInterview3, 65},
+	{kClueDektoraInterview4, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueGrigoriansNote, 65},
+	{kClueCrazysInvolvement, 65},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyAttemptedToSeduceLucy, 55},
+	{kClueEarlyQInterview, 55},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueZubenInterview, 50},
+	{kClueHowieLeeInterview, 40}
 };
 
-static clue_weigth clues_actor_10[44] = {
-	{241, 70}, {130, 70}, {147, 70}, {145, 70}, {240, 65}, {216, 65}, {217, 65}, {219, 65},
-	{218, 65}, {221, 65}, {223, 65}, {224, 65}, {226, 65}, {229, 65}, {239, 65}, {95, 65},
-	{121, 65}, {148, 65}, {149, 65}, {150, 65}, {152, 65}, {116, 65}, {117, 65}, {214, 60},
-	{215, 60}, {69, 60}, {70, 60}, {211, 60}, {242, 55}, {213, 55}, {220, 55}, {222, 55},
-	{60, 55}, {107, 55}, {133, 55}, {103, 50}, {92, 45}, {207, 45}, {227, 35}, {212, 35},
-	{230, 35}, {232, 35}, {19, 30}, {25, 30}
+static ClueWeight ClueWeightsForLuther[44] = {
+	{kClueMcCoyIsKind, 70},
+	{kClueGordoBlabs, 70},
+	{kClueDNATyrell, 70},
+	{kCluePowerSource, 70},
+	{kClueMcCoyIsAnnoying, 65},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 65},
+	{kClueMcCoyHelpedLucy, 65},
+	{kClueMcCoyHelpedDektora, 65},
+	{kClueMcCoyShotGuzza, 65},
+	{kClueMcCoyRetiredLucy, 65},
+	{kClueMcCoyRetiredDektora, 65},
+	{kClueMcCoyRetiredSadik, 65},
+	{kClueMcCoyBetrayal, 65},
+	{kClueMcCoyIsStupid, 65},
+	{kClueSuspectDektora, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kClueMcCoyIsABladeRunner, 60},
+	{kClueMcCoyLetZubenEscape, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueSightingMcCoyRuncitersShop, 60},
+	{kClueMcCoyIsInsane, 55},
+	{kClueMcCoysDescription, 55},
+	{kClueMcCoyHelpedGordo, 55},
+	{kClueMcCoyRetiredZuben, 55},
+	{kClueIzoInterview, 55},
+	{kClueDektoraInterview4, 55},
+	{kClueDektoraConfession, 55},
+	{kClueGordoInterview3, 50},
+	{kClueEarlyQInterview, 45},
+	{kClueCrystalArrestedCrazylegs, 45},
+	{kClueMcCoyShotZubenintheback, 35},
+	{kClueMcCoyKilledRunciter1, 35},
+	{kClueMcCoyKilledRunciter2, 35},
+	{kClueEarlyAttemptedToSeduceLucy, 35},
+	{kClueZubenInterview, 30},
+	{kClueHowieLeeInterview, 30}
 };
 
 void ScriptInit::Init_Clues2() {
 	for (int i = 0; i != 288; ++i) {
-		Actor_Clue_Add_To_Database(99, i, 100, false, false, -1);
+		Actor_Clue_Add_To_Database(kActorVoiceOver, i, 100, false, false, -1);
 	}
 
 #define IMPORT_CLUE_TABLE(a, arr) \
@@ -211,1117 +535,1119 @@ void ScriptInit::Init_Clues2() {
 		Actor_Clue_Add_To_Database( a, arr[i].clue, arr[i].weight, 0, 0, -1);\
 	}
 
-	IMPORT_CLUE_TABLE( 1, clues_actor_1);
-	IMPORT_CLUE_TABLE( 2, clues_actor_2);
-	IMPORT_CLUE_TABLE( 3, clues_actor_3);
-	IMPORT_CLUE_TABLE( 4, clues_actor_4);
-	IMPORT_CLUE_TABLE( 5, clues_actor_5);
-	IMPORT_CLUE_TABLE( 6, clues_actor_6);
-	IMPORT_CLUE_TABLE( 7, clues_actor_7_and_8);
-	IMPORT_CLUE_TABLE( 9, clues_actor_9);
-	IMPORT_CLUE_TABLE(10, clues_actor_10);
+	IMPORT_CLUE_TABLE(kActorSteele, ClueWeightsForSteele);
+	IMPORT_CLUE_TABLE(kActorGordo, ClueWeightsForGordo);
+	IMPORT_CLUE_TABLE(kActorDektora, ClueWeightsForDektora);
+	IMPORT_CLUE_TABLE(kActorGuzza, ClueWeightsForGuzza);
+	IMPORT_CLUE_TABLE(kActorClovis, ClueWeightsForClovis);
+	IMPORT_CLUE_TABLE(kActorLucy, ClueWeightsForLucy);
+	IMPORT_CLUE_TABLE(kActorIzo, ClueWeightsForIzoAndSadik);
+	IMPORT_CLUE_TABLE(kActorSadik, ClueWeightsForIzoAndSadik);
+	IMPORT_CLUE_TABLE(kActorCrazylegs, ClueWeightsForCrazylegs);
+	IMPORT_CLUE_TABLE(kActorLuther, ClueWeightsForLuther);
 
 #undef IMPORT_CLUE_TABLE
 
-	Actor_Clue_Add_To_Database(11, 201, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 213, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 212, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 218, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 225, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 229, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 230, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 213, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 219, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 222, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 223, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 228, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 124, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 131, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 227, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 215, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 217, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 220, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 222, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 226, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 232, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 60, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 69, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 70, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 92, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 95, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 19, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 103, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 107, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 121, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 130, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 133, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 147, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 148, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 149, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 150, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 152, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 207, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 5, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 239, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 240, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 241, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 242, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 212, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 215, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 216, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 0, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 73, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 211, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 108, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 134, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 135, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 66, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 109, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 110, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 111, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 222, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 218, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 219, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 220, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 223, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 224, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 226, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 228, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 231, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 73, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 222, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 227, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 223, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 224, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 228, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 231, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 213, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 229, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 214, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 147, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 148, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 150, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 152, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 117, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 27, 20, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 16, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 17, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 26, 25, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 227, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(1, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 227, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 17, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 16, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 27, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 26, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(25, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(25, 213, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(25, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 0, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 5, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 8, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 9, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 227, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 241, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 215, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 216, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 217, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 220, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 219, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 218, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 222, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 223, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 224, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 226, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 228, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 230, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 232, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 25, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 60, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 69, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 70, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 92, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 95, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 19, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 103, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 107, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 121, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 130, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 133, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 147, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 148, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 149, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 150, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 151, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 152, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 145, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 207, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 211, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 25, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 64, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 69, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 111, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 124, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 219, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 241, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 217, 25, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 223, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 126, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 195, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 197, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 198, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 202, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 240, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 241, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 213, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 221, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 229, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 230, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 231, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 232, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 239, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 25, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 60, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 69, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 70, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 92, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 19, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 103, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 121, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 207, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 211, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 5, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 8, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 9, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 126, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 195, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 197, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 198, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 202, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 219, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 80, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 214, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 147, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 148, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 150, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 152, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 117, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 0, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 5, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 8, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 9, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 227, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 221, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 228, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 231, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 227, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 217, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 221, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 224, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 226, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 229, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 232, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 145, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 214, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 147, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 148, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 150, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 152, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 117, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 126, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 195, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 197, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 198, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 202, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 111, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 219, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 227, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 221, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 228, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 231, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 222, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 227, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 240, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 212, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 229, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 231, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 232, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 239, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 60, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 69, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 70, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 92, 25, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 95, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 19, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 103, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 107, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 121, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 130, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 133, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 147, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 149, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 150, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 151, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 152, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 227, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 217, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 221, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 224, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 226, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 229, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 232, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 145, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 239, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 241, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 222, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 212, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 221, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 228, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 229, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 162, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 164, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 166, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 168, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 170, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 172, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 176, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 0, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 211, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 80, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 108, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 134, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 135, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 214, 65, false, false, -1);
+	//note: this might look a bit weird, but it is implemented in this way in the original game - few weights are in table, others by direct call
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueBobShotInColdBlood, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoysDescription, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyKilledRunciter1, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyBetrayal, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyKilledRunciter2, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoysDescription, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyHelpedLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyRetiredZuben, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyRetiredLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyRetiredLutherLance, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueHomelessManKid, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueFlaskOfAbsinthe, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyShotZubenintheback, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyLetZubenEscape, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedIzoIzoIsAReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedGordo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredZuben, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredSadik, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueEarlyAttemptedToSeduceLucy, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueIzoInterview, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoInterview1, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueEarlyQInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueSuspectDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueZubenInterview, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoInterview3, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDektoraInterview4, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueIzosStashRaided, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoBlabs, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDektoraConfession, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNATyrell, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNASebastian, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNAChew, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNAMoraji, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNAMarcus, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueCrystalArrestedCrazylegs, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueShellCasings, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsStupid, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsAnnoying, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsKind, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsInsane, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyKilledRunciter1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyLetZubenEscape, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyWarnedIzo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueOfficersStatement, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueSightingSadikBradbury, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueSightingMcCoyRuncitersShop, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueHollowayInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueRunciterConfession1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueRunciterConfession2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueWeaponsCache, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueBakersBadge, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueHoldensBadge, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueCar, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredZuben, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyHelpedDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyHelpedLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyHelpedGordo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredSadik, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredLutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueClovisOrdersMcCoysDeath, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueSightingSadikBradbury, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredZuben, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyShotZubenintheback, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredLucy, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredDektora, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredLutherLance, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueClovisOrdersMcCoysDeath, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoysDescription, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyBetrayal, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsABladeRunner, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNATyrell, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNASebastian, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNAMoraji, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNAMarcus, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueCrazylegsInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueChromeDebris, 20, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueCrowdInterviewA, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueCrowdInterviewB, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kCluePaintTransfer, 25, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyShotZubenintheback, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSteele, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyShotZubenintheback, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueCrowdInterviewB, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueCrowdInterviewA, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueChromeDebris, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kCluePaintTransfer, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHanoi, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHanoi, kClueMcCoysDescription, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHanoi, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueOfficersStatement, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueShellCasings, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueChopstickWrapper, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueSushiMenu, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyShotZubenintheback, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsKind, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyLetZubenEscape, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyWarnedIzo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedIzoIzoIsAReplicant, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedGordo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredZuben, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredSadik, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredLutherLance, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyKilledRunciter2, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueEarlyAttemptedToSeduceLucy, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueHowieLeeInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueIzoInterview, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoInterview1, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoInterview2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueEarlyQInterview, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueSuspectDektora, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueZubenInterview, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoInterview3, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDektoraInterview4, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueIzosStashRaided, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoBlabs, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDektoraConfession, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNATyrell, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNASebastian, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNAChew, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNAMoraji, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNALutherLance, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNAMarcus, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kCluePowerSource, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueCrystalArrestedCrazylegs, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueSightingMcCoyRuncitersShop, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueHowieLeeInterview, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueFishLadyInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueGordoInterview1, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueCar, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueHomelessManKid, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyHelpedLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyIsKind, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyHelpedIzoIzoIsAReplicant, 25, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyRetiredLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueGuzzaFramedMcCoy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIncept, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kCluePoliceWeaponUsed, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoysWeaponUsedonBob, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRecoveredHoldensBadge, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsAnnoying, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsKind, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoysDescription, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyShotGuzza, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyBetrayal, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyKilledRunciter2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueClovisOrdersMcCoysDeath, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueEarlyAttemptedToSeduceLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsStupid, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueHowieLeeInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueIzoInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueEarlyQInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueZubenInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoInterview3, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueIzosStashRaided, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueCrystalArrestedCrazylegs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueSightingMcCoyRuncitersShop, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueShellCasings, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueChopstickWrapper, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueSushiMenu, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueGuzzaFramedMcCoy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIncept, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kCluePoliceWeaponUsed, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoysWeaponUsedonBob, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRecoveredHoldensBadge, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedLucy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueWeaponsOrderForm, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsABladeRunner, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNATyrell, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNASebastian, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNAMoraji, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNAMarcus, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueCrazylegsInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueOfficersStatement, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueShellCasings, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueChopstickWrapper, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueSushiMenu, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyShotZubenintheback, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyShotGuzza, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredLutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueClovisOrdersMcCoysDeath, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyShotZubenintheback, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedIzoIzoIsAReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyShotGuzza, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredDektora, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredSadik, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyBetrayal, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueEarlyAttemptedToSeduceLucy, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kCluePowerSource, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsABladeRunner, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNATyrell, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNASebastian, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNAMoraji, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNAMarcus, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueCrazylegsInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueGuzzaFramedMcCoy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIncept, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kCluePoliceWeaponUsed, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoysWeaponUsedonBob, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRecoveredHoldensBadge, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueCar, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedLucy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyShotZubenintheback, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyShotGuzza, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredLutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueClovisOrdersMcCoysDeath, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredZuben, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyShotZubenintheback, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsAnnoying, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyKilledRunciter1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyBetrayal, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueClovisOrdersMcCoysDeath, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueEarlyAttemptedToSeduceLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsStupid, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueIzoInterview, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoInterview1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoInterview2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueEarlyQInterview, 25, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueSuspectDektora, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueZubenInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoInterview3, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDektoraInterview4, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueIzosStashRaided, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoBlabs, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDektoraConfession, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNATyrell, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNAChew, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNAMoraji, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNALutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNAMarcus, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyShotZubenintheback, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedIzoIzoIsAReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyShotGuzza, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredDektora, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredSadik, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyBetrayal, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueEarlyAttemptedToSeduceLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kCluePowerSource, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsStupid, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsKind, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredZuben, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyKilledRunciter1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyShotGuzza, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredLutherLance, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyBetrayal, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKDektoraReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKBobGorskyReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKLutherLanceReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKGrigorianReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKIzoReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKCrazylegsReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKEarlyQReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueOfficersStatement, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueSightingMcCoyRuncitersShop, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueWeaponsOrderForm, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueHollowayInterview, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueRunciterConfession1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueRunciterConfession2, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsABladeRunner, 65, false, false, -1);
 }
 
 void ScriptInit::Init_World_Waypoints() {
@@ -1860,459 +2186,459 @@ void ScriptInit::Init_World_Waypoints() {
 }
 
 void ScriptInit::Init_SDB() {
-	SDB_Set_Actor(0, 8);
+	SDB_Set_Actor(0, kActorSadik);
 	SDB_Set_Sex(0, 1);
-	SDB_Add_MO_Clue(0, 52);
-	SDB_Add_MO_Clue(0, 49);
-	SDB_Add_MO_Clue(0, 48);
-	SDB_Add_MO_Clue(0, 261);
-	SDB_Add_Whereabouts_Clue(0, 45);
-	SDB_Add_Whereabouts_Clue(0, 53);
-	SDB_Add_Whereabouts_Clue(0, 44);
-	SDB_Add_Whereabouts_Clue(0, 67);
-	SDB_Add_Whereabouts_Clue(0, 122);
-	SDB_Add_Replicant_Clue(0, 49);
-	SDB_Add_Replicant_Clue(0, 52);
-	SDB_Add_Replicant_Clue(0, 68);
-	SDB_Add_Replicant_Clue(0, 51);
-	SDB_Add_Replicant_Clue(0, 269);
-	SDB_Add_Replicant_Clue(0, 278);
-	SDB_Add_Replicant_Clue(0, 52);
-	SDB_Add_Non_Replicant_Clue(0, 74);
-	SDB_Add_Non_Replicant_Clue(0, 61);
-	SDB_Add_Non_Replicant_Clue(0, 270);
-	SDB_Add_Other_Clue(0, 180);
-	SDB_Add_Other_Clue(0, 181);
-	SDB_Add_Other_Clue(0, 266);
-	SDB_Add_Other_Clue(0, 47);
-	SDB_Add_Other_Clue(0, 277);
-	SDB_Add_Identity_Clue(0, 266);
-	SDB_Add_Photo_Clue(0, 47, 31);
-	SDB_Add_Photo_Clue(0, 277, 38);
-	SDB_Set_Actor(1, 5);
+	SDB_Add_MO_Clue(0, kClueCrystalsCase);
+	SDB_Add_MO_Clue(0, kClueDetonatorWire);
+	SDB_Add_MO_Clue(0, kClueSadiksGun);
+	SDB_Add_MO_Clue(0, kCluePlasticExplosive);
+	SDB_Add_Whereabouts_Clue(0, kClueTyrellSecurity);
+	SDB_Add_Whereabouts_Clue(0, kClueKingstonKitchenBox1);
+	SDB_Add_Whereabouts_Clue(0, kClueDragonflyEarring);
+	SDB_Add_Whereabouts_Clue(0, kClueChewInterview);
+	SDB_Add_Whereabouts_Clue(0, kClueHomelessManInterview1);
+	SDB_Add_Replicant_Clue(0, kClueDetonatorWire);
+	SDB_Add_Replicant_Clue(0, kClueCrystalsCase);
+	SDB_Add_Replicant_Clue(0, kClueMorajiInterview);
+	SDB_Add_Replicant_Clue(0, kClueAttemptedFileAccess);
+	SDB_Add_Replicant_Clue(0, kClueExpertBomber);
+	SDB_Add_Replicant_Clue(0, kClueRachaelInterview);
+	SDB_Add_Replicant_Clue(0, kClueCrystalsCase);
+	SDB_Add_Non_Replicant_Clue(0, kClueStaggeredbyPunches);
+	SDB_Add_Non_Replicant_Clue(0, kClueIzosWarning);
+	SDB_Add_Non_Replicant_Clue(0, kClueAmateurBomber);
+	SDB_Add_Other_Clue(0, kClueGrigorianInterviewB1);
+	SDB_Add_Other_Clue(0, kClueGrigorianInterviewB2);
+	SDB_Add_Other_Clue(0, kClueAct2Ended);
+	SDB_Add_Other_Clue(0, kClueBombingSuspect);
+	SDB_Add_Other_Clue(0, kClueSadikAtMoonbus);
+	SDB_Add_Identity_Clue(0, kClueAct2Ended);
+	SDB_Add_Photo_Clue(0, kClueBombingSuspect, 31);
+	SDB_Add_Photo_Clue(0, kClueSadikAtMoonbus, 38);
+	SDB_Set_Actor(1, kActorClovis);
 	SDB_Set_Sex(1, 1);
-	SDB_Add_MO_Clue(1, 5);
-	SDB_Add_MO_Clue(1, 11);
-	SDB_Add_Whereabouts_Clue(1, 40);
-	SDB_Add_Whereabouts_Clue(1, 29);
-	SDB_Add_Whereabouts_Clue(1, 67);
-	SDB_Add_Replicant_Clue(1, 0);
-	SDB_Add_Replicant_Clue(1, 2);
-	SDB_Add_Replicant_Clue(1, 68);
-	SDB_Add_Replicant_Clue(1, 156);
-	SDB_Add_Replicant_Clue(1, 157);
-	SDB_Add_Replicant_Clue(1, 107);
-	SDB_Add_Other_Clue(1, 243);
-	SDB_Add_Other_Clue(1, 4);
-	SDB_Add_Other_Clue(1, 61);
-	SDB_Add_Other_Clue(1, 266);
-	SDB_Add_Other_Clue(1, 276);
-	SDB_Add_Other_Clue(1, 243);
-	SDB_Add_Other_Clue(1, 77);
-	SDB_Add_Other_Clue(1, 244);
-	SDB_Add_Identity_Clue(1, 61);
-	SDB_Add_Identity_Clue(1, 266);
-	SDB_Add_Identity_Clue(1, 107);
-	SDB_Add_Photo_Clue(1, 276, 37);
-	SDB_Add_Photo_Clue(1, 243, 7);
-	SDB_Add_Photo_Clue(1, 77, 25);
-	SDB_Add_Photo_Clue(1, 244, 8);
-	SDB_Set_Actor(2, 19);
+	SDB_Add_MO_Clue(1, kClueShellCasings);
+	SDB_Add_MO_Clue(1, kClueLabShellCasings);
+	SDB_Add_Whereabouts_Clue(1, kClueDispatchHitAndRun);
+	SDB_Add_Whereabouts_Clue(1, kClueRuncitersViewB);
+	SDB_Add_Whereabouts_Clue(1, kClueChewInterview);
+	SDB_Add_Replicant_Clue(1, kClueOfficersStatement);
+	SDB_Add_Replicant_Clue(1, kClueDoorForced2);
+	SDB_Add_Replicant_Clue(1, kClueMorajiInterview);
+	SDB_Add_Replicant_Clue(1, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(1, kClueZubenTalksAboutLucy2);
+	SDB_Add_Replicant_Clue(1, kClueDektoraInterview4);
+	SDB_Add_Other_Clue(1, kClueAnimalMurderSuspect);
+	SDB_Add_Other_Clue(1, kClueGracefulFootprints);
+	SDB_Add_Other_Clue(1, kClueIzosWarning);
+	SDB_Add_Other_Clue(1, kClueAct2Ended);
+	SDB_Add_Other_Clue(1, kClueClovisAtMoonbus);
+	SDB_Add_Other_Clue(1, kClueAnimalMurderSuspect);
+	SDB_Add_Other_Clue(1, kClueIzosFriend);
+	SDB_Add_Other_Clue(1, kClueMilitaryBoots);
+	SDB_Add_Identity_Clue(1, kClueIzosWarning);
+	SDB_Add_Identity_Clue(1, kClueAct2Ended);
+	SDB_Add_Identity_Clue(1, kClueDektoraInterview4);
+	SDB_Add_Photo_Clue(1, kClueClovisAtMoonbus, 37);
+	SDB_Add_Photo_Clue(1, kClueAnimalMurderSuspect, 7);
+	SDB_Add_Photo_Clue(1, kClueIzosFriend, 25);
+	SDB_Add_Photo_Clue(1, kClueMilitaryBoots, 8);
+	SDB_Set_Actor(2, kActorZuben);
 	SDB_Set_Sex(2, 1);
-	SDB_Add_MO_Clue(2, 0);
-	SDB_Add_MO_Clue(2, 10);
-	SDB_Add_Whereabouts_Clue(2, 40);
-	SDB_Add_Whereabouts_Clue(2, 29);
-	SDB_Add_Replicant_Clue(2, 0);
-	SDB_Add_Replicant_Clue(2, 2);
-	SDB_Add_Replicant_Clue(2, 25);
-	SDB_Add_Replicant_Clue(2, 18);
-	SDB_Add_Replicant_Clue(2, 20);
-	SDB_Add_Replicant_Clue(2, 156);
-	SDB_Add_Replicant_Clue(2, 157);
-	SDB_Add_Non_Replicant_Clue(2, 3);
-	SDB_Add_Non_Replicant_Clue(2, 21);
-	SDB_Add_Non_Replicant_Clue(2, 158);
-	SDB_Add_Other_Clue(2, 16);
-	SDB_Add_Other_Clue(2, 19);
-	SDB_Add_Other_Clue(2, 273);
-	SDB_Add_Identity_Clue(2, 25);
-	SDB_Add_Identity_Clue(2, 18);
-	SDB_Add_Identity_Clue(2, 19);
-	SDB_Add_Identity_Clue(2, 273);
-	SDB_Add_Photo_Clue(2, 20, 33);
-	SDB_Set_Actor(3, 6);
+	SDB_Add_MO_Clue(2, kClueOfficersStatement);
+	SDB_Add_MO_Clue(2, kClueLabCorpses);
+	SDB_Add_Whereabouts_Clue(2, kClueDispatchHitAndRun);
+	SDB_Add_Whereabouts_Clue(2, kClueRuncitersViewB);
+	SDB_Add_Replicant_Clue(2, kClueOfficersStatement);
+	SDB_Add_Replicant_Clue(2, kClueDoorForced2);
+	SDB_Add_Replicant_Clue(2, kClueHowieLeeInterview);
+	SDB_Add_Replicant_Clue(2, kClueZubenRunsAway);
+	SDB_Add_Replicant_Clue(2, kClueZuben);
+	SDB_Add_Replicant_Clue(2, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(2, kClueZubenTalksAboutLucy2);
+	SDB_Add_Non_Replicant_Clue(2, kClueLimpingFootprints);
+	SDB_Add_Non_Replicant_Clue(2, kClueBigManLimping);
+	SDB_Add_Non_Replicant_Clue(2, kClueZubensMotive);
+	SDB_Add_Other_Clue(2, kClueCrowdInterviewA);
+	SDB_Add_Other_Clue(2, kClueZubenInterview);
+	SDB_Add_Other_Clue(2, kClueLucyInterview);
+	SDB_Add_Identity_Clue(2, kClueHowieLeeInterview);
+	SDB_Add_Identity_Clue(2, kClueZubenRunsAway);
+	SDB_Add_Identity_Clue(2, kClueZubenInterview);
+	SDB_Add_Identity_Clue(2, kClueLucyInterview);
+	SDB_Add_Photo_Clue(2, kClueZuben, 33);
+	SDB_Set_Actor(3, kActorLucy);
 	SDB_Set_Sex(3, 0);
-	SDB_Add_Whereabouts_Clue(3, 8);
-	SDB_Add_Whereabouts_Clue(3, 9);
-	SDB_Add_Whereabouts_Clue(3, 15);
-	SDB_Add_Whereabouts_Clue(3, 28);
-	SDB_Add_Whereabouts_Clue(3, 84);
-	SDB_Add_Whereabouts_Clue(3, 19);
-	SDB_Add_Replicant_Clue(3, 22);
-	SDB_Add_Replicant_Clue(3, 23);
-	SDB_Add_Replicant_Clue(3, 271);
-	SDB_Add_Replicant_Clue(3, 156);
-	SDB_Add_Replicant_Clue(3, 107);
-	SDB_Add_Replicant_Clue(3, 280);
-	SDB_Add_Non_Replicant_Clue(3, 7);
-	SDB_Add_Non_Replicant_Clue(3, 85);
-	SDB_Add_Non_Replicant_Clue(3, 6);
-	SDB_Add_Non_Replicant_Clue(3, 272);
-	SDB_Add_Non_Replicant_Clue(3, 157);
-	SDB_Add_Other_Clue(3, 13);
-	SDB_Add_Other_Clue(3, 16);
-	SDB_Add_Identity_Clue(3, 22);
-	SDB_Add_Identity_Clue(3, 107);
-	SDB_Add_Photo_Clue(3, 13, 5);
-	SDB_Set_Actor(4, 3);
-	SDB_Add_MO_Clue(4, 252);
-	SDB_Add_Replicant_Clue(4, 162);
-	SDB_Add_Replicant_Clue(4, 92);
-	SDB_Add_Replicant_Clue(4, 91);
-	SDB_Add_Replicant_Clue(4, 107);
-	SDB_Add_Non_Replicant_Clue(4, 163);
-	SDB_Add_Non_Replicant_Clue(4, 96);
-	SDB_Add_Non_Replicant_Clue(4, 97);
-	SDB_Add_Non_Replicant_Clue(4, 98);
-	SDB_Add_Non_Replicant_Clue(4, 94);
-	SDB_Add_Other_Clue(4, 91);
-	SDB_Add_Other_Clue(4, 251);
-	SDB_Add_Other_Clue(4, 260);
-	SDB_Add_Other_Clue(4, 113);
-	SDB_Add_Identity_Clue(4, 96);
-	SDB_Add_Identity_Clue(4, 97);
-	SDB_Add_Identity_Clue(4, 92);
-	SDB_Add_Photo_Clue(4, 251, 21);
-	SDB_Add_Photo_Clue(4, 260, 19);
-	SDB_Set_Actor(5, 2);
+	SDB_Add_Whereabouts_Clue(3, kClueChopstickWrapper);
+	SDB_Add_Whereabouts_Clue(3, kClueSushiMenu);
+	SDB_Add_Whereabouts_Clue(3, kClueReferenceLetter);
+	SDB_Add_Whereabouts_Clue(3, kClueRuncitersViewA);
+	SDB_Add_Whereabouts_Clue(3, kClueHysteriaToken);
+	SDB_Add_Whereabouts_Clue(3, kClueZubenInterview);
+	SDB_Add_Replicant_Clue(3, kClueRunciterInterviewA);
+	SDB_Add_Replicant_Clue(3, kClueRunciterInterviewB1);
+	SDB_Add_Replicant_Clue(3, kClueVKLucyReplicant);
+	SDB_Add_Replicant_Clue(3, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(3, kClueDektoraInterview4);
+	SDB_Add_Replicant_Clue(3, kClueRuncitersConfession1);
+	SDB_Add_Non_Replicant_Clue(3, kClueToyDog);
+	SDB_Add_Non_Replicant_Clue(3, kClueRagDoll);
+	SDB_Add_Non_Replicant_Clue(3, kClueCandy);
+	SDB_Add_Non_Replicant_Clue(3, kClueVKLucyHuman);
+	SDB_Add_Non_Replicant_Clue(3, kClueZubenTalksAboutLucy2);
+	SDB_Add_Other_Clue(3, kClueLucy);
+	SDB_Add_Other_Clue(3, kClueCrowdInterviewA);
+	SDB_Add_Identity_Clue(3, kClueRunciterInterviewA);
+	SDB_Add_Identity_Clue(3, kClueDektoraInterview4);
+	SDB_Add_Photo_Clue(3, kClueLucy, 5);
+	SDB_Set_Actor(4, kActorDektora);
+	SDB_Add_MO_Clue(4, kClueScorpions);
+	SDB_Add_Replicant_Clue(4, kClueVKDektoraReplicant);
+	SDB_Add_Replicant_Clue(4, kClueEarlyQInterview);
+	SDB_Add_Replicant_Clue(4, kClueDragonflyBelt);
+	SDB_Add_Replicant_Clue(4, kClueDektoraInterview4);
+	SDB_Add_Non_Replicant_Clue(4, kClueVKDektoraHuman);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview2);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview3);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektorasCard);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview1);
+	SDB_Add_Other_Clue(4, kClueDragonflyBelt);
+	SDB_Add_Other_Clue(4, kClueWomanInAnimoidRow);
+	SDB_Add_Other_Clue(4, kClueChinaBar);
+	SDB_Add_Other_Clue(4, kClueCarRegistration1);
+	SDB_Add_Identity_Clue(4, kClueDektoraInterview2);
+	SDB_Add_Identity_Clue(4, kClueDektoraInterview3);
+	SDB_Add_Identity_Clue(4, kClueEarlyQInterview);
+	SDB_Add_Photo_Clue(4, kClueWomanInAnimoidRow, 21);
+	SDB_Add_Photo_Clue(4, kClueChinaBar, 19);
+	SDB_Set_Actor(5, kActorGordo);
 	SDB_Set_Sex(5, 1);
-	SDB_Add_Whereabouts_Clue(5, 102);
-	SDB_Add_Identity_Clue(5, 69);
-	SDB_Add_Identity_Clue(5, 70);
-	SDB_Set_Actor(6, 7);
+	SDB_Add_Whereabouts_Clue(5, kClueStolenCheese);
+	SDB_Add_Identity_Clue(5, kClueGordoInterview1);
+	SDB_Add_Identity_Clue(5, kClueGordoInterview2);
+	SDB_Set_Actor(6, kActorIzo);
 	SDB_Set_Sex(6, 1);
-	SDB_Add_Whereabouts_Clue(6, 58);
-	SDB_Add_Whereabouts_Clue(6, 59);
-	SDB_Add_Whereabouts_Clue(6, 181);
-	SDB_Add_Whereabouts_Clue(6, 122);
-	SDB_Add_Replicant_Clue(6, 63);
-	SDB_Add_Other_Clue(6, 180);
-	SDB_Add_Other_Clue(6, 66);
-	SDB_Add_Other_Clue(6, 125);
-	SDB_Add_Other_Clue(6, 121);
-	SDB_Add_Other_Clue(6, 255);
-	SDB_Add_Other_Clue(6, 246);
-	SDB_Add_Other_Clue(6, 247);
-	SDB_Add_Other_Clue(6, 62);
-	SDB_Add_Other_Clue(6, 60);
-	SDB_Add_Identity_Clue(6, 181);
-	SDB_Add_Identity_Clue(6, 58);
-	SDB_Add_Identity_Clue(6, 59);
-	SDB_Add_Identity_Clue(6, 246);
-	SDB_Add_Identity_Clue(6, 247);
-	SDB_Add_Identity_Clue(6, 62);
-	SDB_Add_Identity_Clue(6, 60);
-	SDB_Add_Photo_Clue(6, 255, 26);
-	SDB_Set_Actor(7, 0);
-	SDB_Add_Replicant_Clue(7, 275);
-	SDB_Add_Other_Clue(7, 246);
-	SDB_Add_Other_Clue(7, 247);
-	SDB_Add_Identity_Clue(7, 275);
-	SDB_Add_Photo_Clue(7, 275, 36);
-	SDB_Add_Photo_Clue(7, 246, 17);
-	SDB_Add_Photo_Clue(7, 247, 18);
-	SDB_Set_Actor(8, 4);
-	SDB_Add_Other_Clue(8, 256);
-	SDB_Add_Other_Clue(8, 125);
-	SDB_Add_Other_Clue(8, 126);
-	SDB_Add_Identity_Clue(8, 256);
-	SDB_Add_Identity_Clue(8, 126);
-	SDB_Add_Identity_Clue(8, 125);
-	SDB_Add_Photo_Clue(8, 256, 27);
+	SDB_Add_Whereabouts_Clue(6, kClueBobInterview1);
+	SDB_Add_Whereabouts_Clue(6, kClueBobInterview2);
+	SDB_Add_Whereabouts_Clue(6, kClueGrigorianInterviewB2);
+	SDB_Add_Whereabouts_Clue(6, kClueHomelessManInterview1);
+	SDB_Add_Replicant_Clue(6, kClueGogglesReplicantIssue);
+	SDB_Add_Other_Clue(6, kClueGrigorianInterviewB1);
+	SDB_Add_Other_Clue(6, kClueWeaponsCache);
+	SDB_Add_Other_Clue(6, kClueFolder);
+	SDB_Add_Other_Clue(6, kClueIzosStashRaided);
+	SDB_Add_Other_Clue(6, kClueIzo);
+	SDB_Add_Other_Clue(6, kCluePhotoOfMcCoy1);
+	SDB_Add_Other_Clue(6, kCluePhotoOfMcCoy2);
+	SDB_Add_Other_Clue(6, kClueRadiationGoggles);
+	SDB_Add_Other_Clue(6, kClueIzoInterview);
+	SDB_Add_Identity_Clue(6, kClueGrigorianInterviewB2);
+	SDB_Add_Identity_Clue(6, kClueBobInterview1);
+	SDB_Add_Identity_Clue(6, kClueBobInterview2);
+	SDB_Add_Identity_Clue(6, kCluePhotoOfMcCoy1);
+	SDB_Add_Identity_Clue(6, kCluePhotoOfMcCoy2);
+	SDB_Add_Identity_Clue(6, kClueRadiationGoggles);
+	SDB_Add_Identity_Clue(6, kClueIzoInterview);
+	SDB_Add_Photo_Clue(6, kClueIzo, 26);
+	SDB_Set_Actor(7, kActorMcCoy);
+	SDB_Add_Replicant_Clue(7, kClueMcCoyAtMoonbus);
+	SDB_Add_Other_Clue(7, kCluePhotoOfMcCoy1);
+	SDB_Add_Other_Clue(7, kCluePhotoOfMcCoy2);
+	SDB_Add_Identity_Clue(7, kClueMcCoyAtMoonbus);
+	SDB_Add_Photo_Clue(7, kClueMcCoyAtMoonbus, 36);
+	SDB_Add_Photo_Clue(7, kCluePhotoOfMcCoy1, 17);
+	SDB_Add_Photo_Clue(7, kCluePhotoOfMcCoy2, 18);
+	SDB_Set_Actor(8, kActorGuzza);
+	SDB_Add_Other_Clue(8, kClueGuzza);
+	SDB_Add_Other_Clue(8, kClueFolder);
+	SDB_Add_Other_Clue(8, kClueGuzzaFramedMcCoy);
+	SDB_Add_Identity_Clue(8, kClueGuzza);
+	SDB_Add_Identity_Clue(8, kClueGuzzaFramedMcCoy);
+	SDB_Add_Identity_Clue(8, kClueFolder);
+	SDB_Add_Photo_Clue(8, kClueGuzza, 27);
 }
 
 void ScriptInit::Init_CDB() {
-	CDB_Set_Crime(0, 0);
-	CDB_Set_Crime(1, 0);
-	CDB_Set_Crime(2, 0);
-	CDB_Set_Crime(3, 0);
-	CDB_Set_Crime(4, 0);
-	CDB_Set_Crime(5, 0);
-	CDB_Set_Crime(6, 0);
-	CDB_Set_Crime(7, 0);
-	CDB_Set_Crime(8, 0);
-	CDB_Set_Crime(9, 0);
-	CDB_Set_Crime(10, 0);
-	CDB_Set_Crime(11, 0);
-	CDB_Set_Crime(12, 0);
-	CDB_Set_Crime(15, 0);
-	CDB_Set_Crime(16, 0);
-	CDB_Set_Crime(17, 0);
-	CDB_Set_Crime(22, 0);
-	CDB_Set_Crime(23, 0);
-	CDB_Set_Crime(24, 0);
-	CDB_Set_Crime(26, 0);
-	CDB_Set_Crime(27, 0);
-	CDB_Set_Crime(28, 0);
-	CDB_Set_Crime(29, 0);
-	CDB_Set_Crime(30, 0);
-	CDB_Set_Crime(37, 0);
-	CDB_Set_Crime(31, 0);
-	CDB_Set_Crime(39, 0);
-	CDB_Set_Crime(243, 0);
-	CDB_Set_Crime(244, 0);
-	CDB_Set_Crime(273, 0);
-	CDB_Set_Crime(113, 0);
-	CDB_Set_Crime(114, 0);
-	CDB_Set_Crime(115, 0);
-	CDB_Set_Crime(19, 0);
-	CDB_Set_Crime(13, 0);
-	CDB_Set_Crime(14, 0);
-	CDB_Set_Crime(20, 0);
-	CDB_Set_Crime(43, 1);
-	CDB_Set_Crime(44, 1);
-	CDB_Set_Crime(45, 1);
-	CDB_Set_Crime(46, 1);
-	CDB_Set_Crime(49, 1);
-	CDB_Set_Crime(50, 1);
-	CDB_Set_Crime(51, 1);
-	CDB_Set_Crime(53, 1);
-	CDB_Set_Crime(54, 1);
-	CDB_Set_Crime(55, 1);
-	CDB_Set_Crime(65, 1);
-	CDB_Set_Crime(278, 1);
-	CDB_Set_Crime(279, 1);
-	CDB_Set_Crime(47, 1);
-	CDB_Set_Crime(262, 1);
-	CDB_Set_Crime(263, 1);
-	CDB_Set_Crime(261, 1);
-	CDB_Set_Crime(259, 1);
-	CDB_Set_Crime(33, 8);
-	CDB_Set_Crime(86, 8);
-	CDB_Set_Crime(275, 8);
-	CDB_Set_Crime(276, 8);
-	CDB_Set_Crime(277, 8);
-	CDB_Set_Crime(271, 8);
-	CDB_Set_Crime(52, 8);
-	CDB_Set_Crime(144, 8);
-	CDB_Set_Crime(178, 5);
-	CDB_Set_Crime(179, 5);
-	CDB_Set_Crime(180, 5);
-	CDB_Set_Crime(181, 5);
-	CDB_Set_Crime(68, 3);
-	CDB_Set_Crime(269, 3);
-	CDB_Set_Crime(270, 3);
-	CDB_Set_Crime(66, 2);
-	CDB_Set_Crime(125, 2);
-	CDB_Set_Crime(121, 2);
-	CDB_Set_Crime(122, 2);
-	CDB_Set_Crime(123, 2);
-	CDB_Set_Crime(124, 2);
-	CDB_Set_Crime(128, 2);
-	CDB_Set_Crime(83, 2);
-	CDB_Set_Crime(125, 2);
-	CDB_Set_Crime(126, 2);
-	CDB_Set_Crime(74, 4);
-	CDB_Set_Crime(266, 4);
+	CDB_Set_Crime(kClueOfficersStatement, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueDoorForced1, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueDoorForced2, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLimpingFootprints, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueGracefulFootprints, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueShellCasings, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCandy, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueToyDog, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueChopstickWrapper, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueSushiMenu, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLabCorpses, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLabShellCasings, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRuncitersVideo, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueReferenceLetter, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCrowdInterviewA, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCrowdInterviewB, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRunciterInterviewA, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRunciterInterviewB1, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRunciterInterviewB2, kCrimeAnimalMurder);
+	CDB_Set_Crime(kCluePaintTransfer, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueChromeDebris, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRuncitersViewA, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRuncitersViewB, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarColorAndMake, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLicensePlate, kCrimeAnimalMurder);
+	CDB_Set_Crime(kCluePartialLicenseNumber, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLabPaintTransfer, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueAnimalMurderSuspect, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueMilitaryBoots, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLucyInterview, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarRegistration1, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarRegistration2, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarRegistration3, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueZubenInterview, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLucy, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueDragonflyAnklet, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueZuben, kCrimeAnimalMurder);
+	CDB_Set_Crime(kCluePhoneCallGuzza, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDragonflyEarring, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSecurity, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellGuardInterview, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDetonatorWire, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueVictimInformation, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueAttemptedFileAccess, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueKingstonKitchenBox1, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSalesPamphlet1, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSalesPamphlet2, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDogCollar1, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueRachaelInterview, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellInterview, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueBombingSuspect, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDogCollar2, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueKingstonKitchenBox2, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kCluePlasticExplosive, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSecurityPhoto, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueGaffsInformation, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueMoonbus1, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueMcCoyAtMoonbus, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueClovisAtMoonbus, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueSadikAtMoonbus, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueVKLucyReplicant, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueCrystalsCase, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kCluePhoneCallCrystal, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueCrimeSceneNotes, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueGrigorianInterviewA, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueGrigorianInterviewB1, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueGrigorianInterviewB2, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueMorajiInterview, kCrimeMorajiMurder);
+	CDB_Set_Crime(kClueExpertBomber, kCrimeMorajiMurder);
+	CDB_Set_Crime(kClueAmateurBomber, kCrimeMorajiMurder);
+	CDB_Set_Crime(kClueWeaponsCache, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueFolder, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueIzosStashRaided, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueHomelessManInterview1, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueHomelessManInterview2, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueHomelessManKid, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueOriginalRequisitionForm, kCrimeArmsDealing);
+	CDB_Set_Crime(kCluePoliceIssueWeapons, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueFolder, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueGuzzaFramedMcCoy, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueStaggeredbyPunches, kCrimeBradburyAssault);
+	CDB_Set_Crime(kClueAct2Ended, kCrimeBradburyAssault);
 	int i = 0;
 	do {
 		CDB_Set_Clue_Asset_Type(i++, -1);
 	} while (i < 288);
-	CDB_Set_Clue_Asset_Type(0, 2);
-	CDB_Set_Clue_Asset_Type(2, 2);
-	CDB_Set_Clue_Asset_Type(3, 2);
-	CDB_Set_Clue_Asset_Type(4, 2);
-	CDB_Set_Clue_Asset_Type(5, 3);
-	CDB_Set_Clue_Asset_Type(6, 3);
-	CDB_Set_Clue_Asset_Type(7, 3);
-	CDB_Set_Clue_Asset_Type(8, 3);
-	CDB_Set_Clue_Asset_Type(9, 0);
-	CDB_Set_Clue_Asset_Type(10, 2);
-	CDB_Set_Clue_Asset_Type(11, 2);
-	CDB_Set_Clue_Asset_Type(12, 1);
-	CDB_Set_Clue_Asset_Type(13, 0);
-	CDB_Set_Clue_Asset_Type(14, 0);
-	CDB_Set_Clue_Asset_Type(15, 3);
-	CDB_Set_Clue_Asset_Type(16, 2);
-	CDB_Set_Clue_Asset_Type(17, 2);
-	CDB_Set_Clue_Asset_Type(19, 2);
-	CDB_Set_Clue_Asset_Type(20, 0);
-	CDB_Set_Clue_Asset_Type(21, 2);
-	CDB_Set_Clue_Asset_Type(22, 2);
-	CDB_Set_Clue_Asset_Type(23, 2);
-	CDB_Set_Clue_Asset_Type(24, 2);
-	CDB_Set_Clue_Asset_Type(25, 2);
-	CDB_Set_Clue_Asset_Type(26, 2);
-	CDB_Set_Clue_Asset_Type(27, 3);
-	CDB_Set_Clue_Asset_Type(28, 0);
-	CDB_Set_Clue_Asset_Type(29, 0);
-	CDB_Set_Clue_Asset_Type(30, 0);
-	CDB_Set_Clue_Asset_Type(31, 0);
-	CDB_Set_Clue_Asset_Type(32, 3);
-	CDB_Set_Clue_Asset_Type(33, 2);
-	CDB_Set_Clue_Asset_Type(34, -1);
-	CDB_Set_Clue_Asset_Type(35, -1);
-	CDB_Set_Clue_Asset_Type(36, 0);
-	CDB_Set_Clue_Asset_Type(37, 3);
-	CDB_Set_Clue_Asset_Type(39, 2);
-	CDB_Set_Clue_Asset_Type(40, 2);
-	CDB_Set_Clue_Asset_Type(41, 0);
-	CDB_Set_Clue_Asset_Type(43, 2);
-	CDB_Set_Clue_Asset_Type(44, 3);
-	CDB_Set_Clue_Asset_Type(45, 1);
-	CDB_Set_Clue_Asset_Type(46, 2);
-	CDB_Set_Clue_Asset_Type(47, 0);
-	CDB_Set_Clue_Asset_Type(48, 0);
-	CDB_Set_Clue_Asset_Type(49, 3);
-	CDB_Set_Clue_Asset_Type(50, 2);
-	CDB_Set_Clue_Asset_Type(51, 2);
-	CDB_Set_Clue_Asset_Type(52, 2);
-	CDB_Set_Clue_Asset_Type(53, 3);
-	CDB_Set_Clue_Asset_Type(54, 3);
-	CDB_Set_Clue_Asset_Type(55, 3);
-	CDB_Set_Clue_Asset_Type(56, 2);
-	CDB_Set_Clue_Asset_Type(57, 2);
-	CDB_Set_Clue_Asset_Type(58, 2);
-	CDB_Set_Clue_Asset_Type(59, 2);
-	CDB_Set_Clue_Asset_Type(60, 2);
-	CDB_Set_Clue_Asset_Type(61, 2);
-	CDB_Set_Clue_Asset_Type(62, 3);
-	CDB_Set_Clue_Asset_Type(63, 2);
-	CDB_Set_Clue_Asset_Type(64, 2);
-	CDB_Set_Clue_Asset_Type(65, 3);
-	CDB_Set_Clue_Asset_Type(66, 2);
-	CDB_Set_Clue_Asset_Type(67, 2);
-	CDB_Set_Clue_Asset_Type(68, 2);
-	CDB_Set_Clue_Asset_Type(69, 2);
-	CDB_Set_Clue_Asset_Type(70, 2);
-	CDB_Set_Clue_Asset_Type(71, 2);
-	CDB_Set_Clue_Asset_Type(72, 2);
-	CDB_Set_Clue_Asset_Type(74, 2);
-	CDB_Set_Clue_Asset_Type(75, 3);
-	CDB_Set_Clue_Asset_Type(76, 3);
-	CDB_Set_Clue_Asset_Type(77, 0);
-	CDB_Set_Clue_Asset_Type(78, 0);
-	CDB_Set_Clue_Asset_Type(79, 2);
-	CDB_Set_Clue_Asset_Type(80, 3);
-	CDB_Set_Clue_Asset_Type(81, 3);
-	CDB_Set_Clue_Asset_Type(84, 3);
-	CDB_Set_Clue_Asset_Type(85, 3);
-	CDB_Set_Clue_Asset_Type(86, 0);
-	CDB_Set_Clue_Asset_Type(87, 3);
-	CDB_Set_Clue_Asset_Type(88, 0);
-	CDB_Set_Clue_Asset_Type(89, 1);
-	CDB_Set_Clue_Asset_Type(93, 3);
-	CDB_Set_Clue_Asset_Type(94, 2);
-	CDB_Set_Clue_Asset_Type(96, 2);
-	CDB_Set_Clue_Asset_Type(97, 2);
-	CDB_Set_Clue_Asset_Type(98, 3);
-	CDB_Set_Clue_Asset_Type(99, 3);
-	CDB_Set_Clue_Asset_Type(100, 3);
-	CDB_Set_Clue_Asset_Type(101, 2);
-	CDB_Set_Clue_Asset_Type(102, 2);
-	CDB_Set_Clue_Asset_Type(103, 2);
-	CDB_Set_Clue_Asset_Type(104, 2);
-	CDB_Set_Clue_Asset_Type(105, 3);
-	CDB_Set_Clue_Asset_Type(106, 3);
-	CDB_Set_Clue_Asset_Type(107, 2);
-	CDB_Set_Clue_Asset_Type(108, 2);
-	CDB_Set_Clue_Asset_Type(109, 3);
-	CDB_Set_Clue_Asset_Type(110, 3);
-	CDB_Set_Clue_Asset_Type(112, 2);
-	CDB_Set_Clue_Asset_Type(113, 2);
-	CDB_Set_Clue_Asset_Type(114, 2);
-	CDB_Set_Clue_Asset_Type(115, 2);
-	CDB_Set_Clue_Asset_Type(116, 2);
-	CDB_Set_Clue_Asset_Type(117, 2);
-	CDB_Set_Clue_Asset_Type(118, 3);
-	CDB_Set_Clue_Asset_Type(119, 3);
-	CDB_Set_Clue_Asset_Type(120, 2);
-	CDB_Set_Clue_Asset_Type(121, 2);
-	CDB_Set_Clue_Asset_Type(122, 2);
-	CDB_Set_Clue_Asset_Type(123, 2);
-	CDB_Set_Clue_Asset_Type(124, 2);
-	CDB_Set_Clue_Asset_Type(126, 2);
-	CDB_Set_Clue_Asset_Type(127, 3);
-	CDB_Set_Clue_Asset_Type(128, 3);
-	CDB_Set_Clue_Asset_Type(129, 3);
-	CDB_Set_Clue_Asset_Type(131, 3);
-	CDB_Set_Clue_Asset_Type(133, 2);
-	CDB_Set_Clue_Asset_Type(134, 2);
-	CDB_Set_Clue_Asset_Type(135, 2);
-	CDB_Set_Clue_Asset_Type(136, 2);
-	CDB_Set_Clue_Asset_Type(137, 0);
-	CDB_Set_Clue_Asset_Type(138, 0);
-	CDB_Set_Clue_Asset_Type(139, 2);
-	CDB_Set_Clue_Asset_Type(140, 2);
-	CDB_Set_Clue_Asset_Type(141, 2);
-	CDB_Set_Clue_Asset_Type(142, 2);
-	CDB_Set_Clue_Asset_Type(143, 2);
-	CDB_Set_Clue_Asset_Type(144, 2);
-	CDB_Set_Clue_Asset_Type(145, 3);
-	CDB_Set_Clue_Asset_Type(146, 3);
-	CDB_Set_Clue_Asset_Type(178, 2);
-	CDB_Set_Clue_Asset_Type(179, 2);
-	CDB_Set_Clue_Asset_Type(180, 2);
-	CDB_Set_Clue_Asset_Type(181, 2);
-	CDB_Set_Clue_Asset_Type(147, 3);
-	CDB_Set_Clue_Asset_Type(148, 3);
-	CDB_Set_Clue_Asset_Type(149, 3);
-	CDB_Set_Clue_Asset_Type(150, 3);
-	CDB_Set_Clue_Asset_Type(151, 3);
-	CDB_Set_Clue_Asset_Type(152, 3);
-	CDB_Set_Clue_Asset_Type(243, 0);
-	CDB_Set_Clue_Asset_Type(244, 0);
-	CDB_Set_Clue_Asset_Type(245, 0);
-	CDB_Set_Clue_Asset_Type(246, 0);
-	CDB_Set_Clue_Asset_Type(247, 0);
-	CDB_Set_Clue_Asset_Type(248, 0);
-	CDB_Set_Clue_Asset_Type(249, 0);
-	CDB_Set_Clue_Asset_Type(250, 0);
-	CDB_Set_Clue_Asset_Type(251, 0);
-	CDB_Set_Clue_Asset_Type(252, 0);
-	CDB_Set_Clue_Asset_Type(253, 0);
-	CDB_Set_Clue_Asset_Type(254, 0);
-	CDB_Set_Clue_Asset_Type(255, 0);
-	CDB_Set_Clue_Asset_Type(256, 0);
-	CDB_Set_Clue_Asset_Type(257, 1);
-	CDB_Set_Clue_Asset_Type(258, 0);
-	CDB_Set_Clue_Asset_Type(259, 0);
-	CDB_Set_Clue_Asset_Type(260, 0);
-	CDB_Set_Clue_Asset_Type(261, 0);
-	CDB_Set_Clue_Asset_Type(262, 0);
-	CDB_Set_Clue_Asset_Type(263, 0);
-	CDB_Set_Clue_Asset_Type(264, 3);
-	CDB_Set_Clue_Asset_Type(265, 3);
-	CDB_Set_Clue_Asset_Type(269, 2);
-	CDB_Set_Clue_Asset_Type(270, 2);
-	CDB_Set_Clue_Asset_Type(271, 2);
-	CDB_Set_Clue_Asset_Type(272, 2);
-	CDB_Set_Clue_Asset_Type(162, 2);
-	CDB_Set_Clue_Asset_Type(163, 2);
-	CDB_Set_Clue_Asset_Type(164, 2);
-	CDB_Set_Clue_Asset_Type(165, 2);
-	CDB_Set_Clue_Asset_Type(168, 2);
-	CDB_Set_Clue_Asset_Type(169, 2);
-	CDB_Set_Clue_Asset_Type(174, 2);
-	CDB_Set_Clue_Asset_Type(175, 2);
-	CDB_Set_Clue_Asset_Type(273, 2);
-	CDB_Set_Clue_Asset_Type(274, 0);
-	CDB_Set_Clue_Asset_Type(275, 0);
-	CDB_Set_Clue_Asset_Type(276, 0);
-	CDB_Set_Clue_Asset_Type(277, 0);
-	CDB_Set_Clue_Asset_Type(156, 2);
-	CDB_Set_Clue_Asset_Type(157, 2);
-	CDB_Set_Clue_Asset_Type(158, 2);
-	CDB_Set_Clue_Asset_Type(278, 2);
-	CDB_Set_Clue_Asset_Type(279, 2);
-	CDB_Set_Clue_Asset_Type(280, 2);
-	CDB_Set_Clue_Asset_Type(283, 2);
-	CDB_Set_Clue_Asset_Type(284, 2);
-	CDB_Set_Clue_Asset_Type(285, 2);
-	CDB_Set_Clue_Asset_Type(286, 2);
-	CDB_Set_Clue_Asset_Type(287, 2);
-	CDB_Set_Clue_Asset_Type(125, 3);
+	CDB_Set_Clue_Asset_Type(kClueOfficersStatement, 2);
+	CDB_Set_Clue_Asset_Type(kClueDoorForced2, 2);
+	CDB_Set_Clue_Asset_Type(kClueLimpingFootprints, 2);
+	CDB_Set_Clue_Asset_Type(kClueGracefulFootprints, 2);
+	CDB_Set_Clue_Asset_Type(kClueShellCasings, 3);
+	CDB_Set_Clue_Asset_Type(kClueCandy, 3);
+	CDB_Set_Clue_Asset_Type(kClueToyDog, 3);
+	CDB_Set_Clue_Asset_Type(kClueChopstickWrapper, 3);
+	CDB_Set_Clue_Asset_Type(kClueSushiMenu, 0);
+	CDB_Set_Clue_Asset_Type(kClueLabCorpses, 2);
+	CDB_Set_Clue_Asset_Type(kClueLabShellCasings, 2);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersVideo, 1);
+	CDB_Set_Clue_Asset_Type(kClueLucy, 0);
+	CDB_Set_Clue_Asset_Type(kClueDragonflyAnklet, 0);
+	CDB_Set_Clue_Asset_Type(kClueReferenceLetter, 3);
+	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewB, 2);
+	CDB_Set_Clue_Asset_Type(kClueZubenInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueZuben, 0);
+	CDB_Set_Clue_Asset_Type(kClueBigManLimping, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB1, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB2, 2);
+	CDB_Set_Clue_Asset_Type(kClueHowieLeeInterview, 2);
+	CDB_Set_Clue_Asset_Type(kCluePaintTransfer, 2);
+	CDB_Set_Clue_Asset_Type(kClueChromeDebris, 3);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersViewA, 0);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersViewB, 0);
+	CDB_Set_Clue_Asset_Type(kClueCarColorAndMake, 0);
+	CDB_Set_Clue_Asset_Type(kCluePartialLicenseNumber, 0);
+	CDB_Set_Clue_Asset_Type(kClueBriefcase, 3);
+	CDB_Set_Clue_Asset_Type(kClueGaffsInformation, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedRunciters, -1);
+	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedChinatown, -1);
+	CDB_Set_Clue_Asset_Type(kClueWantedPoster, 0);
+	CDB_Set_Clue_Asset_Type(kClueLicensePlate, 3);
+	CDB_Set_Clue_Asset_Type(kClueLabPaintTransfer, 2);
+	CDB_Set_Clue_Asset_Type(kClueDispatchHitAndRun, 2);
+	CDB_Set_Clue_Asset_Type(kClueInceptShotRoy, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallGuzza, 2);
+	CDB_Set_Clue_Asset_Type(kClueDragonflyEarring, 3);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSecurity, 1);
+	CDB_Set_Clue_Asset_Type(kClueTyrellGuardInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueBombingSuspect, 0);
+	CDB_Set_Clue_Asset_Type(kClueSadiksGun, 0);
+	CDB_Set_Clue_Asset_Type(kClueDetonatorWire, 3);
+	CDB_Set_Clue_Asset_Type(kClueVictimInformation, 2);
+	CDB_Set_Clue_Asset_Type(kClueAttemptedFileAccess, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrystalsCase, 2);
+	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox1, 3);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet1, 3);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet2, 3);
+	CDB_Set_Clue_Asset_Type(kCluePeruvianLadyInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueHasanInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueBobInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueBobInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueIzoInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueIzosWarning, 2);
+	CDB_Set_Clue_Asset_Type(kClueRadiationGoggles, 3);
+	CDB_Set_Clue_Asset_Type(kClueGogglesReplicantIssue, 2);
+	CDB_Set_Clue_Asset_Type(kClueFishLadyInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueDogCollar1, 3);
+	CDB_Set_Clue_Asset_Type(kClueWeaponsCache, 2);
+	CDB_Set_Clue_Asset_Type(kClueChewInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueMorajiInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueAnsweringMachineMessage, 2);
+	CDB_Set_Clue_Asset_Type(kClueChessTable, 2);
+	CDB_Set_Clue_Asset_Type(kClueStaggeredbyPunches, 2);
+	CDB_Set_Clue_Asset_Type(kClueMaggieBracelet, 3);
+	CDB_Set_Clue_Asset_Type(kClueEnvelope, 3);
+	CDB_Set_Clue_Asset_Type(kClueIzosFriend, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityPhoto, 0);
+	CDB_Set_Clue_Asset_Type(kCluePurchasedScorpions, 2);
+	CDB_Set_Clue_Asset_Type(kClueWeaponsOrderForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueShippingForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueHysteriaToken, 3);
+	CDB_Set_Clue_Asset_Type(kClueRagDoll, 3);
+	CDB_Set_Clue_Asset_Type(kClueMoonbus1, 0);
+	CDB_Set_Clue_Asset_Type(kClueCheese, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektorasDressingRoom, 0);
+	CDB_Set_Clue_Asset_Type(kClueEarlyQsClub, 1);
+	CDB_Set_Clue_Asset_Type(kClueStrangeScale1, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview3, 2);
+	CDB_Set_Clue_Asset_Type(kClueDektorasCard, 3);
+	CDB_Set_Clue_Asset_Type(kClueGrigoriansNote, 3);
+	CDB_Set_Clue_Asset_Type(kClueCollectionReceipt, 3);
+	CDB_Set_Clue_Asset_Type(kClueSpecialIngredient, 2);
+	CDB_Set_Clue_Asset_Type(kClueStolenCheese, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview3, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoConfession, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordosLighter1, 3);
+	CDB_Set_Clue_Asset_Type(kClueGordosLighter2, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview4, 2);
+	CDB_Set_Clue_Asset_Type(kClueHollowayInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueBakersBadge, 3);
+	CDB_Set_Clue_Asset_Type(kClueHoldensBadge, 3);
+	CDB_Set_Clue_Asset_Type(kClueCarIdentified, 2);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration1, 2);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration2, 2);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration3, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueLichenDogWrapper, 3);
+	CDB_Set_Clue_Asset_Type(kClueRequisitionForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueScaryChair, 2);
+	CDB_Set_Clue_Asset_Type(kClueIzosStashRaided, 2);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManKid, 2);
+	CDB_Set_Clue_Asset_Type(kClueGuzzaFramedMcCoy, 2);
+	CDB_Set_Clue_Asset_Type(kClueOriginalShippingForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueOriginalRequisitionForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueCandyWrapper, 3);
+	CDB_Set_Clue_Asset_Type(kClueFlaskOfAbsinthe, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektoraConfession, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterConfession1, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterConfession2, 2);
+	CDB_Set_Clue_Asset_Type(kClueLutherLanceInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueMoonbus2, 0);
+	CDB_Set_Clue_Asset_Type(kClueMoonbusCloseup, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora1, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora2, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy1, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy2, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallClovis, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallCrystal, 2);
+	CDB_Set_Clue_Asset_Type(kCluePowerSource, 3);
+	CDB_Set_Clue_Asset_Type(kClueBomb, 3);
+	CDB_Set_Clue_Asset_Type(kClueCrimeSceneNotes, 2);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB1, 2);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB2, 2);
+	CDB_Set_Clue_Asset_Type(kClueDNATyrell, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNASebastian, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNAChew, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNAMoraji, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNALutherLance, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNAMarcus, 3);
+	CDB_Set_Clue_Asset_Type(kClueAnimalMurderSuspect, 0);
+	CDB_Set_Clue_Asset_Type(kClueMilitaryBoots, 0);
+	CDB_Set_Clue_Asset_Type(kClueOuterDressingRoom, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy1, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy2, 0);
+	CDB_Set_Clue_Asset_Type(kClueEarlyQAndLucy, 0);
+	CDB_Set_Clue_Asset_Type(kClueClovisflowers, 0);
+	CDB_Set_Clue_Asset_Type(kClueLucyWithDektora, 0);
+	CDB_Set_Clue_Asset_Type(kClueWomanInAnimoidRow, 0);
+	CDB_Set_Clue_Asset_Type(kClueScorpions, 0);
+	CDB_Set_Clue_Asset_Type(kClueStrangeScale2, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityCamera, 0);
+	CDB_Set_Clue_Asset_Type(kClueIzo, 0);
+	CDB_Set_Clue_Asset_Type(kClueGuzza, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityDisc, 1);
+	CDB_Set_Clue_Asset_Type(kClueScorpionbox, 0);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSecurityPhoto, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBar, 0);
+	CDB_Set_Clue_Asset_Type(kCluePlasticExplosive, 0);
+	CDB_Set_Clue_Asset_Type(kClueDogCollar2, 0);
+	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox2, 0);
+	CDB_Set_Clue_Asset_Type(kClueCrystalsCigarette, 3);
+	CDB_Set_Clue_Asset_Type(kClueSpinnerKeys, 3);
+	CDB_Set_Clue_Asset_Type(kClueExpertBomber, 2);
+	CDB_Set_Clue_Asset_Type(kClueAmateurBomber, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKLucyReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKLucyHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKDektoraReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKDektoraHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKGrigorianReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKGrigorianHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKRunciterReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKRunciterHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueLucyInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueMoonbusReflection, 0);
+	CDB_Set_Clue_Asset_Type(kClueMcCoyAtMoonbus, 0);
+	CDB_Set_Clue_Asset_Type(kClueClovisAtMoonbus, 0);
+	CDB_Set_Clue_Asset_Type(kClueSadikAtMoonbus, 0);
+	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy1, 2);
+	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy2, 2);
+	CDB_Set_Clue_Asset_Type(kClueZubensMotive, 2);
+	CDB_Set_Clue_Asset_Type(kClueRachaelInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueTyrellInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersConfession1, 2);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB1, 2);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB2, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview3, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegGgrovels, 2);
+	CDB_Set_Clue_Asset_Type(kClueFolder, 3);
 }
 
 void ScriptInit::Init_Spinner() {
@@ -2329,274 +2655,274 @@ void ScriptInit::Init_Spinner() {
 }
 
 void ScriptInit::Init_Actor_Friendliness() {
-	Actor_Set_Friendliness_To_Other(1, 0, 65);
-	Actor_Set_Friendliness_To_Other(1, 4, 60);
-	Actor_Set_Friendliness_To_Other(1, 11, 30);
-	Actor_Set_Friendliness_To_Other(1, 15, 35);
-	Actor_Set_Friendliness_To_Other(1, 23, 65);
-	Actor_Set_Friendliness_To_Other(1, 24, 65);
-	Actor_Set_Friendliness_To_Other(1, 28, 70);
-	Actor_Set_Friendliness_To_Other(1, 30, 65);
-	Actor_Set_Friendliness_To_Other(1, 34, 80);
-	Actor_Set_Friendliness_To_Other(1, 53, 65);
-	Actor_Set_Friendliness_To_Other(2, 1, 45);
-	Actor_Set_Friendliness_To_Other(2, 4, 65);
-	Actor_Set_Friendliness_To_Other(2, 11, 70);
-	Actor_Set_Friendliness_To_Other(2, 12, 75);
-	Actor_Set_Friendliness_To_Other(2, 15, 30);
-	Actor_Set_Friendliness_To_Other(2, 19, 80);
-	Actor_Set_Friendliness_To_Other(2, 23, 40);
-	Actor_Set_Friendliness_To_Other(2, 24, 40);
-	Actor_Set_Friendliness_To_Other(2, 28, 70);
-	Actor_Set_Friendliness_To_Other(2, 53, 40);
-	Actor_Set_Friendliness_To_Other(4, 1, 75);
-	Actor_Set_Friendliness_To_Other(4, 2, 70);
-	Actor_Set_Friendliness_To_Other(4, 11, 40);
-	Actor_Set_Friendliness_To_Other(4, 12, 55);
-	Actor_Set_Friendliness_To_Other(4, 15, 40);
-	Actor_Set_Friendliness_To_Other(4, 19, 45);
-	Actor_Set_Friendliness_To_Other(4, 23, 55);
-	Actor_Set_Friendliness_To_Other(4, 24, 55);
-	Actor_Set_Friendliness_To_Other(4, 28, 60);
-	Actor_Set_Friendliness_To_Other(4, 30, 60);
-	Actor_Set_Friendliness_To_Other(4, 34, 60);
-	Actor_Set_Friendliness_To_Other(4, 53, 65);
-	Actor_Set_Friendliness_To_Other(5, 0, 63);
-	Actor_Set_Friendliness_To_Other(6, 0, 50);
-	Actor_Set_Friendliness_To_Other(11, 1, 30);
-	Actor_Set_Friendliness_To_Other(11, 2, 70);
-	Actor_Set_Friendliness_To_Other(11, 4, 30);
-	Actor_Set_Friendliness_To_Other(11, 12, 55);
-	Actor_Set_Friendliness_To_Other(11, 15, 60);
-	Actor_Set_Friendliness_To_Other(11, 19, 70);
-	Actor_Set_Friendliness_To_Other(11, 23, 30);
-	Actor_Set_Friendliness_To_Other(11, 24, 30);
-	Actor_Set_Friendliness_To_Other(11, 28, 65);
-	Actor_Set_Friendliness_To_Other(11, 53, 30);
-	Actor_Set_Friendliness_To_Other(12, 2, 75);
-	Actor_Set_Friendliness_To_Other(12, 4, 40);
-	Actor_Set_Friendliness_To_Other(12, 11, 35);
-	Actor_Set_Friendliness_To_Other(12, 15, 40);
-	Actor_Set_Friendliness_To_Other(12, 19, 65);
-	Actor_Set_Friendliness_To_Other(12, 23, 40);
-	Actor_Set_Friendliness_To_Other(12, 24, 40);
-	Actor_Set_Friendliness_To_Other(12, 28, 70);
-	Actor_Set_Friendliness_To_Other(12, 53, 45);
-	Actor_Set_Friendliness_To_Other(15, 1, 55);
-	Actor_Set_Friendliness_To_Other(15, 2, 40);
-	Actor_Set_Friendliness_To_Other(15, 4, 40);
-	Actor_Set_Friendliness_To_Other(15, 11, 35);
-	Actor_Set_Friendliness_To_Other(15, 12, 40);
-	Actor_Set_Friendliness_To_Other(15, 19, 40);
-	Actor_Set_Friendliness_To_Other(15, 23, 60);
-	Actor_Set_Friendliness_To_Other(15, 24, 60);
-	Actor_Set_Friendliness_To_Other(15, 28, 65);
-	Actor_Set_Friendliness_To_Other(15, 53, 65);
-	Actor_Set_Friendliness_To_Other(19, 1, 45);
-	Actor_Set_Friendliness_To_Other(19, 2, 90);
-	Actor_Set_Friendliness_To_Other(19, 4, 55);
-	Actor_Set_Friendliness_To_Other(19, 11, 65);
-	Actor_Set_Friendliness_To_Other(19, 12, 60);
-	Actor_Set_Friendliness_To_Other(19, 15, 35);
-	Actor_Set_Friendliness_To_Other(19, 23, 35);
-	Actor_Set_Friendliness_To_Other(19, 24, 35);
-	Actor_Set_Friendliness_To_Other(19, 28, 60);
-	Actor_Set_Friendliness_To_Other(19, 53, 35);
-	Actor_Set_Friendliness_To_Other(23, 1, 75);
-	Actor_Set_Friendliness_To_Other(23, 4, 75);
-	Actor_Set_Friendliness_To_Other(23, 11, 35);
-	Actor_Set_Friendliness_To_Other(23, 12, 45);
-	Actor_Set_Friendliness_To_Other(23, 15, 40);
-	Actor_Set_Friendliness_To_Other(23, 24, 80);
-	Actor_Set_Friendliness_To_Other(23, 28, 70);
-	Actor_Set_Friendliness_To_Other(23, 30, 85);
-	Actor_Set_Friendliness_To_Other(23, 34, 85);
-	Actor_Set_Friendliness_To_Other(23, 53, 85);
-	Actor_Set_Friendliness_To_Other(24, 1, 75);
-	Actor_Set_Friendliness_To_Other(24, 4, 75);
-	Actor_Set_Friendliness_To_Other(24, 11, 35);
-	Actor_Set_Friendliness_To_Other(24, 12, 45);
-	Actor_Set_Friendliness_To_Other(24, 15, 40);
-	Actor_Set_Friendliness_To_Other(24, 23, 80);
-	Actor_Set_Friendliness_To_Other(24, 28, 65);
-	Actor_Set_Friendliness_To_Other(24, 30, 80);
-	Actor_Set_Friendliness_To_Other(24, 34, 85);
-	Actor_Set_Friendliness_To_Other(24, 53, 85);
-	Actor_Set_Friendliness_To_Other(28, 0, 60);
-	Actor_Set_Friendliness_To_Other(28, 1, 60);
-	Actor_Set_Friendliness_To_Other(28, 2, 65);
-	Actor_Set_Friendliness_To_Other(28, 4, 65);
-	Actor_Set_Friendliness_To_Other(28, 12, 65);
-	Actor_Set_Friendliness_To_Other(28, 15, 40);
-	Actor_Set_Friendliness_To_Other(28, 19, 65);
-	Actor_Set_Friendliness_To_Other(28, 23, 70);
-	Actor_Set_Friendliness_To_Other(28, 24, 70);
-	Actor_Set_Friendliness_To_Other(28, 53, 70);
-	Actor_Set_Friendliness_To_Other(30, 1, 70);
-	Actor_Set_Friendliness_To_Other(30, 4, 75);
-	Actor_Set_Friendliness_To_Other(30, 11, 35);
-	Actor_Set_Friendliness_To_Other(30, 23, 70);
-	Actor_Set_Friendliness_To_Other(30, 24, 70);
-	Actor_Set_Friendliness_To_Other(30, 34, 65);
-	Actor_Set_Friendliness_To_Other(30, 53, 70);
-	Actor_Set_Friendliness_To_Other(34, 0, 70);
-	Actor_Set_Friendliness_To_Other(34, 1, 70);
-	Actor_Set_Friendliness_To_Other(34, 4, 80);
-	Actor_Set_Friendliness_To_Other(34, 11, 35);
-	Actor_Set_Friendliness_To_Other(34, 23, 70);
-	Actor_Set_Friendliness_To_Other(34, 24, 70);
-	Actor_Set_Friendliness_To_Other(34, 30, 65);
-	Actor_Set_Friendliness_To_Other(34, 53, 70);
-	Actor_Set_Friendliness_To_Other(53, 1, 70);
-	Actor_Set_Friendliness_To_Other(53, 4, 65);
-	Actor_Set_Friendliness_To_Other(53, 11, 35);
-	Actor_Set_Friendliness_To_Other(53, 15, 35);
-	Actor_Set_Friendliness_To_Other(53, 23, 70);
-	Actor_Set_Friendliness_To_Other(53, 24, 65);
-	Actor_Set_Friendliness_To_Other(53, 28, 80);
-	Actor_Set_Friendliness_To_Other(53, 30, 70);
-	Actor_Set_Friendliness_To_Other(53, 34, 70);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorMcCoy, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorGuzza, 60);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorGrigorian, 30);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorRunciter, 35);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorOfficerLeary, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorOfficerGrayford, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorKlein, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorSergeantWalls, 80);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorGaff, 65);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorSteele, 45);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorGuzza, 65);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorGrigorian, 70);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorTransient, 75);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorRunciter, 30);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorZuben, 80);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorOfficerLeary, 40);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorOfficerGrayford, 40);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorGaff, 40);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorSteele, 75);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorGordo, 70);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorGrigorian, 40);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorTransient, 55);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorZuben, 45);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorOfficerLeary, 55);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorOfficerGrayford, 55);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorHowieLee, 60);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorKlein, 60);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorSergeantWalls, 60);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorGaff, 65);
+	Actor_Set_Friendliness_To_Other(kActorClovis, kActorMcCoy, 63);
+	Actor_Set_Friendliness_To_Other(kActorLucy, kActorMcCoy, 50);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorSteele, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorGordo, 70);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorGuzza, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorTransient, 55);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorRunciter, 60);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorZuben, 70);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorOfficerLeary, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorOfficerGrayford, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorHowieLee, 65);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorGaff, 30);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGordo, 75);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGuzza, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorZuben, 65);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorOfficerLeary, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorOfficerGrayford, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGaff, 45);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorSteele, 55);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGordo, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGuzza, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorTransient, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorZuben, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorOfficerLeary, 60);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorOfficerGrayford, 60);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorHowieLee, 65);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGaff, 65);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorSteele, 45);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGordo, 90);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGuzza, 55);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGrigorian, 65);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorTransient, 60);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorRunciter, 35);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorOfficerLeary, 35);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorOfficerGrayford, 35);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorHowieLee, 60);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGaff, 35);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorSteele, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorGuzza, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorTransient, 45);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorOfficerGrayford, 80);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorKlein, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorSergeantWalls, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorGaff, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorSteele, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorGuzza, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorTransient, 45);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorOfficerLeary, 80);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorHowieLee, 65);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorKlein, 80);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorSergeantWalls, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorGaff, 85);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorMcCoy, 60);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorSteele, 60);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorGordo, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorGuzza, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorTransient, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorZuben, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorOfficerGrayford, 70);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorGaff, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorSteele, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorGuzza, 75);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorOfficerGrayford, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorSergeantWalls, 65);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorGaff, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorMcCoy, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorSteele, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorGuzza, 80);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorOfficerGrayford, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorKlein, 65);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorGaff, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorSteele, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorGuzza, 65);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorRunciter, 35);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorOfficerGrayford, 65);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorHowieLee, 80);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorKlein, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorSergeantWalls, 70);
 }
 
 void ScriptInit::Init_Actor_Combat_Aggressiveness() {
-	Actor_Set_Combat_Aggressiveness(4, 50);
-	Actor_Set_Combat_Aggressiveness(14, 50);
-	Actor_Set_Combat_Aggressiveness(17, 50);
-	Actor_Set_Combat_Aggressiveness(19, 90);
-	Actor_Set_Combat_Aggressiveness(2, 50);
-	Actor_Set_Combat_Aggressiveness(6, 0);
-	Actor_Set_Combat_Aggressiveness(7, 70);
-	Actor_Set_Combat_Aggressiveness(3, 60);
-	Actor_Set_Combat_Aggressiveness(1, 70);
-	Actor_Set_Combat_Aggressiveness(8, 80);
-	Actor_Set_Combat_Aggressiveness(5, 75);
-	Actor_Set_Combat_Aggressiveness(23, 70);
-	Actor_Set_Combat_Aggressiveness(24, 60);
-	Actor_Set_Combat_Aggressiveness(70, 40);
-	Actor_Set_Combat_Aggressiveness(71, 30);
-	Actor_Set_Combat_Aggressiveness(72, 30);
-	Actor_Set_Combat_Aggressiveness(64, 100);
+	Actor_Set_Combat_Aggressiveness(kActorGuzza, 50);
+	Actor_Set_Combat_Aggressiveness(kActorBulletBob, 50);
+	Actor_Set_Combat_Aggressiveness(kActorTyrellGuard, 50);
+	Actor_Set_Combat_Aggressiveness(kActorZuben, 90);
+	Actor_Set_Combat_Aggressiveness(kActorGordo, 50);
+	Actor_Set_Combat_Aggressiveness(kActorLucy, 0);
+	Actor_Set_Combat_Aggressiveness(kActorIzo, 70);
+	Actor_Set_Combat_Aggressiveness(kActorDektora, 60);
+	Actor_Set_Combat_Aggressiveness(kActorSteele, 70);
+	Actor_Set_Combat_Aggressiveness(kActorSadik, 80);
+	Actor_Set_Combat_Aggressiveness(kActorClovis, 75);
+	Actor_Set_Combat_Aggressiveness(kActorOfficerLeary, 70);
+	Actor_Set_Combat_Aggressiveness(kActorOfficerGrayford, 60);
+	Actor_Set_Combat_Aggressiveness(kActorMutant1, 40);
+	Actor_Set_Combat_Aggressiveness(kActorMutant2, 30);
+	Actor_Set_Combat_Aggressiveness(kActorMutant3, 30);
+	Actor_Set_Combat_Aggressiveness(kActorFreeSlotA, 100);
 }
 
 void ScriptInit::Init_Actor_Honesty() {
-	Actor_Set_Honesty(19, 90);
+	Actor_Set_Honesty(kActorZuben, 90);
 }
 
 void ScriptInit::Init_Actor_Intelligence() {
-	Actor_Set_Intelligence(19, 20);
-	Actor_Set_Intelligence(2, 70);
-	Actor_Set_Intelligence(6, 60);
-	Actor_Set_Intelligence(7, 75);
-	Actor_Set_Intelligence(3, 80);
-	Actor_Set_Intelligence(1, 80);
-	Actor_Set_Intelligence(8, 80);
-	Actor_Set_Intelligence(5, 100);
-	Actor_Set_Intelligence(23, 50);
-	Actor_Set_Intelligence(24, 40);
-	Actor_Set_Intelligence(70, 40);
-	Actor_Set_Intelligence(71, 20);
-	Actor_Set_Intelligence(72, 30);
-	Actor_Set_Intelligence(64, 10);
+	Actor_Set_Intelligence(kActorZuben, 20);
+	Actor_Set_Intelligence(kActorGordo, 70);
+	Actor_Set_Intelligence(kActorLucy, 60);
+	Actor_Set_Intelligence(kActorIzo, 75);
+	Actor_Set_Intelligence(kActorDektora, 80);
+	Actor_Set_Intelligence(kActorSteele, 80);
+	Actor_Set_Intelligence(kActorSadik, 80);
+	Actor_Set_Intelligence(kActorClovis, 100);
+	Actor_Set_Intelligence(kActorOfficerLeary, 50);
+	Actor_Set_Intelligence(kActorOfficerGrayford, 40);
+	Actor_Set_Intelligence(kActorMutant1, 40);
+	Actor_Set_Intelligence(kActorMutant2, 20);
+	Actor_Set_Intelligence(kActorMutant3, 30);
+	Actor_Set_Intelligence(kActorFreeSlotA, 10);
 }
 
 void ScriptInit::Init_Actor_Stability() {
-	Actor_Set_Stability(19, 35);
+	Actor_Set_Stability(kActorZuben, 35);
 }
 
 void ScriptInit::Init_Actor_Health() {
-	Actor_Set_Health(0, 50, 50);
-	Actor_Set_Health(1, 50, 50);
-	Actor_Set_Health(2, 50, 50);
-	Actor_Set_Health(3, 50, 50);
-	Actor_Set_Health(4, 50, 50);
-	Actor_Set_Health(5, 50, 50);
-	Actor_Set_Health(6, 50, 50);
-	Actor_Set_Health(7, 50, 50);
-	Actor_Set_Health(8, 50, 50);
-	Actor_Set_Health(9, 50, 50);
-	Actor_Set_Health(10, 50, 50);
-	Actor_Set_Health(11, 50, 50);
-	Actor_Set_Health(12, 50, 50);
-	Actor_Set_Health(13, 50, 50);
-	Actor_Set_Health(14, 50, 50);
-	Actor_Set_Health(15, 50, 50);
-	Actor_Set_Health(16, 50, 50);
-	Actor_Set_Health(17, 50, 50);
-	Actor_Set_Health(18, 50, 50);
-	Actor_Set_Health(19, 50, 50);
-	Actor_Set_Health(20, 50, 50);
-	Actor_Set_Health(21, 50, 50);
-	Actor_Set_Health(22, 50, 50);
-	Actor_Set_Health(23, 50, 50);
-	Actor_Set_Health(24, 50, 50);
-	Actor_Set_Health(25, 50, 50);
-	Actor_Set_Health(26, 50, 50);
-	Actor_Set_Health(27, 50, 50);
-	Actor_Set_Health(28, 50, 50);
-	Actor_Set_Health(29, 50, 50);
-	Actor_Set_Health(30, 50, 50);
-	Actor_Set_Health(31, 50, 50);
-	Actor_Set_Health(32, 50, 50);
-	Actor_Set_Health(33, 50, 50);
-	Actor_Set_Health(34, 50, 50);
-	Actor_Set_Health(35, 50, 50);
-	Actor_Set_Health(36, 50, 50);
-	Actor_Set_Health(37, 50, 50);
-	Actor_Set_Health(38, 50, 50);
-	Actor_Set_Health(40, 50, 50);
-	Actor_Set_Health(41, 50, 50);
-	Actor_Set_Health(42, 50, 50);
-	Actor_Set_Health(43, 50, 50);
-	Actor_Set_Health(44, 50, 50);
-	Actor_Set_Health(45, 50, 50);
-	Actor_Set_Health(46, 50, 50);
-	Actor_Set_Health(47, 50, 50);
-	Actor_Set_Health(48, 50, 50);
-	Actor_Set_Health(49, 50, 50);
-	Actor_Set_Health(50, 50, 50);
-	Actor_Set_Health(51, 50, 50);
-	Actor_Set_Health(52, 50, 50);
-	Actor_Set_Health(53, 50, 50);
-	Actor_Set_Health(54, 50, 50);
-	Actor_Set_Health(55, 50, 50);
-	Actor_Set_Health(56, 50, 50);
-	Actor_Set_Health(57, 50, 50);
-	Actor_Set_Health(58, 50, 50);
-	Actor_Set_Health(59, 50, 50);
-	Actor_Set_Health(62, 50, 50);
-	Actor_Set_Health(66, 50, 50);
-	Actor_Set_Health(67, 50, 50);
-	Actor_Set_Health(68, 50, 50);
-	Actor_Set_Health(69, 50, 50);
-	Actor_Set_Health(19, 80, 80);
-	Actor_Set_Health(2, 40, 40);
-	Actor_Set_Health(6, 20, 20);
-	Actor_Set_Health(7, 50, 50);
-	Actor_Set_Health(3, 60, 60);
-	Actor_Set_Health(1, 60, 60);
-	Actor_Set_Health(8, 60, 60);
-	Actor_Set_Health(5, 90, 90);
-	Actor_Set_Health(23, 40, 40);
-	Actor_Set_Health(24, 50, 50);
-	Actor_Set_Health(70, 30, 30);
-	Actor_Set_Health(71, 50, 50);
-	Actor_Set_Health(72, 20, 20);
-	Actor_Set_Health(64, 20, 20);
-	Actor_Set_Health(65, 20, 20);
+	Actor_Set_Health(kActorMcCoy, 50, 50);
+	Actor_Set_Health(kActorSteele, 50, 50);
+	Actor_Set_Health(kActorGordo, 50, 50);
+	Actor_Set_Health(kActorDektora, 50, 50);
+	Actor_Set_Health(kActorGuzza, 50, 50);
+	Actor_Set_Health(kActorClovis, 50, 50);
+	Actor_Set_Health(kActorLucy, 50, 50);
+	Actor_Set_Health(kActorIzo, 50, 50);
+	Actor_Set_Health(kActorSadik, 50, 50);
+	Actor_Set_Health(kActorCrazylegs, 50, 50);
+	Actor_Set_Health(kActorLuther, 50, 50);
+	Actor_Set_Health(kActorGrigorian, 50, 50);
+	Actor_Set_Health(kActorTransient, 50, 50);
+	Actor_Set_Health(kActorLance, 50, 50);
+	Actor_Set_Health(kActorBulletBob, 50, 50);
+	Actor_Set_Health(kActorRunciter, 50, 50);
+	Actor_Set_Health(kActorInsectDealer, 50, 50);
+	Actor_Set_Health(kActorTyrellGuard, 50, 50);
+	Actor_Set_Health(kActorEarlyQ, 50, 50);
+	Actor_Set_Health(kActorZuben, 50, 50);
+	Actor_Set_Health(kActorHasan, 50, 50);
+	Actor_Set_Health(kActorMarcus, 50, 50);
+	Actor_Set_Health(kActorMia, 50, 50);
+	Actor_Set_Health(kActorOfficerLeary, 50, 50);
+	Actor_Set_Health(kActorOfficerGrayford, 50, 50);
+	Actor_Set_Health(kActorHanoi, 50, 50);
+	Actor_Set_Health(kActorBaker, 50, 50);
+	Actor_Set_Health(kActorDeskClerk, 50, 50);
+	Actor_Set_Health(kActorHowieLee, 50, 50);
+	Actor_Set_Health(kActorFishDealer, 50, 50);
+	Actor_Set_Health(kActorKlein, 50, 50);
+	Actor_Set_Health(kActorMurray, 50, 50);
+	Actor_Set_Health(kActorHawkersBarkeep, 50, 50);
+	Actor_Set_Health(kActorHolloway, 50, 50);
+	Actor_Set_Health(kActorSergeantWalls, 50, 50);
+	Actor_Set_Health(kActorMoraji, 50, 50);
+	Actor_Set_Health(kActorTheBard, 50, 50);
+	Actor_Set_Health(kActorPhotographer, 50, 50);
+	Actor_Set_Health(kActorDispatcher, 50, 50);
+	Actor_Set_Health(kActorRajif, 50, 50);
+	Actor_Set_Health(kActorGovernorKolvig, 50, 50);
+	Actor_Set_Health(kActorEarlyQBartender, 50, 50);
+	Actor_Set_Health(kActorHawkersParrot, 50, 50);
+	Actor_Set_Health(kActorTaffyPatron, 50, 50);
+	Actor_Set_Health(kActorLockupGuard, 50, 50);
+	Actor_Set_Health(kActorTeenager, 50, 50);
+	Actor_Set_Health(kActorHysteriaPatron1, 50, 50);
+	Actor_Set_Health(kActorHysteriaPatron2, 50, 50);
+	Actor_Set_Health(kActorHysteriaPatron3, 50, 50);
+	Actor_Set_Health(kActorShoeshineMan, 50, 50);
+	Actor_Set_Health(kActorTyrell, 50, 50);
+	Actor_Set_Health(kActorChew, 50, 50);
+	Actor_Set_Health(kActorGaff, 50, 50);
+	Actor_Set_Health(kActorBryant, 50, 50);
+	Actor_Set_Health(kActorTaffy, 50, 50);
+	Actor_Set_Health(kActorSebastian, 50, 50);
+	Actor_Set_Health(kActorRachael, 50, 50);
+	Actor_Set_Health(kActorGeneralDoll, 50, 50);
+	Actor_Set_Health(kActorIsabella, 50, 50);
+	Actor_Set_Health(kActorLeon, 50, 50);
+	Actor_Set_Health(kActorMaggie, 50, 50);
+	Actor_Set_Health(kActorGenwalkerA, 50, 50);
+	Actor_Set_Health(kActorGenwalkerB, 50, 50);
+	Actor_Set_Health(kActorGenwalkerC, 50, 50);
+	Actor_Set_Health(kActorZuben, 80, 80);
+	Actor_Set_Health(kActorGordo, 40, 40);
+	Actor_Set_Health(kActorLucy, 20, 20);
+	Actor_Set_Health(kActorIzo, 50, 50);
+	Actor_Set_Health(kActorDektora, 60, 60);
+	Actor_Set_Health(kActorSteele, 60, 60);
+	Actor_Set_Health(kActorSadik, 60, 60);
+	Actor_Set_Health(kActorClovis, 90, 90);
+	Actor_Set_Health(kActorOfficerLeary, 40, 40);
+	Actor_Set_Health(kActorOfficerGrayford, 50, 50);
+	Actor_Set_Health(kActorMutant1, 30, 30);
+	Actor_Set_Health(kActorMutant2, 50, 50);
+	Actor_Set_Health(kActorMutant3, 20, 20);
+	Actor_Set_Health(kActorFreeSlotA, 20, 20);
+	Actor_Set_Health(kActorFreeSlotB, 20, 20);
 	if (Game_Flag_Query(45) == 1) {
-		Actor_Set_Health(2, 60, 60);
+		Actor_Set_Health(kActorGordo, 60, 60);
 	}
 	if (Game_Flag_Query(46) == 1) {
-		Actor_Set_Health(6, 40, 40);
+		Actor_Set_Health(kActorLucy, 40, 40);
 	}
 	if (Game_Flag_Query(44) == 1) {
-		Actor_Set_Health(7, 65, 65);
+		Actor_Set_Health(kActorIzo, 65, 65);
 	}
 	if (Game_Flag_Query(47) == 1) {
-		Actor_Set_Health(3, 70, 70);
+		Actor_Set_Health(kActorDektora, 70, 70);
 	}
 	if (Game_Flag_Query(48) == 1) {
-		Actor_Set_Health(8, 80, 80);
+		Actor_Set_Health(kActorSadik, 80, 80);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index 757ec35..d63679b 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -68,7 +68,7 @@ void SceneScriptAR01::InitializeScene() {
 	Ambient_Sounds_Add_Sound(376, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	if (Game_Flag_Query(252) && !Game_Flag_Query(321) && !Game_Flag_Query(323)) {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 		Game_Flag_Set(273);
 		Scene_Loop_Start_Special(0, 1, 0);
 		Scene_Loop_Set_Default(2);
@@ -103,56 +103,56 @@ bool SceneScriptAR01::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptAR01::ClickedOnActor(int actorId) {
-	if (actorId == 16 || actorId == 20) {
-		Actor_Face_Actor(0, actorId, true);
-		Actor_Says(0, 8910, 14);
+	if (actorId == kActorInsectDealer || actorId == kActorHasan) {
+		Actor_Face_Actor(kActorMcCoy, actorId, true);
+		Actor_Says(kActorMcCoy, 8910, 14);
 		return true;
 	}
-	if (actorId == 29) {
-		Actor_Set_Goal_Number(29, 2);
-		if (!Loop_Actor_Walk_To_XYZ(0, -120.73f, 0.0f, 219.17f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 29, true);
-			Actor_Face_Actor(29, 0, true);
+	if (actorId == kActorFishDealer) {
+		Actor_Set_Goal_Number(kActorFishDealer, 2);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -120.73f, 0.0f, 219.17f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorFishDealer, true);
+			Actor_Face_Actor(kActorFishDealer, kActorMcCoy, true);
 			if (Game_Flag_Query(328)) {
-				if (Actor_Clue_Query(0, 93) && !Actor_Clue_Query(0, 64)) {
-					Actor_Says(0, 40, 11);
-					Actor_Says(29, 120, 14);
-					Actor_Says(0, 45, 17);
-					Actor_Says(29, 130, 14);
-					Actor_Says(29, 140, 14);
-					Actor_Says(0, 50, 13);
-					Actor_Says(29, 150, 14);
-					Actor_Clue_Acquire(0, 64, 1, 0);
+				if (Actor_Clue_Query(kActorMcCoy, kClueStrangeScale1) && !Actor_Clue_Query(kActorMcCoy, kClueFishLadyInterview)) {
+					Actor_Says(kActorMcCoy, 40, 11);
+					Actor_Says(kActorFishDealer, 120, 14);
+					Actor_Says(kActorMcCoy, 45, 17);
+					Actor_Says(kActorFishDealer, 130, 14);
+					Actor_Says(kActorFishDealer, 140, 14);
+					Actor_Says(kActorMcCoy, 50, 13);
+					Actor_Says(kActorFishDealer, 150, 14);
+					Actor_Clue_Acquire(kActorMcCoy, kClueFishLadyInterview, 1, kActorMcCoy);
 				} else {
 					if (Random_Query(1, 2) == 1) {
-						Actor_Says(0, 30, 17);
-						Actor_Says(29, 100, 14);
-						Actor_Says(29, 110, 14);
-						Actor_Says(0, 35, 13);
+						Actor_Says(kActorMcCoy, 30, 17);
+						Actor_Says(kActorFishDealer, 100, 14);
+						Actor_Says(kActorFishDealer, 110, 14);
+						Actor_Says(kActorMcCoy, 35, 13);
 					} else {
-						Actor_Says(0, 30, 17);
-						Actor_Says(29, 220, 14);
+						Actor_Says(kActorMcCoy, 30, 17);
+						Actor_Says(kActorFishDealer, 220, 14);
 					}
 				}
-				Actor_Set_Goal_Number(29, 1);
+				Actor_Set_Goal_Number(kActorFishDealer, 1);
 			} else {
-				Actor_Says(0, 0, 18);
-				Actor_Says(29, 0, 14);
-				Actor_Says(29, 10, 14);
-				Actor_Says(29, 20, 14);
-				Actor_Says(29, 30, 14);
-				Actor_Says(0, 5, 17);
-				Actor_Says(29, 40, 14);
-				Actor_Says(0, 10, 13);
-				Actor_Says(29, 50, 14);
-				Actor_Says(0, 15, 17);
-				Actor_Says(29, 60, 14);
-				Actor_Says(29, 70, 14);
-				Actor_Says(29, 80, 14);
-				Actor_Says(29, 90, 14);
-				Actor_Says(0, 25, 13);
+				Actor_Says(kActorMcCoy, 0, 18);
+				Actor_Says(kActorFishDealer, 0, 14);
+				Actor_Says(kActorFishDealer, 10, 14);
+				Actor_Says(kActorFishDealer, 20, 14);
+				Actor_Says(kActorFishDealer, 30, 14);
+				Actor_Says(kActorMcCoy, 5, 17);
+				Actor_Says(kActorFishDealer, 40, 14);
+				Actor_Says(kActorMcCoy, 10, 13);
+				Actor_Says(kActorFishDealer, 50, 14);
+				Actor_Says(kActorMcCoy, 15, 17);
+				Actor_Says(kActorFishDealer, 60, 14);
+				Actor_Says(kActorFishDealer, 70, 14);
+				Actor_Says(kActorFishDealer, 80, 14);
+				Actor_Says(kActorFishDealer, 90, 14);
+				Actor_Says(kActorMcCoy, 25, 13);
 				Game_Flag_Set(328);
-				Actor_Set_Goal_Number(29, 1);
+				Actor_Set_Goal_Number(kActorFishDealer, 1);
 			}
 			return true;
 		}
@@ -166,23 +166,23 @@ bool SceneScriptAR01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptAR01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -358.0, 0.0, -149.0, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -477.0, 0.0, -149.0, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -358.0, 0.0, -149.0, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -477.0, 0.0, -149.0, 0, 0, false, 0);
 			Game_Flag_Set(322);
 			Game_Flag_Set(464);
 			Game_Flag_Reset(180);
 			Game_Flag_Set(479);
 			Set_Enter(8, 31);
-			Actor_Set_Goal_Number(29, 3);
+			Actor_Set_Goal_Number(kActorFishDealer, 3);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -182.0, 0.0, -551.0, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0, 0.0, -551.0, 0, 1, false, 0)) {
 			Game_Flag_Set(320);
-			Async_Actor_Walk_To_XYZ(0, -222.0, 0.0, -690.0, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -222.0, 0.0, -690.0, 0, false);
 			Set_Enter(0, 1);
-			Actor_Set_Goal_Number(29, 3);
+			Actor_Set_Goal_Number(kActorFishDealer, 3);
 		}
 		return true;
 	}
@@ -190,27 +190,27 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 		if (Game_Flag_Query(486) == 1) {
 			Spinner_Set_Selectable_Destination_Flag(6, 1);
 		}
-		int v1 = Loop_Actor_Walk_To_XYZ(0, -164.0f, 0.0f, 332.0f, 0, 1, false, 0);
-		Actor_Face_Heading(0, 545, false);
-		if (Actor_Query_Goal_Number(7) >= 2 && Actor_Query_Goal_Number(7) <= 103) {
+		int v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -164.0f, 0.0f, 332.0f, 0, 1, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 545, false);
+		if (Actor_Query_Goal_Number(kActorIzo) >= 2 && Actor_Query_Goal_Number(kActorIzo) <= 103) {
 			Player_Loses_Control();
-			Actor_Put_In_Set(7, 0);
-			Actor_Set_At_XYZ(7, -448.0, 0.0, 130.0, 0);
-			Loop_Actor_Walk_To_XYZ(7, -323.0f, 0.64f, 101.74f, 48, 0, true, 0);
-			Loop_Actor_Walk_To_Actor(7, 0, 48, 0, true);
-			Actor_Face_Actor(7, 0, true);
-			Actor_Change_Animation_Mode(7, 6);
-			Actor_Says(0, 1800, 21);
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Put_In_Set(kActorIzo, 0);
+			Actor_Set_At_XYZ(kActorIzo, -448.0, 0.0, 130.0, 0);
+			Loop_Actor_Walk_To_XYZ(kActorIzo, -323.0f, 0.64f, 101.74f, 48, 0, true, 0);
+			Loop_Actor_Walk_To_Actor(kActorIzo, kActorMcCoy, 48, 0, true);
+			Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+			Actor_Change_Animation_Mode(kActorIzo, 6);
+			Actor_Says(kActorMcCoy, 1800, 21);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			Player_Gains_Control();
-			Actor_Retired_Here(0, 12, 48, 1, 7);
+			Actor_Retired_Here(kActorMcCoy, 12, 48, 1, kActorIzo);
 		} else if (!v1) {
 			if (Game_Flag_Query(486) && !Game_Flag_Query(660)) {
-				Actor_Voice_Over(4310, 99);
-				Actor_Voice_Over(4320, 99);
-				Actor_Voice_Over(4330, 99);
-				Actor_Voice_Over(4340, 99);
-				Actor_Voice_Over(4350, 99);
+				Actor_Voice_Over(4310, kActorVoiceOver);
+				Actor_Voice_Over(4320, kActorVoiceOver);
+				Actor_Voice_Over(4330, kActorVoiceOver);
+				Actor_Voice_Over(4340, kActorVoiceOver);
+				Actor_Voice_Over(4350, kActorVoiceOver);
 				Game_Flag_Set(660);
 			}
 			Game_Flag_Reset(176);
@@ -222,7 +222,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 			Game_Flag_Reset(180);
 
 			int spinnerDest = Spinner_Interface_Choose_Dest(4, 0);
-			Actor_Face_Heading(0, 545, 0);
+			Actor_Face_Heading(kActorMcCoy, 545, false);
 
 			switch (spinnerDest) {
 			case 0:
@@ -290,7 +290,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 				break;
 			default:
 				Game_Flag_Set(180);
-				Actor_Set_Invisible(0, 0);
+				Actor_Set_Invisible(kActorMcCoy, false);
 				break;
 			}
 		}
@@ -317,11 +317,11 @@ void SceneScriptAR01::SceneFrameAdvanced(int frame) {
 		Ambient_Sounds_Play_Sound(117, 40, -50, 80, 99);
 	}
 	if ((frame == 75 || frame == 196) && Game_Flag_Query(273)) {
-		Actor_Face_Heading(0, 545, false);
-		Actor_Change_Animation_Mode(0, 42);
+		Actor_Face_Heading(kActorMcCoy, 545, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 42);
 		Game_Flag_Reset(273);
 	} else if (frame == 196 && !Game_Flag_Query(273)) {
-		Actor_Change_Animation_Mode(0, 41);
+		Actor_Change_Animation_Mode(kActorMcCoy, 41);
 	}
 }
 
@@ -333,16 +333,16 @@ void SceneScriptAR01::PlayerWalkedIn() {
 		Game_Flag_Set(710);
 	}
 	if (Game_Flag_Query(323) == 1) {
-		Loop_Actor_Walk_To_XYZ(0, -358.0f, 0.0f, -149.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -358.0f, 0.0f, -149.0f, 0, 1, false, 0);
 		Game_Flag_Reset(323);
 	}
-	if (Actor_Query_Goal_Number(37) < 199) {
-		Actor_Set_Goal_Number(37, 199);
+	if (Actor_Query_Goal_Number(kActorPhotographer) < 199) {
+		Actor_Set_Goal_Number(kActorPhotographer, 199);
 	}
 }
 
 void SceneScriptAR01::PlayerWalkedOut() {
-	Actor_Set_Invisible(0, 0);
+	Actor_Set_Invisible(kActorMcCoy, false);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	if (!Game_Flag_Query(479)) {
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index 0e754b3..0d81c31 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -96,72 +96,72 @@ bool SceneScriptAR02::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptAR02::ClickedOnActor(int actorId) {
 	if (actorId == 16) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 16, true);
-			Actor_Face_Actor(16, 0, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true);
+			Actor_Face_Actor(kActorInsectDealer, kActorMcCoy, true);
 			if (Global_Variable_Query(1) == 2) {
 				if (Game_Flag_Query(329) && !Game_Flag_Query(366)) {
 					Game_Flag_Set(366);
 					Player_Loses_Control();
 					ADQ_Flush();
-					ADQ_Add(16, 210, 14);
-					Loop_Actor_Walk_To_XYZ(0, -350.66f, 0.0f, -1117.19f, 0, 0, false, 0);
-					Actor_Face_Actor(0, 16,true);
-					Actor_Says(0, 110, 18);
-					Actor_Says(16, 230, 14);
-					Actor_Says(0, 115, 18);
-					Actor_Says(16, 240, 14);
+					ADQ_Add(kActorInsectDealer, 210, 14);
+					Loop_Actor_Walk_To_XYZ(kActorMcCoy, -350.66f, 0.0f, -1117.19f, 0, 0, false, 0);
+					Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true);
+					Actor_Says(kActorMcCoy, 110, 18);
+					Actor_Says(kActorInsectDealer, 230, 14);
+					Actor_Says(kActorMcCoy, 115, 18);
+					Actor_Says(kActorInsectDealer, 240, 14);
 					Item_Pickup_Spin_Effect(956, 288, 257);
-					Actor_Says(16, 250, 14);
+					Actor_Says(kActorInsectDealer, 250, 14);
 					Player_Gains_Control();
 					sub_402AE0();
 				} else if (Game_Flag_Query(329)) {
-					Actor_Says(0, 75, 18);
-					Actor_Says(16, 60, 12);
-					Actor_Says(16, 70, 14);
+					Actor_Says(kActorMcCoy, 75, 18);
+					Actor_Says(kActorInsectDealer, 60, 12);
+					Actor_Says(kActorInsectDealer, 70, 14);
 				} else {
 					sub_402694();
 				}
 			} else if (Global_Variable_Query(1) > 2) {
-				if (Actor_Clue_Query(0, 56) && !Actor_Clue_Query(0, 90)) {
-					Actor_Says(0, 205, 16);
-					Actor_Says(16, 290, 12);
-					Actor_Says(16, 300, 13);
-					Actor_Says(0, 210, 15);
-					Actor_Says(16, 310, 12);
-					Actor_Says(0, 215, 13);
+				if (Actor_Clue_Query(kActorMcCoy, kCluePeruvianLadyInterview) && !Actor_Clue_Query(kActorMcCoy, kClueDragonflyCollection)) {
+					Actor_Says(kActorMcCoy, 205, 16);
+					Actor_Says(kActorInsectDealer, 290, 12);
+					Actor_Says(kActorInsectDealer, 300, 13);
+					Actor_Says(kActorMcCoy, 210, 15);
+					Actor_Says(kActorInsectDealer, 310, 12);
+					Actor_Says(kActorMcCoy, 215, 13);
 					if (Game_Flag_Query(374)) {
-						Actor_Says(0, 220, 14);
-						Actor_Says(16, 320, 12);
-						Actor_Says(0, 225, 13);
-						Actor_Says(16, 330, 14);
-						Actor_Says(0, 230, 19);
-						Actor_Says(16, 340, 13);
-						Actor_Says(16, 350, 12);
-						Actor_Says(0, 235, 16);
-						Actor_Clue_Acquire(0, 79, 0, 16);
+						Actor_Says(kActorMcCoy, 220, 14);
+						Actor_Says(kActorInsectDealer, 320, 12);
+						Actor_Says(kActorMcCoy, 225, 13);
+						Actor_Says(kActorInsectDealer, 330, 14);
+						Actor_Says(kActorMcCoy, 230, 19);
+						Actor_Says(kActorInsectDealer, 340, 13);
+						Actor_Says(kActorInsectDealer, 350, 12);
+						Actor_Says(kActorMcCoy, 235, 16);
+						Actor_Clue_Acquire(kActorMcCoy, kCluePurchasedScorpions, 0, kActorInsectDealer);
 					}
-					Actor_Clue_Acquire(0, 90, 0, 16);
+					Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyCollection, 0, kActorInsectDealer);
 				} else {
-					Actor_Says(0, 240, 17);
-					Actor_Says(16, 360, 13);
-					Actor_Says(16, 370, 14);
-					Actor_Says(0, 245, 13);
+					Actor_Says(kActorMcCoy, 240, 17);
+					Actor_Says(kActorInsectDealer, 360, 13);
+					Actor_Says(kActorInsectDealer, 370, 14);
+					Actor_Says(kActorMcCoy, 245, 13);
 				}
 			}
 			return true;
 		}
 	}
 	if (actorId == 20 && Global_Variable_Query(1) == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -240.79f, 0.0f, -1328.89f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 20, true);
-			Actor_Face_Actor(20, 0, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -240.79f, 0.0f, -1328.89f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorHasan, true);
+			Actor_Face_Actor(kActorHasan, kActorMcCoy, true);
 			if (Game_Flag_Query(330)) {
 				sub_402CE4();
 				return false;
 			}
-			Actor_Says(20, 0, 14);
-			Actor_Says(0, 140, 18);
+			Actor_Says(kActorHasan, 0, 14);
+			Actor_Says(kActorMcCoy, 140, 18);
 			Game_Flag_Set(330);
 			return true;
 		}
@@ -171,24 +171,24 @@ bool SceneScriptAR02::ClickedOnActor(int actorId) {
 
 bool SceneScriptAR02::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 106) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 16, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true);
 			if (!Game_Flag_Query(331)) {
-				Actor_Says(16, 0, 14);
-				Actor_Says(0, 55, 18);
-				Actor_Says(16, 10, 14);
-				Actor_Says(0, 60, 18);
-				Actor_Says(16, 20, 14);
+				Actor_Says(kActorInsectDealer, 0, 14);
+				Actor_Says(kActorMcCoy, 55, 18);
+				Actor_Says(kActorInsectDealer, 10, 14);
+				Actor_Says(kActorMcCoy, 60, 18);
+				Actor_Says(kActorInsectDealer, 20, 14);
 				Game_Flag_Set(331);
 			} else if (Game_Flag_Query(331) && !Game_Flag_Query(367)) {
-				Actor_Says(0, 65, 21);
-				Actor_Says(16, 30, 14);
-				Actor_Says(16, 40, 14);
-				Actor_Says(0, 70, 18);
-				Actor_Says(16, 50, 14);
+				Actor_Says(kActorMcCoy, 65, 21);
+				Actor_Says(kActorInsectDealer, 30, 14);
+				Actor_Says(kActorInsectDealer, 40, 14);
+				Actor_Says(kActorMcCoy, 70, 18);
+				Actor_Says(kActorInsectDealer, 50, 14);
 				Game_Flag_Set(367);
 			} else {
-				Actor_Says(0, 8527, 14);
+				Actor_Says(kActorMcCoy, 8527, 14);
 			}
 			return true;
 		}
@@ -198,16 +198,16 @@ bool SceneScriptAR02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptAR02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -182.0f, 0.0f, -551.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -551.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(321);
-			Async_Actor_Walk_To_XYZ(0, -182.0f, 0.0f, -407.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -407.0f, 0, false);
 			Set_Enter(0, 0);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -465.0f, 0.0f, -799.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -560.0f, 0.0f, -799.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -465.0f, 0.0f, -799.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -560.0f, 0.0f, -799.0f, 0, 0, false, 0);
 			Game_Flag_Set(117);
 			Game_Flag_Reset(180);
 			Game_Flag_Set(182);
@@ -231,7 +231,7 @@ void SceneScriptAR02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptAR02::PlayerWalkedIn() {
 	if (Game_Flag_Query(116) == 1) {
-		Loop_Actor_Walk_To_XYZ(0, -465.0f, 0.0f, -799.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -465.0f, 0.0f, -799.0f, 0, 0, false, 0);
 		Game_Flag_Reset(116);
 	}
 	Game_Flag_Set(726);
@@ -247,10 +247,10 @@ void SceneScriptAR02::DialogueQueueFlushed(int a1) {
 
 void SceneScriptAR02::sub_402694() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 44) || Actor_Clue_Query(0, 47)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring) || Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(490, 3, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 14) && !Actor_Clue_Query(0, 44) && !Actor_Clue_Query(0, 47)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyAnklet) && !Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring) && !Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(500, 3, 5, 5);
 	}
 	DM_Add_To_List_Never_Repeat_Once_Selected(510, 8, 3, -1);
@@ -262,37 +262,37 @@ void SceneScriptAR02::sub_402694() {
 	case 490:
 	case 500:
 		if (answerValue == 490) {
-			Actor_Says(0, 145, 15);
+			Actor_Says(kActorMcCoy, 145, 15);
 		} else {
-			Actor_Says(0, 150, 15);
+			Actor_Says(kActorMcCoy, 150, 15);
 		}
-		Actor_Says(16, 80, 14);
-		Actor_Says(0, 80, 16);
-		Actor_Says(16, 90, 12);
-		Actor_Says(0, 85, 17);
-		Actor_Says(16, 100, 14);
-		Actor_Says(16, 110, 12);
-		Actor_Says(16, 120, 12);
-		Actor_Says(0, 90, 13);
-		Actor_Says(16, 130, 12);
-		Actor_Says(16, 140, 14);
-		Actor_Says(0, 95, 15);
-		Actor_Says(16, 150, 12);
-		Actor_Says(16, 160, 13);
-		Actor_Says(16, 170, 14);
-		Actor_Says(0, 100, 16);
-		Actor_Says(16, 180, 13);
+		Actor_Says(kActorInsectDealer, 80, 14);
+		Actor_Says(kActorMcCoy, 80, 16);
+		Actor_Says(kActorInsectDealer, 90, 12);
+		Actor_Says(kActorMcCoy, 85, 17);
+		Actor_Says(kActorInsectDealer, 100, 14);
+		Actor_Says(kActorInsectDealer, 110, 12);
+		Actor_Says(kActorInsectDealer, 120, 12);
+		Actor_Says(kActorMcCoy, 90, 13);
+		Actor_Says(kActorInsectDealer, 130, 12);
+		Actor_Says(kActorInsectDealer, 140, 14);
+		Actor_Says(kActorMcCoy, 95, 15);
+		Actor_Says(kActorInsectDealer, 150, 12);
+		Actor_Says(kActorInsectDealer, 160, 13);
+		Actor_Says(kActorInsectDealer, 170, 14);
+		Actor_Says(kActorMcCoy, 100, 16);
+		Actor_Says(kActorInsectDealer, 180, 13);
 		Game_Flag_Set(329);
-		Actor_Clue_Acquire(0, 56, 1, 16);
+		Actor_Clue_Acquire(kActorMcCoy, kCluePeruvianLadyInterview, 1, kActorInsectDealer);
 		break;
 	case 510:
-		Actor_Says(0, 8475, 12);
-		Actor_Says(16, 190, 12);
-		Actor_Says(0, 105, 15);
-		Actor_Says(16, 200, 14);
+		Actor_Says(kActorMcCoy, 8475, 12);
+		Actor_Says(kActorInsectDealer, 190, 12);
+		Actor_Says(kActorMcCoy, 105, 15);
+		Actor_Says(kActorInsectDealer, 200, 14);
 		break;
 	case 520:
-		Actor_Says(0, 215, 16);
+		Actor_Says(kActorMcCoy, 215, 16);
 		break;
 	}
 }
@@ -307,29 +307,29 @@ void SceneScriptAR02::sub_402AE0() {
 	int answerValue = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answerValue == 530) {
-		Actor_Says(0, 120, 12);
+		Actor_Says(kActorMcCoy, 120, 12);
 		if (Query_Difficulty_Level() != 0) {
 			Global_Variable_Decrement(2, 15);
 		}
-		Actor_Clue_Acquire(0, 75, 1, 16);
-		Actor_Modify_Friendliness_To_Other(16, 0, 5);
+		Actor_Clue_Acquire(kActorMcCoy, kClueMaggieBracelet, 1, kActorInsectDealer);
+		Actor_Modify_Friendliness_To_Other(kActorInsectDealer, kActorMcCoy, 5);
 	} else if (answerValue == 540) {
-		Actor_Says(0, 125, 13);
-		Actor_Says(16, 260, 3);
-		Actor_Says(0, 130, 15);
-		Actor_Says(16, 270, 3);
-		Actor_Says(16, 280, 3);
-		Actor_Says(0, 135, 11);
-		Actor_Modify_Friendliness_To_Other(16, 0, -5);
+		Actor_Says(kActorMcCoy, 125, 13);
+		Actor_Says(kActorInsectDealer, 260, 3);
+		Actor_Says(kActorMcCoy, 130, 15);
+		Actor_Says(kActorInsectDealer, 270, 3);
+		Actor_Says(kActorInsectDealer, 280, 3);
+		Actor_Says(kActorMcCoy, 135, 11);
+		Actor_Modify_Friendliness_To_Other(kActorInsectDealer, kActorMcCoy, -5);
 	}
 }
 
 void SceneScriptAR02::sub_402CE4() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 93)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueStrangeScale1)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(550, 8, 5, 2);
 	}
-	if (Actor_Clue_Query(0, 44)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(560, 6, 5, 7);
 	}
 	Dialogue_Menu_Add_DONE_To_List(570);
@@ -338,48 +338,48 @@ void SceneScriptAR02::sub_402CE4() {
 	Dialogue_Menu_Disappear();
 	switch (answerValue) {
 	case 550:
-		Actor_Says(0, 145, 11);
-		Actor_Says(20, 30, 11);
-		Actor_Says(0, 160, 11);
-		Actor_Says(20, 40, 11);
-		Actor_Says(0, 165, 11);
-		Actor_Says(20, 50, 11);
-		Actor_Says(0, 170, 11);
-		Actor_Says(20, 60, 11);
-		Actor_Says(0, 175, 11);
+		Actor_Says(kActorMcCoy, 145, 11);
+		Actor_Says(kActorHasan, 30, 11);
+		Actor_Says(kActorMcCoy, 160, 11);
+		Actor_Says(kActorHasan, 40, 11);
+		Actor_Says(kActorMcCoy, 165, 11);
+		Actor_Says(kActorHasan, 50, 11);
+		Actor_Says(kActorMcCoy, 170, 11);
+		Actor_Says(kActorHasan, 60, 11);
+		Actor_Says(kActorMcCoy, 175, 11);
 		Game_Flag_Set(370);
 		break;
 	case 560:
-		Actor_Says(0, 150, 11);
-		Actor_Says(20, 140, 11);
-		Actor_Says(0, 185, 11);
-		Actor_Says(20, 150, 11);
-		Actor_Says(20, 160, 11);
-		Actor_Says(0, 190, 11);
-		Actor_Says(20, 170, 11);
-		Actor_Says(0, 195, 11);
-		Actor_Says(20, 180, 11);
-		Actor_Says(20, 190, 11);
-		Actor_Says(20, 200, 11);
-		Actor_Says(0, 200, 11);
-		Actor_Says(20, 210, 11);
-		Actor_Says(20, 220, 11);
-		Actor_Says(20, 230, 11);
+		Actor_Says(kActorMcCoy, 150, 11);
+		Actor_Says(kActorHasan, 140, 11);
+		Actor_Says(kActorMcCoy, 185, 11);
+		Actor_Says(kActorHasan, 150, 11);
+		Actor_Says(kActorHasan, 160, 11);
+		Actor_Says(kActorMcCoy, 190, 11);
+		Actor_Says(kActorHasan, 170, 11);
+		Actor_Says(kActorMcCoy, 195, 11);
+		Actor_Says(kActorHasan, 180, 11);
+		Actor_Says(kActorHasan, 190, 11);
+		Actor_Says(kActorHasan, 200, 11);
+		Actor_Says(kActorMcCoy, 200, 11);
+		Actor_Says(kActorHasan, 210, 11);
+		Actor_Says(kActorHasan, 220, 11);
+		Actor_Says(kActorHasan, 230, 11);
 		Game_Flag_Set(370);
 		break;
 	case 570:
-		if (Actor_Clue_Query(0, 57)) {
-			Actor_Says(0, 1315, 11);
+		if (Actor_Clue_Query(kActorMcCoy, kClueHasanInterview)) {
+			Actor_Says(kActorMcCoy, 1315, 11);
 		} else {
-			Actor_Says(0, 940, 13);
-			Actor_Says(20, 70, 12);
-			Actor_Says(20, 90, 12);
-			Actor_Says(0, 180, 15);
-			Actor_Says(20, 100, 14);
-			Actor_Says(20, 110, 12);
-			Actor_Says(20, 120, 13);
-			Actor_Modify_Friendliness_To_Other(20, 0, -1);
-			Actor_Clue_Acquire(0, 57, 0, 20);
+			Actor_Says(kActorMcCoy, 940, 13);
+			Actor_Says(kActorHasan, 70, 12);
+			Actor_Says(kActorHasan, 90, 12);
+			Actor_Says(kActorMcCoy, 180, 15);
+			Actor_Says(kActorHasan, 100, 14);
+			Actor_Says(kActorHasan, 110, 12);
+			Actor_Says(kActorHasan, 120, 13);
+			Actor_Modify_Friendliness_To_Other(kActorHasan, kActorMcCoy, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueHasanInterview, 0, kActorHasan);
 		}
 		break;
 	}
diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp
index 25abb5b..b572843 100644
--- a/engines/bladerunner/script/scene/bb01.cpp
+++ b/engines/bladerunner/script/scene/bb01.cpp
@@ -85,8 +85,8 @@ bool SceneScriptBB01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		Loop_Actor_Walk_To_XYZ(0, -140.0f, 9.0f, 818.0f, 0, 1, false, 0);
-		if (!Loop_Actor_Walk_To_XYZ(0, -233.0f, 9.0f, 846.0f, 0, 1, false, 0)) {
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 9.0f, 818.0f, 0, 1, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -233.0f, 9.0f, 846.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(264);
 			Game_Flag_Reset(258);
 			Game_Flag_Set(177);
@@ -95,14 +95,14 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -125.39f, 9.0f, 372.45f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -125.39f, 9.0f, 372.45f, 0, 1, false, 0)) {
 			Game_Flag_Set(262);
 			Set_Enter(1, 3);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 43.0f, 0.0f, 1062.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.0f, 0.0f, 1062.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -216,7 +216,7 @@ void SceneScriptBB01::PlayerWalkedIn() {
 	} else if (Game_Flag_Query(263)) {
 		Game_Flag_Reset(263);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 43.0f, 0.0f, 954.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.0f, 0.0f, 954.0f, 0, 0, false, 0);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp
index 7b43ff4..6022444 100644
--- a/engines/bladerunner/script/scene/bb02.cpp
+++ b/engines/bladerunner/script/scene/bb02.cpp
@@ -88,7 +88,7 @@ bool SceneScriptBB02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 98.0f, -415.06f, -593.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 98.0f, -415.06f, -593.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(263);
@@ -97,7 +97,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -12.0f, -415.06f, -27.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -415.06f, -27.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
 			if (!Game_Flag_Query(493)) {
 				Scene_Loop_Start_Special(2, 0, 1);
@@ -110,8 +110,8 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 86.0f, -415.06f, 174.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 179.0f, -415.06f, 274.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 86.0f, -415.06f, 174.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, -415.06f, 274.0f, 0, 0, false, 0);
 			Game_Flag_Set(282);
 			Game_Flag_Reset(493);
 			Set_Enter(21, 4);
@@ -139,10 +139,10 @@ void SceneScriptBB02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB02::PlayerWalkedIn() {
 	if (Game_Flag_Query(281)) {
-		Loop_Actor_Walk_To_XYZ(0, 86.0f, -415.06f, 174.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 86.0f, -415.06f, 174.0f, 0, 0, false, 0);
 		Game_Flag_Reset(281);
 	} else if (Game_Flag_Query(333)) {
-		Loop_Actor_Walk_To_XYZ(0, 35.0f, -415.06f, -27.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 35.0f, -415.06f, -27.0f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(333);
 	}
diff --git a/engines/bladerunner/script/scene/bb03.cpp b/engines/bladerunner/script/scene/bb03.cpp
index db2747f..de538c4 100644
--- a/engines/bladerunner/script/scene/bb03.cpp
+++ b/engines/bladerunner/script/scene/bb03.cpp
@@ -84,8 +84,8 @@ bool SceneScriptBB03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 176.0f, 60.16f, -64.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 176.0f, 60.16f, 0.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, -64.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, 0.0f, 0, 0, false, 0);
 			Game_Flag_Set(283);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -94,7 +94,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 20.0f, 60.16f, 0.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 20.0f, 60.16f, 0.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(281);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -103,27 +103,27 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 204.0f, 60.16f, -164.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 204.0f, 60.16f, -164.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) < 4) {
-				if (Actor_Query_Goal_Number(56) == 200) {
-					Actor_Says(56, 70, 3);
-					Actor_Says(0, 7010, 13);
-					Actor_Says(56, 80, 3);
-					Actor_Says(0, 7015, 12);
-					Actor_Says(56, 90, 3);
-					Actor_Says(0, 7020, 14);
-					Actor_Says(56, 100, 3);
-					Actor_Says(0, 7025, 15);
-					Actor_Says(56, 110, 3);
-					Actor_Set_Targetable(54, false);
-					Actor_Set_Targetable(58, false);
+				if (Actor_Query_Goal_Number(kActorSebastian) == 200) {
+					Actor_Says(kActorSebastian, 70, 3);
+					Actor_Says(kActorMcCoy, 7010, 13);
+					Actor_Says(kActorSebastian, 80, 3);
+					Actor_Says(kActorMcCoy, 7015, 12);
+					Actor_Says(kActorSebastian, 90, 3);
+					Actor_Says(kActorMcCoy, 7020, 14);
+					Actor_Says(kActorSebastian, 100, 3);
+					Actor_Says(kActorMcCoy, 7025, 15);
+					Actor_Says(kActorSebastian, 110, 3);
+					Actor_Set_Targetable(kActorBryant, false);
+					Actor_Set_Targetable(kActorGeneralDoll, false);
 				}
 				Game_Flag_Set(285);
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Set_Enter(22, 6);
 			} else {
-				Actor_Says(0, 8522, 3);
+				Actor_Says(kActorMcCoy, 8522, 3);
 			}
 		}
 		return true;
@@ -143,11 +143,11 @@ void SceneScriptBB03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB03::PlayerWalkedIn() {
 	if (Game_Flag_Query(286)) {
-		Loop_Actor_Walk_To_XYZ(0, 164.0f, 60.16f, -164.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 164.0f, 60.16f, -164.0f, 0, 0, false, 0);
 		Game_Flag_Reset(286);
 	}
 	if (Game_Flag_Query(284)) {
-		Loop_Actor_Walk_To_XYZ(0, 176.0f, 60.16f, -64.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, -64.0f, 0, 0, false, 0);
 		Game_Flag_Reset(284);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp
index 3d7134c..793f786 100644
--- a/engines/bladerunner/script/scene/bb04.cpp
+++ b/engines/bladerunner/script/scene/bb04.cpp
@@ -80,9 +80,9 @@ bool SceneScriptBB04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -92.0f, -26.6f, 45.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, -26.6f, 45.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
-			Loop_Actor_Walk_To_XYZ(0, -15.0f, -25.17f, 45.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -15.0f, -25.17f, 45.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(333);
@@ -92,7 +92,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -107.0f, -26.6f, 397.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -107.0f, -26.6f, 397.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(284);
@@ -115,7 +115,7 @@ void SceneScriptBB04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB04::PlayerWalkedIn() {
 	if (Game_Flag_Query(332)) {
-		Loop_Actor_Walk_To_XYZ(0, -92.0f, -26.6f, 45.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, -26.6f, 45.0f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(332);
 	}
diff --git a/engines/bladerunner/script/scene/bb05.cpp b/engines/bladerunner/script/scene/bb05.cpp
index d01054b..a1047cc 100644
--- a/engines/bladerunner/script/scene/bb05.cpp
+++ b/engines/bladerunner/script/scene/bb05.cpp
@@ -72,10 +72,10 @@ void SceneScriptBB05::SceneLoaded() {
 	Clickable_Object("BOX06");
 	Unclickable_Object("BOX06");
 	Unclickable_Object("BOX14");
-	if (Actor_Query_Goal_Number(56) == 200) {
-		Actor_Set_Goal_Number(58, 299);
-		Actor_Put_In_Set(58, 97);
-		Actor_Set_At_Waypoint(58, 39, 0);
+	if (Actor_Query_Goal_Number(kActorSebastian) == 200) {
+		Actor_Set_Goal_Number(kActorGeneralDoll, 299);
+		Actor_Put_In_Set(kActorGeneralDoll, 97);
+		Actor_Set_At_Waypoint(kActorGeneralDoll, 39, 0);
 	}
 }
 
@@ -97,7 +97,7 @@ bool SceneScriptBB05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -212.0f, -60.31f, 131.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -212.0f, -60.31f, 131.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(286);
@@ -106,7 +106,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 95.0f, -60.31f, 331.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 95.0f, -60.31f, 331.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(297);
@@ -115,7 +115,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 271.0f, -60.31f, 203.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 271.0f, -60.31f, 203.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(299);
@@ -124,7 +124,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 151.0f, -60.34f, -108.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 151.0f, -60.34f, -108.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(301);
@@ -147,60 +147,60 @@ void SceneScriptBB05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB05::PlayerWalkedIn() {
 	if (Game_Flag_Query(298)) {
-		Loop_Actor_Walk_To_XYZ(0, 95.0f, -60.31f, 303.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 95.0f, -60.31f, 303.0f, 0, 0, false, 0);
 		Game_Flag_Reset(298);
 	} else if (Game_Flag_Query(300)) {
-		Loop_Actor_Walk_To_XYZ(0, 231.0f, -60.31f, 203.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 231.0f, -60.31f, 203.0f, 0, 0, false, 0);
 		Game_Flag_Reset(300);
 	} else if (Game_Flag_Query(302)) {
-		Loop_Actor_Walk_To_XYZ(0, 111.0f, -60.31f, -24.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 111.0f, -60.31f, -24.0f, 0, 0, false, 0);
 		Game_Flag_Reset(302);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -76.0f, -60.31f, 131.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, -60.31f, 131.0f, 0, 0, false, 0);
 		Game_Flag_Reset(285);
 	}
-	if (Actor_Query_Goal_Number(56) == 200) {
-		Actor_Face_Actor(56, 0, true);
-		Actor_Face_Actor(0, 56, true);
-		Actor_Says(56, 120, 13);
-		Actor_Says(0, 7030, 15);
-		Actor_Says(56, 130, 17);
-		Actor_Says(56, 140, 16);
-		Actor_Says(56, 150, 14);
-		Actor_Says(56, 160, 15);
-		Actor_Says(0, 7035, 14);
-		Actor_Says(56, 170, 12);
-		Actor_Says(0, 7040, 14);
-		Actor_Says(56, 180, 16);
-		Actor_Says(0, 7045, 14);
+	if (Actor_Query_Goal_Number(kActorSebastian) == 200) {
+		Actor_Face_Actor(kActorSebastian, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorSebastian, true);
+		Actor_Says(kActorSebastian, 120, 13);
+		Actor_Says(kActorMcCoy, 7030, 15);
+		Actor_Says(kActorSebastian, 130, 17);
+		Actor_Says(kActorSebastian, 140, 16);
+		Actor_Says(kActorSebastian, 150, 14);
+		Actor_Says(kActorSebastian, 160, 15);
+		Actor_Says(kActorMcCoy, 7035, 14);
+		Actor_Says(kActorSebastian, 170, 12);
+		Actor_Says(kActorMcCoy, 7040, 14);
+		Actor_Says(kActorSebastian, 180, 16);
+		Actor_Says(kActorMcCoy, 7045, 14);
 		if (Game_Flag_Query(399)) {
-			Actor_Says(56, 190, 15);
-			Actor_Says(0, 7050, 17);
-			Actor_Says(56, 200, 16);
-			Actor_Says_With_Pause(56, 210, 1.5f, 14);
-			Actor_Says(0, 7055, 15);
+			Actor_Says(kActorSebastian, 190, 15);
+			Actor_Says(kActorMcCoy, 7050, 17);
+			Actor_Says(kActorSebastian, 200, 16);
+			Actor_Says_With_Pause(kActorSebastian, 210, 1.5f, 14);
+			Actor_Says(kActorMcCoy, 7055, 15);
 		} else {
-			Actor_Put_In_Set(58, 22);
-			Actor_Set_At_Waypoint(58, 134, 0);
-			Loop_Actor_Walk_To_Waypoint(58, 135, 0, 0, false);
-			Actor_Says(58, 0, 3);
-			Actor_Face_Actor(0, 58, true);
-			Actor_Face_Actor(56, 58, true);
-			Actor_Says(56, 220, 13);
-			Loop_Actor_Walk_To_Waypoint(58, 134, 0, 0, false);
-			Actor_Face_Actor(56, 0, true);
-			Actor_Face_Actor(0, 56, true);
-			Actor_Says(56, 230, 15);
-			Actor_Says(0, 7060, 17);
-			Actor_Says(56, 240, 12);
+			Actor_Put_In_Set(kActorGeneralDoll, 22);
+			Actor_Set_At_Waypoint(kActorGeneralDoll, 134, 0);
+			Loop_Actor_Walk_To_Waypoint(kActorGeneralDoll, 135, 0, 0, false);
+			Actor_Says(kActorGeneralDoll, 0, 3);
+			Actor_Face_Actor(kActorMcCoy, kActorGeneralDoll, true);
+			Actor_Face_Actor(kActorSebastian, kActorGeneralDoll, true);
+			Actor_Says(kActorSebastian, 220, 13);
+			Loop_Actor_Walk_To_Waypoint(kActorGeneralDoll, 134, 0, 0, false);
+			Actor_Face_Actor(kActorSebastian, kActorMcCoy, true);
+			Actor_Face_Actor(kActorMcCoy, kActorSebastian, true);
+			Actor_Says(kActorSebastian, 230, 15);
+			Actor_Says(kActorMcCoy, 7060, 17);
+			Actor_Says(kActorSebastian, 240, 12);
 		}
-		Actor_Says(0, 7065, 16);
-		Actor_Says(56, 250, 16);
-		Actor_Says(0, 7070, 18);
-		Actor_Set_Goal_Number(56, 205);
-		Actor_Set_Goal_Number(58, 201);
-		Actor_Set_Goal_Number(54, 101);
-		Actor_Set_Goal_Number(58, 200);
+		Actor_Says(kActorMcCoy, 7065, 16);
+		Actor_Says(kActorSebastian, 250, 16);
+		Actor_Says(kActorMcCoy, 7070, 18);
+		Actor_Set_Goal_Number(kActorSebastian, 205);
+		Actor_Set_Goal_Number(kActorGeneralDoll, 201);
+		Actor_Set_Goal_Number(kActorBryant, 101);
+		Actor_Set_Goal_Number(kActorGeneralDoll, 200);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp
index 48d983d..6cdf907 100644
--- a/engines/bladerunner/script/scene/bb06.cpp
+++ b/engines/bladerunner/script/scene/bb06.cpp
@@ -76,13 +76,13 @@ bool SceneScriptBB06::MouseClick(int x, int y) {
 
 bool SceneScriptBB06::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BOX31", objectName)) {
-		if (!Loop_Actor_Walk_To_Scene_Object(0, "BOX31", 24, 1, false)) {
-			Actor_Face_Object(0, "BOX31", true);
+		if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BOX31", 24, true, false)) {
+			Actor_Face_Object(kActorMcCoy, "BOX31", true);
 			if (Game_Flag_Query(410)) {
-				Actor_Voice_Over(60, 99);
-				Actor_Voice_Over(70, 99);
+				Actor_Voice_Over(60, kActorVoiceOver);
+				Actor_Voice_Over(70, kActorVoiceOver);
 			} else {
-				Actor_Voice_Over(50, 99);
+				Actor_Voice_Over(50, kActorVoiceOver);
 			}
 		}
 	}
@@ -107,7 +107,7 @@ bool SceneScriptBB06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -37.0f, 0.0f, 178.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -37.0f, 0.0f, 178.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(298);
@@ -116,7 +116,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 101.0f, 0.0f, -25.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 101.0f, 0.0f, -25.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(393);
@@ -125,7 +125,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -115.0f, 0.0f, -103.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -115.0f, 0.0f, -103.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(363);
@@ -163,7 +163,7 @@ void SceneScriptBB06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB06::PlayerWalkedIn() {
 	if (Game_Flag_Query(297)) {
-		Loop_Actor_Walk_To_XYZ(0, -36.0f, 0.0f, 145.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -36.0f, 0.0f, 145.0f, 0, 0, false, 0);
 		Game_Flag_Reset(297);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp
index f088732..b53db97 100644
--- a/engines/bladerunner/script/scene/bb07.cpp
+++ b/engines/bladerunner/script/scene/bb07.cpp
@@ -66,20 +66,20 @@ bool SceneScriptBB07::MouseClick(int x, int y) {
 
 bool SceneScriptBB07::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("PRINTER", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -472.63f, 252.59f, -1086.81f, 0, 0, false, 0)) {
-			Actor_Face_Object(0, "PRINTER", true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -472.63f, 252.59f, -1086.81f, 0, 0, false, 0)) {
+			Actor_Face_Object(kActorMcCoy, "PRINTER", true);
 			if (Game_Flag_Query(396) && !Game_Flag_Query(398)) {
-				Actor_Voice_Over(130, 99);
+				Actor_Voice_Over(130, kActorVoiceOver);
 				Item_Pickup_Spin_Effect(941, 439, 242);
-				Actor_Voice_Over(140, 99);
+				Actor_Voice_Over(140, kActorVoiceOver);
 				Game_Flag_Set(398);
-				Actor_Clue_Acquire(0, 148, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDNASebastian, 1, -1);
 			} else if (Game_Flag_Query(396) && Game_Flag_Query(398)) {
-				Actor_Face_Object(0, "PRINTER", true);
-				Actor_Says(0, 8570, 13);
+				Actor_Face_Object(kActorMcCoy, "PRINTER", true);
+				Actor_Says(kActorMcCoy, 8570, 13);
 			} else {
-				Actor_Face_Object(0, "PRINTER", true);
-				Actor_Says(0, 8575, 13);
+				Actor_Face_Object(kActorMcCoy, "PRINTER", true);
+				Actor_Says(kActorMcCoy, 8575, 13);
 			}
 		}
 	}
@@ -92,12 +92,12 @@ bool SceneScriptBB07::ClickedOnActor(int actorId) {
 
 bool SceneScriptBB07::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 83) {
-		if (!Loop_Actor_Walk_To_Item(0, 83, 36, 1, false)) {
-			Actor_Face_Item(0, 83, true);
+		if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 83, 36, 1, false)) {
+			Actor_Face_Item(kActorMcCoy, 83, true);
 			if (Game_Flag_Query(396) == 1) {
-				Actor_Voice_Over(150, 99);
-				Actor_Voice_Over(160, 99);
-				Actor_Voice_Over(170, 99);
+				Actor_Voice_Over(150, kActorVoiceOver);
+				Actor_Voice_Over(160, kActorVoiceOver);
+				Actor_Voice_Over(170, kActorVoiceOver);
 			}
 		}
 	}
@@ -106,7 +106,7 @@ bool SceneScriptBB07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -615.0f, 252.59f, -1018.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -615.0f, 252.59f, -1018.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Overlay_Remove("BB07OVER");
@@ -116,7 +116,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -619.0f, 252.59f, -1136.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -619.0f, 252.59f, -1136.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Overlay_Remove("BB07OVER");
@@ -126,7 +126,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -551.0f, 252.59f, -1004.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -551.0f, 252.59f, -1004.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Overlay_Remove("BB07OVER");
@@ -140,17 +140,17 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
 
 bool SceneScriptBB07::ClickedOn2DRegion(int region) {
 	if (region == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -568.63f, 252.59f, -1114.81f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 229, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -568.63f, 252.59f, -1114.81f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 229, false);
 			if (Game_Flag_Query(396)) {
-				Actor_Says(0, 8585, 15);
+				Actor_Says(kActorMcCoy, 8585, 15);
 			} else {
 				Ambient_Sounds_Play_Sound(592, 40, 20, 20, 99);
 				Overlay_Play("BB07OVER", 1, 0, 1, 0);
 				Overlay_Play("BB07OVER", 2, 1, 0, 0);
 				Game_Flag_Set(396);
 				if (!Game_Flag_Query(398)) {
-					Actor_Says(39, 0, 3);
+					Actor_Says(kActorAnsweringMachine, 0, 3);
 				}
 			}
 		}
@@ -166,11 +166,11 @@ void SceneScriptBB07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB07::PlayerWalkedIn() {
 	if (Game_Flag_Query(299)) {
-		Loop_Actor_Walk_To_XYZ(0, -594.0f, 252.59f, -1018.0f, 6, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -594.0f, 252.59f, -1018.0f, 6, 0, false, 0);
 		Game_Flag_Reset(299);
 	}
 	if (Game_Flag_Query(365)) {
-		Loop_Actor_Walk_To_XYZ(0, -602.0f, 252.59f, -1124.0f, 6, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -602.0f, 252.59f, -1124.0f, 6, 0, false, 0);
 		Game_Flag_Reset(365);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb08.cpp b/engines/bladerunner/script/scene/bb08.cpp
index b88eef6..6f8eab3 100644
--- a/engines/bladerunner/script/scene/bb08.cpp
+++ b/engines/bladerunner/script/scene/bb08.cpp
@@ -80,10 +80,10 @@ bool SceneScriptBB08::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB08::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 204.0f, 0.1f, 94.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 256, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 204.0f, 0.1f, 94.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 256, false);
 			Footstep_Sound_Override_On(2);
-			Loop_Actor_Travel_Ladder(0, 8, 1, 0);
+			Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 1, 0);
 			Footstep_Sound_Override_Off();
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -93,7 +93,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 247.0f, 0.1f, 27.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 247.0f, 0.1f, 27.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(506);
@@ -116,14 +116,14 @@ void SceneScriptBB08::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB08::PlayerWalkedIn() {
 	if (Game_Flag_Query(219)) {
-		Actor_Set_At_XYZ(0, 204.0f, 96.1f, 94.0f, 256);
+		Actor_Set_At_XYZ(kActorMcCoy, 204.0f, 96.1f, 94.0f, 256);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Ladder(0, 8, 0, 0);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 0, 0);
 		Footstep_Sound_Override_Off();
-		Actor_Face_Heading(0, 768, false);
+		Actor_Face_Heading(kActorMcCoy, 768, false);
 		Game_Flag_Reset(219);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 188.0f, 0.1f, 28.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 188.0f, 0.1f, 28.0f, 0, 0, false, 0);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp
index dc3356e..886b373 100644
--- a/engines/bladerunner/script/scene/bb09.cpp
+++ b/engines/bladerunner/script/scene/bb09.cpp
@@ -53,7 +53,7 @@ void SceneScriptBB09::InitializeScene() {
 	Ambient_Sounds_Add_Sound(308, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(309, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(310, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0);
-	Actor_Set_Targetable(8, true);
+	Actor_Set_Targetable(kActorSadik, true);
 }
 
 void SceneScriptBB09::SceneLoaded() {
@@ -80,8 +80,8 @@ bool SceneScriptBB09::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB09::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 454.56f, -9.0f, 190.31f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 450.56f, -9.0f, 250.31f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 454.56f, -9.0f, 190.31f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 450.56f, -9.0f, 250.31f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(216);
@@ -91,7 +91,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 71.0f, -9.0f, 136.0f, 72, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 71.0f, -9.0f, 136.0f, 72, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(219);
diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp
index f40084b..281f141 100644
--- a/engines/bladerunner/script/scene/bb10.cpp
+++ b/engines/bladerunner/script/scene/bb10.cpp





More information about the Scummvm-git-logs mailing list