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 max-issues=0
# Label filters # Label filters
exclude-labels=by design,can't reproduce,duplicate,question,invalid,wontfix,translation,ignore changelog exclude-labels=by design,can't reproduce,duplicate,question,invalid,wontfix,ignore changelog
bug-labels=conflict,bug,critical bug
enhancement-labels=enhancement,feature request,Focus Feature
# Tag is created before generating changelog for release candidates # Tag is created before generating changelog for release candidates
unreleased=false unreleased=false

4
addons/aircraft/CfgAmmo.hpp
View File

@ -1,4 +1,3 @@
class CfgAmmo { class CfgAmmo {
class BulletBase; class BulletBase;
class B_20mm : BulletBase { class B_20mm : BulletBase {
@ -11,11 +10,11 @@ class CfgAmmo {
explosive = 1.8; explosive = 1.8;
tracersEvery = 3; tracersEvery = 3;
tracerEndTime = 3.5; tracerEndTime = 3.5;
CraterEffects = "ExploAmmoCrater"; CraterEffects = "ExploAmmoCrater";
explosionEffects = "ExploAmmoExplosion"; explosionEffects = "ExploAmmoExplosion";
model = "\A3\Weapons_f\Data\bullettracer\tracer_red"; model = "\A3\Weapons_f\Data\bullettracer\tracer_red";
}; };
class ACE_20mm_HE : B_20mm {}; class ACE_20mm_HE : B_20mm {};
class ACE_20mm_AP : B_20mm { class ACE_20mm_AP : B_20mm {
hit = 50; hit = 50;
@ -57,7 +56,6 @@ class CfgAmmo {
submunitionAmmo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Sub"; submunitionAmmo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Sub";
submunitionConeType[] = {"custom", {{0,0}, {0,0}, {0,0}} }; submunitionConeType[] = {"custom", {{0,0}, {0,0}, {0,0}} };
}; };
class ACE_Gatling_30mm_HE_Plane_CAS_01_Sub: Gatling_30mm_HE_Plane_CAS_01_F {}; 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 // 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 { class CfgMagazines {
// shoot helper object to tripple rof // shoot helper object to tripple rof
class VehicleMagazine; class VehicleMagazine;

59
addons/aircraft/CfgVehicles.hpp
View File

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

21
addons/aircraft/CfgWeapons.hpp
View File

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

476
addons/aircraft/Heli_Attack_01_base_F.hpp
View File

File diff suppressed because one or more lines are too long

238
addons/aircraft/RscInGameUI.hpp
View File

@ -10,35 +10,32 @@ class HScrollbar;
class RscLadderPicture; class RscLadderPicture;
class RscControlsGroupNoScrollbars; class RscControlsGroupNoScrollbars;
class RscInGameUI {
class RscInGameUI
{
class RscUnitInfo; class RscUnitInfo;
class Rsc_ACE_Helo_UI_Turret: RscUnitInfo class Rsc_ACE_Helo_UI_Turret: RscUnitInfo {
{
idd = 300; idd = 300;
controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"}; controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"};
class VScrollbar; class VScrollbar;
class HScrollbar; class HScrollbar;
class CA_IGUI_elements_group: RscControlsGroup class CA_IGUI_elements_group: RscControlsGroup {
{
idc = 170; idc = 170;
class VScrollbar: VScrollbar
{ class VScrollbar: VScrollbar {
width = 0; width = 0;
}; };
class HScrollbar: HScrollbar
{ class HScrollbar: HScrollbar {
height = 0; height = 0;
}; };
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))"; x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)"; y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)"; w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)"; h = "40 * (0.025 * SafezoneH)";
class controls
{ class controls {
class CA_Distance: RscText class CA_Distance: RscText {
{
idc = 151; idc = 151;
style = 2; style = 2;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -49,8 +46,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class CA_Speed: RangeText
{ class CA_Speed: RangeText {
idc = 188; idc = 188;
style = 2; style = 2;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -62,8 +59,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class CA_Alt: RangeText
{ class CA_Alt: RangeText {
idc = 189; idc = 189;
style = 2; style = 2;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -75,8 +72,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class CA_VisionMode: RscText
{ class CA_VisionMode: RscText {
idc = 152; idc = 152;
style = 0; style = 0;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -88,8 +85,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class CA_FlirMode: RscText
{ class CA_FlirMode: RscText {
idc = 153; idc = 153;
style = 0; style = 0;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -101,8 +98,8 @@ class RscInGameUI
w = "4.5 * (0.01875 * SafezoneH)"; w = "4.5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class ValueGrid: RangeText
{ class ValueGrid: RangeText {
idc = 172; idc = 172;
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
style = 2; style = 2;
@ -113,8 +110,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class TextTADS: RangeText
{ class TextTADS: RangeText {
idc = 1010; idc = 1010;
text = "TADS"; text = "TADS";
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
@ -125,8 +122,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class ValueTime: RangeText
{ class ValueTime: RangeText {
idc = 190; idc = 190;
text = "20:28:35"; text = "20:28:35";
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
@ -138,8 +135,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class CA_Laser: RscText
{ class CA_Laser: RscText {
idc = 158; idc = 158;
style = "0x30 + 0x800"; style = "0x30 + 0x800";
sizeEx = "0.038 * SafezoneH"; sizeEx = "0.038 * SafezoneH";
@ -151,8 +148,8 @@ class RscInGameUI
w = "12.5 * (0.01875 * SafezoneH)"; w = "12.5 * (0.01875 * SafezoneH)";
h = "12 * (0.025 * SafezoneH)"; h = "12 * (0.025 * SafezoneH)";
}; };
class CA_Heading: RscText
{ class CA_Heading: RscText {
idc = 156; idc = 156;
style = 0; style = 0;
sizeEx = "0.038 * SafezoneH"; sizeEx = "0.038 * SafezoneH";
@ -167,37 +164,37 @@ class RscInGameUI
}; };
}; };
}; };
class Rsc_ACE_Helo_UI_01: RscUnitInfo
{ class Rsc_ACE_Helo_UI_01: RscUnitInfo {
controls[] = {"WeaponInfoControlsGroupRight", "CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"}; controls[] = {"WeaponInfoControlsGroupRight", "CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"};
}; };
class Rsc_ACE_Helo_UI_02: RscUnitInfo
{ class Rsc_ACE_Helo_UI_02: RscUnitInfo {
controls[] = {"CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"}; 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; idd = 300;
controls[] = {"CA_Zeroing", "CA_IGUI_elements_group", "CA_VehicleToggles"}; controls[] = {"CA_Zeroing", "CA_IGUI_elements_group", "CA_VehicleToggles"};
class CA_IGUI_elements_group: RscControlsGroup
{ class CA_IGUI_elements_group: RscControlsGroup {
idc = 170; idc = 170;
class VScrollbar: VScrollbar
{ class VScrollbar: VScrollbar {
width = 0; width = 0;
}; };
class HScrollbar: HScrollbar
{ class HScrollbar: HScrollbar {
height = 0; height = 0;
}; };
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))"; x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)"; y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)"; w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)"; h = "40 * (0.025 * SafezoneH)";
class controls
{ class controls {
class CA_Distance: RscText class CA_Distance: RscText {
{
idc = 151; idc = 151;
style = 2; style = 2;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -208,8 +205,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class CA_Speed: RangeText
{ class CA_Speed: RangeText {
idc = 188; idc = 188;
style = 2; style = 2;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -221,8 +218,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class CA_Alt: RangeText
{ class CA_Alt: RangeText {
idc = 189; idc = 189;
style = 2; style = 2;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -234,8 +231,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class ValueTime: RangeText
{ class ValueTime: RangeText {
idc = 190; idc = 190;
text = "20:28:35"; text = "20:28:35";
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
@ -247,8 +244,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class CA_VisionMode: RscText
{ class CA_VisionMode: RscText {
idc = 152; idc = 152;
style = 0; style = 0;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -261,8 +258,8 @@ class RscInGameUI
w = "4 * (0.01875 * SafezoneH)"; w = "4 * (0.01875 * SafezoneH)";
h = "1.0 * (0.025 * SafezoneH)"; h = "1.0 * (0.025 * SafezoneH)";
}; };
class CA_FlirMode: RscText
{ class CA_FlirMode: RscText {
idc = 153; idc = 153;
style = 0; style = 0;
sizeEx = "0.0295 * SafezoneH"; sizeEx = "0.0295 * SafezoneH";
@ -275,8 +272,8 @@ class RscInGameUI
w = "4.5 * (0.01875 * SafezoneH)"; w = "4.5 * (0.01875 * SafezoneH)";
h = "1.0 * (0.025 * SafezoneH)"; h = "1.0 * (0.025 * SafezoneH)";
}; };
class TgT_Grid_text: RangeText
{ class TgT_Grid_text: RangeText {
idc = 1005; idc = 1005;
text = "TGT:"; text = "TGT:";
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
@ -288,8 +285,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class TGT_ValueGrid: RangeText
{ class TGT_ValueGrid: RangeText {
idc = 172; idc = 172;
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
colorText[] = {0.706, 0.0745, 0.0196, 0.8}; colorText[] = {0.706, 0.0745, 0.0196, 0.8};
@ -301,8 +298,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class OWN_Grid_text: RangeText
{ class OWN_Grid_text: RangeText {
idc = 1005; idc = 1005;
text = "OWN:"; text = "OWN:";
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
@ -314,8 +311,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class OWN_ValueGrid: RangeText
{ class OWN_ValueGrid: RangeText {
idc = 171; idc = 171;
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
colorText[] = {0.15, 1, 0.15, 0.8}; colorText[] = {0.15, 1, 0.15, 0.8};
@ -327,8 +324,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class CA_Laser: RscText
{ class CA_Laser: RscText {
idc = 158; idc = 158;
style = "0x30 + 0x800"; style = "0x30 + 0x800";
sizeEx = "0.038 * SafezoneH"; sizeEx = "0.038 * SafezoneH";
@ -341,8 +338,8 @@ class RscInGameUI
w = "12.5 * (0.01875 * SafezoneH)"; w = "12.5 * (0.01875 * SafezoneH)";
h = "12 * (0.025 * SafezoneH)"; h = "12 * (0.025 * SafezoneH)";
}; };
class CA_Heading: RscText
{ class CA_Heading: RscText {
idc = 156; idc = 156;
style = 0; style = 0;
sizeEx = "0.038 * SafezoneH"; sizeEx = "0.038 * SafezoneH";
@ -358,29 +355,28 @@ class RscInGameUI
}; };
}; };
}; };
class Rsc_ACE_Drones_UI_Pilots: RscUnitInfo
{ class Rsc_ACE_Drones_UI_Pilots: RscUnitInfo {
idd = 300; 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"}; 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
{ class DriverOpticsGroup: RscControlsGroup {
idc = 392; idc = 392;
class VScrollbar: VScrollbar
{ class VScrollbar: VScrollbar {
width = 0; width = 0;
}; };
class HScrollbar: HScrollbar
{ class HScrollbar: HScrollbar {
height = 0; height = 0;
}; };
x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))"; x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
y = "0 * (0.025 * SafezoneH) + (SafezoneY)"; y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
w = "53.5 * (0.01875 * SafezoneH)"; w = "53.5 * (0.01875 * SafezoneH)";
h = "40 * (0.025 * SafezoneH)"; h = "40 * (0.025 * SafezoneH)";
class controls
{ class controls {
class TextGrid: RscText class TextGrid: RscText {
{
style = 0; style = 0;
sizeEx = "0.02 * SafezoneH"; sizeEx = "0.02 * SafezoneH";
shadow = 0; shadow = 0;
@ -392,8 +388,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class ValueGrid: TextGrid
{ class ValueGrid: TextGrid {
idc = 189; idc = 189;
text = "382546"; text = "382546";
x = "10.3 * (0.01875 * SafezoneH)"; x = "10.3 * (0.01875 * SafezoneH)";
@ -401,8 +397,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class TextTime: TextGrid
{ class TextTime: TextGrid {
idc = 1010; idc = 1010;
text = "TIME [UTC]:"; text = "TIME [UTC]:";
x = "5.8 * (0.01875 * SafezoneH)"; x = "5.8 * (0.01875 * SafezoneH)";
@ -410,8 +406,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class ValueTime: TextGrid
{ class ValueTime: TextGrid {
idc = 101; idc = 101;
text = "20:28:35"; text = "20:28:35";
x = "10 * (0.01875 * SafezoneH)"; x = "10 * (0.01875 * SafezoneH)";
@ -419,8 +415,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class TextMag: TextGrid
{ class TextMag: TextGrid {
idc = 1011; idc = 1011;
text = "CAM MAG:"; text = "CAM MAG:";
x = "5.8 * (0.01875 * SafezoneH)"; x = "5.8 * (0.01875 * SafezoneH)";
@ -428,8 +424,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class OpticsZoom: TextGrid
{ class OpticsZoom: TextGrid {
idc = 192; idc = 192;
text = "28x"; text = "28x";
x = "10.3 * (0.01875 * SafezoneH)"; x = "10.3 * (0.01875 * SafezoneH)";
@ -437,8 +433,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class BorderLineSpdTop: RscPicture
{ class BorderLineSpdTop: RscPicture {
idc = 1203; idc = 1203;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "3.343 * (0.01875 * SafezoneH)"; x = "3.343 * (0.01875 * SafezoneH)";
@ -446,8 +442,8 @@ class RscInGameUI
w = "3 * (0.01875 * SafezoneH)"; w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class BorderLineSpdBottom: RscPicture
{ class BorderLineSpdBottom: RscPicture {
idc = 1207; idc = 1207;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "3.343 * (0.01875 * SafezoneH)"; x = "3.343 * (0.01875 * SafezoneH)";
@ -455,8 +451,8 @@ class RscInGameUI
w = "3 * (0.01875 * SafezoneH)"; w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class BorderLineAltTop: RscPicture
{ class BorderLineAltTop: RscPicture {
idc = 1205; idc = 1205;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "47.16 * (0.01875 * SafezoneH)"; x = "47.16 * (0.01875 * SafezoneH)";
@ -464,8 +460,8 @@ class RscInGameUI
w = "3 * (0.01875 * SafezoneH)"; w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class BorderLineAltBottom: RscPicture
{ class BorderLineAltBottom: RscPicture {
idc = 1206; idc = 1206;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
x = "47.16 * (0.01875 * SafezoneH)"; x = "47.16 * (0.01875 * SafezoneH)";
@ -473,8 +469,8 @@ class RscInGameUI
w = "3 * (0.01875 * SafezoneH)"; w = "3 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class TextSpd: TextGrid
{ class TextSpd: TextGrid {
idc = 1004; idc = 1004;
text = "SPD"; text = "SPD";
x = "4.8 * (0.01875 * SafezoneH)"; x = "4.8 * (0.01875 * SafezoneH)";
@ -482,8 +478,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class SpeedValueBorder: RscPicture
{ class SpeedValueBorder: RscPicture {
idc = 1200; idc = 1200;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\altimeter_value_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\altimeter_value_ca.paa";
x = "6.3 * (0.01875 * SafezoneH)"; x = "6.3 * (0.01875 * SafezoneH)";
@ -491,8 +487,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)"; h = "2 * (0.025 * SafezoneH)";
}; };
class CA_Speed: TextGrid
{ class CA_Speed: TextGrid {
idc = 190; idc = 190;
sizeEx = "0.03*SafezoneH"; sizeEx = "0.03*SafezoneH";
text = "120"; text = "120";
@ -501,8 +497,8 @@ class RscInGameUI
w = "6 * (0.01875 * SafezoneH)"; w = "6 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class AnalogueSpeed: RscLadderPicture
{ class AnalogueSpeed: RscLadderPicture {
idc = 384; idc = 384;
topValue = 1312; topValue = 1312;
bottomValue = -345; bottomValue = -345;
@ -513,8 +509,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "14 * (0.025 * SafezoneH)"; h = "14 * (0.025 * SafezoneH)";
}; };
class TextAlt: TextGrid
{ class TextAlt: TextGrid {
idc = 1006; idc = 1006;
text = "ALT"; text = "ALT";
x = "46.9 * (0.01875 * SafezoneH)"; x = "46.9 * (0.01875 * SafezoneH)";
@ -522,8 +518,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class AltValueBorder: RscPicture
{ class AltValueBorder: RscPicture {
idc = 1201; idc = 1201;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\airspeed_value_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\airspeed_value_ca.paa";
x = "42.25 * (0.01875 * SafezoneH)"; x = "42.25 * (0.01875 * SafezoneH)";
@ -531,8 +527,8 @@ class RscInGameUI
w = "5 * (0.01875 * SafezoneH)"; w = "5 * (0.01875 * SafezoneH)";
h = "2 * (0.025 * SafezoneH)"; h = "2 * (0.025 * SafezoneH)";
}; };
class CA_Alt: TextGrid
{ class CA_Alt: TextGrid {
idc = 191; idc = 191;
sizeEx = "0.03 * SafezoneH"; sizeEx = "0.03 * SafezoneH";
style = 1; style = 1;
@ -542,8 +538,8 @@ class RscInGameUI
w = "3.2 * (0.01875 * SafezoneH)"; w = "3.2 * (0.01875 * SafezoneH)";
h = "1.2 * (0.025 * SafezoneH)"; h = "1.2 * (0.025 * SafezoneH)";
}; };
class AnalogueAlt: RscLadderPicture
{ class AnalogueAlt: RscLadderPicture {
idc = 385; idc = 385;
topValue = 14430; topValue = 14430;
bottomValue = -2110; bottomValue = -2110;
@ -554,8 +550,8 @@ class RscInGameUI
w = "2.5 * (0.01875 * SafezoneH)"; w = "2.5 * (0.01875 * SafezoneH)";
h = "14 * (0.025 * SafezoneH)"; h = "14 * (0.025 * SafezoneH)";
}; };
class AnalogueHorizon: RscLadderPicture
{ class AnalogueHorizon: RscLadderPicture {
idc = 383; idc = 383;
topValue = 90; topValue = 90;
bottomValue = -90; bottomValue = -90;
@ -566,8 +562,8 @@ class RscInGameUI
w = "20 * (0.01875 * SafezoneH)"; w = "20 * (0.01875 * SafezoneH)";
h = "30 * (0.025 * SafezoneH)"; h = "30 * (0.025 * SafezoneH)";
}; };
class HorizonCenter: RscPicture
{ class HorizonCenter: RscPicture {
idc = 1202; idc = 1202;
text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\horizon_aircraft_ca.paa"; text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\horizon_aircraft_ca.paa";
x = "24.75 * (0.01875 * SafezoneH)"; x = "24.75 * (0.01875 * SafezoneH)";

1
addons/aircraft/flightmodel_alca.hpp
View File

@ -1,4 +1,3 @@
acceleration = 300; acceleration = 300;
maxSpeed = 936; maxSpeed = 936;
irScanRangeMin = 500; irScanRangeMin = 500;

1
addons/aircraft/flightmodel_thunderbolt.hpp
View File

@ -1,4 +1,3 @@
maxSpeed = 736; maxSpeed = 736;
aileronSensitivity = 0.85; aileronSensitivity = 0.85;
elevatorSensitivity = 0.75; elevatorSensitivity = 0.75;

1
addons/aircraft/flightmodel_yak.hpp
View File

@ -1,4 +1,3 @@
maxSpeed = 1059; maxSpeed = 1059;
acceleration = 300; acceleration = 300;
aileronSensitivity = 0.635; aileronSensitivity = 0.635;

8
addons/cookoff/ACE_Settings.hpp
View File

@ -12,10 +12,16 @@ class ACE_Settings {
value = 1; value = 1;
typeName = "BOOL"; typeName = "BOOL";
}; };
class GVAR(enableAmmoCookoff) { class GVAR(enableAmmoCookoff) { // For CBA Setting Switch: we can eliminate and just use (ammoCookoffDuration == 0)
displayName = CSTRING(enableAmmoCookoff_name); displayName = CSTRING(enableAmmoCookoff_name);
description = CSTRING(enableAmmoCookoff_tooltip); description = CSTRING(enableAmmoCookoff_tooltip);
value = 1; value = 1;
typeName = "BOOL"; 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", { ["AllVehicles", "killed", {
params ["_vehicle"]; params ["_vehicle"];
if (_vehicle getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then { if (_vehicle getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then {
if (GVAR(ammoCookoffDuration) == 0) exitWith {};
([_vehicle] call FUNC(getVehicleAmmo)) params ["_mags", "_total"]; ([_vehicle] call FUNC(getVehicleAmmo)) params ["_mags", "_total"];
[_vehicle, _mags, _total] call FUNC(detonateAmmunition); [_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 // These functions are smart and do all the cooking off work
if (local _box) then { if (local _box) then {
if (_box getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then { if (_box getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmoCookoff)]) then {
if (GVAR(ammoCookoffDuration) == 0) exitWith {};
([_box] call FUNC(getVehicleAmmo)) params ["_mags", "_total"]; ([_box] call FUNC(getVehicleAmmo)) params ["_mags", "_total"];
[_box, _mags, _total] call FUNC(detonateAmmunition); [_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"]; _magazine params ["_magazineClassname", "_amountOfMagazines"];
if (_amountOfMagazines > 0) exitWith { 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; _amountOfMagazines = _amountOfMagazines - _removed;
if (_amountOfMagazines <= 0) then { if (_amountOfMagazines <= 0) then {

6
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> <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> <Polish>Aktywuje samozapłon amunicji. Wystrzeliwuje pociski podczas gdy pojazd płonie i posiada amunicję.</Polish>
</Key> </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> </Package>
</Project> </Project>

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

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

4
addons/map/CfgLights.hpp
View File

@ -32,4 +32,8 @@ class CfgLights {
class ACE_FlashlightLight_Yellow: ACE_FlashlightLight_White { class ACE_FlashlightLight_Yellow: ACE_FlashlightLight_White {
diffuse[] = {1,1,0.4}; 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 M_Titan_AT: MissileBase {};
class ACE_Javelin_FGM148: M_Titan_AT { class ACE_Javelin_FGM148: M_Titan_AT {
irLock = 0; irLock = 1;
laserLock = 0; laserLock = 0;
airLock = 0; airLock = 0;

12
addons/realisticnames/CfgVehicles.hpp
View File

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

2
addons/repair/CfgVehicles.hpp
View File

@ -471,7 +471,7 @@ class CfgVehicles {
transportRepair = 0; 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; GVAR(canRepair) = 0;
}; };

22
optionals/compat_rh_acc/CfgWeapons.hpp
View File

@ -1,17 +1,17 @@
class CfgWeapons { class CfgWeapons {
class ItemCore; class ItemCore;
/* Scopes */
class InventoryOpticsItem_Base_F; class InventoryOpticsItem_Base_F;
/*
// This would require MOA turrets // This would require MOA turrets
class RH_shortdot : ItemCore { /*class RH_shortdot : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -1, 25 }; ACE_ScopeAdjust_Vertical[] = { -1, 25 };
ACE_ScopeAdjust_Horizontal[] = { -13, 13 }; ACE_ScopeAdjust_Horizontal[] = { -13, 13 };
ACE_ScopeAdjust_VerticalIncrement = 0.5; ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_Unit = "MOA"; ACE_ScopeAdjust_Unit = "MOA";
}; };*/
*/
class RH_accupoint : ItemCore { class RH_accupoint : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Vertical[] = { -4, 30 };
@ -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;
};
};
};
}; };