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

Use GVAR where applicable

Browse Source
This commit is contained in:
Ozan Eğitmen 2016-07-20 07:15:18 +03:00
parent fed71b00e8
commit 8f80cd59c8
52 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/atragmx/functions/fnc_add_new_gun.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_add_new_gun * call ace_atragmx_fnc_add_new_gun
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_calculate_range_card.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_calculate_range_card * call ace_atragmx_fnc_calculate_range_card
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_calculate_solution.sqf
View File

@ -37,7 +37,7 @@
* 8: Spin drift (MOA) <NUMBER> * 8: Spin drift (MOA) <NUMBER>
* *
* Example: * Example:
* call ace_atragmx_calculate_solution * call ace_atragmx_fnc_calculate_solution
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_calculate_target_range_assist * call ace_atragmx_fnc_calculate_target_range_assist
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_calculate_target_solution.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_calculate_target_solution * call ace_atragmx_fnc_calculate_target_solution
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_calculate_target_speed_assist.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_calculate_target_speed_assist * call ace_atragmx_fnc_calculate_target_speed_assist
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_change_gun.sqf
View File

@ -11,7 +11,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_change_gun * call ace_atragmx_fnc_change_gun
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_create_dialog.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_create_dialog * call ace_atragmx_fnc_create_dialog
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_gun_list.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_scope_unit * call ace_atragmx_fnc_cycle_scope_unit
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_image_size_units.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_image_size_units * call ace_atragmx_fnc_cycle_image_size_units
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_num_ticks_units.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_num_ticks_units * call ace_atragmx_fnc_cycle_num_ticks_units
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_range_card_columns.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_range_card_columns * call ace_atragmx_fnc_cycle_range_card_columns
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_scope_unit.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_scope_unit * call ace_atragmx_fnc_cycle_scope_unit
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_target_size_units.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_target_size_units * call ace_atragmx_fnc_cycle_target_size_units
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_cycle_target_speed_direction.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_cycle_target_direction * call ace_atragmx_fnc_cycle_target_direction
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_delete_gun.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_delete_gun * call ace_atragmx_fnc_delete_gun
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_parse_input.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_parse_input * call ace_atragmx_fnc_parse_input
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_reset_relative_click_memory.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_reset_relative_click_memory * call ace_atragmx_fnc_reset_relative_click_memory
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_save_gun.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_save_gun * call ace_atragmx_fnc_save_gun
* *
* Public: No * Public: No
*/ */

4
addons/atragmx/functions/fnc_show_add_new_gun.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_add_new_gun * call ace_atragmx_fnc_show_add_new_gun
* *
* Public: No * Public: No
*/ */
@ -17,4 +17,4 @@
GVAR(showAddNewGun) = _this; GVAR(showAddNewGun) = _this;
{ctrlShow [_x, _this]} forEach [11000, 11001, 11002, 11003]; {ctrlShow [_x, _this]} forEach [11000, 11001, 11002, 11003];

2
addons/atragmx/functions/fnc_show_gun_list.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_gun_list * call ace_atragmx_fnc_show_gun_list
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_show_main_page.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_main_page * call ace_atragmx_fnc_show_main_page
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_show_range_card.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_range_card * call ace_atragmx_fnc_show_range_card
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_show_range_card_setup.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_range_card_setup * call ace_atragmx_fnc_show_range_card_setup
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_show_target_range_assist.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_target_range_assist * call ace_atragmx_fnc_show_target_range_assist
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_show_target_speed_assist.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_target_speed_assist * call ace_atragmx_fnc_show_target_speed_assist
* *
* Public: No * Public: No
*/ */

2
addons/atragmx/functions/fnc_show_target_speed_assist_timer.sqf
View File

@ -9,7 +9,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* call ace_atragmx_show_target_speed_assist_timer * call ace_atragmx_fnc_show_target_speed_assist_timer
* *
* Public: No * Public: No
*/ */

2
addons/attach/GUI_VirtualAmmo.hpp
View File

