Merge pull request #652 from KillahPotatoes/v0.96.6

V0.96.6
KillahPotatoes · Sep 8, 2019 · aee5284 · aee5284
2 parents 420909b + 27798dc
commit aee5284
Show file tree

Hide file tree

Showing 61 changed files with 1,569 additions and 411 deletions.
diff --git a/Missionbasefiles/kp_liberation.song_bin_tanh/mission.sqm b/Missionbasefiles/kp_liberation.song_bin_tanh/mission.sqm
@@ -8,14 +8,14 @@ class EditorData
 	toggles=513;
 	class ItemIDProvider
 	{
-		nextID=633;
+		nextID=646;
 	};
 	class Camera
 	{
-		pos[]={1372.8306,55.560783,465.82941};
-		dir[]={0.77747244,-0.60665154,-0.16650243};
-		up[]={0.59341282,0.79475814,-0.12708488};
-		aside[]={-0.20943744,-3.1790114e-007,-0.97794938};
+		pos[]={1371.6664,24.004627,452.12912};
+		dir[]={0.93252647,-0.35703716,0.054267786};
+		up[]={0.35644579,0.9340843,0.020742955};
+		aside[]={0.058097087,6.3902917e-008,-0.99832481};
 	};
 };
 binarizationWanted=0;
@@ -200,7 +200,7 @@ class Mission
 	};
 	class Entities
 	{
-		items=359;
+		items=372;
 		class Item0
 		{
 			dataType="Logic";
@@ -2268,13 +2268,12 @@ class Mission
 		class Item107
 		{
 			dataType="Marker";
-			position[]={11605.399,3.1619999,8136.6348};
+			position[]={11545.439,2.502887,8152.6802};
 			name="military_9";
 			text="Da Kao Base";
 			type="o_support";
 			colorName="ColorEAST";
 			id=267;
-			atlOffset=-0.00049901009;
 		};
 		class Item108
 		{
@@ -6342,6 +6341,7 @@ class Mission
 			};
 			id=622;
 			type="Land_Campfire_burning";
+			atlOffset=1.9073486e-006;
 		};
 		class Item350
 		{
@@ -6390,6 +6390,7 @@ class Mission
 			};
 			id=626;
 			type="Land_LampShabby_F";
+			atlOffset=4.7683716e-007;
 		};
 		class Item353
 		{
@@ -6406,6 +6407,7 @@ class Mission
 			};
 			id=627;
 			type="Land_LampShabby_F";
+			atlOffset=4.7683716e-007;
 		};
 		class Item354
 		{
@@ -6422,6 +6424,7 @@ class Mission
 			};
 			id=628;
 			type="Land_LampShabby_F";
+			atlOffset=4.7683716e-007;
 		};
 		class Item355
 		{
@@ -6469,6 +6472,7 @@ class Mission
 			};
 			id=631;
 			type="Land_LampShabby_F";
+			atlOffset=4.7683716e-007;
 		};
 		class Item358
 		{
@@ -6485,6 +6489,150 @@ class Mission
 			};
 			id=632;
 			type="Land_LampShabby_F";
