fix aircraft spawning without turrets

remove delta7 black, eta2 black
add eta2 venom, orange

addons - Copy/RD501_Main/functions/attach_turrets/apply_turrets.sqf

@@ -15,28 +15,28 @@
 
     _disable_sim_time=60;
     _time_of_select=time;
-   
+
     //First w8 until simulation is enabled,check every X seconds. If Y seconds has passed,dont apply script
     waitUntil {
-      sleep 0.25; 
+      sleep 0.25;
       ((simulationEnabled _vic) || ((time-_time_of_select)>_disable_sim_time))
     };
 
     //If its been in disabled simulation for 60 seconds, dont put turrets
     if((time-_time_of_select)>_disable_sim_time) exitWith {};
-      
+
     //if no crew,exit
     if(count(crew _vic) ==0) exitWith {};
-   
+
     //if not the server,exit
     if (!isServer) exitWith {};
-      
+
     //we put in a delay to allow vehicle to be placed
     sleep 2;
     
     //We check if the vehicle still exists after that X second sleep, incase zeus delets it.
     if(!(alive _vic)) exitWith{};
-  
+
     //First we make the vehicle invincible to prevent damage
     _vic allowDamage false;
 

addons - Copy/RD501_Vehicles/_init_functions/cis_aircraft_mass.sqf

@@ -1,2 +0,0 @@
-params["_this"];
-_this setmass 15000;

addons - Copy/RD501_Vehicles/_init_functions/cis_aircraft_turrets.hpp

@@ -1,39 +1,62 @@
-    class macro_new_vehicle(vulture,MKII) {
-    	
+
+//CIS_Air
+	class macro_new_vehicle(vulture,MKII) {
         class turret_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,1.5,-.6]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+        class swop_init {
+        	init = "[_this select 0] execVM '\vulture\init.sqf';[_this select 0] execVM '\vulture\initturbine.sqf';";
+        };
     };
     
     class macro_new_vehicle(trifighter,MKII) {
-        class turret_script2 {
-            init =  "[_this select 0,18000] call RD501_Main_fnc_set_mass;";
+        class weight_script {
+            init = "[_this select 0,18000] call RD501_Main_fnc_set_mass;";
         };
         class turret_script {
-            init =  [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,1,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
+            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,1,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
-       
+       class swop_init {
+       		init = "[_this select 0] execVM '\vulture\inittri.sqf';[_this select 0] execVM '\vulture\initturbine.sqf';";
+       };
+		class edit_mass {
+			init = "[_this select 0,15000] call RD501_Main_fnc_set_mass;";
+		};
     };
 
     class macro_new_vehicle(hyena,Mk2) {
-        class turret_script {
-            
+        class turret_1 {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[-1,1.5,-0.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class turret_2 {
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[1,1.5,-0.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+		};
     };
 
     class macro_new_vehicle(HMP,gunship) {
-        class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-1.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+		class turret1 {
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+		};
+		class turret2 {
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+		};
+		class turret3 {
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[-5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+		};
+		macro_standard_eh
+        class swop_init {
+			init = "[_this select 0] execVM '\SW_Droides_2\DroidGunship\initturbine.sqf';";
         };
     };
 
     class macro_new_vehicle(HMP,transport) {
-        class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-1.5]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
+		class turret1 {
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+		};
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\SW_Droides_2\DroidGunship\initturbine.sqf';";
+		};
     };
 
     class macro_new_vehicle(scimitar,Mk2) {
@@ -41,11 +64,21 @@
             
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[-.4,13,0]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\Scimitar\initturbine.sqf';";
+		};
     };
 
     class macro_new_vehicle(nantex,Mk2) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,3,.6]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\GeonFighter\init.sqf';[_this select 0] execVM '\GeonFighter\initturbine.sqf';";
+		};
+		class edit_mass {
+			init = "[_this select 0,15000] call RD501_Main_fnc_set_mass;";
+		};
     };

addons - Copy/RD501_Vehicles/_init_functions/common_xeh.hpp

@@ -0,0 +1,6 @@
+#define macro_standard_eh class fire_script { \
+	fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; \
+}; \
+class killed_script {\
+	killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";\
+};         

addons - Copy/RD501_Vehicles/_init_functions/empire_aircraft_turrets.hpp

@@ -1,53 +1,83 @@
-	//Empire_Air
+
+//Empire_Air
     class macro_new_vehicle(TIE,stryker_MkII) {
         class turret_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[0,-2,-2.2]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
+		macro_standard_eh
     };	
     class macro_new_vehicle(TIE,interceptor_MkII) {
         class turret_script {         
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[-.4,-.2,-1.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
+		macro_standard_eh
     };	
     class macro_new_vehicle(TIE,fighter_MkII) {
         class turret_script  { 
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[0,1,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
+		macro_standard_eh
     };	
     class macro_new_vehicle(TIE,defender_MkII) {
         class turret_script {
-
             init =  [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[0,-.2,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\TIEdef\init.sqf';";
+		};
     };	
     class macro_new_vehicle(TIE,bomber_MkII) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[-.4,2,-.9]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';";
+		};
     };	
     class macro_new_vehicle(TIE,x1_MkII) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[-.4,2,-.9]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
-    };		
-
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
+    };
     class macro_new_vehicle(TIE,fo) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[0,1,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
     };	
     class macro_new_vehicle(TIE,sf) {
         class turret_script {
-           
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[0,1,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
     };	
     class macro_new_vehicle(TIE,silencer) {
         class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,imperial)),[-.4,0,-.9]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
+			init = "[_this select 0] execVM '\TIEsilencer\init.sqf';[_this select 0] execVM '\TIEsilencer\initturbine.sqf';";
+		};
+		macro_standard_eh
+		class swop_init {
+			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
+		};
     };

addons - Copy/RD501_Vehicles/_init_functions/rebel_aircraft_turrets.hpp

@@ -1,29 +1,41 @@
-	//Rebellion_Air
+
+//Rebellion_Air
     class macro_new_vehicle(A_Wing,RZ_1_Mk2) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,rebel)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\awing\init.sqf';[_this select 0] execVM '\awing\initturbine.sqf';";
+		};
+		macro_standard_eh
     };
