Cleanup aircraft (#5197)

This commit is contained in:
PabstMirror 2017-05-31 11:30:29 -05:00 committed by GitHub
parent 9f291c86d8
commit 4ad73446a6
3 changed files with 37 additions and 1025 deletions

View File

@ -33,12 +33,10 @@ class CfgVehicles {
class Turrets: Turrets { class Turrets: Turrets {
class CopilotTurret; class CopilotTurret;
}; };
//class UserActions;
}; };
class Heli_Light_01_base_F: Helicopter_Base_H { class Heli_Light_01_base_F: Helicopter_Base_H {
lockDetectionSystem = 0; incomingMissileDetectionSystem = 16; // Vanilla: 0
incomingMissileDetectionSystem = 16;
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -49,16 +47,8 @@ class CfgVehicles {
}; };
}; };
class Heli_Light_01_unarmed_base_F: Heli_Light_01_base_F {};
class B_Heli_Light_01_F: Heli_Light_01_unarmed_base_F {
/*class Turrets: Turrets {
class CopilotTurret: CopilotTurret {};
};*/
};
class Heli_Light_01_armed_base_F: Heli_Light_01_base_F { class Heli_Light_01_armed_base_F: Heli_Light_01_base_F {
lockDetectionSystem = 0; incomingMissileDetectionSystem = 16; // Vanilla: 0
incomingMissileDetectionSystem = 16;
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -67,13 +57,10 @@ class CfgVehicles {
}; };
}; };
}; };
class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F {};
class Heli_Light_02_base_F: Helicopter_Base_H { class Heli_Light_02_base_F: Helicopter_Base_H {
driverCanEject = 1; driverCanEject = 1;
lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; // Vanilla: 24
incomingMissileDetectionSystem = 16; magazines[] = {"2000Rnd_762x51_Belt_T_Green", "12Rnd_PG_missiles", "168Rnd_CMFlare_Chaff_Magazine"}; // Switch gun magazine to 7.62mm from 6.5mm
magazines[] = {"2000Rnd_762x51_Belt_T_Green", "12Rnd_PG_missiles", "168Rnd_CMFlare_Chaff_Magazine"};
class Turrets: Turrets { class Turrets: Turrets {
class CopilotTurret: CopilotTurret { class CopilotTurret: CopilotTurret {
@ -91,10 +78,8 @@ class CfgVehicles {
#include "Heli_Attack_01_base_F.hpp" #include "Heli_Attack_01_base_F.hpp"
class B_Heli_Attack_01_F: Heli_Attack_01_base_F {};
class Heli_Attack_02_base_F: Helicopter_Base_F { class Heli_Attack_02_base_F: Helicopter_Base_F {
lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; // Vanilla: 24
incomingMissileDetectionSystem = 16;
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -105,8 +90,7 @@ class CfgVehicles {
}; };
class Heli_Transport_01_base_F: Helicopter_Base_H { class Heli_Transport_01_base_F: Helicopter_Base_H {
lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; // Vanilla: 24
incomingMissileDetectionSystem = 16;
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -116,35 +100,19 @@ class CfgVehicles {
}; };
class MainTurret: MainTurret { class MainTurret: MainTurret {
magazines[] = {"2000Rnd_762x51_Belt_T_Red"}; magazines[] = {"2000Rnd_762x51_Belt_T_Red"}; // Switch gun magazine to 7.62mm from 6.5mm
canEject = 1; canEject = 1;
}; };
class RightDoorGun: MainTurret { class RightDoorGun: MainTurret {
magazines[] = {"2000Rnd_762x51_Belt_T_Red"}; magazines[] = {"2000Rnd_762x51_Belt_T_Red"}; // Switch gun magazine to 7.62mm from 6.5mm
canEject = 1; canEject = 1;
}; };
}; };
/*class UserActions {
class DoorL1_Open {
available = 1;
condition = "((this doorPhase 'door_L') == 0) AND Alive(this) AND driver this != player AND gunner this != player";
};
class DoorR1_Open: DoorL1_Open {
condition = "((this doorPhase 'door_R') == 0) AND Alive(this) AND driver this != player AND gunner this != player";
};
class DoorL1_Close: DoorL1_Open {
condition = "((this doorPhase 'door_L') > 0) AND Alive(this) AND driver this != player AND gunner this != player";
};
class DoorR1_Close: DoorL1_Close {
condition = "((this doorPhase 'door_R') > 0) AND Alive(this) AND driver this != player AND gunner this != player";
};
};*/
}; };
class Heli_Transport_02_base_F: Helicopter_Base_H { class Heli_Transport_02_base_F: Helicopter_Base_H {
lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; // Vanilla: 24
incomingMissileDetectionSystem = 16;
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -153,112 +121,51 @@ class CfgVehicles {
showHMD = 1; showHMD = 1;
}; };
}; };
/*class UserActions: UserActions {
class DoorL1_Open {
available = 1;
condition = "this animationPhase ""door_back_L"" < 0.5 AND Alive(this)";
};
class DoorR1_Open: DoorL1_Open {
condition = "this animationPhase ""door_back_R"" < 0.5 AND Alive(this)";
};
class DoorL1_Close: DoorL1_Open {
condition = "this animationPhase ""door_back_L"" > 0.5 AND Alive(this)";
};
class DoorR1_Close: DoorL1_Close {
condition = "this animationPhase ""door_back_R"" > 0.5 AND Alive(this)";
};
class CargoRamp_Open: DoorL1_Open {
userActionID = 52;
displayName = CSTRING(OpenCargoRamp);
textToolTip = CSTRING(OpenCargoRamp);
position = "action_cargoramp";
radius = 3.0;
condition = "this animationPhase ""cargoramp_open"" < 0.5 AND Alive(this)";
statement = "this animateDoor ['cargoramp_open', 1]";
};
class CargoRamp_Close: DoorL1_Close {
userActionID = 55;
displayName = CSTRING(CloseCargoRamp);
textToolTip = CSTRING(CloseCargoRamp);
position = "action_cargoramp";
radius = 3.0;
condition = "this animationPhase ""cargoramp_open"" > 0.5 AND Alive(this)";
statement = "this animateDoor ['cargoramp_open', 0]";
};
};*/
}; };
class Heli_light_03_base_F: Helicopter_Base_F { class Heli_light_03_base_F: Helicopter_Base_F {
lockDetectionSystem = 0; // Vanilla: 12
incomingMissileDetectionSystem = 16; // Vanilla: 24
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
class MainTurret: MainTurret { class MainTurret: MainTurret {
canEject = 1; canEject = 1;
};
};
};
class I_Heli_light_03_F: Heli_light_03_base_F {
lockDetectionSystem = 0;
incomingMissileDetectionSystem = 16;
weapons[] = {"M134_minigun", "missiles_DAR", "CMFlareLauncher", "ACE_AIR_SAFETY" };
magazines[] = {"5000Rnd_762x51_Yellow_Belt", "24Rnd_missiles", "168Rnd_CMFlare_Chaff_Magazine"};
class Turrets: Turrets {
class MainTurret: MainTurret {
showHMD = 1; showHMD = 1;
gunBeg = "commanderview"; weapons[] = {"Laserdesignator_mounted"}; // Add Laser Designator
gunEnd = "laserstart";
memoryPointGun = "laserstart";
stabilizedInAxes = 3;
weapons[] = {"Laserdesignator_mounted"};
soundServo[] = {"", 0.01, 1, 30};
magazines[] = {"Laserbatteries"}; magazines[] = {"Laserbatteries"};
inGunnerMayFire = 1;
}; };
}; };
}; };
class Heli_light_03_unarmed_base_F: Heli_light_03_base_F {};
class I_Heli_light_03_unarmed_F: Heli_light_03_unarmed_base_F {};
class Plane_CAS_01_base_F: Plane_Base_F { class Plane_CAS_01_base_F: Plane_Base_F {
lockDetectionSystem = 12; lockDetectionSystem = 12; // Vanilla: 8
incomingMissileDetectionSystem = 16; incomingMissileDetectionSystem = 16; // Vanilla: 24
}; };
class Plane_CAS_02_base_F: Plane_Base_F { class Plane_CAS_02_base_F: Plane_Base_F {
lockDetectionSystem = 12; lockDetectionSystem = 12; // Vanilla: 8
incomingMissileDetectionSystem = 16; incomingMissileDetectionSystem = 16; // Vanilla: 24
}; };
class Plane_Fighter_03_base_F: Plane_Base_F { class Plane_Fighter_03_base_F: Plane_Base_F {
lockDetectionSystem = 12; lockDetectionSystem = 12; // Vanilla: 8
incomingMissileDetectionSystem = 16; incomingMissileDetectionSystem = 16; // Vanilla: 24
};
class UAV_01_base_F: Helicopter_Base_F {
/*class Turrets: Turrets {
class MainTurret: MainTurret {};
};*/
}; };
class UAV_02_base_F: UAV { class UAV_02_base_F: UAV {
weapons[] = {}; weapons[] = {}; // Remove flare launcher
magazines[] = {}; magazines[] = {};
class Turrets {
class MainTurret;
};
}; };
class UAV_02_CAS_base_F: UAV_02_base_F { class UAV_02_CAS_base_F: UAV_02_base_F {
weapons[] = {}; weapons[] = {}; // Remove flare launcher
magazines[] = {}; magazines[] = {};
/*class Turrets: Turrets {
class MainTurret: MainTurret {};
};*/
}; };
class Heli_Transport_03_base_F: Helicopter_Base_H { class Heli_Transport_03_base_F: Helicopter_Base_H {
incomingMissileDetectionSystem = 16; // Vanilla: 24
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -267,14 +174,8 @@ class CfgVehicles {
}; };
}; };
}; };
class B_Heli_Transport_03_F: Heli_Transport_03_base_F {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
};
class Heli_Transport_04_base_F: Helicopter_Base_H { class Heli_Transport_04_base_F: Helicopter_Base_H {
lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; // Vanilla: 24
incomingMissileDetectionSystem = 16;
driverCanEject = 1; driverCanEject = 1;
class Turrets: Turrets { class Turrets: Turrets {
@ -287,28 +188,4 @@ class CfgVehicles {
}; };
}; };
}; };
class O_Heli_Transport_04_bench_F: Heli_Transport_04_base_F {
class Turrets: Turrets {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
class LoadmasterTurret: LoadmasterTurret {
canEject = 1;
};
};
};
class O_Heli_Transport_04_covered_F: Heli_Transport_04_base_F {
class Turrets: Turrets {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
class LoadmasterTurret: LoadmasterTurret {
canEject = 1;
};
};
};
}; };

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
ace_aircraft ace_aircraft
============ ============
Changes to air weaponry, flight models and HUDs. Changes to air weaponry, ejection and HUDs.
- Contributions by Kimi (geraldbolso1899) for HUD updates - Contributions by Kimi (geraldbolso1899) for HUD updates