+			atlOffset=4.7683716e-007;
+		};
+		class Item359
+		{
+			dataType="Marker";
+			position[]={11692.29,6.388,7658.3418};
+			name="military_18";
+			text="Da Kao Radio Control";
+			type="o_support";
+			colorName="ColorEAST";
+			id=633;
+			atlOffset=-0.00013017654;
+		};
+		class Item360
+		{
+			dataType="Marker";
+			position[]={11412.36,1.406,12474.793};
+			name="capture_29";
+			text="Niha Sông Hau";
+			type="n_art";
+			colorName="ColorEAST";
+			id=634;
+			atlOffset=-2.6680861;
+		};
+		class Item361
+		{
+			dataType="Marker";
+			position[]={12541.085,-0.077,11392.884};
+			name="capture_30";
+			text="Timms Khue Cong";
+			type="n_art";
+			colorName="ColorEAST";
+			id=635;
+			atlOffset=-2.6681294;
+		};
+		class Item362
+		{
+			dataType="Marker";
+			position[]={7245.8242,2.99,8063.7139};
+			name="capture_31";
+			text="Khe Ban Tanh";
+			type="n_art";
+			colorName="ColorEAST";
+			id=636;
+			atlOffset=-2.668936;
+		};
+		class Item363
+		{
+			dataType="Marker";
+			position[]={4199,-0.73100001,8990.5234};
+			name="capture_32";
+			text="Goh Nui";
+			type="n_art";
+			colorName="ColorEAST";
+			id=637;
+			atlOffset=-3.9113262;
+		};
+		class Item364
+		{
+			dataType="Marker";
+			position[]={454.85999,3.6470001,12311.597};
+			name="capture_33";
+			text="Kho Nam Trang";
+			type="n_art";
+			colorName="ColorEAST";
+			id=638;
+			atlOffset=-2.6684711;
+		};
+		class Item365
+		{
+			dataType="Marker";
+			position[]={515.90802,15.893,14544.831};
+			name="capture_34";
+			text="Lha Un Garang";
+			type="n_art";
+			colorName="ColorEAST";
+			id=639;
+			atlOffset=-2.6681709;
+		};
+		class Item366
+		{
+			dataType="Marker";
+			position[]={2867.0759,11.111,14271.151};
+			name="military_19";
+			text="Vinh Long Food Depot";
+			type="o_support";
+			colorName="ColorEAST";
+			id=640;
+			atlOffset=-0.00059318542;
+		};
+		class Item367
+		{
+			dataType="Marker";
+			position[]={3661.073,2.2909999,13094.38};
+			name="factory_22";
+			text="Hong Ngu Ironworks";
+			type="loc_Fuelstation";
+			colorName="ColorEAST";
+			id=641;
+			atlOffset=0.00018334389;
+		};
+		class Item368
+		{
+			dataType="Marker";
+			position[]={5289.5908,-0.30899999,4465.9282};
+			name="capture_35";
+			text="Ghoram Tho";
+			type="n_art";
+			colorName="ColorEAST";
+			id=642;
+			atlOffset=-2.6685121;
+		};
+		class Item369
+		{
+			dataType="Marker";
+			position[]={14150.817,-0.085000001,1315.963};
+			name="capture_36";
+			text="Sho Lang Tho";
+			type="n_art";
+			colorName="ColorEAST";
+			id=643;
+			atlOffset=-2.6687562;
+		};
+		class Item370
+		{
+			dataType="Marker";
+			position[]={12913.526,6.131,6721.0879};
+			name="factory_23";
+			text="Lao Khea Ironworks";
+			type="loc_Fuelstation";
+			colorName="ColorEAST";
+			id=644;
+			atlOffset=-0.00055027008;
+		};
+		class Item371
+		{
+			dataType="Marker";
+			position[]={5577.8472,4.0949998,10980.842};
+			name="factory_24";
+			text="Ben Cat Plantation";
+			type="loc_Fuelstation";
+			colorName="ColorEAST";
+			id=645;
+			atlOffset=-0.00035524368;
 		};
 	};
 	class Connections

diff --git a/Missionframework/arsenal_presets/unsung.sqf b/Missionframework/arsenal_presets/unsung.sqf
@@ -1838,6 +1838,9 @@ GRLIB_arsenal_items = [
     "ItemWatch",
     "Medikit",
     "MineDetector",
+    "NVGoggles",
+    "NVGoggles_INDEP",
+    "NVGoggles_OPFOR",
     "ToolKit"
 ];
 