-    
 
     class macro_new_vehicle(X_wing,T_65_MkII) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,rebel)),[-.4,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\XT\init.sqf';[_this select 0] execVM '\XT\initturbine.sqf';";
+		};
+		macro_standard_eh
     };
 
-
     class macro_new_vehicle(Y_wing,Rebels_MkII) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,rebel)),[0,11,-1.7]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\ywing\initturbine.sqf';";
+		};
+		macro_standard_eh
     };
+
     class macro_new_vehicle(shuttle,Millenium_Falcon) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,rebel)),[0,1,1.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\MIlleniumFalcon\init.sqf';[_this select 0] execVM '\MIlleniumFalcon\initturbine.sqf';";
+		};
+		macro_standard_eh
     };	

addons - Copy/RD501_Vehicles/_init_functions/republic_aircraft_turrets.hpp

@@ -1,73 +1,68 @@
 	//Republic_Air
     class macro_new_vehicle(ARC_170,MKII) {
-        class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,republic)),[0,5,-1.6]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
-        class init_fx
-        {
+        class init_fx {
             init = "[_this select 0] execVM '\arc\init.sqf';[_this select 0] execVM '\arc\initturbine.sqf';";
         }
         class drone_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,-2.2,1.75]] spawn macro_fnc_name(apply_aircraft_drone);
         };
-    };	
+		macro_standard_eh
+    };
+
     class macro_new_vehicle(v_wing,MKII) {
-        class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,republic)),[0,4,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
-        class edit_mass_and_fx
-        {
-             init = "[_this select 0,18000] call RD501_Main_fnc_set_mass;[_this select 0] execVM '\Vwing\init.sqf';[_this select 0] execVM '\Vwing\initturbine.sqf';";
+        class edit_mass {
+        	init = "[_this select 0,45000] call RD501_Main_fnc_set_mass;";
         };
+		class init_fx {
+			init = "[_this select 0] execVM '\Vwing\init.sqf';[_this select 0] execVM '\Vwing\initturbine.sqf';";
+		}
         class drone_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,-0.6,1.4]] spawn macro_fnc_name(apply_aircraft_drone);
         };
-    };	
+		macro_standard_eh
+    };
+
     class macro_new_vehicle(Y_wing,MkII) {
-        class drone_script {
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,4.85,0.6]] spawn macro_fnc_name(apply_aircraft_drone);
-        };
+		class init_fx {
+			init = "[_this select 0] execVM '\ywing\initturbine.sqf';";
+		};
+		class drone_script {
+			init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,2.2,0]] spawn macro_fnc_name(apply_aircraft_drone);
+		};
+		macro_standard_eh
     };	
 
     class macro_new_vehicle(delta,7a_Mk2) {
-        class edit_mass_and_fx
-        {
-            init = "[_this select 0,10200] call RD501_Main_fnc_set_mass;[_this select 0] execVM '\delta7\initturbine.sqf';[_this select 0] execVM '\awing\init.sqf';";
-        };
-        class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,republic)),[0,3,.5]] spawn macro_fnc_name(apply_aircraft_turrets);
+        class edit_mass {
+            init = "[_this select 0,10200] call RD501_Main_fnc_set_mass;";
         };
+		class init_fx {
+			init = "[_this select 0] execVM '\delta7\initturbine.sqf';[_this select 0] execVM '\awing\init.sqf';";
+		}
         class drone_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[-1,2,0]] spawn macro_fnc_name(apply_aircraft_drone);
         };
     };	
 
-     class macro_new_vehicle(delta,7b_Mk2) {
-        class edit_mass_and_fx
-        {
-            init = "[_this select 0,10200] call RD501_Main_fnc_set_mass;[_this select 0] execVM '\delta7\initturbine.sqf';[_this select 0] execVM '\awing\init.sqf';";
-        };
-        class turret_script {
-            
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,republic)),[0,3,.5]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
+    class macro_new_vehicle(delta,7b_Mk2) {
+		class edit_mass {
+			init = "[_this select 0,10200] call RD501_Main_fnc_set_mass;";
+		};
+		class init_fx {
+			init = "[_this select 0] execVM '\delta7\initturbine.sqf';[_this select 0] execVM '\awing\init.sqf';";
+		}
         class drone_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,1,2]] spawn macro_fnc_name(apply_aircraft_drone);
         };
     };	
 
     class macro_new_vehicle(eta,lime_Mk2) {
-        class turret_script {
-           
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,republic)),[0,3,-1]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
-         class set_mass_and_fx
-        {
-            init = "[_this select 0,15000] call RD501_Main_fnc_set_mass;[_this select 0] execVM '\eta2\init.sqf';[_this select 0] execVM '\eta2\initturbine.sqf'; ";
-        };
+		class edit_mass {
+			init = "[_this select 0,15000] call RD501_Main_fnc_set_mass;";
+		};
+		class init_fx {
+			init = "[_this select 0] execVM '\eta2\init.sqf';[_this select 0] execVM '\eta2\initturbine.sqf';";
+		}
         class drone_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[-0.9,1.3,0.1]] spawn macro_fnc_name(apply_aircraft_drone);
         };

addons - Copy/RD501_Vehicles/_init_functions/resistance_aircraft_turrets.hpp

@@ -1,14 +1,20 @@
 	//Resistance_Air
 	class macro_new_vehicle(A_Wing,RZ_2_Mk2) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,rebel)),[0,6,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\awing\init.sqf';[_this select 0] execVM '\awing\initturbine.sqf';";
+		};
+		macro_standard_eh
     };
 
 	class macro_new_vehicle(X_wing,T_70_MkII) {
         class turret_script {
-            
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,rebel)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
+		class swop_init {
+			init = "[_this select 0] execVM '\XT\init.sqf';[_this select 0] execVM '\XT\initturbine.sqf';";
+		};
+		macro_standard_eh
     };

addons - Copy/RD501_Vehicles/air/ARC_170/arc_mass.sqf

@@ -1,2 +0,0 @@
-params["_this"];
-_this setmass 35000;

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

