Merge pull request #167 from 501st-Aux-Mod-Team/aviation-adjustments

Aviation adjustments

addons - Copy/RD501_Vehicles/air/ARC_170X/arc170_common.hpp

@@ -1,3 +1,4 @@
+#include "../../common/common_pilotCamera.hpp"
 
 scope = 2;
 scopeCurator = 2;
@@ -22,6 +23,10 @@ magazines[]=
 	macro_new_mag(Kannon,100),
 	macro_new_mag(Kannon,100)
 };
+
+RD501_magclamp_large_offset[]={0.0,0.0,-3.0};
+RD501_magclamp_small_offset[]={0.0,0.0,-0.5};
+
 class Components: Components
 {
 	class TransportPylonsComponent

addons - Copy/RD501_Vehicles/air/LAAT/common_stuff_tcw.hpp

@@ -6,6 +6,18 @@ class EventHandlers : DefaultEventhandlers
 
 #include "../../common/helicopter_mfd.hpp"
 
+class ACE_SelfActions: ACE_SelfActions
+{
+	class ACE_Passengers
+	{
+		condition = "alive _target";
+		displayName = "Passengers";
+		insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
+		statement = "";
+	};
+	#include "../../common/universal_hud_color_changer.hpp"
+};
+
 scope=2;
 author="RD501";
 forceInGarage = 1;

addons - Copy/RD501_Vehicles/air/LAAT/config.cpp

@@ -145,16 +145,6 @@ class CfgVehicles
 			class CargoTurret_05: CargoTurret_05{};
 			class CargoTurret_06: CargoTurret_06{};
 		};
-		class ACE_SelfActions
-		{
-			class ACE_Passengers
-			{
-				condition = "alive _target";
-				displayName = "Passengers";
-				insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
-				statement = "";
-			};
-		};
 	};
 	class macro_new_vehicle(laat,Mk1_lights):3as_LAAT_Mk1Lights
 	{
@@ -192,16 +182,6 @@ class CfgVehicles
 			class CargoTurret_05: CargoTurret_05{};
 			class CargoTurret_06: CargoTurret_06{};
 		};
-		class ACE_SelfActions
-		{
-			class ACE_Passengers
-			{
-				condition = "alive _target";
-				displayName = "Passengers";
-				insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
-				statement = "";
-			};
-		};
 	};
 
 	class macro_new_vehicle(laat,Mk2):3as_LAAT_Mk2
@@ -236,16 +216,6 @@ class CfgVehicles
 			class CargoTurret_01: CargoTurret_01{};
 			class CargoTurret_02: CargoTurret_02{};
 		};
-		class ACE_SelfActions
-		{
-			class ACE_Passengers
-			{
-				condition = "alive _target";
-				displayName = "Passengers";
-				insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
-				statement = "";
-			};
-		};
 	};
 	class macro_new_vehicle(laat,Mk2_lights):3as_LAAT_Mk2Lights
 	{
@@ -279,16 +249,6 @@ class CfgVehicles
 			class CargoTurret_01: CargoTurret_01{};
 			class CargoTurret_02: CargoTurret_02{};
 		};
-		class ACE_SelfActions
-		{
-			class ACE_Passengers
-			{
-				condition = "alive _target";
-				displayName = "Passengers";
-				insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
-				statement = "";
-			};
-		};
 	};
 
 // SWOP START HERE
