7 files changed, 777 insertions, 201 deletions

diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index 0f80954b..a4406da9 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -358,7 +358,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 					pVehicle->AutoPilot.m_nCruiseSpeed = FindPoliceCarSpeedForWantedLevel(pVehicle);
 					pVehicle->SetStatus(STATUS_PHYSICS);
 					pVehicle->AutoPilot.m_nCarMission = 
-						pVehicle->GetVehicleAppearance() == VEHICLE_BOAT ? FindPoliceBoatMissionForWantedLevel() : FindPoliceCarMissionForWantedLevel();
+						pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT ? FindPoliceBoatMissionForWantedLevel() : FindPoliceCarMissionForWantedLevel();
 					pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
 					pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
 				}else if (pVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE){
@@ -432,7 +432,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 	if (pVehicle->bIsLawEnforcer) {
 		if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_FARAWAY ||
 			pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_CLOSE) {
-			if (FindPlayerVehicle() && FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_BIKE)
+			if (FindPlayerVehicle() && FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE)
 				pVehicle->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_FARAWAY;
 		}
 	}
@@ -489,16 +489,16 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 
 	if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0) {
 		if (!FindPlayerVehicle() ||
-			FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_CAR ||
-			FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_BIKE) {
-			if (pVehicle->GetVehicleAppearance() == VEHICLE_BOAT) {
+			FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR ||
+			FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE) {
+			if (pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT) {
 				pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
 				pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
 			}
 		}
-		else if (FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_BOAT) {
-			if (pVehicle->GetVehicleAppearance() == VEHICLE_CAR ||
-				pVehicle->GetVehicleAppearance() == VEHICLE_BIKE) {
+		else if (FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT) {
+			if (pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR ||
+				pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE) {
 				pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
 				pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
 			}
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 956bad28..920fba81 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -655,10 +655,10 @@ CCarCtrl::GenerateOneRandomCar()
 	}
 	int nMadDrivers;
 	switch (pVehicle->GetVehicleAppearance()) {
-	case VEHICLE_BIKE:
+	case VEHICLE_APPEARANCE_BIKE:
 		nMadDrivers = 30;
 		break;
-	case VEHICLE_BOAT:
+	case VEHICLE_APPEARANCE_BOAT:
 		nMadDrivers = 40;
 		break;
 	default:
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 82003561..a177343b 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -960,7 +960,7 @@ void CGarage::Update()
 					if (m_pDoor1) {
 						if (((CVector2D)FindPlayerVehicle()->GetPosition() - (CVector2D)m_pDoor1->GetPosition()).MagnitudeSqr() < SQR(DISTANCE_TO_SHOW_HIDEOUT_MESSAGE) &&
 							CTimer::GetTimeInMilliseconds() - CGarages::LastTimeHelpMessage > TIME_BETWEEN_HIDEOUT_MESSAGES) {
-							if (FindPlayerVehicle()->GetVehicleAppearance() != VEHICLE_HELI && FindPlayerVehicle()->GetVehicleAppearance() != VEHICLE_PLANE) {
+							if (FindPlayerVehicle()->GetVehicleAppearance() != VEHICLE_APPEARANCE_HELI && FindPlayerVehicle()->GetVehicleAppearance() != VEHICLE_APPEARANCE_PLANE) {
 								CHud::SetHelpMessage(TheText.Get("GA_21"), false); // You cannot store any more cars in this garage.
 								CGarages::LastTimeHelpMessage = CTimer::GetTimeInMilliseconds();
 							}
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 78b8d198..cccf9cc4 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -172,12 +172,12 @@ CPickup::GiveUsAPickUpObject(int32 handle)
 }
 
 bool
-CPickup::CanBePickedUp(CPlayerPed *player)
+CPickup::CanBePickedUp(CPlayerPed *player, int playerId)
 {
 	assert(m_pObject != nil);
 	bool cannotBePickedUp =
-		(m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > 99.5f)
-		|| (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > 99.5f)
+		(m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > CWorld::Players[playerId].m_nMaxArmour - 0.5f)
+		|| (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > CWorld::Players[playerId].m_nMaxHealth - 0.5f)
 		|| (m_pObject->GetModelIndex() == MI_PICKUP_BRIBE && player->m_pWanted->m_nWantedLevel == 0)
 		|| (m_pObject->GetModelIndex() == MI_PICKUP_KILLFRENZY && (CTheScripts::IsPlayerOnAMission() || CDarkel::FrenzyOnGoing() || !CGame::nastyGame));
 	return !cannotBePickedUp;
@@ -233,7 +233,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 		}
 
 		// if we didn't then we've got nothing to do
-		if (isPickupTouched && CanBePickedUp(player)) {
+		if (isPickupTouched && CanBePickedUp(player, playerId)) {
 			CPad::GetPad(0)->StartShake(120, 100);
 			switch (m_eType)
 			{
@@ -497,14 +497,14 @@ CPickups::GivePlayerGoodiesWithPickUpMI(int16 modelIndex, int playerIndex)
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_ADRENALINE, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_BODYARMOUR) {
-		player->m_fArmour = 100.0f;
+		player->m_fArmour = CWorld::Players[playerIndex].m_nMaxArmour;
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_ARMOUR, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_INFO) {
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_BONUS, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_HEALTH) {
-		player->m_fHealth = 100.0f;
+		player->m_fHealth = CWorld::Players[playerIndex].m_nMaxHealth;
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_HEALTH, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_BONUS) {
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index 79f52a67..810f3dff 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -46,7 +46,7 @@ public:
 	bool Update(CPlayerPed *player, CVehicle *vehicle, int playerId);
 private:
 	bool IsMine() { return m_eType >= PICKUP_MINE_INACTIVE && m_eType <= PICKUP_FLOATINGPACKAGE_FLOATING; }
-	inline bool CanBePickedUp(CPlayerPed *player);
+	inline bool CanBePickedUp(CPlayerPed *player, int playerId);
 	void RemoveKeepType();
 	void Remove();
 };
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 0ff3c53d..16c5c0ff 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -54,15 +54,19 @@
 #include "Remote.h"
 #include "Replay.h"
 #include "Restart.h"
+#include "RoadBlocks.h"
 #include "RpAnimBlend.h"
 #include "Rubbish.h"
 #include "Shadows.h"
 #include "SpecialFX.h"
+#include "Sprite.h"
 #include "Stats.h"
 #include "Streaming.h"
 #include "Text.h"
+#include "Timecycle.h"
 #include "TxdStore.h"
 #include "User.h"
+#include "VisibilityPlugins.h"
 #include "WaterLevel.h"
 #include "Weather.h"
 #include "World.h"
@@ -70,7 +74,7 @@
 #include "main.h"
 
 #define PICKUP_PLACEMENT_OFFSET 0.5f
-#define PED_FIND_Z_OFFSET 5.0f
+#define PED_FIND_Z_OFFSET 10.0f
 
 #define SPHERE_MARKER_R 0
 #define SPHERE_MARKER_G 128
@@ -89,13 +93,10 @@
 
 uint8 CTheScripts::ScriptSpace[SIZE_SCRIPT_SPACE];
 CRunningScript CTheScripts::ScriptsArray[MAX_NUM_SCRIPTS];
-int32 CTheScripts::BaseBriefIdForContact[MAX_NUM_CONTACTS];
-int32 CTheScripts::OnAMissionForContactFlag[MAX_NUM_CONTACTS];
 intro_text_line CTheScripts::IntroTextLines[MAX_NUM_INTRO_TEXT_LINES];
 intro_script_rectangle CTheScripts::IntroRectangles[MAX_NUM_INTRO_RECTANGLES];
 CSprite2d CTheScripts::ScriptSprites[MAX_NUM_SCRIPT_SRPITES];
 script_sphere_struct CTheScripts::ScriptSphereArray[MAX_NUM_SCRIPT_SPHERES];
-tCollectiveData CTheScripts::CollectiveArray[MAX_NUM_COLLECTIVES];
 tUsedObject CTheScripts::UsedObjectArray[MAX_NUM_USED_OBJECTS];
 int32 CTheScripts::MultiScriptArray[MAX_NUM_MISSION_SCRIPTS];
 tBuildingSwap CTheScripts::BuildingSwapArray[MAX_NUM_BUILDING_SWAPS];
@@ -116,8 +117,6 @@ uint16 CTheScripts::NumberOfMissionScripts;
 uint32 CTheScripts::LargestMissionScriptSize;
 uint32 CTheScripts::MainScriptSize;
 uint8 CTheScripts::FailCurrentMission;
-uint8 CTheScripts::CountdownToMakePlayerUnsafe;
-uint8 CTheScripts::DelayMakingPlayerUnsafeThisTime;
 uint16 CTheScripts::NumScriptDebugLines;
 uint16 CTheScripts::NumberOfIntroRectanglesThisFrame;
 uint16 CTheScripts::NumberOfIntroTextLinesThisFrame;
@@ -128,6 +127,11 @@ CStuckCarCheck CTheScripts::StuckCars;
 uint16 CTheScripts::CommandsExecuted;
 uint16 CTheScripts::ScriptsUpdated;
 int32 ScriptParams[32];
+uint8 CTheScripts::RiotIntensity;
+uint32 CTheScripts::LastMissionPassedTime;
+uint16 CTheScripts::NumberOfExclusiveMissionScripts;
+bool CTheScripts::bPlayerHasMetDebbieHarry;
+bool CTheScripts::bPlayerIsInTheStatium;
 
 
 const uint32 CRunningScript::nSaveStructSize =
@@ -269,9 +273,19 @@ void CMissionCleanup::Process()
 	CPopulation::m_AllRandomPedsThisType = -1;
 	CPopulation::PedDensityMultiplier = 1.0f;
 	CCarCtrl::CarDensityMultiplier = 1.0f;
+	CPed::nThreatReactionRangeMultiplier = 1;
+	CPed::nEnterCarRangeMultiplier = 1;
 	FindPlayerPed()->m_pWanted->m_fCrimeSensitivity = 1.0f;
-	TheCamera.Restore();
+	//CRoadBlocks::ClearScriptRoadblocks() // TODO(MIAMI)
+	CRouteNode::Initialise();
+	if (!CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle)
+		TheCamera.Restore();
 	TheCamera.SetWideScreenOff();
+	// TODO(MIAMI)
+	//CSpecialFX::bLiftCam = false;
+	//CSpecialFX::bVideoCam = false;
+	//CTimeCycle::StopExtraColour(0);
+	// TODO(MIAMI): change this to loop when it supports parameters
 	DMAudio.ClearMissionAudio();
 	CWeather::ReleaseWeather();
 	for (int i = 0; i < NUM_OF_SPECIAL_CHARS; i++)
@@ -280,11 +294,18 @@ void CMissionCleanup::Process()
 		CStreaming::SetMissionDoesntRequireModel(MI_CUTOBJ01 + i);
 	CStreaming::ms_disableStreaming = false;
 	CHud::m_ItemToFlash = -1;
-	CHud::SetHelpMessage(nil, false);
+	CHud::SetHelpMessage(nil, false); // TODO(MIAMI): third parameter is false
 	CUserDisplay::OnscnTimer.m_bDisabled = false;
+	CTheScripts::RemoveScriptTextureDictionary();
 	CWorld::Players[0].m_pPed->m_pWanted->m_bIgnoredByCops = false;
 	CWorld::Players[0].m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
 	CWorld::Players[0].MakePlayerSafe(false);
+	//TODO(MIAMI): drunkenness, enable drive by
+	//DMAudio::ShutUpPlayerTalking(0);
+	CVehicle::bDisableRemoteDetonation = false;
+	//CVehicle::bDisableRemoteDetonationOnContact = false; // TODO(MIAMI)
+	//CGameLogic::ClearShortCut(); // TODO(MIAMI)
+	CTheScripts::RiotIntensity = 0;
 	CTheScripts::StoreVehicleIndex = -1;
 	CTheScripts::StoreVehicleWasRandom = true;
 	CTheScripts::UpsideDownCars.Init();
@@ -507,7 +528,6 @@ void CRunningScript::CollectParameters(uint32* pIp, int16 total)
 int32 CRunningScript::CollectNextParameterWithoutIncreasingPC(uint32 ip)
 {
 	uint32* pIp = &ip;
-	float tmp;
 	switch (CTheScripts::Read1ByteFromScript(pIp))
 	{
 	case ARGUMENT_INT32:
@@ -521,8 +541,7 @@ int32 CRunningScript::CollectNextParameterWithoutIncreasingPC(uint32 ip)
 	case ARGUMENT_INT16:
 		return CTheScripts::Read2BytesFromScript(pIp);
 	case ARGUMENT_FLOAT:
-		tmp = CTheScripts::ReadFloatFromScript(pIp);
-		return *(int32*)&tmp;
+		return CTheScripts::Read4BytesFromScript(pIp);
 	default:
 		assert(0);
 	}
@@ -631,14 +650,7 @@ void CTheScripts::Init()
 	StoreVehicleIndex = -1;
 	StoreVehicleWasRandom = true;
 	OnAMissionFlag = 0;
-	for (int i = 0; i < MAX_NUM_CONTACTS; i++){
-		BaseBriefIdForContact[i] = 0;
-		OnAMissionForContactFlag[i] = 0;
-	}
-	for (int i = 0; i < MAX_NUM_COLLECTIVES; i++){
-		CollectiveArray[i].index = -1;
-		CollectiveArray[i].unk_data = 0;
-	}
+	LastMissionPassedTime = (uint32)-1;
 	NextFreeCollectiveIndex = 0;
 	LastRandomPedId = -1;
 	for (int i = 0; i < MAX_NUM_USED_OBJECTS; i++){
@@ -652,15 +664,17 @@ void CTheScripts::Init()
 	bUsingAMultiScriptFile = true;
 	for (int i = 0; i < MAX_NUM_MISSION_SCRIPTS; i++)
 		MultiScriptArray[i] = 0;
+	NumberOfExclusiveMissionScripts = 0;
 	NumberOfMissionScripts = 0;
 	LargestMissionScriptSize = 0;
 	MainScriptSize = 0;
 	ReadMultiScriptFileOffsetsFromScript();
 	FailCurrentMission = 0;
-	CountdownToMakePlayerUnsafe = 0;
 	DbgFlag = false;
-	DelayMakingPlayerUnsafeThisTime = 1;
 	NumScriptDebugLines = 0;
+	RiotIntensity = 0;
+	bPlayerHasMetDebbieHarry = false;
+	bPlayerIsInTheStatium = false;
 	for (int i = 0; i < MAX_NUM_SCRIPT_SPHERES; i++){
 		ScriptSphereArray[i].m_bInUse = false;
 		ScriptSphereArray[i].m_Index = 1;
@@ -681,6 +695,7 @@ void CTheScripts::Init()
 		IntroRectangles[i].m_sColor = CRGBA(255, 255, 255, 255);
 	}
 	NumberOfIntroRectanglesThisFrame = 0;
+	RemoveScriptTextureDictionary();
 	for (int i = 0; i < MAX_NUM_BUILDING_SWAPS; i++){
 		BuildingSwapArray[i].m_pBuilding = nil;
 		BuildingSwapArray[i].m_nNewModel = -1;
@@ -690,6 +705,15 @@ void CTheScripts::Init()
 		InvisibilitySettingArray[i] = nil;
 }
 
+void CTheScripts::RemoveScriptTextureDictionary()
+{
+	for (int i = 0; i < ARRAY_SIZE(CTheScripts::ScriptSprites); i++)
+		CTheScripts::ScriptSprites[i].Delete();
+	int slot = CTxdStore::FindTxdSlot("script");
+	if (slot != -1)
+		CTxdStore::RemoveTxd(slot);
+}
+
 void CRunningScript::RemoveScriptFromList(CRunningScript** ppScript)
 {
 	if (prev)
@@ -733,10 +757,6 @@ void CTheScripts::Process()
 	DrawScriptSpheres();
 	if (FailCurrentMission)
 		--FailCurrentMission;
-	if (CountdownToMakePlayerUnsafe){
-		if (--CountdownToMakePlayerUnsafe == 0)
-			CWorld::Players[0].MakePlayerSafe(false);
-	}
 	if (UseTextCommands){
 		for (int i = 0; i < MAX_NUM_INTRO_TEXT_LINES; i++)
 			IntroTextLines[i].Reset();
@@ -843,6 +863,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 	case COMMAND_WAIT:
 		CollectParameters(&m_nIp, 1);
 		m_nWakeTime = CTimer::GetTimeInMilliseconds() + ScriptParams[0];
+		m_bSkipWakeTime = false;
 		return 1;
 	case COMMAND_GOTO:
 		CollectParameters(&m_nIp, 1);
@@ -1256,13 +1277,11 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		UpdateCompareFlag(*ptr1 == *ptr2);
 		return 0;
 	}
-	/* Following commands are not implemented, and go to default case
-	case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_VAR:
-	case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_INT_LVAR:
-	case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_LVAR:
-	*/
+	//case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_VAR:
+	//case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_INT_LVAR:
+	//case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_LVAR:
 	case COMMAND_IS_FLOAT_VAR_EQUAL_TO_NUMBER:
 	{
 		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
@@ -1298,19 +1317,18 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		UpdateCompareFlag(*(float*)ptr1 == *(float*)ptr2);
 		return 0;
 	}
-	/* Following commands are not implemented, and go to default case
-	case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_VAR:
-	case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_FLOAT_LVAR:
-	case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_LVAR:
-	*/
+	//case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_VAR:
+	//case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_FLOAT_LVAR:
+	//case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_LVAR:
+	/*
 	case COMMAND_GOTO_IF_TRUE:
 		CollectParameters(&m_nIp, 1);
 		if (m_bCondResult)
 			SetIP(ScriptParams[0] >= 0 ? ScriptParams[0] : SIZE_MAIN_SCRIPT - ScriptParams[0]);
-		/* Check COMMAND_GOTO note. */
 		return 0;
+	*/
 	case COMMAND_GOTO_IF_FALSE:
 		CollectParameters(&m_nIp, 1);
 		if (!m_bCondResult)
@@ -1322,12 +1340,14 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 			CTheScripts::bAlreadyRunningAMissionScript = false;
 		RemoveScriptFromList(&CTheScripts::pActiveScripts);
 		AddScriptToList(&CTheScripts::pIdleScripts);
+		m_bIsActive = false;
 		return 1;
 	case COMMAND_START_NEW_SCRIPT:
 	{
 		CollectParameters(&m_nIp, 1);
 		assert(ScriptParams[0] >= 0);
 		CRunningScript* pNew = CTheScripts::StartNewScript(ScriptParams[0]);
+		m_bIsActive = true;
 		int8 type = CTheScripts::Read1ByteFromScript(&m_nIp);
 		float tmp;
 		for (int i = 0; type != ARGUMENT_END; type = CTheScripts::Read1ByteFromScript(&m_nIp), i++) {
@@ -1375,7 +1395,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 	{
 		CollectParameters(&m_nIp, 4);
 		int32 index = ScriptParams[0];
-		assert(index < 1); /* Constant? Also no more double player glitch */
+		assert(index < NUMPLAYERS);
 		printf("&&&&&&&&&&&&&Creating player: %d\n", index);
 		if (!CStreaming::HasModelLoaded(MI_PLAYER)) {
 			CStreaming::RequestSpecialModel(MI_PLAYER, "player", STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);
@@ -1415,20 +1435,49 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
 		CPlayerPed* ped = CWorld::Players[index].m_pPed;
-		if (!ped->bInVehicle) {
-			pos.z += ped->GetDistanceFromCentreOfMassToBaseOfModel();
-			ped->Teleport(pos);
-			CTheScripts::ClearSpaceForMissionEntity(pos, ped);
+		if (ped->bInVehicle) {
+			pos.z += ped->m_pMyVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
+			ped->m_pMyVehicle->Teleport(pos); // removed dumb stuff that was present here
+			CTheScripts::ClearSpaceForMissionEntity(pos, ped->m_pMyVehicle);
 			return 0;
 		}
-		pos.z += ped->m_pMyVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
-		if (ped->m_pMyVehicle->IsBoat())
-			ped->m_pMyVehicle->Teleport(pos);
-		else
-			ped->m_pMyVehicle->Teleport(pos);
-		/* I'll keep this condition here but obviously it is absolutely pointless */
-		/* It's clearly present in disassembly so it had to be in original code */
-		CTheScripts::ClearSpaceForMissionEntity(pos, ped->m_pMyVehicle);
+		pos.z += ped->GetDistanceFromCentreOfMassToBaseOfModel();
+		CVector vOldPos = ped->GetPosition();
+		ped->Teleport(pos);
+		CTheScripts::ClearSpaceForMissionEntity(pos, ped);
+		if (ped) { // great time to check
+			for (int i = 0; i < ped->m_numNearPeds; i++) {
+				CPed* pTestedPed = ped->m_nearPeds[i];
+				if (!pTestedPed || !IsPedPointerValid(pTestedPed))
+					continue;
+				if (pTestedPed->m_pedInObjective == ped && pTestedPed->m_objective == OBJ_15) {
+					CVector vFollowerPos = pTestedPed->GetFormationPosition();
+					CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped);
+					bool bFound = false;
+					vFollowerPos.z = CWorld::FindGroundZFor3DCoord(vFollowerPos.x, vFollowerPos.y, vFollowerPos.z + 1.0f, &bFound) + 1.0f;
+					if (bFound) {
+						if (CWorld::GetIsLineOfSightClear(vFollowerPos, ped->GetPosition(), true, false, false, true, false, false)) {
+							pTestedPed->Teleport(vFollowerPos);
+						}
+					}
+				}
+				else if (pTestedPed->m_leader == ped) {
+					CVector vFollowerPos;
+					if (pTestedPed->m_pedFormation)
+						vFollowerPos = pTestedPed->GetFormationPosition();
+					else
+						vFollowerPos = ped->GetPosition() + pTestedPed->GetPosition() - vOldPos;
+					CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped);
+					bool bFound = false;
+					vFollowerPos.z = CWorld::FindGroundZFor3DCoord(vFollowerPos.x, vFollowerPos.y, vFollowerPos.z + 1.0f, &bFound) + 1.0f;
+					if (bFound) {
+						if (CWorld::GetIsLineOfSightClear(vFollowerPos, ped->GetPosition(), true, false, false, true, false, false)) {
+							pTestedPed->Teleport(vFollowerPos);
+						}
+					}
+				}
+			}
+		}
 		return 0;
 	}
 	case COMMAND_IS_PLAYER_IN_AREA_2D:
@@ -2084,8 +2133,10 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		}
 		else {
 			CVehicle* car;
-			if (!CModelInfo::IsBikeModel(ScriptParams[0]))
-				car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
+
+			// TODO(MIAMI)
+			//if (!CModelInfo::IsBikeModel(ScriptParams[0]))
+			car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
 			CVector pos = *(CVector*)&ScriptParams[1];
 			if (pos.z <= MAP_Z_LOW_LIMIT)
 				pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
@@ -3500,14 +3551,8 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	case COMMAND_DECLARE_MISSION_FLAG:
 		CTheScripts::OnAMissionFlag = CTheScripts::Read2BytesFromScript(&++m_nIp);
 		return 0;
-	case COMMAND_DECLARE_MISSION_FLAG_FOR_CONTACT:
-		CollectParameters(&m_nIp, 1);
-		CTheScripts::OnAMissionForContactFlag[ScriptParams[0]] = CTheScripts::Read2BytesFromScript(&++m_nIp);
-		return 0;
-	case COMMAND_DECLARE_BASE_BRIEF_ID_FOR_CONTACT:
-		CollectParameters(&m_nIp, 2);
-		CTheScripts::BaseBriefIdForContact[ScriptParams[0]] = ScriptParams[1];
-		return 0;
+	//case COMMAND_DECLARE_MISSION_FLAG_FOR_CONTACT:
+	//case COMMAND_DECLARE_BASE_BRIEF_ID_FOR_CONTACT:
 	case COMMAND_IS_PLAYER_HEALTH_GREATER:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -3822,13 +3867,8 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPlayerInfo* pPlayer = &CWorld::Players[ScriptParams[0]];
 		if (ScriptParams[1]){
-			if (CGame::playingIntro || CTheScripts::DelayMakingPlayerUnsafeThisTime){
-				CTheScripts::CountdownToMakePlayerUnsafe = 50;
-				if (CTheScripts::DelayMakingPlayerUnsafeThisTime)
-					CTheScripts::DelayMakingPlayerUnsafeThisTime--;
-			}else{
-				pPlayer->MakePlayerSafe(false);
-			}
+			pPlayer->MakePlayerSafe(false);
+			// TODO(MIAMI): Four Iron hack
 		}else{
 			pPlayer->MakePlayerSafe(true);
 			if (strcmp(m_abScriptName, "camera") == 0){
@@ -4809,7 +4849,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		pPed->m_fHealth = ScriptParams[1];
+		pPed->m_fHealth = Min(ScriptParams[1], CWorld::Players[ScriptParams[0]].m_nMaxHealth);
 		return 0;
 	}
 	case COMMAND_SET_CHAR_HEALTH:
@@ -7161,7 +7201,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPlayerPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPlayerPed);
-		pPlayerPed->m_fArmour = clamp(pPlayerPed->m_fArmour + ScriptParams[1], 0.0f, 100.0f);
+		pPlayerPed->m_fArmour = clamp(pPlayerPed->m_fArmour + ScriptParams[1], 0.0f, CWorld::Players[ScriptParams[0]].m_nMaxArmour);
 		return 0;
 	}
 	case COMMAND_ADD_ARMOUR_TO_CHAR:
@@ -7712,9 +7752,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	}
 	case COMMAND_REMOVE_TEXTURE_DICTIONARY:
 	{
-		for (int i = 0; i < ARRAY_SIZE(CTheScripts::ScriptSprites); i++)
-			CTheScripts::ScriptSprites[i].Delete();
-		CTxdStore::RemoveTxd(CTxdStore::FindTxdSlot("script"));
+		CTheScripts::RemoveScriptTextureDictionary();
 		return 0;
 	}
 	case COMMAND_SET_OBJECT_DYNAMIC:
@@ -8319,14 +8357,34 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		DMAudio.PreloadMissionAudio(str);
 		return 0;
 	case COMMAND_HAS_MISSION_AUDIO_LOADED:
-		UpdateCompareFlag(DMAudio.GetMissionAudioLoadingStatus() == 1);
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("HAS_MISSION_AUDIO_LOADED not implemented, default to TRUE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		//UpdateCompareFlag(DMAudio.GetMissionAudioLoadingStatus() == 1);
 		return 0;
+	}
 	case COMMAND_PLAY_MISSION_AUDIO:
-		DMAudio.PlayLoadedMissionAudio();
+		CollectParameters(&m_nIp, 1);
+		debug("PLAY_MISSION_AUDIO doesn't support parameter yet, skipping\n");
+		//DMAudio.PlayLoadedMissionAudio();
 		return 0;
 	case COMMAND_HAS_MISSION_AUDIO_FINISHED:
-		UpdateCompareFlag(DMAudio.IsMissionAudioSampleFinished());
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("HAS_MISSION_AUDIO_FINISHED not implemented, default to TRUE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		//UpdateCompareFlag(DMAudio.IsMissionAudioSampleFinished());
 		return 0;
+	}
 	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -8638,8 +8696,15 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CStats::RegisterLongestFlightInDodo(ScriptParams[0]);
 		return 0;
 	case COMMAND_GET_OFFSET_FROM_CAR_IN_WORLD_COORDS:
-		assert(0 && "GET_OFFSET_FROM_CAR_IN_WORLD_COORDS not yet implemented");
+	{
+		CollectParameters(&m_nIp, 4);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		CVector result = pVehicle->GetMatrix() * *(CVector*)&ScriptParams[1] + pVehicle->GetPosition();
+		*(CVector*)&ScriptParams[0] = result;
+		StoreParameters(&m_nIp, 3);
 		return 0;
+	}
 	case COMMAND_SET_TOTAL_NUMBER_OF_KILL_FRENZIES:
 		CollectParameters(&m_nIp, 1);
 		CStats::SetTotalNumberKillFrenzies(ScriptParams[0]);
@@ -8716,6 +8781,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 #ifdef USE_DEBUG_SCRIPT_LOADER
 		CFileMgr::ChangeDir("\\data\\");
 		int handle = CFileMgr::OpenFile(scriptfile, "rb");
+		CFileMgr::ChangeDir("\\");
 #else
 		CFileMgr::ChangeDir("\\");
 		int handle = CFileMgr::OpenFile("data\\main.scm", "rb");
@@ -9166,7 +9232,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 {
 	char tmp[48];
 	switch (command) {
-	case COMMAND_LOAD_COLLISION_WITH_SCREEN:
+	case COMMAND_LOAD_COLLISION_WITH_SCREEN: // NB: not actually implemented
 		CollectParameters(&m_nIp, 1);
 		CTimer::Stop();
 		CGame::currLevel = (eLevelName)ScriptParams[0];
@@ -9193,7 +9259,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		m_nIp += 8;
 		LoadSplash(tmp);
 		return 0;
-	case COMMAND_SET_CAR_IGNORE_LEVEL_TRANSITIONS:
+	case COMMAND_SET_CAR_IGNORE_LEVEL_TRANSITIONS: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
@@ -9204,7 +9270,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 			pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pVehicle->GetPosition());
 		return 0;
 	}
-	case COMMAND_MAKE_CRAIGS_CAR_A_BIT_STRONGER:
+	case COMMAND_MAKE_CRAIGS_CAR_A_BIT_STRONGER:  // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
@@ -9228,7 +9294,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		DMAudio.PreloadCutSceneMusic(STREAMED_SOUND_GAME_COMPLETED);
 		printf("End preload end of game audio\n");
 		return 0;
-	case COMMAND_ENABLE_PLAYER_CONTROL_CAMERA:
+	case COMMAND_ENABLE_PLAYER_CONTROL_CAMERA: // NB: not actually implemented
 		CPad::GetPad(0)->DisablePlayerControls &= PLAYERCONTROL_DISABLED_1;
 		return 0;
 	case COMMAND_SET_OBJECT_ROTATION:
@@ -9250,11 +9316,11 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		*(CVector*)&ScriptParams[0] = TheCamera.Cams[2].Source;
 		StoreParameters(&m_nIp, 3);
 		return 0;
-	case COMMAND_GET_DEBUG_CAMERA_FRONT_VECTOR:
+	case COMMAND_GET_DEBUG_CAMERA_FRONT_VECTOR: // NB: not actually implemented
 		*(CVector*)&ScriptParams[0] = TheCamera.Cams[2].Front;
 		StoreParameters(&m_nIp, 3);
 		return 0;
-	case COMMAND_IS_PLAYER_TARGETTING_ANY_CHAR:
+	case COMMAND_IS_PLAYER_TARGETTING_ANY_CHAR: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 1);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
@@ -9271,10 +9337,38 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CPed* pTestedPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
 		assert(pTestedPed);
 		CEntity* pTarget = pPed->m_pPointGunAt;
-		UpdateCompareFlag(pTarget && pTarget->IsPed() && pTarget == pTestedPed);
+		bool bTargetting = pTarget && pTarget->IsPed() && pTarget == pTestedPed;
+		// PC shit
+		static int nCounter = 0;
+		nCounter = Max(0, nCounter - 1);
+		if (!pPed->GetWeapon()->IsTypeMelee() && !bTargetting) {
+			if ((pTarget->GetPosition() - TheCamera.GetPosition()).Magnitude() < 10.0f) {
+				CVector vTestedPos(pTarget->GetPosition().x, pTarget->GetPosition().y, pTarget->GetPosition().z + 0.4);
+				CVector vScreenPos;
+				float w, h;
+				if (CSprite::CalcScreenCoors(vTestedPos, vScreenPos, &w, &h, false)) {
+					CVector2D vCrosshairPosition(CCamera::m_f3rdPersonCHairMultX * RsGlobal.maximumWidth, CCamera::m_f3rdPersonCHairMultY * RsGlobal.maximumHeight);
+					float fScreenDistance = ((CVector2D)vScreenPos - vCrosshairPosition).Magnitude();
+					if (SCREEN_STRETCH_X(0.45f) > fScreenDistance / w) {
+						CColPoint point;
+						CEntity* entity;
+						if (!CWorld::ProcessLineOfSight(TheCamera.GetPosition() + 2.0f * TheCamera.GetForward(),
+							vTestedPos, point, entity, true, true, true, true, true, false) ||
+							entity == pTarget) {
+							nCounter += 2;
+							if (nCounter > 20) {
+								bTargetting = true;
+								nCounter = 20;
+							}
+						}
+					}
+				}
+			}
+		}
+		UpdateCompareFlag(bTargetting);
 		return 0;
 	}
-	case COMMAND_IS_PLAYER_TARGETTING_OBJECT:
+	case COMMAND_IS_PLAYER_TARGETTING_OBJECT: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
@@ -9327,7 +9421,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	case COMMAND_FAIL_CURRENT_MISSION:
 		CTheScripts::FailCurrentMission = 2;
 		return 0;
-	case COMMAND_GET_CLOSEST_OBJECT_OF_TYPE:
+	case COMMAND_GET_CLOSEST_OBJECT_OF_TYPE:  // NB: actually does nothing
 	{
 		CollectParameters(&m_nIp, 5);
 		CVector pos = *(CVector*)&ScriptParams[0];
@@ -9373,7 +9467,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
-	case COMMAND_PLACE_OBJECT_RELATIVE_TO_OBJECT:
+	case COMMAND_PLACE_OBJECT_RELATIVE_TO_OBJECT: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 5);
 		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
@@ -9389,24 +9483,14 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		if (pVehicle->pDriver) {
-			pVehicle->pDriver->bScriptObjectiveCompleted = false;
-			pVehicle->pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
-		}
-		for (int i = 0; i < ARRAY_SIZE(pVehicle->pPassengers); i++)
-		{
-			if (pVehicle->pPassengers[i]) {
-				pVehicle->pPassengers[i]->bScriptObjectiveCompleted = false;
-				pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
-			}
-		}
+		CCarAI::TellOccupantsToLeaveCar(pVehicle);
 		return 0;
 	}
 	case COMMAND_SET_INTERPOLATION_PARAMETERS:
 		CollectParameters(&m_nIp, 2);
-		TheCamera.SetParametersForScriptInterpolation(*(float*)&ScriptParams[0], 50.0f - *(float*)&ScriptParams[0], ScriptParams[1]);
+		TheCamera.SetParametersForScriptInterpolation(*(float*)&ScriptParams[0], 100.0f - *(float*)&ScriptParams[0], ScriptParams[1]);
 		return 0;
-	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING_TOWARDS_POINT:
+	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING_TOWARDS_POINT: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 5);
 		CVector pos = *(CVector*)&ScriptParams[0];
@@ -9421,7 +9505,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 4);
 		return 0;
 	}
-	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING_AWAY_POINT:
+	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING_AWAY_POINT: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 5);
 		CVector pos = *(CVector*)&ScriptParams[0];
@@ -9441,10 +9525,12 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 3);
 		return 0;
 	case COMMAND_ATTACH_CHAR_TO_CAR:
-		// empty implementation
+		// TODO(MIAMI)
+		assert(0);
 		return 0;
 	case COMMAND_DETACH_CHAR_FROM_CAR:
-		// empty implementation
+		// TODO(MIAMI)
+		assert(0);
 		return 0;
 	case COMMAND_SET_CAR_CHANGE_LANE: // for some reason changed in SA
 	{
@@ -9458,15 +9544,20 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		assert(pPed);
-		pPed->m_lastWepDam = -1;
+		if (pPed)
+			pPed->m_lastWepDam = -1;
+		else
+			debug("CLEAR_CHAR_LAST_WEAPON_DAMAGE - Character doesn't exist\n");
 		return 0;
 	}
 	case COMMAND_CLEAR_CAR_LAST_WEAPON_DAMAGE:
 	{
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
-		pVehicle->m_nLastWeaponDamage = -1;
+		if (pVehicle)
+			pVehicle->m_nLastWeaponDamage = -1;
+		else
+			debug("CLEAR_CAR_LAST_WEAPON_DAMAGE - Vehicle doesn't exist\n");
 		return 0;
 	}
 	case COMMAND_GET_RANDOM_COP_IN_AREA:
@@ -9487,9 +9578,11 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 				continue;
 			if (pPed->m_nPedType != PEDTYPE_COP)
 				continue;
+			if (!ThisIsAValidRandomCop(pPed->GetModelIndex(), ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8]))
+				continue;
 			if (pPed->CharCreatedBy != RANDOM_CHAR)
 				continue;
-			if (!pPed->IsPedInControl() && pPed->GetPedState() != PED_DRIVING)
+			if (!pPed->IsPedInControl() && pPed->GetPedState() != PED_DRIVING /* && pPed->GetPedState() != PED_ONROPE */) // TODO(MIAMI)!
 				continue;
 			if (pPed->bRemoveFromWorld)
 				continue;
@@ -9515,7 +9608,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
-	case COMMAND_GET_RANDOM_COP_IN_ZONE:
+	case COMMAND_GET_RANDOM_COP_IN_ZONE: // NB: not actually implemented
 	{
 		char zone[KEY_LENGTH_IN_SCRIPT];
 		strncpy(zone, (const char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
@@ -9619,7 +9712,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		ScriptParams[0] = pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType;
+		ScriptParams[0] = pPed->GetWeapon()->m_eWeaponType;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -9628,7 +9721,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		ScriptParams[0] = pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType;
+		ScriptParams[0] = pPed->GetWeapon()->m_eWeaponType;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -9649,7 +9742,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[2];
 		return 0;
 	}
-	case COMMAND_SET_CAR_HANDBRAKE_TURN_RIGHT:
+	case COMMAND_SET_CAR_HANDBRAKE_TURN_RIGHT: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
@@ -9658,7 +9751,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[1];
 		return 0;
 	}
-	case COMMAND_SET_CAR_HANDBRAKE_STOP:
+	case COMMAND_SET_CAR_HANDBRAKE_STOP: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
@@ -9672,11 +9765,11 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		UpdateCompareFlag(pPed->bInVehicle&& pPed->m_pMyVehicle->m_vehType == VEHICLE_TYPE_BIKE);
+		UpdateCompareFlag(pPed->bInVehicle&& pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE);
 		return 0;
 	}
-	case COMMAND_LOCATE_SNIPER_BULLET_2D:
-	case COMMAND_LOCATE_SNIPER_BULLET_3D:
+	case COMMAND_LOCATE_SNIPER_BULLET_2D: // NB: not actually implemented
+	case COMMAND_LOCATE_SNIPER_BULLET_3D: // NB: not actually implemented
 		LocateSniperBulletCommand(command, &m_nIp);
 		return 0;
 	case COMMAND_GET_NUMBER_OF_SEATS_IN_MODEL:
@@ -9689,10 +9782,10 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->m_vehType == VEHICLE_TYPE_BIKE);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE);
 		return 0;
 	}