@@ -35,39 +35,23 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers;
-
 class CfgVehicles
 {
 	class Plane_Base_F;
 
 	class Xarc: Plane_Base_F
 	{
-		//class AnimationSources;
 		class Turrets;
-		
 	};
 
-		
 	class swop_arc_t: Xarc
 	{
-		class Eventhandlers: DefaultEventhandlers//remove the script that crashes server lol
-		{
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\arc\init.sqf';[_this select 0] execVM '\arc\initturbine.sqf';";
-			
-		};
-
 		class Turrets:Turrets
 		{
 			class MainTurret;
-
 			class CopilotTurret;
 		};
-
 		class Components;
 		class ACE_SelfActions;
 	};
@@ -84,7 +68,6 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat_air(Republic_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
 
-
 		visualTarget = 1; 
 		visualTargetSize = 10;
 		reportOwnPosition = true;
@@ -97,10 +80,6 @@ class CfgVehicles
 		irTargetSize = 10;
 		countermeasureActivationRadius = 2000;
 
-
-		// model = "RD501_Vehicles\air\ARC_170\xt.p3d"
-		// hiddenSelections[] = {"camo1"};
-		// hiddenSelectionsTextures[] = {"ywing\Y-Wing_Body_co.paa"};
 		armor = 500;
 		vtol=4;
 		
@@ -130,16 +109,11 @@ class CfgVehicles
 		gearsUpFrictionCoef = 0;
 		elevatorSensitivity = 1*2;
 		airBrakeFrictionCoef = 80.4;
-		
-		//draconicForceXCoef = 15*2;
-		//draconicForceYCoef = 1*2;
-		//draconicForceZCoef = 1*2;
-		
+
 		VTOLYawInfluence = 3*1.5*2;
 		VTOLPitchInfluence = 2*1.5*1.0;
 		VTOLRollInfluence = 3*2*1;
 
-
 		weapons[] = {
 			macro_basic_air_weapons,
 			macro_new_weapon(generic,republic_aircraft_cannon),
@@ -150,7 +124,6 @@ class CfgVehicles
 			
 		};
 		magazines[] = {
-			
 			macro_new_mag(generic_aircraft_cannon_green,1000),
 			macro_new_mag(a2a,4),
 			macro_new_mag(agm,6),
@@ -162,7 +135,7 @@ class CfgVehicles
 		gunnerUsesPilotView = 1;
 		class Turrets:Turrets
 		{
-			//gumner
+			//gunner
 			class MainTurret:MainTurret
 			{
 				stabilizedInAxes = 4;
@@ -255,13 +228,8 @@ class CfgVehicles
 
 				maxHorizontalRotSpeed = 1.2*2;
 				maxVerticalRotSpeed = 1.2*2;
-			
-
 
 				ballisticsComputer = 1+8;
-	
-				
-
 
 				allowTabLock = 1;
 				showCrewAim = 4;
@@ -282,18 +250,15 @@ class CfgVehicles
 					//macro_new_weapon(bomb,cluster),
 					//macro_new_weapon(bomb,LGB),
 					//macro_basic_air_weapons
-					
 				};
 				magazines[] = {
-					
 					//macro_new_mag(generic_aircraft_cannon_green,1000),
 					//macro_basic_air_mags,
 					//macro_new_mag(sdb_bomb,4),
 					//macro_new_mag(cluster_bomb,4),
 					//macro_new_mag(lgb_bomb,4)
 				};
-			
-			
+
 				memoryPointGun = "kulas";
 				muzzleEnd[] = {"cannon1","cannon2"};
 				muzzlePos[] = {"cannon1","cannon2"};
@@ -316,7 +281,6 @@ class CfgVehicles
 					minFov = 0.25;
 					maxFov = 0.75;
 
-
 					visionMode[]=
 					{
 						"Normal",
@@ -366,7 +330,6 @@ class CfgVehicles
 					};
 				};
 			};
-
 		};
 
 		class pilotCamera
@@ -481,7 +444,6 @@ class CfgVehicles
 
 		class UserActions
 		{
-			
 			class Wing_Close
 			{
 				condition = "this animationPhase ""wing_1_up_A"" == 1 and this animationPhase ""wing_2_up_A"" == 1 and this animationPhase ""wing_1_down_A"" == 1 and this animationPhase ""wing_2_down_A"" == 1";
@@ -513,14 +475,12 @@ class CfgVehicles
 		};	
 
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
 		#include "../../common/universal_mfd.hpp"
 
-
 		class Components: Components
 		{
 			class SensorsManagerComponent
@@ -675,15 +635,5 @@ class CfgVehicles
 				};
 			};
 		};
-
-	
-		class EventHandlers : DefaultEventhandlers 
-		{
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			init = "[_this select 0] execVM 'rd501_vehicles\air\arc_170\arc_mass.sqf';";
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-		};
 	};
-
-	
 };

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

@@ -52,40 +52,29 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
-
 class CfgVehicles
 {
 	class Plane_Base_F;
-	
 
 	class swop_aw:Plane_Base_F
 	{
-		
 		class ACE_SelfActions;
 	};
-
 	class swop_awbl:swop_aw
 	{
-		
 		class ACE_SelfActions;
 	};
 	class swop_awrz2:Plane_Base_F
 	{
-		
 		class ACE_SelfActions;
 	};
-
 	class swop_awrz2b:swop_awrz2
 	{
 		class ACE_SelfActions;
-		
 	};
 	class swop_awrz2g:swop_awrz2
 	{
-		
 		class ACE_SelfActions;
 	};
 
@@ -98,7 +87,6 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat_air(Rebel_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Rebel)
 
-
 		scope = 2;
 		altFullForce = 6000;
 		altNoForce = 9000;
@@ -131,25 +119,15 @@ class CfgVehicles
 				radius = 10;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\awing\init.sqf';[_this select 0] execVM '\awing\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			 class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
-		
 
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
 		#include "../../common/universal_mfd.hpp"
 
-		
 		weapons[] = {
 			macro_new_weapon(wynd,a2a),
 			macro_new_weapon(wynd,agm),
@@ -158,7 +136,6 @@ class CfgVehicles
 			macro_new_weapon(generic,rebel_aircraft_cannon)
 		};
 		magazines[] = {
-		
 			macro_new_mag(a2a,4),
 			macro_new_mag(agm,6),
 			macro_new_mag(ugm,10),
@@ -166,16 +143,12 @@ class CfgVehicles
 			macro_new_mag(generic_aircraft_cannon_red,1000),
 			macro_new_mag(generic_aircraft_cannon_red,1000)
 		};
-
-	
 	};
 
 	macro_r1_skin(RZ_1_Blue_Leader_MkII,Blue Leader,t_awing_02_cw.paa)
 	macro_r1_skin(RZ_1_Blue_MkII,Blue,t_awing_03_cw.paa)
