Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into medical-rewrite

Browse Source
This commit is contained in:
PabstMirror 2017-02-08 10:32:22 -06:00
commit 4433f6eb38
24 changed files with 940 additions and 924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github_changelog_generator
View File

@ -6,9 +6,7 @@ pr-wo-labels=false
max-issues=0
# Label filters
exclude-labels=by design,can't reproduce,duplicate,question,invalid,wontfix,translation,ignore changelog
bug-labels=conflict,bug,critical bug
enhancement-labels=enhancement,feature request,Focus Feature
exclude-labels=by design,can't reproduce,duplicate,question,invalid,wontfix,ignore changelog
# Tag is created before generating changelog for release candidates
unreleased=false

4
addons/aircraft/CfgAmmo.hpp
View File

@ -1,4 +1,3 @@
class CfgAmmo {
class BulletBase;
class B_20mm : BulletBase {
@ -11,11 +10,11 @@ class CfgAmmo {
explosive = 1.8;
tracersEvery = 3;
tracerEndTime = 3.5;
CraterEffects = "ExploAmmoCrater";
explosionEffects = "ExploAmmoExplosion";
model = "\A3\Weapons_f\Data\bullettracer\tracer_red";
};
class ACE_20mm_HE : B_20mm {};
class ACE_20mm_AP : B_20mm {
hit = 50;
@ -57,7 +56,6 @@ class CfgAmmo {
submunitionAmmo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Sub";
submunitionConeType[] = {"custom", {{0,0}, {0,0}, {0,0}} };
};
class ACE_Gatling_30mm_HE_Plane_CAS_01_Sub: Gatling_30mm_HE_Plane_CAS_01_F {};
// adjust damage and splash damage, closer to bluefor gatling with same caliber

1
addons/aircraft/CfgMagazines.hpp
View File

@ -1,4 +1,3 @@
class CfgMagazines {
// shoot helper object to tripple rof
class VehicleMagazine;

67
addons/aircraft/CfgVehicles.hpp
View File

@ -1,4 +1,3 @@
class CfgVehicles {
class All {
class Turrets;
@ -11,7 +10,6 @@ class CfgVehicles {
};
class Air: AllVehicles {};
class Helicopter: Air {
class Turrets {
class MainTurret;
@ -19,13 +17,11 @@ class CfgVehicles {
};
class Plane: Air {};
class ParachuteBase: Helicopter {
class Turrets;
};
class UAV: Plane {};
class Helicopter_Base_F: Helicopter {
class Turrets: Turrets {
class CopilotTurret;
@ -54,7 +50,6 @@ 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 {};
@ -74,12 +69,11 @@ class CfgVehicles {
};
class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F {};
class Heli_Light_02_base_F: Helicopter_Base_H {
driverCanEject = 1;
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
magazines[] = {"2000Rnd_762x51_Belt_T_Green","12Rnd_PG_missiles","168Rnd_CMFlare_Chaff_Magazine"};
magazines[] = {"2000Rnd_762x51_Belt_T_Green", "12Rnd_PG_missiles", "168Rnd_CMFlare_Chaff_Magazine"};
class Turrets: Turrets {
class CopilotTurret: CopilotTurret {
@ -98,7 +92,6 @@ class CfgVehicles {
#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 {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
@ -121,16 +114,17 @@ class CfgVehicles {
canEject = 1;
showHMD = 1;
};
class MainTurret: MainTurret {
magazines[] = {"2000Rnd_762x51_Belt_T_Red"};
canEject = 1;
};
class RightDoorGun: MainTurret {
magazines[] = {"2000Rnd_762x51_Belt_T_Red"};
canEject = 1;
};
};
/*class UserActions {
class DoorL1_Open {
available = 1;
@ -159,7 +153,6 @@ class CfgVehicles {
showHMD = 1;
};
};
/*class UserActions: UserActions {
class DoorL1_Open {
available = 1;
@ -195,44 +188,41 @@ class CfgVehicles {
};*/
};
class Heli_light_03_base_F: Helicopter_Base_F {};
class I_Heli_light_03_base_F: Heli_light_03_base_F {
lockDetectionSystem = 0;
incomingMissileDetectionSystem = 16;
class Heli_light_03_base_F: Helicopter_Base_F {
driverCanEject = 1;
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 {
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;
gunBeg = "commanderview";
gunEnd = "laserstart";
memoryPointGun = "laserstart";
stabilizedInAxes = 3;
weapons[] = {"Laserdesignator_mounted"};
soundServo[] = {"",0.01,1,30};
soundServo[] = {"", 0.01, 1, 30};
magazines[] = {"Laserbatteries"};
inGunnerMayFire = 1;
};
};
};
class I_Heli_light_03_F: Heli_light_03_base_F {
class Turrets: Turrets {
class MainTurret: MainTurret {};
};
};
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 {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
class Turrets;
#include <flightmodel_thunderbolt.hpp>
@ -241,7 +231,6 @@ class CfgVehicles {
class Plane_CAS_02_base_F: Plane_Base_F {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
class Turrets;
#include <flightmodel_yak.hpp>
@ -250,7 +239,6 @@ class CfgVehicles {
class Plane_Fighter_03_base_F: Plane_Base_F {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
class Turrets;
#include <flightmodel_alca.hpp>
@ -274,35 +262,23 @@ class CfgVehicles {
class UAV_02_CAS_base_F: UAV_02_base_F {
weapons[] = {};
magazines[] = {};
/*class Turrets: Turrets {
class MainTurret: MainTurret {};
};*/
};
class Heli_Transport_03_base_F: Helicopter_Base_H {};
class B_Heli_Transport_03_base_F: Heli_Transport_03_base_F {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
class Heli_Transport_03_base_F: Helicopter_Base_H {
driverCanEject = 1;
class Turrets: Turrets {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
//class MainTurret: MainTurret {};
class RightDoorGun: MainTurret {};
};
};
class B_Heli_Transport_03_unarmed_base_F: Heli_Transport_03_base_F {
class Turrets: Turrets {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
//class MainTurret: MainTurret {};
//class RightDoorGun: MainTurret {};
};
class B_Heli_Transport_03_F: Heli_Transport_03_base_F {
lockDetectionSystem = 12;
incomingMissileDetectionSystem = 16;
};
class Heli_Transport_04_base_F: Helicopter_Base_H {
@ -314,6 +290,7 @@ class CfgVehicles {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
class LoadmasterTurret: MainTurret {
canEject = 1;
};
@ -325,6 +302,7 @@ class CfgVehicles {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
class LoadmasterTurret: LoadmasterTurret {
canEject = 1;
};
@ -336,6 +314,7 @@ class CfgVehicles {
class CopilotTurret: CopilotTurret {
canEject = 1;
};
class LoadmasterTurret: LoadmasterTurret {
canEject = 1;
};

23
addons/aircraft/CfgWeapons.hpp
View File

@ -1,13 +1,10 @@
class Mode_SemiAuto;
class Mode_Burst;
class Mode_FullAuto;
class CfgWeapons {
class RocketPods;
class ACE_AIR_SAFETY : RocketPods
{
class ACE_AIR_SAFETY : RocketPods {
CanLock = 0;
displayName = "SAFE";
displayNameMagazine = "SAFE";
@ -24,10 +21,12 @@ class CfgWeapons {
// Manual Switching Of Flare Mode
class SmokeLauncher;
class CMFlareLauncher: SmokeLauncher {
modes[] = {"Single","Burst","AIBurst"};
modes[] = {"Single", "Burst", "AIBurst"};
class Single: Mode_SemiAuto {
reloadTime = 0.1;
};
class Burst: Mode_Burst {
displayName = CSTRING(CMFlareLauncher_Burst_Name);
};
@ -43,6 +42,7 @@ class CfgWeapons {
reloadTime = 0.023; //0.04;
dispersion = 0.006; //0.0022;
};
class close: manual {};
class short: close {};
class medium: close {};
@ -57,18 +57,22 @@ class CfgWeapons {
dispersion = 0.006;
displayName = CSTRING(gatling_20mm_Name);
};
class close: close {
reloadTime = 0.04;
dispersion = 0.006;
};
class short: short {
reloadTime = 0.04;
dispersion = 0.006;
};
class medium: medium {
reloadTime = 0.04;
dispersion = 0.006;
};
class far: far {
reloadTime = 0.04;
dispersion = 0.006;
@ -78,14 +82,13 @@ class CfgWeapons {
// buff gatling rof
class MGunCore;
class MGun: MGunCore {};
class LMG_RCWS: MGun {};
class LMG_Minigun: LMG_RCWS {
class manual: MGun {
reloadTime = 0.075; //0.015;
dispersion = 0.00093; //0.006;
};
class close: manual {};
class short: close {};
class medium: close {};
@ -94,10 +97,12 @@ class CfgWeapons {
class LMG_Minigun_heli: LMG_Minigun {
showAimCursorInternal = 0;
class manual: manual {
reloadTime = 0.015; //0.033; Note: This is a way to fast ROF (requires over 60 FPS) @todo
dispersion = 0.006; //0.0087;
};
class close: manual {};
class short: close {};
class medium: close {};
@ -110,11 +115,13 @@ class CfgWeapons {
dispersion = 0.0064; //0.0023;
multiplier = 1;
};
class HighROF: LowROF {
reloadTime = 0.02; //0.03;
dispersion = 0.0064; //0.0023;
multiplier = 1;
};
class close: HighROF {};
class short: close {};
class medium: LowROF {};
@ -124,12 +131,14 @@ class CfgWeapons {
class Gatling_30mm_Plane_CAS_01_F: CannonCore {
autoFire = 1;
burst = 1;
class LowROF: Mode_FullAuto {
autoFire = 0;
burst = 22; //65;
reloadTime = 0.0462; //0.0154; //0.034;
multiplier = 3;
};
class close: LowROF {};
class near: close {};
class short: close {};

832
addons/aircraft/Heli_Attack_01_base_F.hpp
View File

File diff suppressed because one or more lines are too long

658
addons/aircraft/RscInGameUI.hpp
View File

@ -10,572 +10,568 @@ class HScrollbar;
class RscLadderPicture;
class RscControlsGroupNoScrollbars;
class RscInGameUI
{
class RscInGameUI {
class RscUnitInfo;
class Rsc_ACE_Helo_UI_Turret: RscUnitInfo
{
class Rsc_ACE_Helo_UI_Turret: RscUnitInfo {
idd = 300;
controls[] = {"CA_IGUI_elements_group","CA_VehicleToggles"};
controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"};
class VScrollbar;
class HScrollbar;
class CA_IGUI_elements_group: RscControlsGroup
{
class CA_IGUI_elements_group: RscControlsGroup {
idc = 170;
class VScrollbar: VScrollbar
{
class VScrollbar: VScrollbar {
width = 0;
};
class HScrollbar: HScrollbar
{
class HScrollbar: HScrollbar {
height = 0;
};
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)";
class controls
{
class CA_Distance: RscText
{
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)";
class controls {
class CA_Distance: RscText {
idc = 151;
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
x = "24.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "24.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class CA_Speed: RangeText
{
class CA_Speed: RangeText {
idc = 188;
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "120";
x = "14.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "14.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class CA_Alt: RangeText
{
class CA_Alt: RangeText {
idc = 189;
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "3825";
x = "34.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "34.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class CA_VisionMode: RscText
{
class CA_VisionMode: RscText {
idc = 152;
style = 0;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "VIS";
x = "12.58 * (0.01875 * SafezoneH)";
y = "8 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "12.58 * (0.01875 * SafezoneH)";
y = "8 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class CA_FlirMode: RscText
{
class CA_FlirMode: RscText {
idc = 153;
style = 0;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "BHOT";
x = "15.78 * (0.01875 * SafezoneH)";
y = "8 * (0.025 * SafezoneH)";
w = "4.5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "15.78 * (0.01875 * SafezoneH)";
y = "8 * (0.025 * SafezoneH)";
w = "4.5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class ValueGrid: RangeText
{
class ValueGrid: RangeText {
idc = 172;
font = "EtelkaMonospacePro";
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
x = "12.20 * (0.01875 * SafezoneH)";
y = "3.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "12.20 * (0.01875 * SafezoneH)";
y = "3.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class TextTADS: RangeText
{
class TextTADS: RangeText {
idc = 1010;
text = "TADS";
font = "EtelkaMonospacePro";
style = 2;
shadow = 0;
x = "12.30 * (0.01875 * SafezoneH)";
y = "5 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "12.30 * (0.01875 * SafezoneH)";
y = "5 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class ValueTime: RangeText
{
class ValueTime: RangeText {
idc = 190;
text = "20:28:35";
font = "EtelkaMonospacePro";
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
x = "12.1 * (0.01875 * SafezoneH)";
y = "6.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "12.1 * (0.01875 * SafezoneH)";
y = "6.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class CA_Laser: RscText
{
class CA_Laser: RscText {
idc = 158;
style = "0x30 + 0x800";
sizeEx = "0.038*SafezoneH";
sizeEx = "0.038 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = QPATHTOF(data\Helo_LaserON.paa);
x = "20.45 * (0.01875 * SafezoneH)";
y = "14.1 * (0.025 * SafezoneH)";
w = "12.5 * (0.01875 * SafezoneH)";
h = "12 * (0.025 * SafezoneH)";
x = "20.45 * (0.01875 * SafezoneH)";
y = "14.1 * (0.025 * SafezoneH)";
w = "12.5 * (0.01875 * SafezoneH)";
h = "12 * (0.025 * SafezoneH)";
};
class CA_Heading: RscText
{
class CA_Heading: RscText {
idc = 156;
style = 0;
sizeEx = "0.038*SafezoneH";
sizeEx = "0.038 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "023";
x = "24.83 * (0.01875 * SafezoneH)";
y = "6 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "24.83 * (0.01875 * SafezoneH)";
y = "6 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
};
};
};
class Rsc_ACE_Helo_UI_01: RscUnitInfo
{
controls[] = {"WeaponInfoControlsGroupRight","CA_TextFlaresMode","CA_TextFlares","CA_VehicleToggles","CA_Radar"};
class Rsc_ACE_Helo_UI_01: RscUnitInfo {
controls[] = {"WeaponInfoControlsGroupRight", "CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"};
};
class Rsc_ACE_Helo_UI_02: RscUnitInfo
{
controls[] = {"CA_TextFlaresMode","CA_TextFlares","CA_VehicleToggles","CA_Radar"};
class Rsc_ACE_Helo_UI_02: RscUnitInfo {
controls[] = {"CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"};
};
class Rsc_ACE_Drones_UI_Turret: RscUnitInfo
{
class Rsc_ACE_Drones_UI_Turret: RscUnitInfo {
idd = 300;
controls[] = {"CA_Zeroing","CA_IGUI_elements_group","CA_VehicleToggles"};
class CA_IGUI_elements_group: RscControlsGroup
{
controls[] = {"CA_Zeroing", "CA_IGUI_elements_group", "CA_VehicleToggles"};
class CA_IGUI_elements_group: RscControlsGroup {
idc = 170;
class VScrollbar: VScrollbar
{
class VScrollbar: VScrollbar {
width = 0;
};
class HScrollbar: HScrollbar
{
class HScrollbar: HScrollbar {
height = 0;
};
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)";
class controls
{
class CA_Distance: RscText
{
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)";
class controls {
class CA_Distance: RscText {
idc = 151;
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
x = "24.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "24.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class CA_Speed: RangeText
{
class CA_Speed: RangeText {
idc = 188;
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "120";
x = "14.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "14.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class CA_Alt: RangeText
{
class CA_Alt: RangeText {
idc = 189;
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "3825";
x = "34.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "34.78 * (0.01875 * SafezoneH)";
y = "30.88 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class ValueTime: RangeText
{
class ValueTime: RangeText {
idc = 190;
text = "20:28:35";
font = "EtelkaMonospacePro";
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
x = "1.75 * (0.01875 * SafezoneH)";
y = "10.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "1.75 * (0.01875 * SafezoneH)";
y = "10.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class CA_VisionMode: RscText
{
class CA_VisionMode: RscText {
idc = 152;
style = 0;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "VIS";
align = "right";
x = "2.6 * (0.01875 * SafezoneH)";
y = "12.0 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.0 * (0.025 * SafezoneH)";
x = "2.6 * (0.01875 * SafezoneH)";
y = "12.0 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.0 * (0.025 * SafezoneH)";
};
class CA_FlirMode: RscText
{
class CA_FlirMode: RscText {
idc = 153;
style = 0;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "BHOT";
align = "right";
x = "6.18 * (0.01875 * SafezoneH)";
y = "12.0 * (0.025 * SafezoneH)";
w = "4.5 * (0.01875 * SafezoneH)";
h = "1.0 * (0.025 * SafezoneH)";
x = "6.18 * (0.01875 * SafezoneH)";
y = "12.0 * (0.025 * SafezoneH)";
w = "4.5 * (0.01875 * SafezoneH)";
h = "1.0 * (0.025 * SafezoneH)";
};
class TgT_Grid_text: RangeText
{
class TgT_Grid_text: RangeText {
idc = 1005;
text = "TGT:";
font = "EtelkaMonospacePro";
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
x = "1.20 * (0.01875 * SafezoneH)";
y = "13.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "1.20 * (0.01875 * SafezoneH)";
y = "13.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class TGT_ValueGrid: RangeText
{
class TGT_ValueGrid: RangeText {
idc = 172;
font = "EtelkaMonospacePro";
colorText[] = {0.706,0.0745,0.0196,0.8};
colorText[] = {0.706, 0.0745, 0.0196, 0.8};
style = 2;
sizeEx = "0.0295*SafezoneH";
shadow = 0;
x = "5.20 * (0.01875 * SafezoneH)";
y = "13.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "5.20 * (0.01875 * SafezoneH)";
y = "13.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class OWN_Grid_text: RangeText
{
class OWN_Grid_text: RangeText {
idc = 1005;
text = "OWN:";
font = "EtelkaMonospacePro";
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
x = "1.20 * (0.01875 * SafezoneH)";
y = "15 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "1.20 * (0.01875 * SafezoneH)";
y = "15 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class OWN_ValueGrid: RangeText
{
class OWN_ValueGrid: RangeText {
idc = 171;
font = "EtelkaMonospacePro";
colorText[] = {0.15,1,0.15,0.8};
colorText[] = {0.15, 1, 0.15, 0.8};
style = 2;
sizeEx = "0.0295*SafezoneH";
sizeEx = "0.0295 * SafezoneH";
shadow = 0;
x = "5.20 * (0.01875 * SafezoneH)";
y = "15 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "5.20 * (0.01875 * SafezoneH)";
y = "15 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class CA_Laser: RscText
{
class CA_Laser: RscText {
idc = 158;
style = "0x30 + 0x800";
sizeEx = "0.038*SafezoneH";
sizeEx = "0.038 * SafezoneH";
shadow = 0;
align = "right";
font = "EtelkaMonospacePro";
text = QPATHTOF(data\Helo_LaserON.paa);
x = "20.45 * (0.01875 * SafezoneH)";
y = "14.1 * (0.025 * SafezoneH)";
w = "12.5 * (0.01875 * SafezoneH)";
h = "12 * (0.025 * SafezoneH)";
x = "20.45 * (0.01875 * SafezoneH)";
y = "14.1 * (0.025 * SafezoneH)";
w = "12.5 * (0.01875 * SafezoneH)";
h = "12 * (0.025 * SafezoneH)";
};
class CA_Heading: RscText
{
class CA_Heading: RscText {
idc = 156;
style = 0;
sizeEx = "0.038*SafezoneH";
sizeEx = "0.038 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
text = "023";
align = "right";
x = "25 * (0.01875 * SafezoneH)";
y = "5 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "25 * (0.01875 * SafezoneH)";
y = "5 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
};
};
};
class Rsc_ACE_Drones_UI_Pilots: RscUnitInfo
{
class Rsc_ACE_Drones_UI_Pilots: RscUnitInfo {
idd = 300;
controls[] = {"WeaponInfoControlsGroupRight","CA_BackgroundVehicle","CA_BackgroundVehicleTitle","CA_BackgroundVehicleTitleDark","CA_BackgroundFuel","CA_Vehicle","CA_VehicleRole","CA_HitZones","CA_SpeedBackground","CA_SpeedUnits","CA_Speed","CA_ValueFuel","CA_AltBackground","CA_AltUnits","CA_Alt","CA_VehicleToggles","CA_Radar","DriverOpticsGroup"};
class DriverOpticsGroup: RscControlsGroup
{
controls[] = {"WeaponInfoControlsGroupRight", "CA_BackgroundVehicle", "CA_BackgroundVehicleTitle", "CA_BackgroundVehicleTitleDark", "CA_BackgroundFuel", "CA_Vehicle", "CA_VehicleRole", "CA_HitZones", "CA_SpeedBackground", "CA_SpeedUnits", "CA_Speed", "CA_ValueFuel", "CA_AltBackground", "CA_AltUnits", "CA_Alt", "CA_VehicleToggles", "CA_Radar", "DriverOpticsGroup"};
class DriverOpticsGroup: RscControlsGroup {
idc = 392;
class VScrollbar: VScrollbar
{
class VScrollbar: VScrollbar {
width = 0;
};
class HScrollbar: HScrollbar
{
class HScrollbar: HScrollbar {
height = 0;
};
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)";
class controls
{
class TextGrid: RscText
{
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)";
class controls {
class TextGrid: RscText {
style = 0;
sizeEx = "0.02*SafezoneH";
sizeEx = "0.02 * SafezoneH";
shadow = 0;
font = "EtelkaMonospacePro";
idc = 1005;
text = "GRID:";
x = "5.8 * (0.01875 * SafezoneH)";
y = "31.8 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "5.8 * (0.01875 * SafezoneH)";
y = "31.8 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class ValueGrid: TextGrid
{
class ValueGrid: TextGrid {
idc = 189;
text = "382546";
x = "10.3 * (0.01875 * SafezoneH)";
y = "31.8 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "10.3 * (0.01875 * SafezoneH)";
y = "31.8 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class TextTime: TextGrid
{
class TextTime: TextGrid {
idc = 1010;
text = "TIME [UTC]:";
x = "5.8 * (0.01875 * SafezoneH)";
y = "32.6 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "5.8 * (0.01875 * SafezoneH)";
y = "32.6 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class ValueTime: TextGrid
{
class ValueTime: TextGrid {
idc = 101;
text = "20:28:35";
x = "10 * (0.01875 * SafezoneH)";
y = "32.6 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "10 * (0.01875 * SafezoneH)";
y = "32.6 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class TextMag: TextGrid
{
class TextMag: TextGrid {
idc = 1011;
text = "CAM MAG:";
x = "5.8 * (0.01875 * SafezoneH)";
y = "7 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "5.8 * (0.01875 * SafezoneH)";
y = "7 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class OpticsZoom: TextGrid
{
class OpticsZoom: TextGrid {
idc = 192;
text = "28x";
x = "10.3 * (0.01875 * SafezoneH)";
y = "7 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "10.3 * (0.01875 * SafezoneH)";
y = "7 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class BorderLineSpdTop: RscPicture
{
class BorderLineSpdTop: RscPicture {
idc = 1203;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "3.343 * (0.01875 * SafezoneH)";
y = "12.4 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "3.343 * (0.01875 * SafezoneH)";
y = "12.4 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class BorderLineSpdBottom: RscPicture
{
class BorderLineSpdBottom: RscPicture {
idc = 1207;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "3.343 * (0.01875 * SafezoneH)";
y = "26.5 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "3.343 * (0.01875 * SafezoneH)";
y = "26.5 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class BorderLineAltTop: RscPicture
{
class BorderLineAltTop: RscPicture {
idc = 1205;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "47.16 * (0.01875 * SafezoneH)";
y = "12.4 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "47.16 * (0.01875 * SafezoneH)";
y = "12.4 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class BorderLineAltBottom: RscPicture
{
class BorderLineAltBottom: RscPicture {
idc = 1206;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "47.16 * (0.01875 * SafezoneH)";
y = "26.5 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
x = "47.16 * (0.01875 * SafezoneH)";
y = "26.5 * (0.025 * SafezoneH)";
w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)";
};
class TextSpd: TextGrid
{
class TextSpd: TextGrid {
idc = 1004;
text = "SPD";
x = "4.8 * (0.01875 * SafezoneH)";
y = "11.8 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "4.8 * (0.01875 * SafezoneH)";
y = "11.8 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class SpeedValueBorder: RscPicture
{
class SpeedValueBorder: RscPicture {
idc = 1200;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\altimeter_value_ca.paa";
x = "6.3 * (0.01875 * SafezoneH)";
y = "19 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)";
x = "6.3 * (0.01875 * SafezoneH)";
y = "19 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)";
};
class CA_Speed: TextGrid
{
class CA_Speed: TextGrid {
idc = 190;
sizeEx = "0.03*SafezoneH";
text = "120";
x = "7.5 * (0.01875 * SafezoneH)";
y = "19.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "7.5 * (0.01875 * SafezoneH)";
y = "19.5 * (0.025 * SafezoneH)";
w = "6 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class AnalogueSpeed: RscLadderPicture
{
class AnalogueSpeed: RscLadderPicture {
idc = 384;
topValue = 1312;
bottomValue = -345;
visibleRange = -1;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\UAVspeedLadder_ca.paa";
x = "1.5 * (0.01875 * SafezoneH)";
y = "13 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "14 * (0.025 * SafezoneH)";
x = "1.5 * (0.01875 * SafezoneH)";
y = "13 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "14 * (0.025 * SafezoneH)";
};
class TextAlt: TextGrid
{
class TextAlt: TextGrid {
idc = 1006;
text = "ALT";
x = "46.9 * (0.01875 * SafezoneH)";
y = "11.8 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "46.9 * (0.01875 * SafezoneH)";
y = "11.8 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class AltValueBorder: RscPicture
{
class AltValueBorder: RscPicture {
idc = 1201;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\airspeed_value_ca.paa";
x = "42.25 * (0.01875 * SafezoneH)";
y = "19 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)";
x = "42.25 * (0.01875 * SafezoneH)";
y = "19 * (0.025 * SafezoneH)";
w = "5 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)";
};
class CA_Alt: TextGrid
{
class CA_Alt: TextGrid {
idc = 191;
sizeEx = "0.03*SafezoneH";
sizeEx = "0.03 * SafezoneH";
style = 1;
text = "3825";
x = "43 * (0.01875 * SafezoneH)";
y = "19.5 * (0.025 * SafezoneH)";
w = "3.2 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
x = "43 * (0.01875 * SafezoneH)";
y = "19.5 * (0.025 * SafezoneH)";
w = "3.2 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)";
};
class AnalogueAlt: RscLadderPicture
{
class AnalogueAlt: RscLadderPicture {
idc = 385;
topValue = 14430;
bottomValue = -2110;
visibleRange = -1;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\UAValtLadder_ca.paa";
x = "47 * (0.01875 * SafezoneH)";
y = "13 * (0.025 * SafezoneH)";
w = "2.5 * (0.01875 * SafezoneH)";
h = "14 * (0.025 * SafezoneH)";
x = "47 * (0.01875 * SafezoneH)";
y = "13 * (0.025 * SafezoneH)";
w = "2.5 * (0.01875 * SafezoneH)";
h = "14 * (0.025 * SafezoneH)";
};
class AnalogueHorizon: RscLadderPicture
{
class AnalogueHorizon: RscLadderPicture {
idc = 383;
topValue = 90;
bottomValue = -90;
visibleRange = -1;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\horizon_ladder_ca.paa";
x = "16.75 * (0.01875 * SafezoneH)";
y = "5 * (0.025 * SafezoneH)";
w = "20 * (0.01875 * SafezoneH)";
h = "30 * (0.025 * SafezoneH)";
x = "16.75 * (0.01875 * SafezoneH)";
y = "5 * (0.025 * SafezoneH)";
w = "20 * (0.01875 * SafezoneH)";
h = "30 * (0.025 * SafezoneH)";
};
class HorizonCenter: RscPicture
{
class HorizonCenter: RscPicture {
idc = 1202;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\horizon_aircraft_ca.paa";
x = "24.75 * (0.01875 * SafezoneH)";
y = "19 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)";
x = "24.75 * (0.01875 * SafezoneH)";
y = "19 * (0.025 * SafezoneH)";
w = "4 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)";
};
};
};
};
};
};

4
addons/aircraft/config.cpp
View File

@ -8,7 +8,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","Crusty","commy2","jaynus","Kimi"};
authors[] = {"KoffeinFlummi", "Crusty", "commy2", "jaynus", "Kimi"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
@ -21,4 +21,4 @@ class CfgPatches {
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "RscInGameUI.hpp"
#include "RscInGameUI.hpp"

19
addons/aircraft/flightmodel_alca.hpp
View File

@ -1,4 +1,3 @@
acceleration = 300;
maxSpeed = 936;
irScanRangeMin = 500;
@ -9,16 +8,16 @@ rudderInfluence = 0.001;
aileronControlsSensitivityCoef = 3;
elevatorControlsSensitivity = 2;
rudderControlsSensitivityoef = 4;
elevatorCoef[] = {0.6,0.73,0.62,0.52,0.39,0.33,0.28};
aileronCoef[] = {0.5,0.68,0.75,0.86,0.92,0.96,1};
rudderCoef[] = {0.9,0.75,0.58,0.45,0.38,0.35,0.3};
envelope[] = {0,0.06,1.2,3,3.6,3.75,3.65,3.45,3.3,2.8,2.4,1.9,1.5};
angleOfIndicence = 0.0523599; //determines velocity vector behaviour, how quickly it catches up with where your nose is pointing, I think
draconicForceXCoef = 7.5; //max angle of attack, lower value gives higher aoa
draconicForceYCoef = 0.2198; //Something to do with bleed off of speed, low values seem to increase bleed off
elevatorCoef[] = {0.6, 0.73, 0.62, 0.52, 0.39, 0.33, 0.28};
aileronCoef[] = {0.5, 0.68, 0.75, 0.86, 0.92, 0.96, 1};
rudderCoef[] = {0.9, 0.75, 0.58, 0.45, 0.38, 0.35, 0.3};
envelope[] = {0, 0.06, 1.2, 3, 3.6, 3.75, 3.65, 3.45, 3.3, 2.8, 2.4, 1.9, 1.5};
angleOfIndicence = 0.0523599; //determines velocity vector behaviour, how quickly it catches up with where your nose is pointing, I think
draconicForceXCoef = 7.5; //max angle of attack, lower value gives higher aoa
draconicForceYCoef = 0.2198; //Something to do with bleed off of speed, low values seem to increase bleed off
draconicForceZCoef = 5.12; //????
draconicTorqueXCoef = 0.18; //resistance to elevator input, also impacts speed degradation
draconicTorqueXCoef = 0.18; //resistance to elevator input, also impacts speed degradation
draconicTorqueYCoef = 0.000017;
thrustCoef[] = {1.3,1.27,1.24,1.2,1.17,1.15,1.13,1.1,1.06,1,0.94,0.72,0.51,0.4,0.25,0};
thrustCoef[] = {1.3, 1.27, 1.24, 1.2, 1.17, 1.15, 1.13, 1.1, 1.06, 1, 0.94, 0.72, 0.51, 0.4, 0.25, 0};
gunAimDown = 0.029;
flapsFrictionCoef = 0.32;

11
addons/aircraft/flightmodel_thunderbolt.hpp
View File

@ -1,4 +1,3 @@
maxSpeed = 736;
aileronSensitivity = 0.85;
elevatorSensitivity = 0.75;
@ -6,9 +5,9 @@ rudderInfluence = 0.001;
aileronControlsSensitivityCoef = 3;
elevatorControlsSensitivity = 2;
rudderControlsSensitivityoef = 4;
elevatorCoef[] = {0.7,0.75,0.75,0.65,0.55,0.45,0.35};
aileronCoef[] = {0.6,0.85,0.88,0.92,0.95,0.97,1};
rudderCoef[] = {0.8,0.75,0.65,0.5,0.4,0.33,0.3};
elevatorCoef[] = {0.7, 0.75, 0.75, 0.65, 0.55, 0.45, 0.35};
aileronCoef[] = {0.6, 0.85, 0.88, 0.92, 0.95, 0.97, 1};
rudderCoef[] = {0.8, 0.75, 0.65, 0.5, 0.4, 0.33, 0.3};
flapsFrictionCoef = 0.35;
angleOfIndicence = 0.0523599;
draconicForceXCoef = 9.5;
@ -16,7 +15,7 @@ draconicForceYCoef = 0.56;
draconicForceZCoef = 0.1;
draconicTorqueXCoef = 0.58;
draconicTorqueYCoef = 0.00013;
envelope[] = {0,0,0.75,2.4,3.6,3.8,3.7,3.2,2.2,1.7,0.9};
thrustCoef[] = {1,1.2,1.3,1.25,1.06,1.01,1,0.92,0.75,0.65,0.5,0.25,0};
envelope[] = {0, 0, 0.75, 2.4, 3.6, 3.8, 3.7, 3.2, 2.2, 1.7, 0.9};
thrustCoef[] = {1, 1.2, 1.3, 1.25, 1.06, 1.01, 1, 0.92, 0.75, 0.65, 0.5, 0.25, 0};
acceleration = 265;
landingSpeed = 220;

11
addons/aircraft/flightmodel_yak.hpp
View File

@ -1,4 +1,3 @@
maxSpeed = 1059;
acceleration = 300;
aileronSensitivity = 0.635;
@ -7,15 +6,15 @@ rudderInfluence = 0.001;
aileronControlsSensitivityCoef = 3;
elevatorControlsSensitivity = 2;
rudderControlsSensitivityoef = 4;
elevatorCoef[] = {0.6,0.76,0.7,0.65,0.58,0.47,0.43};
aileronCoef[] = {0.5,0.85,0.87,0.89,0.92,0.95,1};
rudderCoef[] = {0.8,0.7,0.6,0.5,0.4,0.32,0.27};
elevatorCoef[] = {0.6, 0.76, 0.7, 0.65, 0.58, 0.47, 0.43};
aileronCoef[] = {0.5, 0.85, 0.87, 0.89, 0.92, 0.95, 1};
rudderCoef[] = {0.8, 0.7, 0.6, 0.5, 0.4, 0.32, 0.27};
angleOfIndicence = 0.0523599;
draconicForceXCoef = 7.6;
draconicForceYCoef = 0.75;
draconicForceZCoef = 0.085;
draconicTorqueXCoef = 0.815;
draconicTorqueYCoef = 0.000152;
envelope[] = {0,0.446,1.5,3.9,5.2,4.8,4.2,3.5,2,1,0.5};
thrustCoef[] = {1,1.2,1.7,1.7,1.65,1.54,1.32,1.1,0.95,0.75,0.5,0.35,0};
envelope[] = {0, 0.446, 1.5, 3.9, 5.2, 4.8, 4.2, 3.5, 2, 1, 0.5};
thrustCoef[] = {1, 1.2, 1.7, 1.7, 1.65, 1.54, 1.32, 1.1, 0.95, 0.75, 0.5, 0.35, 0};
flapsFrictionCoef = 0.32;

8
addons/cookoff/ACE_Settings.hpp
View File

@ -12,10 +12,16 @@ class ACE_Settings {
value = 1;
typeName = "BOOL";
};
class GVAR(enableAmmoCookoff) {
class GVAR(enableAmmoCookoff) { // For CBA Setting Switch: we can eliminate and just use (ammoCookoffDuration == 0)
displayName = CSTRING(enableAmmoCookoff_name);
description = CSTRING(enableAmmoCookoff_tooltip);
value = 1;
typeName = "BOOL";
};
class GVAR(ammoCookoffDuration) {
displayName = CSTRING(ammoCookoffDuration_name);
description = CSTRING(ammoCookoffDuration_tooltip);
value = 1;
typeName = "SCALAR";
};
};

1
addons/cookoff/XEH_postInit.sqf
View File

@ -81,6 +81,7 @@ GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace;
["AllVehicles", "killed", {
params ["_vehicle"];
if (_vehicle getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then {
if (GVAR(ammoCookoffDuration) == 0) exitWith {};
([_vehicle] call FUNC(getVehicleAmmo)) params ["_mags", "_total"];
[_vehicle, _mags, _total] call FUNC(detonateAmmunition);
};

1
addons/cookoff/functions/fnc_cookOffBox.sqf
View File

@ -45,6 +45,7 @@ if (local _box) then {
// These functions are smart and do all the cooking off work
if (local _box) then {
if (_box getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then {
if (GVAR(ammoCookoffDuration) == 0) exitWith {};
([_box] call FUNC(getVehicleAmmo)) params ["_mags", "_total"];
[_box, _mags, _total] call FUNC(detonateAmmunition);
};

2
addons/cookoff/functions/fnc_detonateAmmunition.sqf
View File

@ -31,7 +31,7 @@ private _magazine = _magazines select _magazineIndex;
_magazine params ["_magazineClassname", "_amountOfMagazines"];
if (_amountOfMagazines > 0) exitWith {
private _removed = _amountOfMagazines min floor(1 + random(6));
private _removed = _amountOfMagazines min floor(1 + random(6 / GVAR(ammoCookoffDuration)));
_amountOfMagazines = _amountOfMagazines - _removed;
if (_amountOfMagazines <= 0) then {

8
addons/cookoff/stringtable.xml
View File

@ -60,5 +60,11 @@
<German>Ermöglicht Selbstzündung von Munition. Feuert Projektile der Munition ab, solange das Fahrzeug brennt und Munition besitzt.</German>
<Polish>Aktywuje samozapłon amunicji. Wystrzeliwuje pociski podczas gdy pojazd płonie i posiada amunicję.</Polish>
</Key>
<Key ID="STR_ACE_CookOff_ammoCookoffDuration_name">
<English>Ammunition cook off duration</English>
</Key>
<Key ID="STR_ACE_CookOff_ammoCookoffDuration_tooltip">
<English>Multiplier for how long cook off lasts [Setting to 0 will disable ammo cookoff]</English>
</Key>
</Package>
</Project>
</Project>

2
addons/interaction/functions/fnc_getDoorAnimations.sqf
View File

@ -36,7 +36,7 @@ _index = [
"door_11",
"door_12",
"door_13",
"Door_14",
"door_14",
"door_15",
"door_16",
"door_17",

18
addons/map/CfgLights.hpp
View File

@ -1,7 +1,7 @@
class CfgLights {
class Chemlight_Blue;
class ACE_FlashlightLight_White: Chemlight_Blue {
brightness = 100;
color[] = {1,1,1,1};
@ -16,20 +16,24 @@ class CfgLights {
start = 0.075;
};
};
class ACE_FlashlightLight_Red: ACE_FlashlightLight_White {
diffuse[] = {1,0,0};
};
class ACE_FlashlightLight_Blue: ACE_FlashlightLight_White {
diffuse[] = {0.25,0.25,1};
};
class ACE_FlashlightLight_Green: ACE_FlashlightLight_White {
diffuse[] = {0,1,0};
};
class ACE_FlashlightLight_Yellow: ACE_FlashlightLight_White {
diffuse[] = {1,1,0.4};
};
};
class ACE_FlashlightLight_Orange: ACE_FlashlightLight_White {
diffuse[] = {1,0.65,0};
};
};

2
addons/missileguidance/CfgAmmo.hpp
View File

@ -69,7 +69,7 @@ class CfgAmmo {
class M_Titan_AT: MissileBase {};
class ACE_Javelin_FGM148: M_Titan_AT {
irLock = 0;
irLock = 1;
laserLock = 0;
airLock = 0;

2
addons/modules/XEH_PREP.hpp
View File

@ -1 +1 @@
PREP(moduleInit);
PREP(moduleInit);

12
addons/realisticnames/CfgVehicles.hpp
View File

@ -251,6 +251,18 @@ class CfgVehicles {
class I_Truck_02_medical_F: Truck_02_medical_base_F {
displayName = CSTRING(Truck_02_medical_Name);
};
class C_Truck_02_transport_F: Truck_02_transport_base_F {
displayName = CSTRING(Truck_02_transport_Name);
};
class C_Truck_02_covered_F: Truck_02_base_F {
displayName = CSTRING(Truck_02_covered_Name);
};
class C_Truck_02_fuel_F: Truck_02_fuel_base_F {
displayName = CSTRING(Truck_02_fuel_Name);
};
class C_Truck_02_box_F: Truck_02_box_base_F {
displayName = CSTRING(Truck_02_box_Name);
};
class Truck_03_base_F;
class O_Truck_03_transport_F: Truck_03_base_F {

146
addons/realisticnames/stringtable.xml
View File

@ -2605,88 +2605,88 @@
<Korean>MP5K</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_01_blk">
<English>HK416A5 10" (Black)</English>
<Czech>HK416A5 10" (Černá)</Czech>
<French>HK416A5 10" (Noir)</French>
<Spanish>HK416A5 10" (Negro)</Spanish>
<Russian>HK416A5 10" (Чёрный)</Russian>
<Polish>HK416A5 10" (czarny)</Polish>
<German>HK416A5 10" (Schwarz)</German>
<Italian>HK416A5 10" (Nero)</Italian>
<Hungarian>HK416A5 10" (Fekete)</Hungarian>
<Portuguese>HK416A5 10" (Preto)</Portuguese>
<Japanese>HK416A5 10" (黒)</Japanese>
<Korean>HK416A5 10" (검정)</Korean>
<English>HK416A5 11" (Black)</English>
<Czech>HK416A5 11" (Černá)</Czech>
<French>HK416A5 11" (Noir)</French>
<Spanish>HK416A5 11" (Negro)</Spanish>
<Russian>HK416A5 11" (Чёрный)</Russian>
<Polish>HK416A5 11" (czarny)</Polish>
<German>HK416A5 11" (Schwarz)</German>
<Italian>HK416A5 11" (Nero)</Italian>
<Hungarian>HK416A5 11" (Fekete)</Hungarian>
<Portuguese>HK416A5 11" (Preto)</Portuguese>
<Japanese>HK416A5 11" (黒)</Japanese>
<Korean>HK416A5 11" (검정)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_01_khk">
<English>HK416A5 10" (Khaki)</English>
<Czech>HK416A5 10" (Khaki)</Czech>
<French>HK416A5 10" (Kaki)</French>
<Spanish>HK416A5 10" (Caqui)</Spanish>
<Russian>HK416A5 10" (Хаки)</Russian>
<Polish>HK416A5 10" (khaki)</Polish>
<German>HK416A5 10" (Khaki)</German>
<Italian>HK416A5 10" (Khaki)</Italian>
<Hungarian>HK416A5 10" (Khaki)</Hungarian>
<Portuguese>HK416A5 10" (Caqui)</Portuguese>
<Japanese>HK416A5 10" (土埃)</Japanese>
<Korean>HK416A5 10" (카키)</Korean>
<English>HK416A5 11" (Khaki)</English>
<Czech>HK416A5 11" (Khaki)</Czech>
<French>HK416A5 11" (Kaki)</French>
<Spanish>HK416A5 11" (Caqui)</Spanish>
<Russian>HK416A5 11" (Хаки)</Russian>
<Polish>HK416A5 11" (khaki)</Polish>
<German>HK416A5 11" (Khaki)</German>
<Italian>HK416A5 11" (Khaki)</Italian>
<Hungarian>HK416A5 11" (Khaki)</Hungarian>
<Portuguese>HK416A5 11" (Caqui)</Portuguese>
<Japanese>HK416A5 11" (土埃)</Japanese>
<Korean>HK416A5 11" (카키)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_01_snd">
<English>HK416A5 10" (Sand)</English>
<Czech>HK416A5 10" (Písková)</Czech>
<French>HK416A5 10" (Beige)</French>
<Spanish>HK416A5 10" (Arena)</Spanish>
<Russian>HK416A5 10" (Песочный)</Russian>
<German>HK416A5 10" (Sand)</German>
<Polish>HK416A5 10" (piaskowy)</Polish>
<Italian>HK416A5 10" (Sabbia)</Italian>
<Hungarian>HK416A5 10" (Homok)</Hungarian>
<Portuguese>HK416A5 10" (Deserto)</Portuguese>
<Japanese>HK416A5 10" (砂地)</Japanese>
<Korean>HK416A5 10" (모래)</Korean>
<English>HK416A5 11" (Sand)</English>
<Czech>HK416A5 11" (Písková)</Czech>
<French>HK416A5 11" (Beige)</French>
<Spanish>HK416A5 11" (Arena)</Spanish>
<Russian>HK416A5 11" (Песочный)</Russian>
<German>HK416A5 11" (Sand)</German>
<Polish>HK416A5 11" (piaskowy)</Polish>
<Italian>HK416A5 11" (Sabbia)</Italian>
<Hungarian>HK416A5 11" (Homok)</Hungarian>
<Portuguese>HK416A5 11" (Deserto)</Portuguese>
<Japanese>HK416A5 11" (砂地)</Japanese>
<Korean>HK416A5 11" (모래)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_01_GL_blk">
<English>HK416A5 10" GL (Black)</English>
<Czech>HK416A5 10" GL (Černá)</Czech>
<French>HK416A5 10" GL (Noir)</French>
<Spanish>HK416A5 10" GL (Negro)</Spanish>
<Russian>HK416A5 10" GL (Чёрный)</Russian>
<Polish>HK416A5 10" GL (czarny)</Polish>
<German>HK416A5 10" GL (Schwarz)</German>
<Italian>HK416A5 10" GL (Nero)</Italian>
<Hungarian>HK416A5 10" GL (Fekete)</Hungarian>
<Portuguese>HK416A5 10" GL (Preto)</Portuguese>
<Japanese>HK416A5 10" GL (黒)</Japanese>
<Korean>HK416A5 10" GL (검정)</Korean>
<English>HK416A5 11" GL (Black)</English>
<Czech>HK416A5 11" GL (Černá)</Czech>
<French>HK416A5 11" GL (Noir)</French>
<Spanish>HK416A5 11" GL (Negro)</Spanish>
<Russian>HK416A5 11" GL (Чёрный)</Russian>
<Polish>HK416A5 11" GL (czarny)</Polish>
<German>HK416A5 11" GL (Schwarz)</German>
<Italian>HK416A5 11" GL (Nero)</Italian>
<Hungarian>HK416A5 11" GL (Fekete)</Hungarian>
<Portuguese>HK416A5 11" GL (Preto)</Portuguese>
<Japanese>HK416A5 11" GL (黒)</Japanese>
<Korean>HK416A5 11" GL (검정)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_01_GL_khk">
<English>HK416A5 10" GL (Khaki)</English>
<Czech>HK416A5 10" GL (Khaki)</Czech>
<French>HK416A5 10" GL (Kaki)</French>
<Spanish>HK416A5 10" GL (Caqui)</Spanish>
<Russian>HK416A5 10" GL (Хаки)</Russian>
<Polish>HK416A5 10" GL (khaki)</Polish>
<German>HK416A5 10" GL (Khaki)</German>
<Italian>HK416A5 10" GL (Khaki)</Italian>
<Hungarian>HK416A5 10" GL (Khaki)</Hungarian>
<Portuguese>HK416A5 10" GL (Caqui)</Portuguese>
<Japanese>HK416A5 10" GL (土埃)</Japanese>
<Korean>HK416A5 10" GL (카키)</Korean>
<English>HK416A5 11" GL (Khaki)</English>
<Czech>HK416A5 11" GL (Khaki)</Czech>
<French>HK416A5 11" GL (Kaki)</French>
<Spanish>HK416A5 11" GL (Caqui)</Spanish>
<Russian>HK416A5 11" GL (Хаки)</Russian>
<Polish>HK416A5 11" GL (khaki)</Polish>
<German>HK416A5 11" GL (Khaki)</German>
<Italian>HK416A5 11" GL (Khaki)</Italian>
<Hungarian>HK416A5 11" GL (Khaki)</Hungarian>
<Portuguese>HK416A5 11" GL (Caqui)</Portuguese>
<Japanese>HK416A5 11" GL (土埃)</Japanese>
<Korean>HK416A5 11" GL (카키)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_01_GL_snd">
<English>HK416A5 10" GL (Sand)</English>
<Czech>HK416A5 10" GL (Písková)</Czech>
<French>HK416A5 10" GL (Beige)</French>
<Spanish>HK416A5 10" GL (Arena)</Spanish>
<Russian>HK416A5 10" GL (Песочный)</Russian>
<German>HK416A5 10" GL (Sand)</German>
<Polish>HK416A5 10" GL (piaskowy)</Polish>
<Italian>HK416A5 10" GL (Sabbia)</Italian>
<Hungarian>HK416A5 10" GL (Homok)</Hungarian>
<Portuguese>HK416A5 10" GL (Deserto)</Portuguese>
<Japanese>HK416A5 10" GL (砂地)</Japanese>
<Korean>HK416A5 10" GL (모래)</Korean>
<English>HK416A5 11" GL (Sand)</English>
<Czech>HK416A5 11" GL (Písková)</Czech>
<French>HK416A5 11" GL (Beige)</French>
<Spanish>HK416A5 11" GL (Arena)</Spanish>
<Russian>HK416A5 11" GL (Песочный)</Russian>
<German>HK416A5 11" GL (Sand)</German>
<Polish>HK416A5 11" GL (piaskowy)</Polish>
<Italian>HK416A5 11" GL (Sabbia)</Italian>
<Hungarian>HK416A5 11" GL (Homok)</Hungarian>
<Portuguese>HK416A5 11" GL (Deserto)</Portuguese>
<Japanese>HK416A5 11" GL (砂地)</Japanese>
<Korean>HK416A5 11" GL (모래)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_arifle_SPAR_02_blk">
<English>HK416A5 14.5" (Black)</English>
@ -2769,7 +2769,7 @@
<Italian>HK417A2 20" (Sabbia)</Italian>
<Hungarian>HK417A2 20" (Homok)</Hungarian>
<Portuguese>HK417A2 20" (Deserto)</Portuguese>
<Japanese>HK417A2 20'' (砂地)</Japanese>
<Japanese>HK417A2 20" (砂地)</Japanese>
<Korean>HK417A2 20" (모래)</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_launch_RPG32_ghex">

2
addons/repair/CfgVehicles.hpp
View File

@ -471,7 +471,7 @@ class CfgVehicles {
transportRepair = 0;
};
class Truck_02_engineeral_base_F: Truck_02_box_base_F {
class Truck_02_medical_base_F: Truck_02_box_base_F {
GVAR(canRepair) = 0;
};

26
optionals/compat_rh_acc/CfgWeapons.hpp
View File

@ -1,18 +1,18 @@
class CfgWeapons {
class ItemCore;
/* Scopes */
class InventoryOpticsItem_Base_F;
/*
// This would require MOA turrets
class RH_shortdot : ItemCore {
/*class RH_shortdot : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -1, 25 };
ACE_ScopeAdjust_Horizontal[] = { -13, 13 };
ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_Unit = "MOA";
};
*/
};*/
class RH_accupoint : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
@ -147,4 +147,18 @@ class CfgWeapons {
};
};
};
/* Flashlights */
class InventoryFlashLightItem_Base_F;
class RH_SFM952V: ItemCore {
class ItemInfo: InventoryFlashLightItem_Base_F {
class FlashLight {
ACE_Flashlight_Colour = "white";
ACE_Flashlight_Beam = QPATHTOEF(map,UI\Flashlight_beam_white_ca.paa);
ACE_Flashlight_Size = 2.75;
ACE_Flashlight_Sound = 1;
};
};
};
};