-	case COMMAND_IS_CHAR_LYING_DOWN:
+	case COMMAND_IS_CHAR_LYING_DOWN: // NB: not actually implemented
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
@@ -9724,14 +9817,39 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CPed::nThreatReactionRangeMultiplier = *(float*)&ScriptParams[0];
 		return 0;
 	case COMMAND_SET_CHAR_CEASE_ATTACK_TIMER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->m_ceaseAttackTimer = ScriptParams[1];
+		return 0;
+	}
 	case COMMAND_GET_REMOTE_CONTROLLED_CAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CWorld::Players[ScriptParams[0]].m_pRemoteVehicle;
+		if (pVehicle)
+			ScriptParams[0] = CPools::GetVehiclePool()->GetIndex(pVehicle);
+		else
+			ScriptParams[0] = -1;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
 	case COMMAND_IS_PC_VERSION:
-	case COMMAND_REPLAY:
-	case COMMAND_IS_REPLAY_PLAYING:
+		UpdateCompareFlag(true);
+		return 0;
+	//case COMMAND_REPLAY:
+	//case COMMAND_IS_REPLAY_PLAYING:
 	case COMMAND_IS_MODEL_AVAILABLE:
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(CModelInfo::GetModelInfo(ScriptParams[0]) != nil);
+		return 0;
 	case COMMAND_SHUT_CHAR_UP:
+		assert("SHUT_CHAR_UP not implemented"); // TODO(MIAMI)
 	case COMMAND_SET_ENABLE_RC_DETONATE:
-		assert(0);
+		CollectParameters(&m_nIp, 1);
+		CVehicle::bDisableRemoteDetonation = ScriptParams[0];
+		return 0;
 	case COMMAND_SET_CAR_RANDOM_ROUTE_SEED:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9750,28 +9868,145 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	case COMMAND_GET_FIRST_PICKUP_COORDS:
 	case COMMAND_GET_NEXT_PICKUP_COORDS:
 	case COMMAND_REMOVE_ALL_CHAR_WEAPONS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->ClearWeapons();
+		return 0;
+	}
 	case COMMAND_HAS_PLAYER_GOT_WEAPON:
-	case COMMAND_HAS_CHAR_GOT_WEAPON:
-	case COMMAND_IS_PLAYER_FACING_CHAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		bool bFound = false;
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+			if (pPed->GetWeapon(i).m_eWeaponType == ScriptParams[1]) {
+				bFound = true;
+				break;
+			}
+		}
+		UpdateCompareFlag(bFound);
+		return 0;
+	}
+	//case COMMAND_HAS_CHAR_GOT_WEAPON:
+	//case COMMAND_IS_PLAYER_FACING_CHAR:
 	case COMMAND_SET_TANK_DETONATE_CARS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle && pVehicle->m_vehType == VEHICLE_TYPE_CAR);