-
 	macro_r1_skin(RZ_1_Green_Leader_MkII,Green Leader,t_awing_04_cw.paa)
 	macro_r1_skin(RZ_1_Green_MkII,Green,t_awing_05_cw.paa)
-
 	macro_r1_skin(RZ_1_Red_Leader_MkII,Red Leader,t_awing_06_cw.paa)
 
 	//--------------------------------------------------------------------------------
@@ -196,8 +169,7 @@ class CfgVehicles
 		armor = 200;
 		
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
@@ -229,13 +201,6 @@ class CfgVehicles
 				radius = 10;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\awing\init.sqf';[_this select 0] execVM '\awing\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 
 		crew = "SWOP_Rebel_navy_pil_b";
@@ -257,7 +222,6 @@ class CfgVehicles
 			macro_new_mag(generic_aircraft_cannon_red,1000),
 			macro_new_mag(generic_aircraft_cannon_red,1000)
 		};
-
 	};
 
 	class macro_new_vehicle(A_Wing,RZ_2_Mk2_blue) : macro_new_vehicle(A_Wing,RZ_2_Mk2)
@@ -277,9 +241,4 @@ class CfgVehicles
 		hiddenSelections[] = {"camo1"};
 		hiddenSelectionsTextures[] = {"Awing\t_queenhoneybeegreen_co.paa"};
 	};
-
-	
-
-
-	
 };

addons - Copy/RD501_Vehicles/air/Delta/common_delta.hpp

@@ -1,8 +1,7 @@
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat_air(Republic_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
-		
-		class EventHandlers : DefaultEventhandlers {};
+
 		class UserActions
 		{
 			class AfterburnerOff
@@ -33,8 +32,7 @@
 		};	
 
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
@@ -54,14 +52,12 @@
 			macro_new_weapon(generic,republic_aircraft_cannon)
 		};
 		magazines[] = {
-		
 			macro_basic_air_mags,
 			macro_new_mag(generic_aircraft_cannon_green,1000),
 			macro_new_mag(generic_aircraft_cannon_green,1000),
 			macro_new_mag(a2a,4),
 			macro_new_mag(agm,6),
 			macro_new_mag(ugm,10)
-		
 		};
 
 		armor=200;

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

@@ -28,8 +28,6 @@ class CfgPatches
 		{
 			macro_new_vehicle(delta,7a_Mk2),
 			macro_new_vehicle(delta,7a_Mk2_red),
-			macro_new_vehicle(delta,7b_Mk2),
-			macro_new_vehicle(delta,7a_Mk2_blue)
 		};
 		weapons[]=
 		{
@@ -40,14 +38,11 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers;
-
 class CfgVehicles
 {
 	class Plane_Base_F;
 	class swop_delta7a:Plane_Base_F
 	{
-		
 		class ACE_SelfActions;
 	};
 	class macro_new_vehicle(delta,7a_Mk2):swop_delta7a
@@ -60,13 +55,11 @@ class CfgVehicles
 
 		hiddenSelections[] = {"camo1", "camo2", "camo3"};
 		hiddenSelectionsTextures[] = {"\A3\boat_f\Boat_Armed_01\data\Boat_Armed_01_ext_co.paa", "\A3\boat_f\Boat_Armed_01\data\Boat_Armed_01_ext_co.paa", "\A3\boat_f\Boat_Armed_01\data\Boat_Armed_01_ext_co.paa"};
-		
 	};
 
 
 	class swop_delta7b_anakin:swop_delta7a
 	{
-		
 		class ACE_SelfActions;
 	};
 
@@ -77,7 +70,7 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		#include "common_delta.hpp"	
-				visualTarget = 1; 
+		visualTarget = 1;
 		visualTargetSize = 1;
 		reportOwnPosition = true;
 		radarTargetSize = 1;
@@ -88,23 +81,14 @@ class CfgVehicles
 		irTarget = 1;
 		irTargetSize = 1;
 		countermeasureActivationRadius = 2000;
-
-		
 	};
 
 	class macro_new_vehicle(delta,7a_Mk2_red) : macro_new_vehicle(delta,7b_Mk2)
 	{
 		forceInGarage = 0;
-		Displayname = "CS-M Delta-7B (Red) Mk.II"
+		Displayname = "CS-M Delta-7B (Red) Mk.II";
 		hiddenSelections[] = {"camo1","camo2","camo3"};
 		hiddenSelectionsMaterials[] = {"delta7\Delta7wedge_obi.rvmat","delta7\Delta7back_obi.rvmat","delta7\Delta7astro.rvmat"};
 		hiddenSelectionsTextures[] = {"delta7\tx_delta7_wedge_obi.paa","delta7\tx_delta7_back_obi.paa","delta7\tx_delta7_astromech_obi.paa"};
 	};
-	class macro_new_vehicle(delta,7a_Mk2_blue) : macro_new_vehicle(delta,7b_Mk2)
-	{
-		forceInGarage = 0;
-		displayname = "CS-M Delta-7B (Black) Mk.II";
-		hiddenSelections[] = {"camo1", "camo2", "camo3"};
-		hiddenSelectionsTextures[] = {"\A3\boat_f\Boat_Armed_01\data\Boat_Armed_01_ext_co.paa", "\A3\boat_f\Boat_Armed_01\data\Boat_Armed_01_ext_co.paa", "\A3\boat_f\Boat_Armed_01\data\Boat_Armed_01_ext_co.paa"};
-	};
 };

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

@@ -12,7 +12,6 @@
 
 #define new_eta_class(name) vehicle_classname##_##name
 