@ -5,7 +5,7 @@ class RscTitles {
duration = 9999999; duration = 9999999;
fadein = 0; fadein = 0;
fadeout = 0; fadeout = 0;
onLoad = "uiNamespace setVariable ['ACE_attach_virtualAmmoDisplay', (_this select 0)];"; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(virtualAmmoDisplay), _this select 0)]);
class controls {}; class controls {};
class objects { class objects {
class TheObject { class TheObject {

2
addons/concertina_wire/functions/fnc_handleKilled.sqf
View File

@ -19,7 +19,7 @@ TRACE_2("params",_wire,_killer);
private ["_distance", "_vehicle"]; private ["_distance", "_vehicle"];
if (isNull _killer) then { if (isNull _killer) then {
_killer = _wire getVariable ["ace_concertina_wire_lastDamager", objNull]; _killer = _wire getVariable [QGVAR(lastDamager), objNull];
if (isNull _killer) then { if (isNull _killer) then {
private _midPoint = ((_wire selectionPosition "start") vectorAdd (_wire selectionPosition "deploy")) vectorMultiply 0.5; private _midPoint = ((_wire selectionPosition "start") vectorAdd (_wire selectionPosition "deploy")) vectorMultiply 0.5;
{ {

2
addons/explosives/CfgVehicles.hpp
View File

@ -7,7 +7,7 @@ class CfgVehicles {
class ACE_SelfActions { class ACE_SelfActions {
class ACE_Explosives { class ACE_Explosives {
displayName = CSTRING(Menu); displayName = CSTRING(Menu);
condition = QUOTE(!(_player getVariable [ARR_2('ace_explosives_PlantingExplosive',false)])); condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(PlantingExplosive),false)]));
statement = ""; statement = "";
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"}; exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 1; showDisabled = 1;

2
addons/explosives/GUI_VirtualAmmo.hpp
View File

@ -5,7 +5,7 @@ class RscTitles {
duration = 9999999; duration = 9999999;
fadein = 0; fadein = 0;
fadeout = 0; fadeout = 0;
onLoad = "uiNamespace setVariable ['ACE_explosives_virtualAmmoDisplay', (_this select 0)];"; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(virtualAmmoDisplay), _this select 0)]);
class controls {}; class controls {};
class objects { class objects {
class TheObject { class TheObject {

6
addons/flashlights/CfgSounds.hpp
View File

@ -1,7 +1,7 @@
class CfgSounds { class CfgSounds {
class ACE_flashlights_flashlightClick { class GVAR(flashlightClick) {
name = "ACE_flashlights_flashlightClick"; name = QGVAR(flashlightClick);
sound[] = {"\a3\sounds_f\weapons\Other\dry4.wss", 0.2, 2}; sound[] = {"\a3\sounds_f\weapons\Other\dry4.wss", 0.2, 2};
titles[] = {}; titles[] = {};
}; };
}; };

62
addons/frag/CfgAmmo.hpp
View File

@ -13,7 +13,7 @@ class CfgAmmo {
class ACE_GBU12 : Bo_GBU12_LGB { class ACE_GBU12 : Bo_GBU12_LGB {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};
GVAR(metal) = 140000; GVAR(metal) = 140000;
GVAR(charge) = 87000; GVAR(charge) = 87000;
GVAR(gurney_c) = 2320; GVAR(gurney_c) = 2320;
@ -31,7 +31,7 @@ class CfgAmmo {
GVAR(skip) = 0; GVAR(skip) = 0;
GVAR(force) = 1; GVAR(force) = 1;
// This is a good high-drag frag type for grenades. // This is a good high-drag frag type for grenades.
GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(classes)[] = {QGVAR(tiny_HD)};
/* /*
These values are based on the M67 Grenade, should be tweaked for These values are based on the M67 Grenade, should be tweaked for
individual grenades. individual grenades.
@ -53,7 +53,7 @@ class CfgAmmo {
// Source: http://fas.org/man/dod-101/sys/missile/hydra-70.htm // Source: http://fas.org/man/dod-101/sys/missile/hydra-70.htm
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 3850; GVAR(metal) = 3850;
GVAR(charge) = 1040; GVAR(charge) = 1040;
GVAR(gurney_c) = 2700; GVAR(gurney_c) = 2700;
@ -75,7 +75,7 @@ class CfgAmmo {
class Bo_Mk82: BombCore { class Bo_Mk82: BombCore {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};
GVAR(metal) = 140000; GVAR(metal) = 140000;
GVAR(charge) = 87000; GVAR(charge) = 87000;
GVAR(gurney_c) = 2320; GVAR(gurney_c) = 2320;
@ -87,7 +87,7 @@ class CfgAmmo {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(force) = 1; GVAR(force) = 1;
GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(classes)[] = {QGVAR(tiny_HD)};
GVAR(metal) = 200; GVAR(metal) = 200;
GVAR(charge) = 32; GVAR(charge) = 32;
GVAR(gurney_c) = 2700; GVAR(gurney_c) = 2700;
@ -97,7 +97,7 @@ class CfgAmmo {
// Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(classes)[] = {QGVAR(tiny_HD)};
GVAR(metal) = 200; GVAR(metal) = 200;
GVAR(charge) = 45; GVAR(charge) = 45;
GVAR(gurney_c) = 2830; GVAR(gurney_c) = 2830;
@ -124,7 +124,7 @@ class CfgAmmo {
// Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};
GVAR(metal) = 36000; GVAR(metal) = 36000;
GVAR(charge) = 9979; GVAR(charge) = 9979;
GVAR(gurney_c) = 2440; GVAR(gurney_c) = 2440;
@ -134,7 +134,7 @@ class CfgAmmo {
// Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 3200; GVAR(metal) = 3200;
GVAR(charge) = 420; GVAR(charge) = 420;
GVAR(gurney_c) = 2440; GVAR(gurney_c) = 2440;
@ -143,7 +143,7 @@ class CfgAmmo {
class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS { class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 800; GVAR(metal) = 800;
GVAR(charge) = 4200; GVAR(charge) = 4200;
GVAR(gurney_c) = 2320; GVAR(gurney_c) = 2320;
@ -152,7 +152,7 @@ class CfgAmmo {
class Sh_105mm_HEAT_MP : Sh_125mm_HEAT { class Sh_105mm_HEAT_MP : Sh_125mm_HEAT {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 11400; GVAR(metal) = 11400;
GVAR(charge) = 7100; GVAR(charge) = 7100;
GVAR(gurney_c) = 2800; GVAR(gurney_c) = 2800;
@ -161,7 +161,7 @@ class CfgAmmo {
class Sh_120mm_HE : ShellBase { class Sh_120mm_HE : ShellBase {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 23000; GVAR(metal) = 23000;
GVAR(charge) = 3148; GVAR(charge) = 3148;
GVAR(gurney_c) = 2830; GVAR(gurney_c) = 2830;
@ -170,7 +170,7 @@ class CfgAmmo {
class Sh_125mm_HE: Sh_120mm_HE { class Sh_125mm_HE: Sh_120mm_HE {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 16000; GVAR(metal) = 16000;
GVAR(charge) = 3200; GVAR(charge) = 3200;
GVAR(gurney_c) = 2440; GVAR(gurney_c) = 2440;
@ -179,7 +179,7 @@ class CfgAmmo {
class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS {
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};
GVAR(metal) = 1950; GVAR(metal) = 1950;
GVAR(charge) = 15800; GVAR(charge) = 15800;
GVAR(gurney_c) = 2320; GVAR(gurney_c) = 2320;
@ -206,7 +206,7 @@ class CfgAmmo {
// Source: http://fas.org/man/dod-101/sys/smart/agm-65.htm // Source: http://fas.org/man/dod-101/sys/smart/agm-65.htm
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 56250; GVAR(metal) = 56250;
GVAR(charge) = 39000; GVAR(charge) = 39000;
GVAR(gurney_c) = 2700; GVAR(gurney_c) = 2700;
@ -216,7 +216,7 @@ class CfgAmmo {
// Source: http://www.designation-systems.net/dusrm/m-114.html // Source: http://www.designation-systems.net/dusrm/m-114.html
GVAR(enabled) = 1; GVAR(enabled) = 1;
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 8000; GVAR(metal) = 8000;
GVAR(charge) = 2400; GVAR(charge) = 2400;
GVAR(gurney_c) = 2700; GVAR(gurney_c) = 2700;
@ -225,7 +225,7 @@ class CfgAmmo {
/* /*
class B_762x51_Ball; class B_762x51_Ball;
class ACE_frag_base: B_762x51_Ball { ////TODO: B_762x45_Ball no longer exists, is this a valid replacement? class GVAR(base): B_762x51_Ball { ////TODO: B_762x45_Ball no longer exists, is this a valid replacement?
model = "\A3\Weapons_f\ammo\shell"; model = "\A3\Weapons_f\ammo\shell";
timeToLive = 12; timeToLive = 12;
typicalSpeed = 800; typicalSpeed = 800;
@ -382,47 +382,47 @@ class CfgAmmo {
*/ */
class B_65x39_Caseless; class B_65x39_Caseless;
class ACE_frag_base: B_65x39_Caseless { class GVAR(base): B_65x39_Caseless {
timeToLive = 12; timeToLive = 12;
typicalSpeed = 1500; typicalSpeed = 1500;
deflecting = 65; deflecting = 65;
}; };
class ACE_frag_tiny: ACE_frag_base { class GVAR(tiny): GVAR(base) {
hit = 6; hit = 6;
airFriction = BASE_DRAG; airFriction = BASE_DRAG;
caliber = 0.75; caliber = 0.75;
}; };
class ACE_frag_tiny_HD: ACE_frag_base { class GVAR(tiny_HD): GVAR(base) {
hit = 6; hit = 6;
airFriction = BASE_DRAG_HD; airFriction = BASE_DRAG_HD;
caliber = 0.75; caliber = 0.75;
}; };
class ACE_frag_small: ACE_frag_base { class GVAR(small): GVAR(base) {
hit = 12; hit = 12;
airFriction = BASE_DRAG*0.9; airFriction = BASE_DRAG*0.9;
}; };
class ACE_frag_small_HD: ACE_frag_base { class GVAR(small_HD): GVAR(base) {
hit = 12; hit = 12;
airFriction = BASE_DRAG_HD*0.9; airFriction = BASE_DRAG_HD*0.9;
}; };
class ACE_frag_medium: ACE_frag_base { class GVAR(medium): GVAR(base) {
hit = 14; hit = 14;
airFriction = BASE_DRAG*0.75; airFriction = BASE_DRAG*0.75;
caliber = 1.2; caliber = 1.2;
}; };
class ACE_frag_medium_HD: ACE_frag_base { class GVAR(medium_HD): GVAR(base) {
hit = 14; hit = 14;
airFriction = BASE_DRAG_HD*0.75; airFriction = BASE_DRAG_HD*0.75;
caliber = 1.2; caliber = 1.2;
}; };
class ACE_frag_large: ACE_frag_base { class GVAR(large): GVAR(base) {
hit = 28; hit = 28;
indirectHit = 2; indirectHit = 2;
indirectHitRange = 0.25; indirectHitRange = 0.25;
@ -432,7 +432,7 @@ class CfgAmmo {
}; };
class ACE_frag_large_HD: ACE_frag_large { class GVAR(large_HD): GVAR(large) {
hit = 28; hit = 28;
indirectHit = 2; indirectHit = 2;
indirectHitRange = 0.25; indirectHitRange = 0.25;
@ -442,7 +442,7 @@ class CfgAmmo {
}; };
class ACE_frag_huge: ACE_frag_large { class GVAR(huge): GVAR(large) {
hit = 40; hit = 40;
indirectHit = 4; indirectHit = 4;
indirectHitRange = 0.5; indirectHitRange = 0.5;
@ -450,7 +450,7 @@ class CfgAmmo {
caliber = 2.8; caliber = 2.8;
}; };
class ACE_frag_huge_HD: ACE_frag_large { class GVAR(huge_HD): GVAR(large) {
hit = 40; hit = 40;
indirectHit = 4; indirectHit = 4;
indirectHitRange = 0.5; indirectHitRange = 0.5;
@ -458,19 +458,19 @@ class CfgAmmo {
caliber = 2.8; caliber = 2.8;
}; };
class ACE_frag_spall_small: ACE_frag_small { class GVAR(spall_small): GVAR(small) {
timeToLive = 0.1; timeToLive = 0.1;
}; };
class ACE_frag_spall_medium: ACE_frag_medium { class GVAR(spall_medium): GVAR(medium) {
timeToLive = 0.15; timeToLive = 0.15;
}; };
class ACE_frag_spall_large: ACE_frag_large { class GVAR(spall_large): GVAR(large) {
timeToLive = 0.25; timeToLive = 0.25;
}; };
class ACE_frag_spall_huge: ACE_frag_huge { class GVAR(spall_huge): GVAR(huge) {
timeToLive = 0.3; timeToLive = 0.3;
}; };

12
addons/frag/functions/fnc_dev_debugAmmo.sqf
View File

@ -35,15 +35,15 @@ private _processedCfgAmmos = [];
_warn = false; _warn = false;
_fragTypes = getArray (_ammoConfig >> "ACE_frag_CLASSES"); _fragTypes = getArray (_ammoConfig >> QGVAR(CLASSES));
if(_fragTypes isEqualTo []) then {_warn = true;}; if(_fragTypes isEqualTo []) then {_warn = true;};
_c = getNumber(_ammoConfig >> "ACE_frag_CHARGE"); _c = getNumber(_ammoConfig >> QGVAR(CHARGE));
if(_c == 0) then {_warn = true;}; if(_c == 0) then {_warn = true;};
_m = getNumber(_ammoConfig >> "ACE_frag_METAL"); _m = getNumber(_ammoConfig >> QGVAR(METAL));
if(_m == 0) then {_warn = true;}; if(_m == 0) then {_warn = true;};
_k = getNumber(_ammoConfig >> "ACE_frag_GURNEY_K"); _k = getNumber(_ammoConfig >> QGVAR(GURNEY_K));
if(_k == 0) then {_warn = true;}; if(_k == 0) then {_warn = true;};
_gC = getNumber(_ammoConfig >> "ACE_frag_GURNEY_C"); _gC = getNumber(_ammoConfig >> QGVAR(GURNEY_C));
if(_gC == 0) then { _warn = true;}; if(_gC == 0) then { _warn = true;};
if(_debugMissing && _warn) then { if(_debugMissing && _warn) then {
@ -51,7 +51,7 @@ private _processedCfgAmmos = [];
diag_log text format [" - _c=%1,_m=%2,_k=%3,_gC=%4,_fragTypes=%5",_c,_m,_k,_gC,_fragTypes]; diag_log text format [" - _c=%1,_m=%2,_k=%3,_gC=%4,_fragTypes=%5",_c,_m,_k,_gC,_fragTypes];
}; };
} else { } else {
if (_debugNonFrag && {isArray (_ammoConfig >> "ACE_frag_CLASSES")}) then { if (_debugNonFrag && {isArray (_ammoConfig >> QGVAR(CLASSES))}) then {
diag_log text format ["Ammo [%1] from Mag [%2] has frag configs but will NOT frag:",_ammo,configName _x]; diag_log text format ["Ammo [%1] from Mag [%2] has frag configs but will NOT frag:",_ammo,configName _x];
diag_log text format ["- skip=%1,explosive=%2,indirectHitRange=%3,force=%4,fragPower=%5",_skip,_explosive,_indirectRange,_force,_fragPower]; diag_log text format ["- skip=%1,explosive=%2,indirectHitRange=%3,force=%4,fragPower=%5",_skip,_explosive,_indirectRange,_force,_fragPower];
}; };

16
addons/frag/functions/fnc_doSpall.sqf
View File

@ -76,13 +76,13 @@ if(_alive || {_caliber >= 2.5} || {(_explosive > 0 && {_idh >= 1})}) then {
if(_explosive > 0) then { if(_explosive > 0) then {
// ACE_player sideChat format["EXPLOSIVE!"]; // ACE_player sideChat format["EXPLOSIVE!"];
_warn = false; _warn = false;
_c = getNumber(configFile >> "CfgAmmo" >> _roundType >> "ACE_frag_CHARGE"); _c = getNumber(configFile >> "CfgAmmo" >> _roundType >> QGVAR(CHARGE));
if(_c == 0) then { _c = 1; _warn = true;}; if(_c == 0) then { _c = 1; _warn = true;};
_m = getNumber(configFile >> "CfgAmmo" >> _roundType >> "ACE_frag_METAL"); _m = getNumber(configFile >> "CfgAmmo" >> _roundType >> QGVAR(METAL));
if(_m == 0) then { _m = 2; _warn = true;}; if(_m == 0) then { _m = 2; _warn = true;};
_k = getNumber(configFile >> "CfgAmmo" >> _roundType >> "ACE_frag_GURNEY_K"); _k = getNumber(configFile >> "CfgAmmo" >> _roundType >> QGVAR(GURNEY_K));
if(_k == 0) then { _k = 1/2; _warn = true;}; if(_k == 0) then { _k = 1/2; _warn = true;};
_gC = getNumber(configFile >> "CfgAmmo" >> _roundType >> "ACE_frag_GURNEY_C"); _gC = getNumber(configFile >> "CfgAmmo" >> _roundType >> QGVAR(GURNEY_C));
if(_gC == 0) then { _gC = 2440; _warn = true;}; if(_gC == 0) then { _gC = 2440; _warn = true;};
if(_warn) then { if(_warn) then {
@ -94,10 +94,10 @@ if(_alive || {_caliber >= 2.5} || {(_explosive > 0 && {_idh >= 1})}) then {
}; };
_fragTypes = [ _fragTypes = [
"ACE_frag_spall_small", "ACE_frag_spall_small", "ACE_frag_spall_small", QGVAR(spall_small), QGVAR(spall_small), QGVAR(spall_small),
"ACE_frag_spall_small","ACE_frag_spall_medium","ACE_frag_spall_medium","ACE_frag_spall_medium", QGVAR(spall_small),QGVAR(spall_medium),QGVAR(spall_medium),QGVAR(spall_medium),
"ACE_frag_spall_medium", "ACE_frag_spall_large", "ACE_frag_spall_large", "ACE_frag_spall_huge", QGVAR(spall_medium), QGVAR(spall_large), QGVAR(spall_large), QGVAR(spall_huge),
"ACE_frag_spall_huge" QGVAR(spall_huge)
]; ];

24
addons/frag/functions/fnc_frago.sqf
View File

@ -23,16 +23,16 @@ if((count _this) > 5) then {
}; };
_fragTypes = [ _fragTypes = [
"ACE_frag_tiny", "ACE_frag_tiny", "ACE_frag_tiny", QGVAR(tiny), QGVAR(tiny), QGVAR(tiny),
"ACE_frag_tiny_HD", "ACE_frag_tiny_HD", "ACE_frag_tiny_HD", QGVAR(tiny_HD), QGVAR(tiny_HD), QGVAR(tiny_HD),
"ACE_frag_small","ACE_frag_small","ACE_frag_small","ACE_frag_small", QGVAR(small),QGVAR(small),QGVAR(small),QGVAR(small),
"ACE_frag_small_HD","ACE_frag_small_HD","ACE_frag_small_HD","ACE_frag_small_HD", QGVAR(small_HD),QGVAR(small_HD),QGVAR(small_HD),QGVAR(small_HD),
"ACE_frag_medium_HD", "ACE_frag_medium_HD", "ACE_frag_medium_HD", "ACE_frag_medium_HD", "ACE_frag_medium_HD" QGVAR(medium_HD), QGVAR(medium_HD), QGVAR(medium_HD), QGVAR(medium_HD), QGVAR(medium_HD)
]; ];
_warn = false; _warn = false;
if(isArray (configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_CLASSES")) then { if(isArray (configFile >> "CfgAmmo" >> _shellType >> QGVAR(CLASSES))) then {
_fragTypes = getArray (configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_CLASSES"); _fragTypes = getArray (configFile >> "CfgAmmo" >> _shellType >> QGVAR(CLASSES));
} else { } else {
_warn = true; _warn = true;
}; };
@ -58,13 +58,13 @@ _fragRange = 20*_indirectHitRange*4;
// _gC = 2320; // Gurney constant of tritonal in /ms // _gC = 2320; // Gurney constant of tritonal in /ms
_c = getNumber(configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_CHARGE"); _c = getNumber(configFile >> "CfgAmmo" >> _shellType >> QGVAR(CHARGE));
if(_c == 0) then { _c = 1; _warn = true;}; if(_c == 0) then { _c = 1; _warn = true;};
_m = getNumber(configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_METAL"); _m = getNumber(configFile >> "CfgAmmo" >> _shellType >> QGVAR(METAL));
if(_m == 0) then { _m = 2; _warn = true;}; if(_m == 0) then { _m = 2; _warn = true;};
_k = getNumber(configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_GURNEY_K"); _k = getNumber(configFile >> "CfgAmmo" >> _shellType >> QGVAR(GURNEY_K));
if(_k == 0) then { _k = 1/2; _warn = true;}; if(_k == 0) then { _k = 1/2; _warn = true;};
_gC = getNumber(configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_GURNEY_C"); _gC = getNumber(configFile >> "CfgAmmo" >> _shellType >> QGVAR(GURNEY_C));
if(_gC == 0) then { _gC = 2440; _warn = true;}; if(_gC == 0) then { _gC = 2440; _warn = true;};
if(_warn) then { if(_warn) then {
@ -215,4 +215,4 @@ if(_isArmed && (count _objects) > 0) then {
// ACE_player sideChat format["tracks: %1", (count GVAR(trackedObjects))]; // ACE_player sideChat format["tracks: %1", (count GVAR(trackedObjects))];
// #endif // #endif
// _endTime = diag_tickTime; // _endTime = diag_tickTime;
END_COUNTER(frago); END_COUNTER(frago);

10
addons/huntir/Dialog.hpp
View File

@ -58,7 +58,7 @@
#define __W SafeZoneW #define __W SafeZoneW
#define __H SafeZoneH #define __H SafeZoneH
class ace_huntir_cam_dialog { class GVAR(cam_dialog) {
idd = 18880; idd = 18880;
movingEnable = true; movingEnable = true;
controlsBackground[] = { }; controlsBackground[] = { };
@ -138,7 +138,7 @@ class ace_huntir_cam_dialog {
x = __X + (2*0.8); y = __Y + 0.045; x = __X + (2*0.8); y = __Y + 0.045;
w = 0.05; h = 0.02; w = 0.05; h = 0.02;
text = CSTRING(HELP); text = CSTRING(HELP);
action = "createDialog 'ace_huntir_help_dialog'"; action = QUOTE(createDialog QQGVAR(help_dialog));
}; };
class CAM_BG { class CAM_BG {
idc = -1; idc = -1;
@ -228,7 +228,7 @@ class ace_huntir_cam_dialog {
}; };
}; };
class ace_huntir_cam_dialog_inactive: ace_huntir_cam_dialog { class GVAR(cam_dialog_inactive): GVAR(cam_dialog) {
idd = 18881; idd = 18881;
controls[] = { controls[] = {
TOP_BORDER, TOP_BORDER,
@ -293,7 +293,7 @@ class ace_huntir_cam_dialog_inactive: ace_huntir_cam_dialog {
}; };
}; };
class ace_huntir_cam_dialog_off: ace_huntir_cam_dialog_inactive { class GVAR(cam_dialog_off): GVAR(cam_dialog_inactive) {
idd = 18882; idd = 18882;
controls[] = { controls[] = {
TOP_BORDER, TOP_BORDER,
@ -314,7 +314,7 @@ class ace_huntir_cam_dialog_off: ace_huntir_cam_dialog_inactive {
class CAM_BG: CAM_BG { text = QPATHTOF(UI\ace_huntir_monitor_off.paa); }; class CAM_BG: CAM_BG { text = QPATHTOF(UI\ace_huntir_monitor_off.paa); };
}; };
//ACTIVE PARA CAMERA DIALOG //ACTIVE PARA CAMERA DIALOG
class ace_huntir_help_dialog: ace_huntir_cam_dialog { class GVAR(help_dialog): GVAR(cam_dialog) {
idd = -1; idd = -1;
controls[] = { controls[] = {
TOP_BORDER, TOP_BORDER,

6
addons/huntir/RscTitles.hpp
View File

@ -1,14 +1,14 @@
#define __FONTHEIGHT 0.02 #define __FONTHEIGHT 0.02
class RscTitles { class RscTitles {
class ace_huntir_cam_rose { class GVAR(cam_rose) {
idd=-1; idd=-1;
movingEnable = true; movingEnable = true;
fadein = 0; fadein = 0;
fadeout = 1; fadeout = 1;
duration = 1e+011; duration = 1e+011;
name="ace_huntir_cam_rose"; name=QGVAR(cam_rose);
onLoad = "uiNamespace setVariable ['ace_huntir_cam_rose', _this select 0]"; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(cam_rose), _this select 0)]);
class controls { class controls {
class CHAR_N { class CHAR_N {
type = 0; type = 0;

8
addons/huntir/functions/fnc_cam.sqf
View File

@ -29,9 +29,9 @@ GVAR(ELEVAT) = 0.01;
HUNTIR_BACKGROUND_LAYER_ID cutText["","PLAIN"]; HUNTIR_BACKGROUND_LAYER_ID cutText["","PLAIN"];
closedialog 0; closedialog 0;
createDialog "ace_huntir_cam_dialog"; createDialog QGVAR(cam_dialog);
uiNameSpace setVariable ["ace_huntir_monitor", findDisplay 18880]; uiNameSpace setVariable [QGVAR(monitor), findDisplay 18880];
(uiNameSpace getVariable "ace_huntir_monitor") displaySetEventHandler ["Keydown", QUOTE(_this call FUNC(keyPressed))]; (uiNameSpace getVariable QGVAR(monitor)) displaySetEventHandler ["Keydown", QUOTE(_this call FUNC(keyPressed))];
ctrlSetText [4, "0X"]; ctrlSetText [4, "0X"];
@ -65,7 +65,7 @@ GVAR(no_cams) sort true;
} forEach GVAR(no_cams); } forEach GVAR(no_cams);
[{ [{
//Close monitor if we no longer have the item: //Close monitor if we no longer have the item:
if ((!([ACE_player, "ACE_HuntIR_monitor"] call EFUNC(common,hasItem))) && {!isNull (uiNameSpace getVariable ["ace_huntir_monitor", displayNull])}) then { if ((!([ACE_player, "ACE_HuntIR_monitor"] call EFUNC(common,hasItem))) && {!isNull (uiNameSpace getVariable [QGVAR(monitor), displayNull])}) then {
closeDialog 0; closeDialog 0;
}; };

8
addons/huntir/functions/fnc_huntir.sqf
View File

@ -20,15 +20,15 @@ if ((ACE_player call CBA_fnc_getUnitAnim) select 0 == "stand") then {
}; };
HUNTIR_BACKGROUND_LAYER_ID cutText ["", "BLACK", 0]; HUNTIR_BACKGROUND_LAYER_ID cutText ["", "BLACK", 0];
createDialog "ace_huntir_cam_dialog_off"; createDialog QGVAR(cam_dialog_off);
[{ [{
if (!dialog) exitWith { if (!dialog) exitWith {
HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN", 0]; HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN", 0];
}; };
closeDialog 0; closeDialog 0;
createDialog "ace_huntir_cam_dialog_inactive"; createDialog QGVAR(cam_dialog_inactive);
uiNameSpace setVariable ["ace_huntir_monitor", findDisplay 18881]; uiNameSpace setVariable [QGVAR(monitor), findDisplay 18881];
[{ [{
GVAR(startTime) = CBA_missionTime; GVAR(startTime) = CBA_missionTime;
GVAR(done) = false; GVAR(done) = false;
@ -39,7 +39,7 @@ createDialog "ace_huntir_cam_dialog_off";
GVAR(messageConnecting) = toArray "Connecting....."; GVAR(messageConnecting) = toArray "Connecting.....";
[{ [{
//Close monitor if we no longer have item: //Close monitor if we no longer have item:
if ((!([ACE_player, "ACE_HuntIR_monitor"] call EFUNC(common,hasItem))) && {!isNull (uiNameSpace getVariable ["ace_huntir_monitor", displayNull])}) then { if ((!([ACE_player, "ACE_HuntIR_monitor"] call EFUNC(common,hasItem))) && {!isNull (uiNameSpace getVariable [QGVAR(monitor), displayNull])}) then {
closeDialog 0; closeDialog 0;
}; };

4
addons/huntir/functions/fnc_huntirCompass.sqf
View File

@ -15,7 +15,7 @@
disableSerialization; disableSerialization;
#define __DSP (uiNamespace getVariable "ace_huntir_cam_rose") #define __DSP (uiNamespace getVariable QGVAR(cam_rose))
#define __CHAR_N (__DSP displayCtrl 64432) #define __CHAR_N (__DSP displayCtrl 64432)
#define __CHAR_E (__DSP displayCtrl 64433) #define __CHAR_E (__DSP displayCtrl 64433)
#define __CHAR_S (__DSP displayCtrl 64434) #define __CHAR_S (__DSP displayCtrl 64434)
@ -48,7 +48,7 @@ _fnc_correctIt = {
_pos _pos
}; };
HUNTIR_CAM_ROSE_LAYER_ID cutRsc ["ace_huntir_cam_rose", "PLAIN"]; HUNTIR_CAM_ROSE_LAYER_ID cutRsc [QGVAR(cam_rose), "PLAIN"];
[{ [{
params ["_args", "_idPFH"]; params ["_args", "_idPFH"];

36
addons/javelin/RscInGameUI.hpp
View File

@ -12,11 +12,11 @@ class RscLine;
class RscInGameUI { class RscInGameUI {
class ACE_RscOptics_javelin { class ACE_RscOptics_javelin {
idd = 300; idd = 300;
controls[] = { "ACE_javelin_elements_group", "ACE_Targeting" }; //, "ACE_TargetingConstrains", "ACE_TargetingGate", "ACE_TargetingLines"}; controls[] = { QGVAR(elements_group), "ACE_Targeting" }; //, "ACE_TargetingConstrains", "ACE_TargetingGate", "ACE_TargetingLines"};
onLoad = QUOTE(_this call FUNC(onOpticLoad)); onLoad = QUOTE(_this call FUNC(onOpticLoad));
onUnload = QUOTE(_this call FUNC(onOpticUnload)); onUnload = QUOTE(_this call FUNC(onOpticUnload));
class ACE_javelin_elements_group: RscControlsGroup class GVAR(elements_group): RscControlsGroup
{ {
x = "SafezoneX"; x = "SafezoneX";
y = "SafezoneY"; y = "SafezoneY";
@ -45,7 +45,7 @@ class RscInGameUI {
h = 0; h = 0;
}; };
class ACE_javelin_Day_mode_off: RscPicture { class GVAR(Day_mode_off): RscPicture {
idc = 1001; idc = 1001;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.03/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.03/4)*3*SafezoneH - SafezoneX";
y = "SafezoneY+SafezoneH*0.031 - SafezoneY"; y = "SafezoneY+SafezoneH*0.031 - SafezoneY";
@ -54,16 +54,16 @@ class RscInGameUI {
colorText[] = {0.2941,0.2941,0.2941,1}; colorText[] = {0.2941,0.2941,0.2941,1};
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\day_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\day_co.paa";
}; };
class ACE_javelin_Day_mode: ACE_javelin_Day_mode_off { class GVAR(Day_mode): GVAR(Day_mode_off) {
idc = 160; idc = 160;
colorText[] = {0.2941,0.8745,0.2157,1}; colorText[] = {0.2941,0.8745,0.2157,1};
}; };
class CA_Javelin_WFOV_mode_off : ACE_javelin_Day_mode_off { class CA_Javelin_WFOV_mode_off : GVAR(Day_mode_off) {
idc = 1004; idc = 1004;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.307/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.307/4)*3*SafezoneH - SafezoneX";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\wfov_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\wfov_co.paa";
}; };
class ACE_javelin_WFOV_mode_group: RscControlsGroup { class GVAR(WFOV_mode_group): RscControlsGroup {
x = "SafezoneX"; x = "SafezoneX";
y = "SafezoneY"; y = "SafezoneY";
w = "SafezoneW"; w = "SafezoneW";
@ -126,12 +126,12 @@ class RscInGameUI {
}; };
}; };
class CA_Javelin_NFOV_mode_off: ACE_javelin_Day_mode_off { class CA_Javelin_NFOV_mode_off: GVAR(Day_mode_off) {
idc = 1003; idc = 1003;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.586/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.586/4)*3*SafezoneH - SafezoneX";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\nfov_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\nfov_co.paa";
}; };
class ACE_javelin_NFOV_mode_group: RscControlsGroup { class GVAR(NFOV_mode_group): RscControlsGroup {
x = "SafezoneX"; x = "SafezoneX";
y = "SafezoneY"; y = "SafezoneY";
w = "SafezoneW-SafezoneX"; w = "SafezoneW-SafezoneX";
@ -195,57 +195,57 @@ class RscInGameUI {
}; };
}; };
class ACE_javelin_SEEK_off: ACE_javelin_Day_mode_off { class GVAR(SEEK_off): GVAR(Day_mode_off) {
idc = 699000; idc = 699000;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.863/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.863/4)*3*SafezoneH - SafezoneX";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\seek_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\seek_co.paa";
}; };
class ACE_javelin_SEEK: ACE_javelin_SEEK_off { class GVAR(SEEK): GVAR(SEEK_off) {
idc = 166; idc = 166;
colorText[] = {0.2941,0.8745,0.2157,0}; colorText[] = {0.2941,0.8745,0.2157,0};
}; };
class ACE_javelin_Missle_off: ACE_javelin_Day_mode_off { class GVAR(Missle_off): GVAR(Day_mode_off) {
idc = 1032; idc = 1032;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (-0.134/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (-0.134/4)*3*SafezoneH - SafezoneX";
y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY"; y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY";
colorText[] = {0.2941,0.2941,0.2941,1}; colorText[] = {0.2941,0.2941,0.2941,1};
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\missle_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\missle_co.paa";
}; };
class ACE_javelin_Missle: ACE_javelin_Missle_off { class GVAR(Missle): GVAR(Missle_off) {
idc = 167; idc = 167;
colorText[] = {0.9255,0.5216,0.1216,0}; colorText[] = {0.9255,0.5216,0.1216,0};
}; };
class ACE_javelin_CLU_off: ACE_javelin_Missle_off { class GVAR(CLU_off): GVAR(Missle_off) {
idc = 1027; idc = 1027;
y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY"; y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\clu_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\clu_co.paa";
}; };
class ACE_javelin_HangFire_off: ACE_javelin_Missle_off { class GVAR(HangFire_off): GVAR(Missle_off) {
idc = 1028; idc = 1028;
y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY"; y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\hangfire_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\hangfire_co.paa";
}; };
class ACE_javelin_TOP_off: ACE_javelin_Day_mode_off { class GVAR(TOP_off): GVAR(Day_mode_off) {
idc = 699001; idc = 699001;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY"; y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\top_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\top_co.paa";
colorText[] = {0.2941,0.8745,0.2157,1}; colorText[] = {0.2941,0.8745,0.2157,1};
}; };
class ACE_javelin_DIR: ACE_javelin_Day_mode { class GVAR(DIR): GVAR(Day_mode) {
idc = 699002; idc = 699002;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY"; y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\dir_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\dir_co.paa";
colorText[] = {0.2941,0.2941,0.2941,1}; colorText[] = {0.2941,0.2941,0.2941,1};
}; };
class ACE_javelin_FLTR_mode_off: ACE_javelin_Day_mode_off { class GVAR(FLTR_mode_off): GVAR(Day_mode_off) {
idc = 1002; idc = 1002;
x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX"; x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY"; y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY";
text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\fltr_co.paa"; text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\fltr_co.paa";
}; };
class ACE_javelin_FLTR_mode: ACE_javelin_FLTR_mode_off { class GVAR(FLTR_mode): GVAR(FLTR_mode_off) {
idc = 161; idc = 161;
colorText[] = {0.2941,0.8745,0.2157,1}; colorText[] = {0.2941,0.8745,0.2157,1};
}; };

6
addons/map/CfgSounds.hpp
View File

@ -1,7 +1,7 @@
class CfgSounds { class CfgSounds {
class ACE_map_flashlightClick { class GVAR(flashlightClick) {
name = "ACE_map_flashlightClick"; name = QGVAR(flashlightClick);
sound[] = {"\a3\sounds_f\weapons\Other\dry4.wss", 0.2, 2}; sound[] = {"\a3\sounds_f\weapons\Other\dry4.wss", 0.2, 2};
titles[] = {}; titles[] = {};
}; };
}; };

2
addons/map/functions/fnc_switchFlashlight.sqf
View File

@ -22,4 +22,4 @@ GVAR(flashlightInUse) = _flashlight;
if (GVAR(mapGlow)) then { if (GVAR(mapGlow)) then {
[GVAR(flashlightInUse)] call FUNC(flashlightGlow); [GVAR(flashlightInUse)] call FUNC(flashlightGlow);
}; };
playSound "ACE_map_flashlightClick"; playSound QGVAR(flashlightClick);

12
addons/medical/ui/triagecard.hpp
View File

@ -113,7 +113,7 @@ class GVAR(triageCard) {
animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.9)"; animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.9)";
animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.9)"; animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.9)";
animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.9)"; animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.9)";
action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3('ACE_medical_triageLevel',0,true)];); action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3(QQGVAR(triageLevel),0,true)];);
}; };
class selectTriageStatusMinor: selectTriageStatus { class selectTriageStatusMinor: selectTriageStatus {
idc = 2003; idc = 2003;
@ -131,7 +131,7 @@ class GVAR(triageCard) {
animTextureFocused = "#(argb,8,8,3)color(0,0.5,0,0.9)"; animTextureFocused = "#(argb,8,8,3)color(0,0.5,0,0.9)";
animTexturePressed = "#(argb,8,8,3)color(0,0.5,0,0.9)"; animTexturePressed = "#(argb,8,8,3)color(0,0.5,0,0.9)";
animTextureDefault = "#(argb,8,8,3)color(0,0.5,0,0.9)"; animTextureDefault = "#(argb,8,8,3)color(0,0.5,0,0.9)";
action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3('ACE_medical_triageLevel',1,true)];); action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3(QQGVAR(triageLevel),1,true)];);
}; };
class selectTriageStatusDelayed: selectTriageStatus { class selectTriageStatusDelayed: selectTriageStatus {
idc = 2004; idc = 2004;
@ -149,7 +149,7 @@ class GVAR(triageCard) {
animTextureFocused = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)"; animTextureFocused = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
animTexturePressed = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)"; animTexturePressed = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
animTextureDefault = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)"; animTextureDefault = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3('ACE_medical_triageLevel',2,true)];); action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3(QQGVAR(triageLevel),2,true)];);
}; };
class selectTriageStatusImmediate: selectTriageStatus { class selectTriageStatusImmediate: selectTriageStatus {
idc = 2005; idc = 2005;
@ -167,7 +167,7 @@ class GVAR(triageCard) {
animTextureFocused = "#(argb,8,8,3)color(1,0.2,0.2,0.9)"; animTextureFocused = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
animTexturePressed = "#(argb,8,8,3)color(1,0.2,0.2,0.9)"; animTexturePressed = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
animTextureDefault = "#(argb,8,8,3)color(1,0.2,0.2,0.9)"; animTextureDefault = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3('ACE_medical_triageLevel', 3, true)];); action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3(QQGVAR(triageLevel), 3, true)];);
}; };
class selectTriageStatusDeceased: selectTriageStatus { class selectTriageStatusDeceased: selectTriageStatus {
idc = 2006; idc = 2006;
@ -185,7 +185,7 @@ class GVAR(triageCard) {
animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.9)"; animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.9)";
animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.9)"; animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.9)";
animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.9)"; animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.9)";
action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3('ACE_medical_triageLevel', 4, true)];); action = QUOTE([false] call FUNC(dropDownTriageCard); (GVAR(TriageCardTarget)) setVariable [ARR_3(QQGVAR(triageLevel), 4, true)];);
}; };
}; };
}; };

4
addons/optics/functions/fnc_onDrawScope2D.sqf
View File

@ -37,8 +37,8 @@ if (_isPIP) then {
GVAR(camera) camSetTarget ACE_player; GVAR(camera) camSetTarget ACE_player;
GVAR(camera) camCommit 1; GVAR(camera) camCommit 1;
"ace_optics_rendertarget0" setPiPEffect [0]; QGVAR(rendertarget0) setPiPEffect [0];
GVAR(camera) cameraEffect ["INTERNAL", "BACK", "ace_optics_rendertarget0"]; GVAR(camera) cameraEffect ["INTERNAL", "BACK", QGVAR(rendertarget0)];
TRACE_2("created new pip camera",GVAR(camera),isNull GVAR(camera)); TRACE_2("created new pip camera",GVAR(camera),isNull GVAR(camera));

4
addons/overheating/CfgVehicles.hpp
View File

@ -23,7 +23,7 @@ class CfgVehicles {
}; };
class GVAR(CheckTemperature) { class GVAR(CheckTemperature) {
displayName = CSTRING(CheckTemperatureShort); displayName = CSTRING(CheckTemperatureShort);
condition = "ace_overheating_enabled && {switch (currentWeapon _player) do {case (''): {false}; case (primaryWeapon _player); case (handgunWeapon _player): {true}; default {false}}}"; condition = QUOTE( GVAR(enabled) && {switch (currentWeapon _player) do {case (''): {false}; case (primaryWeapon _player); case (handgunWeapon _player): {true}; default {false}}} );
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE( [ARR_3(_player, _player, currentWeapon _player)] call FUNC(checkTemperature); ); statement = QUOTE( [ARR_3(_player, _player, currentWeapon _player)] call FUNC(checkTemperature); );
showDisabled = 0; showDisabled = 0;
@ -52,7 +52,7 @@ class CfgVehicles {
}; };
class GVAR(CheckTemperature) { class GVAR(CheckTemperature) {
displayName = CSTRING(CheckTemperatureShort); displayName = CSTRING(CheckTemperatureShort);
condition = "ace_overheating_enabled && {switch (currentWeapon _target) do {case (''): {false}; case (primaryWeapon _target); case (handgunWeapon _target): {true}; default {false}}}"; condition = QUOTE( GVAR(enabled) && {switch (currentWeapon _target) do {case (''): {false}; case (primaryWeapon _target); case (handgunWeapon _target): {true}; default {false}}} );
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE( [ARR_3(_player, _target, currentWeapon _target)] call FUNC(checkTemperature); ); statement = QUOTE( [ARR_3(_player, _target, currentWeapon _target)] call FUNC(checkTemperature); );
icon = QUOTE(PATHTOF(UI\temp_ca.paa)); icon = QUOTE(PATHTOF(UI\temp_ca.paa));

2
addons/rangecard/functions/fnc_calculateSolution.sqf
View File

@ -40,7 +40,7 @@
* 8: Spin drift (MOA) <NUMBER> * 8: Spin drift (MOA) <NUMBER>
* *
* Example: * Example:
* call ace_rangecard_calculate_range_card_data * call ace_rangecard_fnc_calculateSolution
* *
* Public: No * Public: No
*/ */

2
addons/refuel/CfgVehicles.hpp
View File

@ -130,7 +130,7 @@ class CfgVehicles {
}; };
class ThingX; class ThingX;
class ACE_refuel_fuelNozzle: ThingX { class GVAR(fuelNozzle): ThingX {
class EventHandlers { class EventHandlers {
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {}; class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
}; };

2
addons/refuel/config.cpp
View File

@ -4,7 +4,7 @@ class CfgPatches {
class ADDON { class ADDON {
name = COMPONENT_NAME; name = COMPONENT_NAME;
units[] = {}; units[] = {};
weapons[] = {"ACE_refuel_fuelNozzle"}; weapons[] = {QGVAR(fuelNozzle)};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"}; requiredAddons[] = {"ace_interaction"};
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);

2
addons/refuel/functions/fnc_takeNozzle.sqf
View File

@ -49,7 +49,7 @@ if (isNull _nozzle) then { // func is called on fuel truck
["_endPosOffset", [0, 0, 0], [[]], 3] ["_endPosOffset", [0, 0, 0], [[]], 3]
]; ];
private _newNozzle = "ACE_refuel_fuelNozzle" createVehicle position _unit; private _newNozzle = QGVAR(fuelNozzle) createVehicle position _unit;
_newNozzle attachTo [_unit, [-0.02,0.05,-0.12], "righthandmiddle1"]; _newNozzle attachTo [_unit, [-0.02,0.05,-0.12], "righthandmiddle1"];
_unit setVariable [QGVAR(nozzle), _newNozzle, true]; _unit setVariable [QGVAR(nozzle), _newNozzle, true];

2
addons/repair/functions/fnc_setHitPointDamage.sqf
View File

@ -1,7 +1,7 @@
/* /*
* Author: commy2 * Author: commy2
* Set the hitpoint damage and change the structural damage acordingly, requires local vehicle. * Set the hitpoint damage and change the structural damage acordingly, requires local vehicle.
* Handles the "ace_repair_setVehicleHitPointDamage" event * Handles the ace_repair_setVehicleHitPointDamage event
* *
* Arguments: * Arguments:
* 0: Local Vehicle to Damage <OBJECT> * 0: Local Vehicle to Damage <OBJECT>