+		((CAutomobile*)pVehicle)->bTankDetonateCars = ScriptParams[1];
+		return 0;
+	}
 	case COMMAND_GET_POSITION_OF_ANALOGUE_STICKS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPad* pPad = CPad::GetPad(ScriptParams[0]);
+		ScriptParams[0] = pPad->NewState.LeftStickX;
+		ScriptParams[1] = pPad->NewState.LeftStickY;
+		ScriptParams[2] = pPad->NewState.RightStickX;
+		ScriptParams[3] = pPad->NewState.RightStickY;
+		StoreParameters(&m_nIp, 4);
+		return 0;
+	}
 	case COMMAND_IS_CAR_ON_FIRE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		bool bOnFire = false;
+		if (pVehicle->m_pCarFire)
+			bOnFire = true;
+		if (pVehicle->m_vehType == VEHICLE_TYPE_CAR && ((CAutomobile*)pVehicle)->Damage.GetEngineStatus() >= ENGINE_STATUS_ON_FIRE)
+			bOnFire = true;
+		if (pVehicle->m_fHealth < 250.0f)
+			bOnFire = true;
+		UpdateCompareFlag(bOnFire);
+		return 0;
+	}
 	case COMMAND_IS_CAR_TYRE_BURST:
-	case COMMAND_SET_CAR_DRIVE_STRAIGHT_AHEAD:
-	case COMMAND_SET_CAR_WAIT:
-	case COMMAND_IS_PLAYER_STANDING_ON_A_VEHICLE:
-	case COMMAND_IS_PLAYER_FOOT_DOWN:
-	case COMMAND_IS_CHAR_FOOT_DOWN:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		bool bIsBurst = false;
+		if (pVehicle->m_vehType == VEHICLE_APPEARANCE_BIKE) {
+			assert("IS_CAR_TYPE_BURST not yet implemented for bikes");
+		}
+		else {
+			CAutomobile* pCar = (CAutomobile*)pVehicle;
+			if (ScriptParams[1] == 4) {
+				for (int i = 0; i < 4; i++) {
+					if (pCar->Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST)
+						bIsBurst = true;
+				}
+			}
+			else
+				bIsBurst = pCar->Damage.GetWheelStatus(ScriptParams[1] == WHEEL_STATUS_BURST);
+		}
+		UpdateCompareFlag(bIsBurst);
+	}
+	//case COMMAND_SET_CAR_DRIVE_STRAIGHT_AHEAD:
+	//case COMMAND_SET_CAR_WAIT:
+	//case COMMAND_IS_PLAYER_STANDING_ON_A_VEHICLE:
+	//case COMMAND_IS_PLAYER_FOOT_DOWN:
+	//case COMMAND_IS_CHAR_FOOT_DOWN:
 	case COMMAND_INITIALISE_OBJECT_PATH:
+		// TODO(MIAMI): script path
+		CollectParameters(&m_nIp, 2);
+		debug("INITALISE_OBJECT_PATH not yet implemented, skipping\n");
+		ScriptParams[0] = 0;
+		StoreParameters(&m_nIp, 1);
+		return 0;
 	case COMMAND_START_OBJECT_ON_PATH:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("START_OBJECT_ON_PATH not yet implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_SET_OBJECT_PATH_SPEED:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_OBJECT_PATH_SPEED not yet implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_SET_OBJECT_PATH_POSITION:
-	case COMMAND_GET_OBJECT_DISTANCE_ALONG_PATH:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_OBJECT_PATH_POSITION not yet implemented, skipping\n");
+		return 0;
+	}
+	//case COMMAND_GET_OBJECT_DISTANCE_ALONG_PATH:
 	case COMMAND_CLEAR_OBJECT_PATH:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("CLEAR_OBJECT_PATH not yet implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_HELI_GOTO_COORDS:
+	{
+		CollectParameters(&m_nIp, 5);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle && pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		((CAutomobile*)pVehicle)->TellHeliToGoToCoors(*(float*)&ScriptParams[1], *(float*)&ScriptParams[2], *(float*)&ScriptParams[3], ScriptParams[4]);
+		return 0;
+	}
 	case COMMAND_IS_INT_VAR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr = ScriptParams[0]);
