From e2a410b95af8c2d9ab61ac4cdce16df1db583d78 Mon Sep 17 00:00:00 2001
From: ebayShopper <ebayShopper@users.noreply.github.com>
Date: Tue, 5 Dec 2017 15:16:36 -0500
Subject: [PATCH] Update AH6X config

This partially reverts commit 95310b9.

Update for model change in commit 43d349c

Turret animation source errors have been fixed in Streatman's new model,
so this is no longer necessary.
---
 CHANGE LOG 1.0.6.2.txt                        |  1 +
 .../Configs/CfgVehicles/CfgVehicles.hpp       |  1 -
 .../Configs/CfgVehicles/Helicopter/AH6.hpp    | 62 ++-----------------
 3 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt
index 418488d22..7daa5b65e 100644
--- a/CHANGE LOG 1.0.6.2.txt	
+++ b/CHANGE LOG 1.0.6.2.txt	
@@ -35,6 +35,7 @@
 [UPDATED] Added all upgraded weapons to the traders as sell only for the sell price of the base weapon plus the sell price of attachments. This allows them to be sold without removing attachments first. #1982 @worldwidesorrow
 [UPDATED] Increased the coverage angle of headlights on land vehicles and added a headlight to the bicycle
 [UPDATED] The huey searchlight and gunner seat now have improved visibility in first person view.
+[UPDATED] The AH6X_DZ now uses a new model which removes the camera and computer, adds a search light and fixes unknown animation source turret errors.
 [UPDATED] Removed policecar from dayz_vehicles due to model errors, SQL must be updated if this vehicle was used, see 1.0.6.2_Updates.sql
 [UPDATED] Player is no longer set in combat for throwing a flare or chemlight
 
diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
index 33fe764aa..5eb79d4b4 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
@@ -311,7 +311,6 @@ class CfgVehicles
 	//class UAZ_Unarmed_Base;
 	//class HMMWV_Base;
 	class AH6_Base_EP1;
-	class AH6X_EP1;
 	class An2_Base_EP1;
 	class TT650_Base;
 	class Truck;
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
index ccea367e2..4189a1135 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
@@ -42,6 +42,7 @@ class AH6J_EP1_DZ: AH6_Base_EP1
 		fired = "_this call BIS_Effects_EH_Fired;";
 	};
 };
+
 class AH6J_EP1_DZE: AH6J_EP1_DZ
 {
 	scope = public;
@@ -49,7 +50,8 @@ class AH6J_EP1_DZE: AH6J_EP1_DZ
 	displayName = "AH6J_DZE";
 	magazines[] = {"60Rnd_CMFlareMagazine"};
 };
-class AH6X_DZ: AH6X_EP1 {
+
+class AH6X_DZ: AH6_Base_EP1 {
 	displayname = $STR_VEH_NAME_AH6X;
 	displaynameshort = $STR_EP1_DN_AH6X;
 	model = "dayz_vehicles\helicopters\greybird\greybird.p3d";
@@ -77,62 +79,8 @@ class AH6X_DZ: AH6X_EP1 {
 	transportMaxMagazines = 30;
 	transportmaxbackpacks = 2;
 	fuelCapacity = 242;
-	transportSoldier = 0;
-	memoryPointsGetInGunner = "pos_cargo";
-	memoryPointsGetInGunnerDir = "pos_cargo_dir";
-	class NewTurret;
-	class Turrets
-	{
-		class ObserverTurret: NewTurret
-		{
-			ProxyType = CPCargo;
-			proxyIndex = 1;
-			startEngine = 0;
-			hasgunner = 1;
-			body = "FLIR_turret";
-			gun = "FLIR_gun";
-			animationSourceBody = "FLIR_turret";
-			animationSourceGun = "FLIR_gun";
-			gunBeg = "FLIR_end";
-			gunEnd = "FLIR_begin";
-			memoryPointGun = "FLIR_end";
-			turretAxis = "FLIR_turret_axis";
-			gunAxis = "FLIR_gun_axis";
-			commanding = -1;
-			class Viewoptics
-			{
-				initAngleX = 0;
-				minAngleX = -30;
-				maxAngleX = 30;
-				initAngleY = 0;
-				minAngleY = -100;
-				maxAngleY = 100;
-				minFov = 0.01;
-				initFov = 0.50;
-				maxFov = 0.80;
-				visionMode[] = {"Normal","NVG"};
-				thermalMode[] = {};
-			};
-			gunnerAction = "AH6j_Cargo_EP1";
-			gunnerOpticsModel = "\ca\weapons\2Dscope_UAV.p3d";
-			memoryPointGunnerOptics = "gunnerview";
-			//gunnerOpticsModel = "\ca\weapons\optika_SOFLAM";
-			soundServo[] = {"",0.01,1};
-			gunnerForceOptics = 0;
-			gunnerGetInAction = "GetInLow";
-			gunnerGetOutAction = "GetOutLow";
-			gunnerName = "Observer";
-			animationSourceHatch = "";
-			minElev = -90;
-			maxElev = 60;
-			initElev = 0;
-			minTurn = -360;
-			maxTurn = 360;
-			initTurn = 0;
-			weapons[] = {};
-			magazines[] = {};
-		};
-	};
+
+	class Turrets {};
 	class DefaultEventhandlers;
 	class EventHandlers: DefaultEventhandlers
 	{