-
 class CfgPatches
 {
 	class macro_patch_name(ETA)
@@ -32,8 +31,9 @@ class CfgPatches
 			macro_new_vehicle(eta,yellow_Mk2),
 			macro_new_vehicle(eta,blue_Mk2),
 			macro_new_vehicle(eta,grey_Mk2),
-			macro_new_vehicle(eta,black_Mk2),
-			macro_new_vehicle(eta,white_Mk2)
+			macro_new_vehicle(eta,white_Mk2),
+			macro_new_vehicle(eta,orange_Mk2),
+			macro_new_vehicle(eta,venom_Mk2)
 		};
 		weapons[]=
 		{
@@ -44,32 +44,15 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
-
 class CfgVehicles
 {
-	class Plane;
-	class Plane_Base_F:Plane
-	{
-		class EventHandlers;
-	};
-
-	
-
+	class Plane_Base_F;
 	class swop_eta2:Plane_Base_F
 	{
-	
-		class EventHandlers
-		{
-			
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
 		class ACE_SelfActions;
-		
 	};
 
-
-	class macro_new_vehicle(eta,lime_Mk2):swop_eta2
+	class macro_new_vehicle(eta,lime_Mk2): swop_eta2
 	{
 		side=1;
 		scope=2;
@@ -89,7 +72,6 @@ class CfgVehicles
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat_air(Republic_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
-		
 
 		gearsUpFrictionCoef = 25;
 		class UserActions
@@ -147,11 +129,9 @@ class CfgVehicles
 			
 			#include "../../common/universal_dmg_report.hpp"
 		};
-		
 
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
@@ -165,14 +145,12 @@ class CfgVehicles
 			macro_new_weapon(generic,republic_aircraft_cannon)
 		};
 		magazines[] = {
-		
 			macro_basic_air_mags,
 			macro_new_mag(generic_aircraft_cannon_green,1000),
 			macro_new_mag(generic_aircraft_cannon_green,1000),
 			macro_new_mag(a2a,4),
 			macro_new_mag(agm,6),
 			macro_new_mag(ugm,10)
-
 		};
 		hiddenSelections[] = {"camo1","camo2"};
 		hiddenSelectionsMaterials[] = {"eta2\eta2main.rvmat","Delta7\Delta7astro.rvmat"};
@@ -325,14 +303,19 @@ class CfgVehicles
 		displayname = "ETA-3 (Grey) Mk.II";
 		hiddenSelectionsTextures[] = {"eta2\eta2_base_custom2_co.paa","eta2\t_yodasstarfighter_r2d2_co.paa"};
 	};
-	class macro_new_vehicle(eta,black_Mk2) : macro_new_vehicle(eta,lime_Mk2)
-	{
-		displayname = "ETA-3 (Black) Mk.II";
-		hiddenSelectionsTextures[] = {"\RD501_Vehicles\textures\LAAT\krayt_black_red\laatkraytbodyblackred.paa","\RD501_Vehicles\textures\LAAT\krayt_black_red\laatkraytbodyblackred.paa"};
-	};
 	class macro_new_vehicle(eta,white_Mk2) : macro_new_vehicle(eta,lime_Mk2)
 	{
 		displayname = "ETA-3 (N-7) Mk.II";
 		hiddenSelectionsTextures[] = {"\RD501_Vehicles\textures\eta\eta2_main_normandy_co.paa","eta2\t_yodasstarfighter_r2d2_co.paa"};
 	};
+	class macro_new_vehicle(eta,orange_Mk2) : macro_new_vehicle(eta,lime_Mk2)
+	{
+		displayname = "ETA-3 (Orange) Mk.II";
+		hiddenSelectionsTextures[] = {"\RD501_Vehicles\textures\eta\eta2_main_orange_co.paa","eta2\t_yodasstarfighter_r2d2_co.paa"};
+	};
+	class macro_new_vehicle(eta,poison_Mk2) : macro_new_vehicle(eta,lime_Mk2)
+	{
+		displayname = "ETA-3 (Venom) Mk.II";
+		hiddenSelectionsTextures[] = {"\RD501_Vehicles\textures\eta\eta2_main_venom_co.paa","eta2\t_yodasstarfighter_r2d2_co.paa"};
+	};
 };

addons - Copy/RD501_Vehicles/air/HMP/common.hpp

@@ -31,13 +31,4 @@ class UserActions
         textToolTip = "<t color='#FF9933'>[RepulsorBrake On]</t>";
         userActionID = 65;
     };	
-};	
-
-class EventHandlers
-{
-    fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-    init = "[_this select 0] execVM '\SW_Droides_2\DroidGunship\initturbine.sqf';";
-    killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-    
-    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 };

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