+		return 0;
+	}
 	case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT:
-		assert(0);
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr = ScriptParams[0]);
+		return 0;
+	}
 	case COMMAND_GET_DEAD_CHAR_PICKUP_COORDS:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -9783,14 +10018,70 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		return 0;
 	}
 	case COMMAND_CREATE_PROTECTION_PICKUP:
+	{
+		CollectParameters(&m_nIp, 5);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
+		ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_PICKUP_REVENUE, PICKUP_ASSET_REVENUE, ScriptParams[3], ScriptParams[4]);
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
 	case COMMAND_IS_CHAR_IN_ANY_BOAT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT);
+		return 0;
+	}
 	case COMMAND_IS_PLAYER_IN_ANY_BOAT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE);
+		return 0;
+	}
 	case COMMAND_IS_CHAR_IN_ANY_HELI:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		return 0;
+	}
 	case COMMAND_IS_PLAYER_IN_ANY_HELI:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		return 0;
+	}
 	case COMMAND_IS_CHAR_IN_ANY_PLANE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE);
+		return 0;
+	}
 	case COMMAND_IS_PLAYER_IN_ANY_PLANE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		return 0;
+	}
 	case COMMAND_IS_CHAR_IN_WATER:
-		assert(0);
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		UpdateCompareFlag(pPed && pPed->bIsInWater);
+		return 0;
+	}
 	case COMMAND_SET_VAR_INT_TO_CONSTANT:
 	{
 		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
@@ -9816,17 +10107,74 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 {
 	switch (command) {
 	case COMMAND_IS_INT_VAR_GREATER_THAN_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr > ScriptParams[0]);
+		return 0;
+	}
 	case COMMAND_IS_INT_LVAR_GREATER_THAN_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr > ScriptParams[0]);
+		return 0;
+	}
 	case COMMAND_IS_CONSTANT_GREATER_THAN_INT_VAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		UpdateCompareFlag(ScriptParams[0] > *ptr);
+		return 0;
+	}
 	case COMMAND_IS_CONSTANT_GREATER_THAN_INT_LVAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		UpdateCompareFlag(ScriptParams[0] > *ptr);
+		return 0;
+	}
 	case COMMAND_IS_INT_VAR_GREATER_OR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr >= ScriptParams[0]);
+		return 0;
+	}
 	case COMMAND_IS_INT_LVAR_GREATER_OR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr >= ScriptParams[0]);
+		return 0;
+	}
 	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		UpdateCompareFlag(ScriptParams[0] >= *ptr);
+		return 0;
+	}
 	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_LVAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		UpdateCompareFlag(ScriptParams[0] >= *ptr);
+		return 0;
+	}
 	case COMMAND_GET_CHAR_WEAPON_IN_SLOT:
 	case COMMAND_GET_CLOSEST_STRAIGHT_ROAD:
-	case COMMAND_SET_CAR_FORWARD_SPEED:
 		assert(0);
+	case COMMAND_SET_CAR_FORWARD_SPEED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		float speed = *(float*)&ScriptParams[1] / GAME_SPEED_TO_CARAI_SPEED;
+		pVehicle->SetMoveSpeed(pVehicle->GetForward() * speed);
+		// TODO(MIAMI): heli hack!
+		return 0;
+	}
 	case COMMAND_SET_AREA_VISIBLE:
 		CollectParameters(&m_nIp, 1);
 		CGame::currArea = ScriptParams[0];
@@ -9834,7 +10182,13 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 		//CStreaming::RemoveBuildingsNotInArea(ScriptParams[0]); 
 		return 0;
 	case COMMAND_SET_CUTSCENE_ANIM_TO_LOOP:
-		assert(0);
+	{
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		debug("SET_CUTSCENE_ANIM_TO_LOOP not implemented yet, skipping\n");
+		return 0;
+	}
 	case COMMAND_MARK_CAR_AS_CONVOY_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9854,7 +10208,15 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 	case COMMAND_SET_CHAR_OBJ_AIM_GUN_AT_CHAR:
 	case COMMAND_SWITCH_SECURITY_CAMERA:
 	case COMMAND_IS_CHAR_IN_FLYING_VEHICLE:
+		assert(0);
 	case COMMAND_IS_PLAYER_IN_FLYING_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && (pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI || pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE));
+		return 0;
+	}
 	case COMMAND_HAS_SONY_CD_BEEN_READ:
 	case COMMAND_GET_NUMBER_OF_SONY_CDS_READ:
 	case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD_OLD:
@@ -9874,6 +10236,10 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 		return 0;
 	}
 	case COMMAND_ADD_MONEY_SPENT_ON_CLOTHES:
+		CollectParameters(&m_nIp, 1);
+		CStats::MoneySpentOnFashion(ScriptParams[0]);
+		return 0;
+		
 	case COMMAND_SET_HELI_ORIENTATION:
 	case COMMAND_CLEAR_HELI_ORIENTATION:
 	case COMMAND_PLANE_GOTO_COORDS:
@@ -9948,11 +10314,40 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 	case COMMAND_SET_CHAR_AS_PLAYER_FRIEND:
 	case COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER:
 	case COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER_WITH_STRING:
+		assert(0);
 	case COMMAND_ADD_SET_PIECE:
+	{
+		CollectParameters(&m_nIp, 13);
+		debug("ADD_SET_PIECE not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_SET_EXTRA_COLOURS:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_EXTRA_COLOURS not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_CLEAR_EXTRA_COLOURS:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("CLEAR_EXTRA_COLOURS not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_CLOSE_CAR_BOOT:
+		assert(0);
 	case COMMAND_GET_WHEELIE_STATS:
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("GET_WHEELIE_STATS not implemented\n");
+			bShowed = true;
+		}
+		for (int i = 0; i < 6; i++)
+			ScriptParams[i] = 0;
+		StoreParameters(&m_nIp, 6);
+		return 0;
+	}
 	case COMMAND_DISARM_CHAR:
 	case COMMAND_BURST_CAR_TYRE:
 	case COMMAND_IS_CHAR_OBJ_NO_OBJ:
@@ -10035,7 +10430,12 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
 	case COMMAND_DISPLAY_TEXT_WITH_3_NUMBERS:
 	case COMMAND_IS_CAR_DROWNING_IN_WATER:
 	case COMMAND_IS_CHAR_DROWNING_IN_WATER:
+		assert(0);
 	case COMMAND_DISABLE_CUTSCENE_SHADOWS:
+	{
+		debug("DISABLE_CUTSCENE_SHADOWS not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY:
 	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_BONE:
 	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_COMPONENT:
@@ -10070,15 +10470,33 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
 	case COMMAND_SET_PROPERTY_AS_OWNED:
 	case COMMAND_ADD_BLOOD_RING_KILLS:
 	case COMMAND_SET_LONGEST_TIME_IN_BLOOD_RING:
+		assert(0);
 	case COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE:
+	{
+		debug("REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_IS_PLAYER_TOUCHING_VEHICLE:
 	case COMMAND_IS_CHAR_TOUCHING_VEHICLE:
 	case COMMAND_CHECK_FOR_PED_MODEL_AROUND_PLAYER:
 	case COMMAND_CLEAR_CHAR_FOLLOW_PATH:
 	case COMMAND_SET_CHAR_CAN_BE_SHOT_IN_VEHICLE:
 	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_VEHICLE:
+		assert(0);
 	case COMMAND_LOAD_MISSION_TEXT:
+	{
+		char key[8];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		TheText.LoadMissionText(key);
+		return 0;
+	}
 	case COMMAND_SET_TONIGHTS_EVENT:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("skipping SET_TONIGHTS_EVENT\n");
+		return 0;
+	}
 	case COMMAND_CLEAR_CHAR_LAST_DAMAGE_ENTITY:
 	case COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY:
 	case COMMAND_FREEZE_OBJECT_POSITION:
@@ -10092,13 +10510,102 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
 	case COMMAND_SET_CHAR_OBJ_GOTO_CAR_ON_FOOT:
 	case COMMAND_GET_CLOSEST_WATER_NODE:
 	case COMMAND_ADD_PORN_LEAFLET_TO_RUBBISH:
+		assert(0);
 	case COMMAND_CREATE_CLOTHES_PICKUP:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
+		CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
+		ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_PICKUP_CLOTHES, PICKUP_ON_STREET, ScriptParams[3]);
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
 	case COMMAND_CHANGE_BLIP_THRESHOLD:
+		assert(0);
 	case COMMAND_MAKE_PLAYER_FIRE_PROOF:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_bFireproof = ScriptParams[1];
+		return 0;
+	}
 	case COMMAND_INCREASE_PLAYER_MAX_HEALTH:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_nMaxHealth += ScriptParams[1];
+		pPlayerInfo->m_pPed->m_fHealth = pPlayerInfo->m_nMaxHealth;
+		return 0;
+	}
 	case COMMAND_INCREASE_PLAYER_MAX_ARMOUR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_nMaxArmour += ScriptParams[1];