diff --git a/Missionframework/kp_liberation_config.sqf b/Missionframework/kp_liberation_config.sqf
@@ -611,14 +611,19 @@ box_transport_config = [
     ["rhsusf_M1083A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]],
     ["rhsusf_M1083A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]],
     ["rhsusf_M1083A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]],
-    ["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.7], [0,-1.3,0.7], [0,-3,0.7]],
-    ["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.7], [0,-1.3,0.7], [0,-3,0.7]],
-    ["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
-    ["rhsusf_M977A4_BKIT_usarmy_wd", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
-    ["rhsusf_M977A4_usarmy_d", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
-    ["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
+    ["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]],
+    ["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]],
+    ["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
+    ["rhsusf_M977A4_BKIT_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
+    ["rhsusf_M977A4_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
+    ["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
     ["rhsusf_m998_d_2dr_halftop", -4.5, [0,-0.9,-0.2]],
     ["rhsusf_m998_w_2dr_halftop", -4.5, [0,-0.9,-0.2]],
+    ["rhsusf_M1239_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]],
+    ["rhsusf_M1239_M2_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]],
+    ["rhsusf_M1239_MK19_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]],
+    ["sfp_tgb30", -5, [0.2,-0.1,2], [0.2,-2.1,2]],
+    ["sfp_tgb40", -5, [0.1,-0.7,2], [0.1,-2.7,2]],
     ["UK3CB_BAF_Merlin_HC3_18_DPMT", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]],
     ["UK3CB_BAF_Merlin_HC3_32_MTP", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]],
     ["UK3CB_BAF_Merlin_HC3_CSAR_MTP", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]],
@@ -663,12 +668,15 @@ ai_resupply_sources = [
     "O_Truck_03_ammo_F",
     "rhs_gaz66_ammo_msv",
     "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom",
+    "rhsusf_M1239_MK19_Deploy_socom_d",
+    "rhsusf_M1239_M2_Deploy_socom_d",
     "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d",
     "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd",
     "rhsusf_M977A4_AMMO_BKIT_usarmy_d",
     "rhsusf_M977A4_AMMO_BKIT_usarmy_wd",
     "rhsusf_M977A4_AMMO_usarmy_d",
     "rhsusf_M977A4_AMMO_usarmy_wd",
+    "sfp_tgb40_ammo",
     "uns_M113_ENG",
     "uns_M35A2_ammo",
     "uns_motorpool1_repair"
@@ -699,12 +707,15 @@ vehicle_repair_sources = [
     "O_Truck_03_repair_F",
     "RHS_Ural_Repair_VDV_01",
     "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom",
+    "rhsusf_M1239_MK19_Deploy_socom_d",
+    "rhsusf_M1239_M2_Deploy_socom_d",
     "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_d",
     "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_wd",
     "rhsusf_M977A4_REPAIR_BKIT_usarmy_d",
     "rhsusf_M977A4_REPAIR_BKIT_usarmy_wd",
     "rhsusf_M977A4_REPAIR_usarmy_d",
     "rhsusf_M977A4_REPAIR_usarmy_wd",
+    "sfp_tgb30_repair",
     "UNS_Hanger_repair",
     "uns_M113_ENG",
     "uns_M35A2_repair",
@@ -738,12 +749,15 @@ vehicle_rearm_sources = [
     "O_Truck_03_ammo_F",
     "rhs_gaz66_ammo_msv",
     "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom",
+    "rhsusf_M1239_MK19_Deploy_socom_d",
+    "rhsusf_M1239_M2_Deploy_socom_d",
     "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d",
     "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd",
     "rhsusf_M977A4_AMMO_BKIT_usarmy_d",
     "rhsusf_M977A4_AMMO_BKIT_usarmy_wd",
     "rhsusf_M977A4_AMMO_usarmy_d",
     "rhsusf_M977A4_AMMO_usarmy_wd",
+    "sfp_tgb40_ammo",
     "uns_M113_ENG",
     "uns_M35A2_ammo"
 ];
@@ -777,10 +791,13 @@ vehicle_refuel_sources = [
     "O_Truck_03_fuel_F",
     "RHS_Ural_Fuel_VDV_01",
     "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom",
+    "rhsusf_M1239_MK19_Deploy_socom_d",
+    "rhsusf_M1239_M2_Deploy_socom_d",
     "rhsusf_M978A4_BKIT_usarmy_d",
     "rhsusf_M978A4_BKIT_usarmy_wd",
     "rhsusf_M978A4_usarmy_d",
     "rhsusf_M978A4_usarmy_wd",
+    "sfp_tgb40_fuel",
     "uns_M113_ENG",
     "uns_M35A2_fuel",
     "uns_M35A2_fueltanker"

diff --git a/Missionframework/presets/blufor/CUP_ACR_Desert.sqf b/Missionframework/presets/blufor/CUP_ACR_Desert.sqf
@@ -70,7 +70,6 @@ infantry_units = [
 ];
 
 light_vehicles = [
-    ["CUP_B_TowingTractor_CZ",50,0,25],                                 // Towing Tractor
     ["CUP_B_UAZ_Unarmed_ACR",100,0,50],                                 // UAZ
     ["CUP_B_UAZ_Open_ACR",100,0,50],                                    // UAZ (Open)
     ["CUP_B_UAZ_MG_ACR",100,40,50],                                     // UAZ (DShKM)
@@ -215,7 +214,7 @@ support_vehicles = [
     ["ACE_Box_82mm_Mo_Illum",50,10,0],
     ["ACE_Wheel",10,0,0],
     ["ACE_Track",10,0,0],
-    ["B_APC_Tracked_01_CRV_F",500,250,350],                             // CRV-6e Bobcat
+    ["CUP_B_TowingTractor_CZ",50,0,25],                                 // Towing Tractor
     ["CUP_B_T810_Repair_CZ_DES",325,0,75],                              // Tatra T810 (Repair)
     ["CUP_B_T810_Refuel_CZ_DES",125,0,275],                             // Tatra T810 (Fuel)
     ["CUP_B_T810_Reammo_CZ_DES",125,200,75],                            // Tatra T810 (Ammo)

diff --git a/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf b/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf
@@ -70,7 +70,6 @@ infantry_units = [
 ];
 
 light_vehicles = [
-    ["CUP_B_TowingTractor_CZ",50,0,25],                                 // Towing Tractor
     ["CUP_B_UAZ_Unarmed_ACR",100,0,50],                                 // UAZ
     ["CUP_B_UAZ_Open_ACR",100,0,50],                                    // UAZ (Open)
     ["CUP_B_UAZ_MG_ACR",100,40,50],                                     // UAZ (DShKM)
@@ -212,7 +211,7 @@ support_vehicles = [
     ["ACE_Box_82mm_Mo_Illum",50,10,0],
     ["ACE_Wheel",10,0,0],
     ["ACE_Track",10,0,0],
-    ["B_APC_Tracked_01_CRV_F",500,250,350],                             // CRV-6e Bobcat
+    ["CUP_B_TowingTractor_CZ",50,0,25],                                 // Towing Tractor
     ["CUP_B_T810_Repair_CZ_WDL",325,0,75],                              // Tatra T810 (Repair)
     ["CUP_B_T810_Refuel_CZ_WDL",125,0,275],                             // Tatra T810 (Fuel)
     ["CUP_B_T810_Reammo_CZ_WDL",125,200,75],                            // Tatra T810 (Ammo)

diff --git a/Missionframework/presets/blufor/CUP_BAF_Desert.sqf b/Missionframework/presets/blufor/CUP_BAF_Desert.sqf
@@ -223,7 +223,6 @@ support_vehicles = [
     ["ACE_Wheel",10,0,0],
     ["ACE_Track",10,0,0],
     ["CUP_B_TowingTractor_GB",50,0,25],                                     // Towing Tractor
-    ["B_APC_Tracked_01_CRV_F",500,250,350],                                 // CRV-6e Bobcat
     ["CUP_B_MTVR_Repair_USA",425,0,75],                                     // MTVR Repair
     ["CUP_B_MTVR_Refuel_USA",125,0,375],                                    // MTVR Refuel
     ["CUP_B_MTVR_Ammo_USA",125,300,75],                                     // MTVR Ammo

diff --git a/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf b/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf
@@ -223,7 +223,6 @@ support_vehicles = [
     ["ACE_Wheel",10,0,0],
     ["ACE_Track",10,0,0],
     ["CUP_B_TowingTractor_GB",50,0,25],                                 // Towing Tractor
-    ["B_APC_Tracked_01_CRV_F",500,250,350],                             // CRV-6e Bobcat
     ["CUP_B_MTVR_Repair_USMC",425,0,75],                                // MTVR Repair
     ["CUP_B_MTVR_Refuel_USMC",125,0,375],                               // MTVR Refuel
     ["CUP_B_MTVR_Ammo_USMC",125,300,75],                                // MTVR Ammo

diff --git a/Missionframework/presets/blufor/CUP_CDF.sqf b/Missionframework/presets/blufor/CUP_CDF.sqf
@@ -69,7 +69,6 @@ infantry_units = [
 ];
 
 light_vehicles = [
-    ["CUP_B_Tractor_CDF",50,0,25],                                      // Towing Tractor
     ["CUP_B_UAZ_Unarmed_CDF",75,0,50],                                  // UAZ
     ["CUP_B_UAZ_MG_CDF",100,60,50],                                     // UAZ (DShKM)
     ["CUP_B_UAZ_AGS30_CDF",100,80,50],                                  // UAZ (AGS-30)
@@ -211,7 +210,6 @@ support_vehicles = [
     ["ACE_Wheel",10,0,0],
     ["ACE_Track",10,0,0],
     ["CUP_B_Tractor_CDF",50,0,75],                                      // Towing Tractor
-    ["B_APC_Tracked_01_CRV_F",500,250,350],                             // CRV-6e Bobcat
     ["CUP_B_Kamaz_Repair_CDF",425,0,75],                                // Kamaz 5350 (Repair)
     ["CUP_B_Kamaz_Refuel_CDF",125,0,375],                               // Kamaz 5350 (Fuel)
     ["CUP_B_Kamaz_Reammo_CDF",125,300,75],                              // Kamaz 5350 (Ammo)