@@ -50,7 +50,6 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
 class CfgVehicles
 {
 	class Plane_Base_F;
@@ -103,13 +102,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";		
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 
 		weapons[] = {
@@ -173,13 +165,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -238,13 +223,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -304,13 +282,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIEdef\init.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -347,13 +318,6 @@ class CfgVehicles
 		class UserActions
 		{
 			
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 
 		weapons[] = {
@@ -428,13 +392,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		
 		weapons[] = {
@@ -509,13 +466,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -575,13 +525,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIE\init.sqf';[_this select 0] execVM '\TIE\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -641,13 +584,6 @@ class CfgVehicles
 				radius = 15;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\TIEsilencer\init.sqf';[_this select 0] execVM '\TIEsilencer\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		weapons[] = {
 			macro_basic_air_weapons,

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

@@ -12,7 +12,6 @@
 
 #define new_v_wing_class(name) vehicle_classname##_##name
 
-
 class CfgPatches
 {
 	class macro_patch_name(V_Wing)
@@ -35,36 +34,17 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
-
 class CfgVehicles
 {
-	class Plane;
-	class Plane_Base_F:Plane
-	{
-		class EventHandlers;
-	};
+	class Plane_Base_F;
 
 	class swop_Vwing:Plane_Base_F
 	{
-	
 		class Components;
-		
-	
-		class Eventhandlers: EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
 		class ACE_SelfActions;
 	};
 
-
-
 	class macro_new_vehicle(v_wing,MKII):swop_Vwing
 	{
 		side=1;
@@ -91,14 +71,7 @@ class CfgVehicles
 		irTarget = 1;
 		irTargetSize = 1;
 		countermeasureActivationRadius = 2000;
-		
-		class Eventhandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\Vwing\init.sqf';[_this select 0] execVM '\Vwing\initturbine.sqf';[_this select 0] execVM 'RD501_Vehicles\air\V_Wing\vwing_mass.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
+
 		//flight model
 		maxSpeed=1100;
 		aileronSensitivity=0.41;
@@ -171,8 +144,6 @@ class CfgVehicles
 
 		#include "../../common/universal_mfd.hpp"
 
-	
-
 		weapons[] = {
 			macro_new_weapon(laser,v_wing),
 			macro_new_weapon(wynd,a2a),
@@ -180,14 +151,12 @@ class CfgVehicles
 			macro_basic_air_weapons
 		};
 		magazines[] = {
-		
 			macro_basic_air_mags,
 			macro_new_mag(generic_aircraft_gun_asg,3000),
 			macro_new_mag(a2a,4),
 			macro_new_mag(a2a,4),
 			macro_new_mag(a2a,4),
 			macro_new_mag(lgm,1)
-
 		};
 
 		class pilotCamera
@@ -221,23 +190,17 @@ class CfgVehicles
 						"OpticsBlur2"
 					};
 				};
-
 				class zoomx4: Wide
 				{
 					opticsDisplayName="NFOV";
 					initFov="(0.425/4)";//"(3.75 / 120)";
 					minFov="(0.425/4)";//"(3.75 / 120)";
 					maxFov="(0.425/4)";//"(3.75 / 120)";
-
-				
 					gunnerOpticsModel="\A3\Drones_F\Weapons_F_Gamma\Reticle\UAV_Optics_Gunner_narrow_F.p3d";
 				};
-
 				class zoomX8: Wide
 				{
 					opticsDisplayName="NFOV";
-					
-
 					initFov="(0.42/8)";//"(.375 / 120)";
 					minFov="(0.42/8)";//"(.375 / 120)";
 					maxFov="(0.42/8)";//"(.375 / 120)";
@@ -254,18 +217,14 @@ class CfgVehicles
 				class zoomX50: Wide
 				{
 					opticsDisplayName="NFOV";
-					
-
 					initFov="(0.42/50)";//"(.375 / 120)";
 					minFov="(0.42/50)";//"(.375 / 120)";
 					maxFov="(0.42/50)";//"(.375 / 120)";
 					gunnerOpticsModel="\A3\Drones_F\Weapons_F_Gamma\Reticle\UAV_Optics_Gunner_narrow_F.p3d";
 				};
-
 				class zoomX70: Wide
 				{
 					opticsDisplayName="NFOV";
-
 					initFov="(0.42/70)";//"(.375 / 120)";
 					minFov="(0.42/70)";//"(.375 / 120)";
 					maxFov="(0.42/70)";//"(.375 / 120)";
@@ -330,7 +289,6 @@ class CfgVehicles
 						{
 							//minRange = 500;
 							//maxRange = 2000;
-
 							minRange = 5;
 							maxRange = 12000;
 							objectDistanceLimitCoef = -1;
@@ -340,7 +298,6 @@ class CfgVehicles
 						{
 							//minRange = 500;
 							maxRange = 1500;
-
 							minRange = 5;
 							//maxRange = 7000;
 							objectDistanceLimitCoef = 1;
@@ -443,6 +400,5 @@ class CfgVehicles
 				};
 			};
 		};
-
 	};
 };

addons - Copy/RD501_Vehicles/air/V_Wing/vwing_mass.sqf

@@ -1,2 +0,0 @@
-params["_this"];
-_this setmass 45000;

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

@@ -38,12 +38,11 @@ class CfgPatches
 
 #include "../../common/sensor_templates.hpp"
 
-class CBA_Extended_EventHandlers_base;
 class CfgVehicles
 {
 	class Plane_Base_F;
 	class swop_vulture;
-	
+
 	class macro_new_vehicle(vulture,MKII) : swop_vulture
 	{
 		scope = 2;
@@ -62,7 +61,6 @@ class CfgVehicles
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
 		class UserActions
 		{
-			
 			class AfterburnerOn
 			{
 				displayName = "<t color='#4C9900'>[Afterburner On]</t>";
@@ -87,11 +85,6 @@ class CfgVehicles
 				radius = 10;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			init = "[_this select 0] execVM '\vulture\init.sqf';[_this select 0] execVM '\vulture\initturbine.sqf';";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		
 		weapons[] = {
@@ -105,5 +98,4 @@ class CfgVehicles
 		};
 		
 	};
-	
 };

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

@@ -61,14 +61,12 @@ class CfgVehicles
 		model = "\shut\sh_flyable.p3d";
 		picture = "\lamda\symb.paa";
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
 		#include "../../common/universal_mfd.hpp"
 		class EventHandlers {
-            
             class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
         };
 	};
@@ -78,8 +76,7 @@ class CfgVehicles
 		
 		transportSoldier = 30;
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
@@ -128,15 +125,8 @@ class CfgVehicles
 				radius = 50;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\MIlleniumFalcon\init.sqf';[_this select 0] execVM '\MIlleniumFalcon\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
-		
+
 		weapons[] = {
 			macro_new_weapon(wynd,a2a),
 			macro_new_weapon(wynd,agm),

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

@@ -49,19 +49,9 @@ class CfgVehicles
 	
 	class swop_xw:Plane_Base_F
 	{
-	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\XT\init.sqf';[_this select 0] execVM '\XT\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
 		class ACE_SelfActions;
 	};
-	
-	
-	
+
 	class swop_xwt70:Plane_Base_F
 	{
 		scope=0;
@@ -74,6 +64,7 @@ class CfgVehicles
 		};
 		class ACE_SelfActions;
 	};
+
 	class swop_xwt70bo:swop_xwt70
 	{
 		scope=0;
@@ -82,8 +73,6 @@ class CfgVehicles
 		};
 	};
 
-
-
 	class macro_new_vehicle(X_wing,T_65_MkII) : swop_xw
 	{
 		forceInGarage=1;
@@ -98,8 +87,7 @@ class CfgVehicles
 		displayname = "X-Wing T-65 Mk.II";
 
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
@@ -158,17 +146,8 @@ class CfgVehicles
 				shortcut = "";
 				statement = "this animate [""wing_1_up_A"",1];this animate [""wing_2_up_A"",1];this animate [""wing_1_down_A"",1];this animate [""wing_2_down_A"",1]; this say3d ""xwing_foldwing_sound""";
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\XT\init.sqf';[_this select 0] execVM '\XT\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 
-
-
 		weapons[] = {
 			macro_new_weapon(wynd,a2a),
 			macro_new_weapon(wynd,agm),
@@ -184,7 +163,6 @@ class CfgVehicles
 			macro_new_mag(agm,6),
 			macro_new_mag(ugm,10)
 		};
-		
 	};
 	
 	class macro_new_vehicle(X_wing,T_65_red5_MkII) : macro_new_vehicle(X_wing,T_65_MkII)
@@ -220,9 +198,9 @@ class CfgVehicles
 	class macro_new_vehicle(X_wing,T_70_MkII) : swop_xwt70
 	{
 		forceInGarage=1;
-		faction = macro_resistance_faction
-		editorSubcategory = macro_editor_cat_air(Resistance)
-		vehicleClass = macro_editor_vehicle_type_air(Resistance)
+		faction = macro_resistance_faction;
+		editorSubcategory = macro_editor_cat_air(Resistance);
+		vehicleClass = macro_editor_vehicle_type_air(Resistance);
 		scope = 2;
 		altFullForce = 6000;
 		airBrakeFrictionCoef = 80.4;
@@ -230,8 +208,7 @@ class CfgVehicles
 		armor = 300;
 		displayname = "X-Wing T-70 Mk.II";
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 
@@ -290,16 +267,8 @@ class CfgVehicles
 				shortcut = "";
 				statement = "this animate [""wing_1_up_A"",1];this animate [""wing_2_up_A"",1];this animate [""wing_1_down_A"",1];this animate [""wing_2_down_A"",1]; this say3d ""xwing_foldwing_sound""";
 			};		
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\XT\init.sqf';[_this select 0] execVM '\XT\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 
-	
 		weapons[] = {
 			macro_new_weapon(wynd,a2a),
 			macro_new_weapon(wynd,agm),

addons - Copy/RD501_Vehicles/air/Y_Wing/common.hpp

@@ -1,6 +1,5 @@
 		vtol=4;
 
-
 		airBrakeFrictionCoef = 80.4;
 		rudderInfluence = 0.9*2;
 
@@ -15,13 +14,11 @@
 			{
 				isCopilot = 1;
 				weapons[] = {
-					
 					macro_basic_air_weapons,
 					macro_new_weapon(voltic,y_wing),
 					macro_new_weapon(generic,republic_aircraft_cannon)
 				};
 				magazines[] = {
-				
 					macro_basic_air_mags,
 					macro_new_mag(generic_aircraft_cannon_green,1000),
 					macro_new_mag(generic_aircraft_cannon_green,1000),
@@ -31,7 +28,6 @@
 					macro_new_mag(voltic,200),
 					macro_new_mag(voltic,200)
 				};
-
 			};
 		};
 
@@ -73,7 +69,7 @@
 					maxFov="0.425/8";//"(30 / 120)";
 					gunnerOpticsModel = "\A3\Drones_F\Weapons_F_Gamma\Reticle\UAV_Optics_Gunner_narrow_F.p3d";
 				};
-								class NarrowX16: Wide
+				class NarrowX16: Wide
 				{
 					opticsDisplayName = "NFOV";
 					initFov="0.425/16";//"(30 / 120)";
@@ -145,8 +141,7 @@
 		};
 
         class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 

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

@@ -12,7 +12,6 @@
 
 #define new_y_wing_class(name) vehicle_classname##_##name
 
-
 class CfgPatches
 {
 	class macro_patch_name(Y_Wing)
@@ -37,21 +36,16 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
 class CfgVehicles
 {
 	class Plane_Base_F;
 	class swop_ywing_base: Plane_Base_F
 	{
-
 		class Turrets;
-		
 	};
 	class swop_ywclones: swop_ywing_base
 	{
-		
 		class Turrets:Turrets
 		{
 			class MainTurret;
@@ -94,13 +88,6 @@ class CfgVehicles
 			#include "../../common/universal_dmg_report.hpp"
 		};	
 
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\ywing\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
 		#include "common.hpp"
 		class Sounds;
 		class SoundsExt;
@@ -1090,7 +1077,6 @@ class CfgVehicles
 
 	class swop_yw: swop_ywing_base
 	{
-		
 		class Turrets:Turrets
 		{
 			class MainTurret;
@@ -1126,13 +1112,6 @@ class CfgVehicles
 		armor=800;
 		
 		#include "common.hpp"
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\ywing\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
 
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -1165,9 +1144,5 @@ class CfgVehicles
 			macro_new_mag(lgb_bomb,4),
 			macro_new_mag(lgb_bomb,4)
 		};
-
 	};
- 
-
-	
 };

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

@@ -37,10 +37,8 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
 class CfgVehicles
 {
-
 	class swop_hbomber;
 	class macro_new_vehicle(hyena,Mk2) : swop_hbomber
 	{
@@ -59,11 +57,7 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
-		
-		class EventHandlers {
-            
-            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-        };
+
 		class UserActions
 		{
 			
@@ -90,9 +84,6 @@ class CfgVehicles
 			macro_new_mag(lgb_bomb,4),
 			macro_new_mag(lgb_bomb,4),
 			macro_new_mag(lgb_bomb,4)
-		
 		};
-
 	};
-	
 };

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

@@ -37,13 +37,11 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers;
 class CfgVehicles
 {
 	class Plane_Base_F;
 	class swop_geofighter:Plane_Base_F
 	{
-		
 		class ACE_SelfActions;
 	};
 	class macro_new_vehicle(nantex,Mk2) : swop_geofighter
@@ -92,16 +90,6 @@ class CfgVehicles
 				radius = 10;
 				onlyforplayer = 1;
 			};
-		};	
-		class EventHandlers:DefaultEventhandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\GeonFighter\init.sqf';[_this select 0] execVM '\GeonFighter\initturbine.sqf';[_this select 0] execVM 'RD501_Vehicles\_init_functions\cis_aircraft_mass.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-		
-            
-           //class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-  
 		};
 		weapons[] = {
 			macro_new_weapon(wynd,a2a),
@@ -111,7 +99,6 @@ class CfgVehicles
 			macro_new_weapon(generic,purple_aircraft_cannon)
 		};
 		magazines[] = {
-		
 			macro_new_mag(a2a,4),
 			macro_new_mag(agm,6),
 			macro_new_mag(ugm,10),

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

@@ -43,7 +43,6 @@ class CfgVehicles
 	class Plane_Base_F;
 	class swop_scimitar:Plane_Base_F
 	{
-		
 		class ACE_SelfActions;
 	};
 	class macro_new_vehicle(scimitar,Mk2) : swop_scimitar
@@ -100,21 +99,12 @@ class CfgVehicles
 				condition = "(player == driver this) AND (alive this) and !(this getVariable ['CloakScimitar', false])";
 				statement = "this spawn SWOP_fnc_cloakScimitar";
 			};
-		};	
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\Scimitar\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
 		};
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 		weapons[] = {
-			
 			macro_basic_air_weapons,
 			macro_new_weapon(generic,cis_aircraft_cannon)
 		};

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

@@ -37,7 +37,6 @@ class CfgPatches
 
 
 #include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
 class CfgVehicles
 {
 	class Plane_Base_F;
@@ -53,9 +52,9 @@ class CfgVehicles
 		scopecurator = 2;
 		airBrakeFrictionCoef = 80.4;
 		armor = 100;
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat_air(CIS)
-		vehicleClass = macro_editor_vehicle_type_air(CIS)
+		faction = macro_cis_faction;
+		editorSubcategory = macro_editor_cat_air(CIS);
+		vehicleClass = macro_editor_vehicle_type_air(CIS);
 		weapons[] = {
 			macro_new_weapon(wynd,a2a),
 			macro_basic_air_weapons,
@@ -96,13 +95,6 @@ class CfgVehicles
 				radius = 10;
 				onlyforplayer = 1;
 			};
-		};	
-	
-
-		class EventHandlers {
-			init="[_this select 0] execVM '\vulture\inittri.sqf';[_this select 0] execVM '\vulture\initturbine.sqf';[_this select 0] execVM 'RD501_Vehicles\_init_functions\cis_aircraft_mass.sqf';";
-            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-        };
+		};
 	};
-	
 };