+		pPlayerInfo->m_pPed->m_fArmour = pPlayerInfo->m_nMaxArmour;
+		return 0;
+	}
 	case COMMAND_CREATE_RANDOM_CHAR_AS_DRIVER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		CPed* pPed = CPopulation::AddPedInCar(pVehicle, true);
+		pPed->CharCreatedBy = MISSION_CHAR;
+		pPed->bRespondsToThreats = false;
+		pPed->bAllowMedicsToReviveMe = false;
+		// TODO(MIAMI): two more flags and more stuff
+		pPed->SetPosition(pVehicle->GetPosition());
+		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
+		pPed->SetPedState(PED_DRIVING);
+		pPed->m_pMyVehicle = pVehicle;
+		pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
+		pVehicle->pDriver = pPed;
+		pVehicle->pDriver->RegisterReference((CEntity**)&pVehicle->pDriver);
+		pPed->bInVehicle = true;
+		pVehicle->SetStatus(STATUS_PHYSICS);
+		if (pVehicle->m_vehType == VEHICLE_TYPE_BOAT)
+			pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
+		pVehicle->bEngineOn = true;
+		pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pVehicle->GetPosition());
+		CPopulation::ms_nTotalMissionPeds++;
+		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
+		StoreParameters(&m_nIp, 1);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.AddEntityToList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
 	case COMMAND_CREATE_RANDOM_CHAR_AS_PASSENGER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		CPed* pPed = CPopulation::AddPedInCar(pVehicle, false);
+		pPed->CharCreatedBy = MISSION_CHAR;
+		pPed->bRespondsToThreats = false;
+		pPed->bAllowMedicsToReviveMe = false;
+		// TODO(MIAMI): two more flags and more stuff (ClearFollowPath)
+		pPed->SetPosition(pVehicle->GetPosition());
+		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
+		CPopulation::ms_nTotalMissionPeds++;
+		pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pVehicle->GetPosition());
+		if (ScriptParams[1] >= 0)
+			pVehicle->AddPassenger(pPed, ScriptParams[1]);
+		else
+			pVehicle->AddPassenger(pPed);
+
+		pPed->m_pMyVehicle = pVehicle;
+		pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
+		pPed->bInVehicle = true;
+		// TODO
+		pPed->SetPedState(PED_DRIVING);
+
+		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
+		StoreParameters(&m_nIp, 1);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.AddEntityToList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
 	case COMMAND_SET_CHAR_IGNORE_THREATS_BEHIND_OBJECTS:
 	case COMMAND_ENSURE_PLAYER_HAS_DRIVE_BY_WEAPON:
 	case COMMAND_MAKE_HELI_COME_CRASHING_DOWN:
@@ -10106,6 +10613,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
 		assert(0);
 	case COMMAND_SET_OBJECT_AREA_VISIBLE:
 	{
+		CollectParameters(&m_nIp, 2);
 		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
 		assert(pObject);
 		pObject->m_area = ScriptParams[1];
@@ -10114,12 +10622,39 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
 	case COMMAND_WAS_VEHICLE_EVER_POLICE:
 	case COMMAND_SET_CHAR_NEVER_TARGETTED:
 	case COMMAND_LOAD_UNCOMPRESSED_ANIM:
+		assert(0);
 	case COMMAND_WAS_CUTSCENE_SKIPPED:
+	{
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("COMMAND_WAS_CUTSCENE_SKIPPED not implemented, default to TRUE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		return 0;
+	}
 	case COMMAND_SET_CHAR_CROUCH_WHEN_THREATENED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		debug("SET_CHAR_CROUCH_WHEN_THREATENED not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_IS_CHAR_IN_ANY_POLICE_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("IS_CHAR_IN_ANY_POLICE_VEHICLE not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
 	case COMMAND_DOES_CHAR_EXIST:
 	case COMMAND_DOES_VEHICLE_EXIST:
 	case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_CONTACT_POINT:
+		assert(0);
 	case COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_CONTACT_POINT:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -10157,14 +10692,45 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
 		CGarages::SetMaxNumStoredCarsForGarage(ScriptParams[0], ScriptParams[1]);
 		break;
 	case COMMAND_WANTED_STARS_ARE_FLASHING:
+	{
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("WANTED_STARS_ARE_FLASHING not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
 	case COMMAND_SET_ALLOW_HURRICANES:
+		CollectParameters(&m_nIp, 1);
+		CStats::NoMoreHurricanes = ScriptParams[0];
+		return 0;
 	case COMMAND_PLAY_ANNOUNCEMENT:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("PLAY_ANNOUNCEMENT not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_SET_PLAYER_IS_IN_STADIUM:
 	case COMMAND_GET_BUS_FARES_COLLECTED_BY_PLAYER:
 	case COMMAND_SET_CHAR_OBJ_BUY_ICE_CREAM:
 	case COMMAND_DISPLAY_RADAR:
 	case COMMAND_REGISTER_BEST_POSITION:
+		assert(0);
 	case COMMAND_IS_PLAYER_IN_INFO_ZONE:
+	{
+		CollectParameters(&m_nIp, 1);
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("IS_PLAYER_IN_INFO_ZONE not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
 	case COMMAND_CLEAR_CHAR_ICE_CREAM_PURCHASE:
 	case COMMAND_IS_IN_CAR_FIRE_BUTTON_PRESSED:
 	case COMMAND_HAS_CHAR_ATTEMPTED_ATTRACTOR:
@@ -10173,9 +10739,23 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
 	case COMMAND_SET_LOAD_COLLISION_FOR_OBJECT_FLAG:
 	case COMMAND_ADD_BIG_GUN_FLASH:
 	case COMMAND_HAS_CHAR_BOUGHT_ICE_CREAM:
+		assert(0);
 	case COMMAND_GET_PROGRESS_PERCENTAGE:
+		*(float*)&ScriptParams[0] = CStats::GetPercentageProgress();
+		StoreParameters(&m_nIp, 1);
+		return 0;
 	case COMMAND_SET_SHORTCUT_PICKUP_POINT:
+	{
+		CollectParameters(&m_nIp, 4);
+		debug("SET_SHORTCUT_PICKUP_POINT not implemented, skipping\n");
+		return 0;
+	}
 	case COMMAND_SET_SHORTCUT_DROPOFF_POINT_FOR_MISSION:
+	{
+		CollectParameters(&m_nIp, 4);
+		debug("SET_SHORTCUT_DROPOFF_POINT_FOR_MISSION not implemented, skipping");
+		return 0;
+	}
 	case COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_AREA:
 	case COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_ZONE:
 	case COMMAND_UNLOCK_ALL_CAR_DOORS_IN_AREA:
@@ -10185,9 +10765,28 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
 		CGangs::SetWillAttackPlayerWithCops((ePedType)((int)PEDTYPE_GANG1 + ScriptParams[0]), !!ScriptParams[1]);
 		return 0;
 	case COMMAND_SET_CHAR_FRIGHTENED_IN_JACKED_CAR:
+		assert(0);
 	case COMMAND_SET_VEHICLE_TO_FADE_IN:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), ScriptParams[1]);
+		return 0;
+	}
 	case COMMAND_REGISTER_ODDJOB_MISSION_PASSED:
+		assert(0);
 	case COMMAND_IS_PLAYER_IN_SHORTCUT_TAXI:
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("IS_PLAYER_IN_SHORTCUT_TAXI not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
 	case COMMAND_IS_CHAR_DUCKING:
 	case COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI:
 	case COMMAND_REGISTER_FIRE_LEVEL:
@@ -10199,6 +10798,19 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
 	return -1;
 }
 
+bool CRunningScript::ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami)
+{
+	switch (mi)
+	{
+	case MI_COP: if (cop) return true;
+	case MI_SWAT: if (swat) return true;
+	case MI_FBI: if (fbi) return true;
+	case MI_ARMY: if (army) return true;
+	default:
+		return miami && (mi >= MI_VICE1 && mi <= MI_VICE8);
+	}
+}
+
 int32 CTheScripts::GetNewUniqueScriptSphereIndex(int32 index)
 {
 	if (ScriptSphereArray[index].m_Index >= UINT16_MAX - 1)
@@ -11563,29 +12175,6 @@ void CRunningScript::DoDeatharrestCheck()
 	while (m_nStackPointer > 1)
 		--m_nStackPointer;
 	m_nIp = m_anStack[--m_nStackPointer];
-	int16 messageId;
-	if (pPlayer->IsRestartingAfterDeath())
-		messageId = 0;
-	else if (pPlayer->IsRestartingAfterArrest())
-		messageId = 5;
-	else
-		messageId = 10;
-	messageId += CGeneral::GetRandomNumberInRange(0, 5);
-	bool found = false;
-	for (int16 contact = 0; !found && contact < MAX_NUM_CONTACTS; contact++) {
-		int contactFlagOffset = CTheScripts::OnAMissionForContactFlag[contact];
-		if (contactFlagOffset && CTheScripts::ScriptSpace[contactFlagOffset] == 1) {
-			messageId += CTheScripts::BaseBriefIdForContact[contact];
-			found = true;
-		}
-	}
-	if (!found)
-		messageId = 8001;
-	char tmp[16];
-	sprintf(tmp, "%d", messageId);
-	CMessages::ClearSmallMessagesOnly();
-	wchar* text = TheText.Get(tmp);
-	// ...and do nothing about it
 	*(int32*)&CTheScripts::ScriptSpace[CTheScripts::OnAMissionFlag] = 0;
 	m_bDeatharrestExecuted = true;
 	m_nWakeTime = 0;
@@ -11729,8 +12318,8 @@ void CTheScripts::RenderTheScriptDebugLines()
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)0);
 }
 
-#define SCRIPT_DATA_SIZE sizeof(CTheScripts::OnAMissionFlag) + sizeof(CTheScripts::BaseBriefIdForContact) + sizeof(CTheScripts::OnAMissionForContactFlag) +\
-	sizeof(CTheScripts::CollectiveArray) + 4 * sizeof(uint32) * MAX_NUM_BUILDING_SWAPS + 2 * sizeof(uint32) * MAX_NUM_INVISIBILITY_SETTINGS + 5 * sizeof(uint32)
+#define SCRIPT_DATA_SIZE sizeof(CTheScripts::OnAMissionFlag) +\
+	4 * sizeof(uint32) * MAX_NUM_BUILDING_SWAPS + 2 * sizeof(uint32) * MAX_NUM_INVISIBILITY_SETTINGS + 5 * sizeof(uint32)
 
 void CTheScripts::SaveAllScripts(uint8* buf, uint32* size)
 {
@@ -11750,12 +12339,6 @@ INITSAVEBUF
 	uint32 script_data_size = SCRIPT_DATA_SIZE;
 	WriteSaveBuf(buf, script_data_size);
 	WriteSaveBuf(buf, OnAMissionFlag);
-	for (uint32 i = 0; i < MAX_NUM_CONTACTS; i++) {
-		WriteSaveBuf(buf, OnAMissionForContactFlag[i]);
-		WriteSaveBuf(buf, BaseBriefIdForContact[i]);
-	}
-	for (uint32 i = 0; i < MAX_NUM_COLLECTIVES; i++)
-		WriteSaveBuf(buf, CollectiveArray[i]);
 	WriteSaveBuf(buf, NextFreeCollectiveIndex);
 	for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
 		CBuilding* pBuilding = BuildingSwapArray[i].m_pBuilding;
@@ -11828,12 +12411,6 @@ INITSAVEBUF
 		ScriptSpace[i] = ReadSaveBuf<uint8>(buf);
 	assert(ReadSaveBuf<uint32>(buf) == SCRIPT_DATA_SIZE);
 	OnAMissionFlag = ReadSaveBuf<uint32>(buf);
-	for (uint32 i = 0; i < MAX_NUM_CONTACTS; i++) {
-		OnAMissionForContactFlag[i] = ReadSaveBuf<uint32>(buf);
-		BaseBriefIdForContact[i] = ReadSaveBuf<uint32>(buf);
-	}
-	for (uint32 i = 0; i < MAX_NUM_COLLECTIVES; i++)
-		CollectiveArray[i] = ReadSaveBuf<tCollectiveData>(buf);
 	NextFreeCollectiveIndex = ReadSaveBuf<uint32>(buf);
 	for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
 		uint32 type = ReadSaveBuf<uint32>(buf);
diff --git a/src/control/Script.h b/src/control/Script.h
index 9931f13e..e84e76bf 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -221,19 +221,17 @@ enum {
 };
 
 enum {
-	SIZE_MAIN_SCRIPT = 128 * 1024,
-	SIZE_MISSION_SCRIPT = 32 * 1024,
+	SIZE_MAIN_SCRIPT = 225512,
+	SIZE_MISSION_SCRIPT = 35000,
 	SIZE_SCRIPT_SPACE = SIZE_MAIN_SCRIPT + SIZE_MISSION_SCRIPT
 };
 
 enum {
 	MAX_NUM_SCRIPTS = 128,
-	MAX_NUM_CONTACTS = 16,
 	MAX_NUM_INTRO_TEXT_LINES = 2,
 	MAX_NUM_INTRO_RECTANGLES = 16,
 	MAX_NUM_SCRIPT_SRPITES = 16,
 	MAX_NUM_SCRIPT_SPHERES = 16,
-	MAX_NUM_COLLECTIVES = 32,
 	MAX_NUM_USED_OBJECTS = 200,
 	MAX_NUM_MISSION_SCRIPTS = 120,
 	MAX_NUM_BUILDING_SWAPS = 25,
@@ -245,13 +243,10 @@ class CTheScripts
 {
 	static uint8 ScriptSpace[SIZE_SCRIPT_SPACE];
 	static CRunningScript ScriptsArray[MAX_NUM_SCRIPTS];
-	static int32 BaseBriefIdForContact[MAX_NUM_CONTACTS];
-	static int32 OnAMissionForContactFlag[MAX_NUM_CONTACTS];
 	static intro_text_line IntroTextLines[MAX_NUM_INTRO_TEXT_LINES];
 	static intro_script_rectangle IntroRectangles[MAX_NUM_INTRO_RECTANGLES];
 	static CSprite2d ScriptSprites[MAX_NUM_SCRIPT_SRPITES];
 	static script_sphere_struct ScriptSphereArray[MAX_NUM_SCRIPT_SPHERES];
-	static tCollectiveData CollectiveArray[MAX_NUM_COLLECTIVES];
 	static tUsedObject UsedObjectArray[MAX_NUM_USED_OBJECTS];
 	static int32 MultiScriptArray[MAX_NUM_MISSION_SCRIPTS];
 	static tBuildingSwap BuildingSwapArray[MAX_NUM_BUILDING_SWAPS];
@@ -275,14 +270,17 @@ class CTheScripts
 	static uint32 LargestMissionScriptSize;
 	static uint32 MainScriptSize;
 	static uint8 FailCurrentMission;
-	static uint8 CountdownToMakePlayerUnsafe;
-	static uint8 DelayMakingPlayerUnsafeThisTime;
 	static uint16 NumScriptDebugLines;
 	static uint16 NumberOfIntroRectanglesThisFrame;
 	static uint16 NumberOfIntroTextLinesThisFrame;
 	static uint8 UseTextCommands;
 	static uint16 CommandsExecuted;
 	static uint16 ScriptsUpdated;
+	static uint8 RiotIntensity;
+	static uint32 LastMissionPassedTime;
+	static uint16 NumberOfExclusiveMissionScripts;
+	static bool bPlayerIsInTheStatium;
+	static bool bPlayerHasMetDebbieHarry;
 
 public:
 	static void Init();
@@ -306,9 +304,6 @@ public:
 
 	static int32* GetPointerToScriptVariable(int32 offset) { assert(offset >= 8 && offset < CTheScripts::GetSizeOfVariableSpace()); return (int32*)&ScriptSpace[offset]; }
 
-	static void ResetCountdownToMakePlayerUnsafe() { CountdownToMakePlayerUnsafe = 0; }
-	static bool IsCountdownToMakePlayerUnsafeOn() { return CountdownToMakePlayerUnsafe != 0; }
-
 	static int32 Read4BytesFromScript(uint32* pIp) {
 		int32 retval = ScriptSpace[*pIp + 3] << 24 | ScriptSpace[*pIp + 2] << 16 | ScriptSpace[*pIp + 1] << 8 | ScriptSpace[*pIp];
 		*pIp += 4;
@@ -371,6 +366,7 @@ private:
 	static int32 AddScriptSphere(int32 id, CVector pos, float radius);
 	static int32 GetNewUniqueScriptSphereIndex(int32 index);
 	static void RemoveScriptSphere(int32 index);
+	static void RemoveScriptTextureDictionary();
 
 	friend class CRunningScript;
 	friend class CHud;
@@ -414,6 +410,7 @@ class CRunningScript
 	uint32 m_anStack[MAX_STACK_DEPTH];
 	uint16 m_nStackPointer;
 	int32 m_anLocalVariables[NUM_LOCAL_VARS + NUM_TIMERS];
+	bool m_bIsActive;
 	bool m_bCondResult;
 	bool m_bIsMissionScript;
 	bool m_bSkipWakeTime;
@@ -507,4 +504,6 @@ private:
 			return false;
 		}
 	}
+	
+	static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami);
 };