@@ -315,15 +275,38 @@ class CfgVehicles
 	
 		class UserActions
 		{
-			#include "user_action.hpp"
+			class ThrusterEngage
+			{
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				position = "pilotview";
+				radius = 20;
+				priority = 0;
+				onlyForPlayer = 1;
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseIncrease.sqf""";
+				shortcut="User19"
+			};
+
+			class ThrusterDisengage: ThrusterEngage
+			{
+				priority = 0;
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseDecrease.sqf""";
+				shortcut="User20"
+			};
 		};
 		class ACE_SelfActions:ACE_SelfActions
 		{		
-			
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
-		#include "../../common/universal_mfd.hpp"
+		#include "../../common/helicopter_mfd.hpp"	
+		//#include "../../common/universal_mfd.hpp"
 
 		class Turrets: Turrets
 		{
@@ -398,8 +381,30 @@ class CfgVehicles
 
 		class UserActions
 		{
-			#include "user_action.hpp"
-
+			class ThrusterEngage
+			{
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				position = "pilotview";
+				radius = 20;
+				priority = 0;
+				onlyForPlayer = 1;
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseIncrease.sqf""";
+				shortcut="User19"
+			};
+			class ThrusterDisengage: ThrusterEngage
+			{
+				priority = 0;
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseDecrease.sqf""";
+				shortcut="User20"
+			};
+			
 			class OpenCargoDoor
 			{
 				displayName = "<t color='#F64747'>[Open Doors]</t>";
@@ -430,7 +435,8 @@ class CfgVehicles
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
-		#include "../../common/universal_mfd.hpp"
+		#include "../../common/helicopter_mfd.hpp"	
+		//#include "../../common/universal_mfd.hpp"
 
 		class Turrets: Turrets
 		{
@@ -511,17 +517,16 @@ class CfgVehicles
 
 		class ACE_SelfActions
 		{		
-			
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
-		#include "../../common/universal_mfd.hpp"
+		#include "../../common/helicopter_mfd.hpp"	
+		//#include "../../common/universal_mfd.hpp"
 
 		//#include "flight_model.hpp"
 		#include "sounds.hpp"
 		class UserActions
 		{
-			#include "user_action.hpp"
 			class StartRefuel
 			{
 				displayName = "<t color='#07CC0C'>[Start Refueling]</t>";
@@ -546,6 +551,29 @@ class CfgVehicles
 				condition = "this call RD501_fnc_mc_canStopRefuel";
 				statement = "_vehicle setVariable['RD501_mc_stop_refuel',true,true];";
 			};
+			class ThrusterEngage
+			{
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				position = "pilotview";
+				radius = 20;
+				priority = 0;
+				onlyForPlayer = 1;
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseIncrease.sqf""";
+				shortcut="User19"
+			};
+			class ThrusterDisengage: ThrusterEngage
+			{
+				priority = 0;
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseDecrease.sqf""";
+				shortcut="User20"
+			};
 		};
 		class EventHandlers : DefaultEventhandlers {
 			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";

addons - Copy/RD501_Vehicles/air/LAAT/inheritance.hpp

@@ -1,13 +1,19 @@
 class Heli_Attack_01_base_F;
 class B_Heli_Attack_01_base_F: Heli_Attack_01_base_F
 {
+	class UserActions;
 	class Turrets;
 	class ViewPilot;
 	class Components;
 };
 class 3as_laat_Base: B_Heli_Attack_01_base_F
 {
-	class UserActions;
+	class ACE_SelfActions;
+	class UserActions: UserActions
+	{
+		class rampOpen;
+		class rampClose;
+	};
 	class Components:Components{};
 	class Turrets: Turrets
 	{

addons - Copy/RD501_Vehicles/air/LAAT/user_action.hpp

@@ -1,28 +1,4 @@
-
 	class ThrusterEngage
-	{
-		displayName = "<t color='#4C9900'>[Impulsor On]</t>";
-		displayNameDefault = "<t color='#4C9900'>[Impulsor On]</t>";
-		textToolTip = "<t color='#4C9900'>[Impulsor On]</t>";
-		position = "pilotview";
-		radius = 20;
-		priority = 21;
-		onlyForPlayer = 1;
-		condition = "((player == driver this) AND (alive this))";
-		statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseIncrease.sqf""";
-	};
-
-	class ThrusterDisngage: ThrusterEngage
-	{
-		priority = 21;
-		displayName = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-		displayNameDefault = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-		textToolTip = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-		condition = "((player == driver this) AND (alive this))";
-		statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseDecrease.sqf""";
-	};
-
-	class ThrusterEngage_spam: ThrusterEngage
 	{
 		displayName = "";
 		displayNameDefault = "";
@@ -36,8 +12,7 @@
 		shortcut="User19"
 	};
 
-
-	class ThrusterDisngage_spam: ThrusterEngage
+	class ThrusterDisengage: ThrusterEngage
 	{
 		priority = 0;
 		displayName = "";
@@ -48,4 +23,15 @@
 		shortcut="User20"
 	};
 
-	
+    class afterburnerMk1_turn_on{};
+    class afterburnerMk1_turn_off{};
+
+	class rampOpen: rampOpen
+	{
+		condition="(this animationphase 'ramp' == 0) AND (alive this) AND (player in [gunner this, driver this])";
+	};
+
+	class rampClose: rampClose
+	{
+		condition="(this animationphase 'ramp' == 1) AND (alive this) AND (player in [gunner this, driver this])";
+	};

addons - Copy/RD501_Vehicles/air/NuClass/config.cpp

@@ -26,11 +26,21 @@ class CfgPatches
 };
 class CfgVehicles
 {
-	class 3as_nuclass_f;
-	class 3AS_Nuclass : 3as_nuclass_f
+	class 3as_nuclass_base;
+	class 3as_nuclass_f: 3as_nuclass_base
 	{
 		class UserActions;
 	};
+	class 3AS_Nuclass : 3as_nuclass_f
+	{
+		class UserActions: UserActions
+		{
+			class rampOpen;
+			class rampClose;
+			class frontrampOpen;
+			class frontrampClose;
+		};
+	};
 
 	class macro_new_vehicle(nuclass,mk1) : 3AS_Nuclass
 	{
@@ -70,7 +80,47 @@ class CfgVehicles
 		};
 		class UserActions:UserActions
 		{
-			#include "user_action.hpp"
+			class ThrusterEngage
+			{
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				position = "pilotview";
+				radius = 20;
+				priority = 0;
+				onlyForPlayer = 1;
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseIncrease.sqf""";
+				shortcut="User19"
+			};
+
+			class ThrusterDisengage: ThrusterEngage
+			{
+				priority = 0;
+				displayName = "";
+				displayNameDefault = "";
+				textToolTip = "";
+				condition = "((player == driver this) AND (alive this))";
+				statement = "this execVM ""\RD501_Main\functions\impulse\fnc_impulseDecrease.sqf""";
+				shortcut="User20"
+			};
+
+			class rampOpen: rampOpen
+			{
+				condition="(this animationSourcePhase 'ramp' == 0) AND (alive this) AND (player in [gunner this, driver this])";
+			};
+			class rampClose: rampClose
+			{
+				condition="(this animationSourcePhase 'ramp' == 1) AND (alive this) AND (player in [gunner this, driver this])";
+			};
+			class frontrampOpen: frontrampOpen
+			{
+				condition="(this animationSourcePhase 'rampfront' == 0) AND (alive this) AND (player in [gunner this, driver this])";
+			};
+			class frontrampClose: frontrampClose
+			{
+				condition="(this animationSourcePhase 'rampfront' == 1) AND (alive this) AND (player in [gunner this, driver this])";
+			};
 		};
 		class ACE_SelfActions
 		{

addons - Copy/RD501_Vehicles/air/NuClass/user_action.hpp

@@ -1,56 +0,0 @@
-
-
-	class ThrusterEngage
-	{
-		displayName = "<t color='#4C9900'>[Impulsor On]</t>";
-		displayNameDefault = "<t color='#4C9900'>[Impulsor On]</t>";
-		textToolTip = "<t color='#4C9900'>[Impulsor On]</t>";
-		position = "pilotview";
-		radius = 20;
-		priority = 21;
-		onlyForPlayer = 1;
-		condition = "(!(this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this) AND (speed this >10) )";
-		statement = "this execVM ""\LAAT\initTE.sqf""";
-	
-	};
-
-	class ThrusterDisngage: ThrusterEngage
-	{
-		priority = 21;
-		displayName = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-		displayNameDefault = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-		textToolTip = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-		condition = "((this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this))";
-		statement = "this execVM ""\LAAT\initTD.sqf""";
-	
-	};
-
-
-	class ThrusterEngage_spam: ThrusterEngage
-	{
-		displayName = "";
-		displayNameDefault = "";
-		textToolTip = "";
-		position = "pilotview";
-		radius = 20;
-		priority = 0;
-		onlyForPlayer = 1;
-		condition = "((player == driver this) AND (alive this) AND (speed this >10) )";
-		statement = "this execVM ""\LAAT\initTE.sqf""";
-		shortcut="User19"
-	};
-
-
-
-	class ThrusterDisngage_spam: ThrusterEngage
-	{
-		priority = 0;
-		displayName = "";
-		displayNameDefault = "";
-		textToolTip = "";
-		condition = "((player == driver this) AND (alive this))";
-		statement = "this execVM ""\LAAT\initTD.sqf""";
-		shortcut="User20"
-	};
-
-	

addons - Copy/RD501_Vehicles/air/Z95/config.cpp

@@ -67,6 +67,7 @@ class CfgVehicles
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat_air(Republic_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
+		RD501_magclamp_large_offset[]={0.0,0.0,-2.0};	
 		stallSpeed=5;
 		draconicTorqueYCoef[]={1.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 		draconicForceYCoef=6;

addons - Copy/RD501_Vehicles/air/drones/config.cpp

@@ -151,6 +151,7 @@ class CfgVehicles
 		forceInGarage = 1;
 		author = "RD501";
 		faction = macro_republic_faction
+		RD501_magclamp_large_offset[]={0.0,0.0,-3.0};	
 		hiddenSelections[] = {"camo1","camo2"};
 		hiddenSelectionsMaterials[] = {"\RD501_Vehicles\textures\sentinel\phantom_fuselage_01.rvmat",""};
 		hiddenSelectionsTextures[] = {"\RD501_Vehicles\textures\sentinel\phantom_fuselage_01_gar_co.paa",""};

addons - Copy/RD501_Vehicles/common/helicopter_mfd.hpp

@@ -1295,6 +1295,7 @@ class MFD
 							};
 						};
 					};
+					/*
 					class AltGroup
 					{
 						condition="1000 - altitudeAGL";
@@ -1459,6 +1460,101 @@ class MFD
 							};
 						};
 					};
+					*/
+					class AltitudeNumberASL
+					{
+						type = "text";
+						source = "altitudeASL";
+						sourceScale = 1;
+						sourceLength = -3;
+						align = "left";
+						scale = 1;
+						pos[]=
+						{
+							{0.98499999,0.171},
+							1
+						};
+						right[]=
+						{
+							{1.02500001,0.171},
+							1
+						};
+						down[]=
+						{
+							{0.98499999,0.20100001},
+							1
+						};
+					};
+
+					class AltitudeNumberAGL:AltitudeNumberASL
+					{
+						source = "altitudeAGL";
+						pos[]=
+						{
+							{0.98499999,0.201},
+							1
+						};
+						right[]=
+						{
+							{1.02500001,0.201},
+							1
+						};
+						down[]=
+						{
+							{0.98499999,0.23100001},
+							1
+						};
+					};
+					class AltitudeRadarTextASL
+					{
+						type = "text";
+						source = "static";
+						text = "ASL:";
+						align = "left";
+						scale = 1;
+						sourceScale = 1;
+						align="center";
+						pos[]=
+						{
+							{0.88499999,0.171},
+							1
+						};
+						right[]=
+						{
+							{0.92500001,0.171},
+							1
+						};
+						down[]=
+						{
+							{0.88499999,0.20100001},
+							1
+						};
+					};
+					class AltitudeRadarTextAGL
+					{
+						type = "text";
+						source = "static";
+						text = "AGL:";
+						align = "left";
+						scale = 1;
+						sourceScale = 1;
+						align="center";
+						pos[]=
+						{
+							{0.88499999,0.201},
+							1
+						};
+						right[]=
+						{
+							{0.92500001,0.201},
+							1
+						};
+						down[]=
+						{
+							{0.88499999,0.23100001},
+							1
+						};
+					};
 					class SpeedNumber
 					{
 						type="text";

addons - Copy/RD501_Vehicles/land/ATAP/config.cpp

@@ -54,6 +54,10 @@ class CfgVehicles
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
+
+		RD501_magclamp_small_forbidden=1;
+		RD501_magclamp_large_offset[]={0.0, -5.5, -10.5};
+
 		class Turrets:Turrets
 		{
 			class MainTurretTop:MainTurretTop{};

addons - Copy/RD501_Vehicles/land/Mynock/config.cpp

@@ -108,6 +108,8 @@ class CfgVehicles
 		artilleryScanner = 1;
 		laserScanner = 1;
 		availableforsuppoerttypes[]={"Artillery"};
+		RD501_magclamp_small_forbidden = 1;
+		RD501_magclamp_large_offset[]={0.0,-3.0,-7.0};
 		class Turrets: Turrets
 		{
 			class MainTurret: MainTurret
@@ -158,6 +160,8 @@ class CfgVehicles
 		irTarget = 1;
 		irTargetSize = 1.2;
 		#include "../../common/smallvehiclekit.hpp"
+		RD501_magclamp_small_forbidden = 1;
+		RD501_magclamp_large_offset[]={0.0,-3.0,-7.0};
 		class Turrets:Turrets
 		{
 			class MainTurret: MainTurret
@@ -190,5 +194,7 @@ class CfgVehicles
 		faction = macro_republic_faction
         editorSubcategory = macro_editor_cat(arty)
         vehicleClass = macro_editor_vehicle_type(arty)
+		RD501_magclamp_small_forbidden = 1;
+		RD501_magclamp_large_offset[] = {0.0,-10.0,-8.0};
 	};
 };