addons - Copy/RD501_Vehicles/config.cpp

@@ -1,5 +1,7 @@
 
 #include "../RD501_main/config_macros.hpp"
+#include "_init_functions/common_xeh.hpp"
+
 
 #define macro_remove_turret\
     class remove_attched_turrets \
@@ -37,13 +39,6 @@ class CfgPatches
 
 class Extended_Init_EventHandlers 
 {
-    // class B_Truck_01_mover_F
-    // {
-    //     class EEE
-    //     {
-    //         init = [_this select 0] spawn macro_fnc_name(og10_move);
-    //     };
-    // };
     class SW_SpeederBike_base
     {
         class anti_wobble
@@ -51,6 +46,7 @@ class Extended_Init_EventHandlers
             init = "(_this select 0) setVelocity [0,0,1]";
         };
     };
+
     class SW_BARC
     {
         class anti_wobble
@@ -77,12 +73,10 @@ class Extended_Init_EventHandlers
 
     class macro_new_vehicle(e_web,shield)
     {
-        
         class shield 
         {
             init = [_this select 0] spawn macro_fnc_name(eweb_shield);
         };
-     
     };
 
     class macro_new_vehicle(droideka,camo)
@@ -90,10 +84,7 @@ class Extended_Init_EventHandlers
     	class droideka_movable 
         {
             init = [_this select 0] spawn macro_fnc_name(droidekka_move);
-        };		
-
-        
-       
+        };
     };
 
     class macro_new_vehicle(dwarf_spider_droid,Movable_MkII)
@@ -137,49 +128,17 @@ class Extended_Init_EventHandlers
         class set_mass
         {
              init = [_this select 0,72800] spawn macro_fnc_name(set_mass);
-
         };
     }
+
     class macro_new_vehicle(ATTE,uav_MkII)//good
     {
         class set_mass
         {
              init = [_this select 0,72800] spawn macro_fnc_name(set_mass);
-
-        };
-        
-    };
-
-    class macro_new_vehicle(delta,7a_Mk2)
-    {
-        class set_mass
-        {
-             init = [_this select 0,10200] spawn macro_fnc_name(set_mass);
-
         };
-        
     };
 
-    class macro_new_vehicle(delta,7b_Mk2)
-    {
-        class set_mass
-        {
-             init = [_this select 0,10200] spawn macro_fnc_name(set_mass);
-
-        };
-        
-    };
-
-    class macro_new_vehicle(eta,lime_Mk2)
-    {
-        class set_mass
-        {
-             init = [_this select 0,15000] spawn macro_fnc_name(set_mass);
-
-        };
-        
-    };
-    
     class macro_new_vehicle(turret_ATTE,Stomper)
     {
         class atte_uav_init
@@ -208,26 +167,7 @@ class Extended_Init_EventHandlers
 		{
 			init = [_this select 0] spawn macro_fnc_name(vehicle_lift);
 		};
-	};  
-    class macro_new_vehicle(HMP,gunship)
-    {
-        class turret1 
-        {
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,5,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
-
-        class turret2 
-        {
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
-
-        class turret3 
-        {
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[-5,0,-.5]] spawn macro_fnc_name(apply_aircraft_turrets);
-        };
-    };	
-
-    
+	};
 
     #include "_init_functions/cis_aircraft_turrets.hpp"
 
@@ -239,7 +179,6 @@ class Extended_Init_EventHandlers
 
     #include "_init_functions/resistance_aircraft_turrets.hpp"
 
-
 };
 
 class Extended_Deleted_EventHandlers 
@@ -285,12 +224,8 @@ class Extended_Deleted_EventHandlers
     	macro_remove_attached_stuff_XEH
     };
 
-
-
     #include "_delete_functions/remove_aircraft_turret.hpp"
-   
-
-};
+    };
 
 class Extended_GetIn_EventHandlers 
 {