From 8bff5f6ef4839ec56b1e80c3dd2f2b845a23f56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Sun, 11 Jan 2015 16:50:29 -0300 Subject: [PATCH 01/18] interaction: add script_component, initial CBAfication of config. --- addons/interaction/CfgEventHandlers.hpp | 27 +++++++++++ .../{clientInit.sqf => XEH_clientInit.sqf} | 0 addons/interaction/XEH_preInit.sqf | 48 +++++++++++++++++++ addons/interaction/config.cpp | 30 +++--------- addons/interaction/script_component.hpp | 12 +++++ 5 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 addons/interaction/CfgEventHandlers.hpp rename addons/interaction/{clientInit.sqf => XEH_clientInit.sqf} (100%) create mode 100644 addons/interaction/XEH_preInit.sqf create mode 100644 addons/interaction/script_component.hpp diff --git a/addons/interaction/CfgEventHandlers.hpp b/addons/interaction/CfgEventHandlers.hpp new file mode 100644 index 0000000000..e635014c46 --- /dev/null +++ b/addons/interaction/CfgEventHandlers.hpp @@ -0,0 +1,27 @@ +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + }; +}; + +class Extended_PostInit_EventHandlers { + class ADDON { + clientInit = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_clientInit.sqf) ); + }; +}; + +class Extended_GetIn_EventHandlers { + class All { + class ADDONnu { + clientGetIn = QUOTE( if (_this select 2 == AGM_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}); + }; + }; +}; + +class Extended_GetOut_EventHandlers { + class All { + class ADDONnu { + clientGetOut = QUOTE( if (_this select 2 == AGM_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}); + }; + }; +}; diff --git a/addons/interaction/clientInit.sqf b/addons/interaction/XEH_clientInit.sqf similarity index 100% rename from addons/interaction/clientInit.sqf rename to addons/interaction/XEH_clientInit.sqf diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf new file mode 100644 index 0000000000..7e2dd7223f --- /dev/null +++ b/addons/interaction/XEH_preInit.sqf @@ -0,0 +1,48 @@ +#include "script_component.hpp" + +PREPF(addInteraction); +PREPF(addInteractionSelf); +PREPF(AddSelectableItem); +PREPF(addToTooltip); +PREPF(applyButtons); +PREPF(canInteractWith); +PREPF(canLockDoor); +PREPF(canTapShoulder); +PREPF(getActions2); +PREPF(GetActions); +PREPF(getDoor); +PREPF(getDoorAnimations); +PREPF(getDown); +PREPF(getSelectedButton); +PREPF(hideMenu); +PREPF(hideMouseHint); +PREPF(initialiseInteraction); +PREPF(isInRange); +PREPF(joinTeam); +PREPF(lockDoor); +PREPF(menuKeyInput); +PREPF(moduleInteraction); +PREPF(moveDown); +PREPF(onButtonDown); +PREPF(onButtonDownSelf); +PREPF(onButtonUp); +PREPF(onClick); +PREPF(onSelectMenuDblClick); +PREPF(openDoor); +PREPF(openMenu); +PREPF(openMenuSelectUI); +PREPF(openMenuSelf); +PREPF(openSelectMenu); +PREPF(openSubMenu); +PREPF(openSubMenuSelf); +PREPF(prepareSelectMenu); +PREPF(push); +PREPF(removeInteraction); +PREPF(removeInteractionSelf); +PREPF(removeTag); +PREPF(sendAway); +PREPF(showMenu); +PREPF(showMouseHint); +PREPF(sortOptionsByPriority); +PREPF(tapShoulder); +PREPF(updateTooltipPosition); \ No newline at end of file diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index 961d644a0b..1ec93b12f2 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -1,5 +1,7 @@ +#include "script_component.hpp" + class CfgPatches { - class AGM_Interaction { + class ADDON { units[] = {}; weapons[] = {}; requiredVersion = 0.60; @@ -12,6 +14,9 @@ class CfgPatches { }; }; +#include "CfgEventHandlers.hpp" + +/* class CfgFunctions { class AGM_Interaction { class AGM_Interaction { @@ -69,28 +74,7 @@ class CfgFunctions { }; }; }; - -class Extended_PostInit_EventHandlers { - class AGM_Interaction { - clientInit = "call compile preprocessFileLineNumbers '\AGM_Interaction\clientInit.sqf'"; - }; -}; - -class Extended_GetIn_EventHandlers { - class All { - class AGM_AutoCloseMenu { - clientGetIn = "if (_this select 2 == AGM_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}"; - }; - }; -}; - -class Extended_GetOut_EventHandlers { - class All { - class AGM_AutoCloseMenu { - clientGetOut = "if (_this select 2 == AGM_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}"; - }; - }; -}; +*/ class AGM_Core_Default_Keys { class openInteractionMenuNew { diff --git a/addons/interaction/script_component.hpp b/addons/interaction/script_component.hpp new file mode 100644 index 0000000000..07fcac5740 --- /dev/null +++ b/addons/interaction/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT interaction +#include "\z\ace\Addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_INTERACTION + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_INTERACTION + #define DEBUG_SETTINGS DEBUG_SETTINGS_INTERACTION +#endif + +#include "\z\ace\Addons\main\script_macros.hpp" \ No newline at end of file From e823e6022437291ed8e4e6b79460c8e07353c140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Sun, 11 Jan 2015 17:40:17 -0300 Subject: [PATCH 02/18] Remove unused code --- addons/interaction/XEH_preInit.sqf | 2 -- addons/interaction/config.cpp | 21 --------------- .../interaction/functions/fn_canLockDoor.sqf | 16 ----------- addons/interaction/functions/fn_lockDoor.sqf | 27 ------------------- 4 files changed, 66 deletions(-) delete mode 100644 addons/interaction/functions/fn_canLockDoor.sqf delete mode 100644 addons/interaction/functions/fn_lockDoor.sqf diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf index 7e2dd7223f..d3ca2a3586 100644 --- a/addons/interaction/XEH_preInit.sqf +++ b/addons/interaction/XEH_preInit.sqf @@ -6,7 +6,6 @@ PREPF(AddSelectableItem); PREPF(addToTooltip); PREPF(applyButtons); PREPF(canInteractWith); -PREPF(canLockDoor); PREPF(canTapShoulder); PREPF(getActions2); PREPF(GetActions); @@ -19,7 +18,6 @@ PREPF(hideMouseHint); PREPF(initialiseInteraction); PREPF(isInRange); PREPF(joinTeam); -PREPF(lockDoor); PREPF(menuKeyInput); PREPF(moduleInteraction); PREPF(moveDown); diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index 1ec93b12f2..c45b4369a6 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -27,7 +27,6 @@ class CfgFunctions { class addToTooltip; class applyButtons; class canInteractWith; - class canLockDoor; class canTapShoulder; class getActions2; class GetActions; @@ -40,7 +39,6 @@ class CfgFunctions { class initialiseInteraction; class isInRange; class joinTeam; - class lockDoor; class menuKeyInput; class moduleInteraction; class moveDown; @@ -112,25 +110,6 @@ class AGM_Core_Default_Keys { control = 1; alt = 0; }; - // disabled for now - /*class lockDoor { - displayName = "$STR_AGM_Interaction_LockDoor"; - condition = "[true] call AGM_Interaction_fnc_canLockDoor && {!AGM_Interaction_isOpeningDoor}"; - statement = "[true] call AGM_Interaction_fnc_lockDoor"; - key = 57; - shift = 0; - control = 0; - alt = 1; - }; - class unlockDoor { - displayName = "$STR_AGM_Interaction_UnlockDoor"; - condition = "[false] call AGM_Interaction_fnc_canLockDoor"; - statement = "[false] call AGM_Interaction_fnc_lockDoor"; - key = 57; - shift = 0; - control = 1; - alt = 1; - };*/ class tapShoulder { displayName = "$STR_AGM_Interaction_TapShoulder"; condition = "[_player, cursorTarget] call AGM_Interaction_fnc_canTapShoulder"; diff --git a/addons/interaction/functions/fn_canLockDoor.sqf b/addons/interaction/functions/fn_canLockDoor.sqf deleted file mode 100644 index 8591bc3c78..0000000000 --- a/addons/interaction/functions/fn_canLockDoor.sqf +++ /dev/null @@ -1,16 +0,0 @@ -// by commy2 - -private ["_mode", "_info", "_house", "_door", "_id"]; - -_mode = _this select 0; //lock: true, unlock: false - -_info = [2] call AGM_Interaction_fnc_getDoor; - -_house = _info select 0; -_door = _info select 1; -_id = _info select 2; - -!isNull _house -&& {_door == "door"} -&& {!_mode || {_house animationPhase format ["door_%1_rot", _id] <= 0}} -&& {(_house getVariable [format ["BIS_Disabled_Door_%1", _id], 0] != 1) isEqualTo _mode} diff --git a/addons/interaction/functions/fn_lockDoor.sqf b/addons/interaction/functions/fn_lockDoor.sqf deleted file mode 100644 index edc317bfac..0000000000 --- a/addons/interaction/functions/fn_lockDoor.sqf +++ /dev/null @@ -1,27 +0,0 @@ -// by commy2 - -private ["_mode", "_info", "_house", "_door", "_id", "_phase"]; - -_mode = _this select 0; //lock: true, unlock: false - -_info = [2] call AGM_Interaction_fnc_getDoor; - -_house = _info select 0; -_door = _info select 1; -_id = _info select 2; - -if (isNull _house) exitWith {}; - -/* -_phase = [1, 0] select _mode; - -_house animate [format ["%1_%2_rot", _door, _id], _phase]; -_house animate [format ["%1_Handle_%2_rot_1", _door, _id], _phase]; -_house animate [format ["%1_Handle_%2_rot_2", _door, _id], _phase]; -*/ - -_house setVariable [format ["BIS_Disabled_%1_%2", _door, _id], [0, 1] select _mode]; - -playSound "AGM_Sound_Click"; - -[localize (["STR_AGM_Interaction_UnlockedDoor", "STR_AGM_Interaction_LockedDoor"] select _mode)] call AGM_Core_fnc_displayTextStructured; From d405d5920a468498e3c7823bb241d0e7705ac1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Sun, 11 Jan 2015 17:41:04 -0300 Subject: [PATCH 03/18] Macros for interaction keys and conditions --- addons/interaction/config.cpp | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index c45b4369a6..d81223eb66 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -78,9 +78,9 @@ class AGM_Core_Default_Keys { class openInteractionMenuNew { displayName = "$STR_AGM_Interaction_InteractionMenu"; condition = "true"; - statement = "call AGM_Interaction_fnc_onButtonDown"; - conditionUp = "!isNull (findDisplay 1713999) && {profileNamespace getVariable ['AGM_Interaction_AutoCloseMenu', false]}"; - statementUp = "if (AGM_Interaction_MenuType mod 2 == 0) then {call AGM_Interaction_fnc_onButtonUp};"; + statement = QUOTE( call FUNC(onButtonDown) ); + conditionUp = QUOTE( !isNull (findDisplay 1713999) && {profileNamespace getVariable [QUOTE(QGVAR(AutoCloseMenu)), false]} ); + statementUp = QUOTE( if (GVAR(MenuType) mod 2 == 0) then {call FUNC(onButtonUp)}; ); exceptions[] = {"AGM_Drag_isNotDragging", "AGM_Medical_canTreat", "AGM_Interaction_isNotEscorting", "AGM_Interaction_isNotSwimming"}; key = 219; shift = 0; @@ -90,9 +90,9 @@ class AGM_Core_Default_Keys { class openInteractionMenuSelfNew { displayName = "$STR_AGM_Interaction_InteractionMenuSelf"; condition = "true"; - statement = "call AGM_Interaction_fnc_onButtonDownSelf"; - conditionUp = "!isNull (findDisplay 1713999) && {profileNamespace getVariable ['AGM_Interaction_AutoCloseMenu', false]}"; - statementUp = "if (AGM_Interaction_MenuType mod 2 == 1) then {call AGM_Interaction_fnc_onButtonUp};"; + statement = QUOTE( call FUNC(onButtonDownSelf) ); + conditionUp = QUOTE( !isNull (findDisplay 1713999) && {profileNamespace getVariable [QUOTE(QGVAR(AutoCloseMenu)), false]} ); + statementUp = QUOTE( if (EGVAR(interaction,MenuType) mod 2 == 1) then {call FUNC(onButtonUp)}; ); exceptions[] = {"AGM_Drag_isNotDragging", "AGM_Medical_canTreat", "AGM_Interaction_isNotEscorting", "AGM_Interaction_isNotSwimming", "AGM_Core_notOnMap"}; key = 219; shift = 0; @@ -101,10 +101,10 @@ class AGM_Core_Default_Keys { }; class openDoor { displayName = "$STR_AGM_Interaction_OpenDoor"; - condition = "!AGM_Interaction_isOpeningDoor && {[2] call AGM_Interaction_fnc_getDoor select 1 != ''}"; - statement = "call AGM_Interaction_fnc_openDoor"; - conditionUp = "AGM_Interaction_isOpeningDoor"; - statementUp = "AGM_Interaction_isOpeningDoor = false"; + condition = QUOTE( !GVAR(isOpeningDoor) && {[2] call FUNC(getDoor) select 1 != ''} ); + statement = QUOTE( call AGM_Interaction_fnc_openDoor ); + conditionUp = QUOTE( GVAR(isOpeningDoor) ); + statementUp = QUOTE( GVAR(isOpeningDoor) = false;); key = 57; shift = 0; control = 1; @@ -112,8 +112,8 @@ class AGM_Core_Default_Keys { }; class tapShoulder { displayName = "$STR_AGM_Interaction_TapShoulder"; - condition = "[_player, cursorTarget] call AGM_Interaction_fnc_canTapShoulder"; - statement = "[_player, cursorTarget] call AGM_Interaction_fnc_tapShoulder"; + condition = QUOTE( [_player, cursorTarget] call FUNC(canTapShoulder) ); + statement = QUOTE( [_player, cursorTarget] call FUNC(tapShoulder); ); key = 20; shift = 1; control = 0; @@ -122,9 +122,9 @@ class AGM_Core_Default_Keys { class modifierKey { displayName = "$STR_AGM_Interaction_ModifierKey"; condition = ""; - statement = "AGM_Modifier = 1;"; + statement = QUOTE( GVAR(Modifier) = 1; ); conditionUp = ""; - statementUp = "AGM_Modifier = 0;"; + statementUp = QUOTE( GVAR(Modifier) = 0; ); exceptions[] = {"AGM_Drag_isNotDragging"}; key = 29; shift = 0; @@ -157,16 +157,16 @@ class AGM_Parameters_Boolean { class AGM_Core_canInteractConditions { class AGM_Interaction_isNotEscorting { - condition = "!(_player getVariable ['AGM_isEscorting', false])"; + condition = QUOTE( !(_player getVariable ['AGM_isEscorting', false]) ); }; class AGM_Interaction_isNotCaptive { - condition = "!(_player getVariable ['AGM_isCaptive', false])"; + condition = QUOTE( !(_player getVariable ['AGM_isCaptive', false]) ); }; class AGM_Interaction_isNotSurrendering { - condition = "!(_player getVariable ['AGM_isSurrender', false])"; + condition = QUOTE( !(_player getVariable ['AGM_isSurrender', false]) ); }; class AGM_Interaction_isNotSwimming { - condition = "!underwater _player"; + condition = QUOTE( !underwater _player ); }; }; From 8d1bdd88ff510f526395a34fa5e79208d092580e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Sun, 11 Jan 2015 18:22:47 -0300 Subject: [PATCH 04/18] Finish macro work for config --- addons/interaction/config.cpp | 114 +++++++++++++++++----------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index d81223eb66..fb38eb63bb 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -20,7 +20,7 @@ class CfgPatches { class CfgFunctions { class AGM_Interaction { class AGM_Interaction { - file = "\AGM_interaction\functions"; + file = PATHOF(functions); class addInteraction; class addInteractionSelf; class AddSelectableItem; @@ -185,7 +185,7 @@ class CfgVehicles { function = "AGM_Interaction_fnc_moduleInteraction"; scope = 2; isGlobal = 1; - icon = "\AGM_Interaction\UI\IconInteraction_ca.paa"; + icon = PATHTOF(UI\IconInteraction_ca.paa); class Arguments { class EnableTeamManagement { displayName = "Enable Team Management"; @@ -205,11 +205,11 @@ class CfgVehicles { class AGM_TeamManagement { displayName = "$STR_AGM_Interaction_TeamManagement"; distance = 4; - condition = "alive _target && {!isPlayer _target} && {_target in units group _player} && {AGM_Interaction_EnableTeamManagement}"; + condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} && {GVAR(EnableTeamManagement)} ); statement = ""; showDisabled = 0; priority = 3.2; - icon = "\AGM_Interaction\UI\team\team_management_ca.paa"; + icon = PATHOF(UI\team\team_management_ca.paa); subMenu[] = {"AGM_TeamManagement", 0}; hotkey = "M"; enableInside = 1; @@ -217,10 +217,10 @@ class CfgVehicles { class AGM_JoinTeamRed { displayName = "$STR_AGM_Interaction_JoinTeamRed"; distance = 4; - condition = "alive _target && {!isPlayer _target} && {_target in units group _player}"; - statement = "[_target, 'RED'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); + statement = QUOTE( [_target, 'RED'] call FUNC(joinTeam) ); showDisabled = 1; - icon = "\AGM_Interaction\UI\team\team_red_ca.paa"; + icon = PATHOF(UI\team\team_red_ca.paa); priority = 2.4; hotkey = "R"; enableInside = 1; @@ -228,10 +228,10 @@ class CfgVehicles { class AGM_JoinTeamGreen { displayName = "$STR_AGM_Interaction_JoinTeamGreen"; distance = 4; - condition = "alive _target && {!isPlayer _target} && {_target in units group _player}"; - statement = "[_target, 'GREEN'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); + statement = QUOTE( [_target, 'GREEN'] call FUNC(joinTeam) ); showDisabled = 1; - icon = "\AGM_Interaction\UI\team\team_green_ca.paa"; + icon = PATHOF(UI\team\team_green_ca.paa); priority = 2.3; hotkey = "G"; enableInside = 1; @@ -239,10 +239,10 @@ class CfgVehicles { class AGM_JoinTeamBlue { displayName = "$STR_AGM_Interaction_JoinTeamBlue"; distance = 4; - condition = "alive _target && {!isPlayer _target} && {_target in units group _player}"; - statement = "[_target, 'BLUE'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); + statement = QUOTE( [_target, 'BLUE'] call FUNC(joinTeam) ); showDisabled = 1; - icon = "\AGM_Interaction\UI\team\team_blue_ca.paa"; + icon = PATHOF(UI\team\team_blue_ca.paa); priority = 2.2; hotkey = "B"; enableInside = 1; @@ -250,10 +250,10 @@ class CfgVehicles { class AGM_JoinTeamYellow { displayName = "$STR_AGM_Interaction_JoinTeamYellow"; distance = 4; - condition = "alive _target && {!isPlayer _target} && {_target in units group _player}"; - statement = "[_target, 'YELLOW'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); + statement = QUOTE( [_target, 'YELLOW'] call FUNC(joinTeam) ); showDisabled = 1; - icon = "\AGM_Interaction\UI\team\team_yellow_ca.paa"; + icon = PATHOF(UI\team\team_yellow_ca.paa); priority = 2.1; hotkey = "Y"; enableInside = 1; @@ -262,10 +262,10 @@ class CfgVehicles { class AGM_LeaveTeam { displayName = "$STR_AGM_Interaction_LeaveTeam"; distance = 4; - condition = "alive _target && {!isPlayer _target} && {_target in units group _player} && {assignedTeam _player != 'MAIN'}"; - statement = "[_target, 'MAIN'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} && {assignedTeam _player != 'MAIN'} ); + statement = QUOTE( [_target, 'MAIN'] call FUNC(joinTeam) ); showDisabled = 1; - icon = "\AGM_Interaction\UI\team\team_white_ca.paa"; + icon = PATHOF(UI\team\team_white_ca.paa); priority = 2.5; hotkey = "N"; enableInside = 1; @@ -275,8 +275,8 @@ class CfgVehicles { class AGM_TapShoulder { displayName = "$STR_AGM_Interaction_TapShoulder"; distance = 4; - condition = "[_player, _target] call AGM_Interaction_fnc_canTapShoulder"; - statement = "[_player, _target] call AGM_Interaction_fnc_tapShoulder"; + condition = QUOTE( [_player, _target] call FUNC(canTapShoulder) ); + statement = QUOTE( [_player, _target] call FUNC(tapShoulder) ); showDisabled = 1; priority = 2.8; hotkey = "Q"; @@ -285,11 +285,11 @@ class CfgVehicles { class AGM_JoinGroup { displayName = "$STR_AGM_Interaction_JoinGroup"; distance = 4; - condition = "side group _player == side group _target && {group _player != group _target}"; - statement = "[_player] joinSilent group _target;"; + condition = QUOTE( side group _player == side group _target && {group _player != group _target} ); + statement = QUOTE( [_player] joinSilent group _target; ); showDisabled = 0; priority = 2.6; - icon = "\AGM_Interaction\UI\team\team_management_ca.paa"; + icon = PATHOF(UI\team\team_management_ca.paa); hotkey = "J"; enableInside = 1; }; @@ -297,24 +297,24 @@ class CfgVehicles { class AGM_GetDown { displayName = "$STR_AGM_Interaction_GetDown"; distance = 4; - condition = "[_target] call AGM_Interaction_fnc_canInteractWith"; - statement = "[_target] call AGM_Interaction_fnc_getDown"; + condition = QUOTE( [_target] call FUNC(canInteractWith) ); + statement = QUOTE( [_target] call FUNC(getDown) ); showDisabled = 0; priority = 2.2; }; class AGM_SendAway { displayName = "$STR_AGM_Interaction_SendAway"; distance = 4; - condition = "[_target] call AGM_Interaction_fnc_canInteractWith"; - statement = "[_target] call AGM_Interaction_fnc_sendAway"; + condition = QUOTE( [_target] call FUNC(canInteractWith) ); + statement = QUOTE( [_target] call FUNC(sendAway) ); showDisabled = 0; priority = 2.0; }; class AGM_Pardon { displayName = "$STR_AGM_Interaction_Pardon"; distance = 4; - condition = "rating _target < -2000 && {alive _target} && {side group _player == side group _target}"; - statement = "[_target, '{_this addRating -rating _this}', _target] call AGM_Core_fnc_execRemoteFnc"; + condition = QUOTE( rating _target < -2000 && {alive _target} && {side group _player == side group _target} ); + statement = QUOTE( [_target, '{_this addRating -rating _this}', _target] call EFUNC(core,execRemoteFnc) ); showDisabled = 0; priority = 2.5; enableInside = 1; @@ -324,84 +324,84 @@ class CfgVehicles { class AGM_SelfActions { class AGM_TeamManagement { displayName = "$STR_AGM_Interaction_TeamManagement"; - condition = "AGM_Interaction_EnableTeamManagement"; + condition = QUOTE( GVAR(EnableTeamManagement) ); statement = ""; showDisabled = 1; priority = 3.2; - icon = "\AGM_Interaction\UI\team\team_management_ca.paa"; + icon = PATHOF(UI\team\team_management_ca.paa); subMenu[] = {"AGM_TeamManagement", 1}; enableInside = 1; hotkey = "M"; class AGM_JoinTeamRed { displayName = "$STR_AGM_Interaction_JoinTeamRed"; - condition = "true"; - statement = "[_player, 'RED'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( true ); + statement = QUOTE( [_player, 'RED'] call FUNC(joinTeam) ); showDisabled = 1; priority = 2.4; - icon = "\AGM_Interaction\UI\team\team_red_ca.paa"; + icon = PATHOF(UI\team\team_red_ca.paa); enableInside = 1; hotkey = "R"; }; class AGM_JoinTeamGreen { displayName = "$STR_AGM_Interaction_JoinTeamGreen"; - condition = "true"; - statement = "[_player, 'GREEN'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( true ); + statement = QUOTE( [_player, 'GREEN'] call FUNC(joinTeam) ); showDisabled = 1; priority = 2.3; - icon = "\AGM_Interaction\UI\team\team_green_ca.paa"; + icon = PATHOF(UI\team\team_green_ca.paa); enableInside = 1; hotkey = "G"; }; class AGM_JoinTeamBlue { displayName = "$STR_AGM_Interaction_JoinTeamBlue"; - condition = "true"; - statement = "[_player, 'BLUE'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( true ); + statement = QUOTE( [_player, 'BLUE'] call FUNC(joinTeam) ); showDisabled = 1; priority = 2.2; - icon = "\AGM_Interaction\UI\team\team_blue_ca.paa"; + icon = PATHOF(UI\team\team_blue_ca.paa); enableInside = 1; hotkey = "B"; }; class AGM_JoinTeamYellow { displayName = "$STR_AGM_Interaction_JoinTeamYellow"; - condition = "true"; - statement = "[_player, 'YELLOW'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( true ); + statement = QUOTE( [_player, 'YELLOW'] call FUNC(joinTeam) ); showDisabled = 1; priority = 2.1; - icon = "\AGM_Interaction\UI\team\team_yellow_ca.paa"; + icon = PATHOF(UI\team\team_yellow_ca.paa); enableInside = 1; hotkey = "Y"; }; class AGM_LeaveTeam { displayName = "$STR_AGM_Interaction_LeaveTeam"; - condition = "assignedTeam _player != 'MAIN'"; - statement = "[_player, 'MAIN'] call AGM_Interaction_fnc_joinTeam"; + condition = QUOTE( assignedTeam _player != 'MAIN' ); + statement = QUOTE( [_player, 'MAIN'] call FUNC(joinTeam) ); showDisabled = 1; priority = 2.5; - icon = "\AGM_Interaction\UI\team\team_white_ca.paa"; + icon = PATHOF(UI\team\team_white_ca.paa); enableInside = 1; hotkey = "N"; }; class AGM_BecomeLeader { displayName = "$STR_AGM_Interaction_BecomeLeader"; - condition = "count (units group _player) > 1 && {leader group _player != _player}"; - statement = "_newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player;"; + condition = QUOTE( count (units group _player) > 1 && {leader group _player != _player} ); + statement = QUOTE( _newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player; ); showDisabled = 1; priority = 1.0; - icon = "\AGM_Interaction\UI\team\team_white_ca.paa"; + icon = PATHOF(UI\team\team_white_ca.paa); enableInside = 1; hotkey = "L"; }; class AGM_LeaveGroup { displayName = "$STR_AGM_Interaction_LeaveGroup"; - condition = "count (units group _player) > 1"; - statement = "_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;"; + condition = QUOTE( count (units group _player) > 1 ); + statement = QUOTE( _oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup; ); showDisabled = 1; priority = 1.2; - icon = "\AGM_Interaction\UI\team\team_management_ca.paa"; + icon = PATHOF(UI\team\team_management_ca.paa); enableInside = 1; hotkey = "M"; }; @@ -580,8 +580,8 @@ class CfgVehicles { class AGM_Push { displayName = "$STR_AGM_Interaction_Push"; distance = 4; - condition = "getMass _target < 1000 and alive _target"; - statement = "[_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call AGM_Interaction_fnc_push;"; + condition = QUOTE( getMass _target < 1000 and alive _target ); + statement = QUOTE( [_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call FUNC(push); ); showDisabled = 0; priority = -1; }; @@ -615,8 +615,8 @@ class CfgWeapons { class AGM_CableTie: AGM_ItemCore { displayName = "$STR_AGM_Interaction_CableTie_Name"; descriptionShort = "$STR_AGM_Interaction_CableTie_Description"; - model = "\AGM_Interaction\agm_cabletie.p3d"; - picture = "\AGM_Interaction\UI\agm_cabletie_x_ca.paa"; + model = PATHOF(agm_cabletie.p3d); + picture = PATHOF(UI\agm_cabletie_x_ca.paa); scope = 2; class ItemInfo: InventoryItem_Base_F { mass = 1; From 6025fc5c57e961edcda23828272f241a04fe1de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Sun, 11 Jan 2015 20:13:47 -0300 Subject: [PATCH 05/18] Macros for the rest of interaction --- addons/interaction/XEH_clientInit.sqf | 7 +- .../functions/fn_AddSelectableItem.sqf | 7 +- .../interaction/functions/fn_GetActions.sqf | 36 ++++----- addons/interaction/functions/fn_MoveDown.sqf | 36 ++++----- .../functions/fn_addInteraction.sqf | 10 ++- .../functions/fn_addInteractionSelf.sqf | 10 +-- .../interaction/functions/fn_addToTooltip.sqf | 4 +- .../interaction/functions/fn_applyButtons.sqf | 14 ++-- .../functions/fn_canInteractWith.sqf | 2 + .../functions/fn_canTapShoulder.sqf | 2 + .../interaction/functions/fn_getActions2.sqf | 19 ++--- .../functions/fn_getCaptivityStatus.sqf | 3 +- addons/interaction/functions/fn_getDoor.sqf | 1 + .../functions/fn_getDoorAnimations.sqf | 1 + addons/interaction/functions/fn_getDown.sqf | 5 +- .../functions/fn_getSelectedButton.sqf | 3 +- addons/interaction/functions/fn_hideMenu.sqf | 20 ++--- .../functions/fn_hideMouseHint.sqf | 12 +-- .../functions/fn_initialiseInteraction.sqf | 72 +++++++++--------- addons/interaction/functions/fn_isInRange.sqf | 7 +- addons/interaction/functions/fn_joinTeam.sqf | 7 +- .../interaction/functions/fn_menuKeyInput.sqf | 5 +- .../functions/fn_moduleInteraction.sqf | 3 +- .../interaction/functions/fn_onButtonDown.sqf | 5 +- .../functions/fn_onButtonDownSelf.sqf | 5 +- .../interaction/functions/fn_onButtonUp.sqf | 24 ++---- addons/interaction/functions/fn_onClick.sqf | 18 ++--- .../functions/fn_onSelectMenuDblClick.sqf | 3 +- addons/interaction/functions/fn_openDoor.sqf | 11 +-- addons/interaction/functions/fn_openMenu.sqf | 5 +- .../functions/fn_openMenuSelectUI.sqf | 23 +++--- .../interaction/functions/fn_openMenuSelf.sqf | 3 +- .../functions/fn_openSelectMenu.sqf | 18 +++-- .../interaction/functions/fn_openSubMenu.sqf | 3 +- .../functions/fn_openSubMenuSelf.sqf | 3 +- .../functions/fn_prepareSelectMenu.sqf | 16 ++-- addons/interaction/functions/fn_push.sqf | 3 +- .../functions/fn_removeInteraction.sqf | 9 ++- .../functions/fn_removeInteractionSelf.sqf | 10 +-- addons/interaction/functions/fn_removeTag.sqf | 1 + addons/interaction/functions/fn_sendAway.sqf | 5 +- .../functions/fn_setCaptivityStatus.sqf | 3 +- addons/interaction/functions/fn_showMenu.sqf | 74 ++++++++++--------- .../functions/fn_showMouseHint.sqf | 14 ++-- .../functions/fn_sortOptionsByPriority.sqf | 1 + .../interaction/functions/fn_tapShoulder.sqf | 7 +- .../functions/fn_updateTooltipPosition.sqf | 1 + 47 files changed, 299 insertions(+), 252 deletions(-) diff --git a/addons/interaction/XEH_clientInit.sqf b/addons/interaction/XEH_clientInit.sqf index 02762d42b6..7b64310037 100644 --- a/addons/interaction/XEH_clientInit.sqf +++ b/addons/interaction/XEH_clientInit.sqf @@ -1,12 +1,13 @@ // by commy2 and CAA-Picard +#include "script_component.hpp" + if (!hasInterface) exitWith {}; -AGM_Interaction_isOpeningDoor = false; -AGM_Dancing = false; +GVAR(isOpeningDoor) = false; // restore global fire teams for JIP { - _team = _x getVariable ["AGM_assignedFireTeam", ""]; + _team = _x getVariable [QGVAR(assignedFireTeam), ""]; if (_team != "") then {_x assignTeam _team}; } forEach allUnits; diff --git a/addons/interaction/functions/fn_AddSelectableItem.sqf b/addons/interaction/functions/fn_AddSelectableItem.sqf index f6fccae709..6ce0b6a3a9 100644 --- a/addons/interaction/functions/fn_AddSelectableItem.sqf +++ b/addons/interaction/functions/fn_AddSelectableItem.sqf @@ -17,6 +17,9 @@ Example: */ + +#include "script_component.hpp" + private ["_container", "_displayName", "_picture", "_data", "_index"]; _container = _this select 0; @@ -25,10 +28,10 @@ _picture = _this select 2; _data = _this select 3; if (_picture == "" || _picture == "PictureThing") then { - _picture = "AGM_Interaction\UI\dot_ca.paa"; + _picture = PATHTOF(UI\dot_ca.paa); }; -if ((profileNamespace getVariable ["AGM_Interaction_FlowMenu", false])) then { +if ((profileNamespace getVariable [QGVAR(FlowMenu), false])) then { //[_displayName, _statement, _condition, _priority, _subMenu, _icon, _tooltip, _conditionShow, _exceptions, _distance, _hotkey] _container pushBack [_displayName, nil, {true},0,[], _picture, "", {true}, [], 4, "", _data]; }else{ diff --git a/addons/interaction/functions/fn_GetActions.sqf b/addons/interaction/functions/fn_GetActions.sqf index 6e7b067150..b0b4bc14bd 100644 --- a/addons/interaction/functions/fn_GetActions.sqf +++ b/addons/interaction/functions/fn_GetActions.sqf @@ -1,12 +1,12 @@ /* Name: AGM_Interaction_fnc_GetActions - + Author: commy2 Garth de Wet (LH) - + Description: - + Parameters: 0: OBJECT - target 1: ARRAY - Parents of the target object @@ -16,16 +16,18 @@ 5: BOOL - Is mission config file? 6: STRING - Classname ("AGM_Actions"/"AGM_SelfActions") 7: STRING - Sub-class - + Returns: Nothing - + Example: [player, [configfile >> "CfgVehicles" >> typeOf player, true] call BIS_fnc_returnParents, [], [],configfile >> "CfgVehicles", false, "AGM_Actions"] call AGM_Interaction_fnc_GetActions; - + [player, [configfile >> "CfgVehicles" >> typeOf player, true] call BIS_fnc_returnParents, [], [],configfile >> "CfgVehicles", false, "AGM_SelfActions"] call AGM_Interaction_fnc_GetActions; */ -#define DEFAULT_ICON "\AGM_Interaction\UI\dot_ca.paa" +#include "script_component.hpp" + +#define DEFAULT_ICON PATHTOF(UI\dot_ca.paa) private ["_target", "_parents", "_actions", "_patches", "_baseConfig", "_actionType", "_i","_index", "_missionConfig", "_stdConfig"]; _target = _this select 0; _parents = _this select 1; @@ -54,7 +56,7 @@ for "_i" from 0 to (_count - 1) do { private ["_action", "_displayName", "_distance","_condition","_statement","_showDisabled", "_priority", "_tooltip", "_hotkey", "_subMenu", "_conditionShow", "_exceptions", "_icon", "_actionToCache", "_cacheActions", "_cache", "_indexCache", "_configName"]; _action = if (_missionConfig) then {_config select _index} else {_stdConfig >> configName (_config select _index)}; - _cache = missionNamespace getVariable ["AGM_Interaction_MenuCache", [[], [], []]]; + _cache = missionNamespace getVariable [QGVAR(MenuCache), [[], [], []]]; if (count _action > 0) then { _configName = configName _action; @@ -77,7 +79,7 @@ for "_i" from 0 to (_count - 1) do { _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [" && {%1 call AGM_Core_canInteract} && {[AGM_player, AGM_Interaction_Target] call AGM_Core_fnc_canInteractWith}", getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[AGM_player, GVAR(Target)] call EFUNC(core,canInteractWith)} ), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; @@ -98,11 +100,11 @@ for "_i" from 0 to (_count - 1) do { _statement = getText (_action >> "statement"); _statement = compile _statement; - if (profileNamespace getVariable ["AGM_Interaction_FlowMenu", false]) then { + if (profileNamespace getVariable [QGVAR(FlowMenu), false]) then { _statement = if (getText (_action >> "statement") == "" && {count _subMenu > 1}) then { - compile format ["call AGM_Interaction_fnc_hideMenu;if(%2 == 1)then{['%1'] call AGM_Interaction_fnc_openSubMenuSelf;}else{['%1'] call AGM_Interaction_fnc_openSubMenu;};", _subMenu select 0, _subMenu select 1]; + compile format [QUOTE( call FUNC(hideMenu);if(%2 == 1)then{['%1'] call FUNC(openSubMenuSelf);}else{['%1'] call FUNC(openSubMenu);}; ), _subMenu select 0, _subMenu select 1]; } else { - compile ("call AGM_Interaction_fnc_hideMenu;" + getText (_action >> "statement")); + compile (QUOTE( call FUNC(hideMenu); ) + getText (_action >> "statement")); }; }; @@ -114,7 +116,7 @@ for "_i" from 0 to (_count - 1) do { _actionToCache = [_displayName, _statement, _condition, _priority, _subMenu, _icon, _tooltip, _conditionShow, _exceptions, _distance, _hotkey]; - if (!(_configName in _patches) && {_showDisabled || {[_object, _player] call _condition}} && {_distance == 0 || {[_object, _distance] call AGM_Interaction_fnc_isInRange}}) then { + if (!(_configName in _patches) && {_showDisabled || {[_object, _player] call _condition}} && {_distance == 0 || {[_object, _distance] call FUNC(isInRange)}}) then { _actions pushBack _actionToCache; _patches pushBack _configName; }; @@ -129,9 +131,9 @@ for "_i" from 0 to (_count - 1) do { _cacheIndices pushBack _indexCache; _cache = [_cacheConfigs, _cacheActions, _cacheIndices]; - ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call AGM_Debug_fnc_log; + ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call EFUNC(debug, log); } else { - ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call AGM_Debug_fnc_log; + ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call EFUNC(debug, log); _cachedAction = _cacheActions select (_cacheIndices select _indexCache); @@ -140,14 +142,14 @@ for "_i" from 0 to (_count - 1) do { _showDisabled = [_object, _player] call (_cachedAction select 7); }; - if (!(_configName in _patches) && {_showDisabled || {[_object, _player] call (_cachedAction select 2)}} && {[_object, (_cachedAction select 9)] call AGM_Interaction_fnc_isInRange || {(_cachedAction select 9) == 0}}) then { + if (!(_configName in _patches) && {_showDisabled || {[_object, _player] call (_cachedAction select 2)}} && {[_object, (_cachedAction select 9)] call FUNC(isInRange) || {(_cachedAction select 9) == 0}}) then { _actions pushBack _cachedAction; _patches pushBack _configName; }; }; }; - AGM_Interaction_MenuCache = _cache; + GVAR(MenuCache) = _cache; }; }; }; diff --git a/addons/interaction/functions/fn_MoveDown.sqf b/addons/interaction/functions/fn_MoveDown.sqf index 7a5662ed9b..8f7a9c95ac 100644 --- a/addons/interaction/functions/fn_MoveDown.sqf +++ b/addons/interaction/functions/fn_MoveDown.sqf @@ -1,40 +1,42 @@ /* Name: AGM_Interaction_fnc_MoveDown - + Author: Garth de Wet (LH) - + Description: Depending on the passed value, either scrolls down through the list or up. - - Parameters: + + Parameters: NUMBER - Amount to increase current interaction target - + Returns: Nothing - + Example: 1 call AGM_Interaction_fnc_MoveDown; -1 call AGM_Interaction_fnc_MoveDown; */ -#define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}}) -if (isNil "AGM_Interaction_MainButton") exitWith{}; -if (isNil "AGM_Interaction_Buttons") exitWith{}; -_count = (count AGM_Interaction_Buttons)- 1; -AGM_Interaction_SelectedButton = CLAMP(AGM_Interaction_SelectedButton + _this, 0, _count); +#include "script_component.hpp" -_target = AGM_Interaction_Target; +#define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}}) +if (isNil QGVAR(MainButton)) exitWith{}; +if (isNil QGVAR(Buttons)) exitWith{}; +_count = (count GVAR(Buttons))- 1; +GVAR(SelectedButton) = CLAMP(GVAR(SelectedButton) + _this, 0, _count); + +_target = GVAR(Target); _player = AGM_player; _vehicle = vehicle _player; disableSerialization; -_dlgInteractionDialog = uiNamespace getVariable "AGM_Flow_Display"; -_top = AGM_Interaction_SelectedButton - 2; +_dlgInteractionDialog = uiNamespace getVariable QGVAR(Flow_Display); +_top = GVAR(SelectedButton) - 2; _i = 0; while {_i <= 4} do { _index =_i + _top; _ctrl = _dlgInteractionDialog displayCtrl (1200 + _i); if (_index >= 0 && {_index <= _count}) then { - _action = AGM_Interaction_Buttons select _index; + _action = GVAR(Buttons) select _index; _ctrl ctrlShow true; _ctrl ctrlSetText (_action select 5); _color = [1,1,1,1]; @@ -55,9 +57,9 @@ while {_i <= 4} do { }; _ctrl = _dlgInteractionDialog displayCtrl 1000; -_ctrl ctrlSetText ((AGM_Interaction_Buttons select AGM_Interaction_SelectedButton) select 0); +_ctrl ctrlSetText ((GVAR(Buttons) select GVAR(SelectedButton)) select 0); _ctrl = _dlgInteractionDialog displayCtrl 1100; -_current = (AGM_Interaction_Buttons select AGM_Interaction_SelectedButton); +_current = (GVAR(Buttons) select GVAR(SelectedButton)); _infoText = ""; if !([_target, _player] call (_current select 2)) then { _infoText = "Unavailable"; diff --git a/addons/interaction/functions/fn_addInteraction.sqf b/addons/interaction/functions/fn_addInteraction.sqf index 72c3ccb182..6b41ed1dd6 100644 --- a/addons/interaction/functions/fn_addInteraction.sqf +++ b/addons/interaction/functions/fn_addInteraction.sqf @@ -2,7 +2,7 @@ * Author: commy2 * * Add an AGM action to an object. Note: This function is global. - * + * * Argument: * 0: Object the action should be assigned to (Object) * 1: Name of the action shown in the menu (String) @@ -11,11 +11,13 @@ * 4: Statement (Code or String) * 5: Show the action even if the conditon is not met (Bool or Number) * 6: Priority (Number, optional default: 0) - * + * * Return value: * ID of the action (used to remove it later). */ +#include "script_component.hpp" + private ["_object", "_displayName", "_distance", "_condition", "_statement", "_showDisabled", "_priority", "_actionsVar", "_id", "_actionIDs", "_actions"]; _object = _this select 0; @@ -42,7 +44,7 @@ if (isNil "_priority") then { _priority = 0; }; -_actionsVar = _object getVariable ["AGM_Interactions", [-1, [], []]]; +_actionsVar = _object getVariable [QGVAR(Interactions), [-1, [], []]]; _id = (_actionsVar select 0) + 1; _actionIDs = _actionsVar select 1; @@ -51,5 +53,5 @@ _actions = _actionsVar select 2; _actionIDs pushBack _id; _actions pushBack [_displayName, _distance, _condition, _statement, _showDisabled, _priority]; -_object setVariable ["AGM_Interactions", [_id, _actionIDs, _actions], true]; +_object setVariable [QGVAR(Interactions), [_id, _actionIDs, _actions], true]; _id diff --git a/addons/interaction/functions/fn_addInteractionSelf.sqf b/addons/interaction/functions/fn_addInteractionSelf.sqf index bccaf40528..a84577f0c2 100644 --- a/addons/interaction/functions/fn_addInteractionSelf.sqf +++ b/addons/interaction/functions/fn_addInteractionSelf.sqf @@ -2,19 +2,19 @@ * Author: commy2 * * Add an AGM self action to the player. Execute this on the local machine of the player. - * + * * Argument: * 0: Name of the action shown in the menu (String) * 1: Condition (Code or String) * 2: Statement (Code or String) * 3: Show the action even if the conditon is not met (Bool or Number) * 4: Priority (Number, optional default: 0) - * + * * Return value: * ID of the action (used to remove it later). */ - +#include "script_component.hpp" private ["_displayName", "_condition", "_statement", "_showDisabled", "_priority", "_actionsVar", "_id", "_actionIDs", "_actions"]; @@ -42,7 +42,7 @@ if (isNil "_priority") then { _priority = 0; }; -_actionsVar = AGM_player getVariable ["AGM_InteractionsSelf", [-1, [], []]]; +_actionsVar = AGM_player getVariable [QGVAR(InteractionsSelf), [-1, [], []]]; _id = (_actionsVar select 0) + 1; _actionIDs = _actionsVar select 1; @@ -51,5 +51,5 @@ _actions = _actionsVar select 2; _actionIDs pushBack _id; _actions pushBack [_displayName, _condition, _statement, _showDisabled, _priority]; -AGM_player setVariable ["AGM_InteractionsSelf", [_id, _actionIDs, _actions], false]; +AGM_player setVariable [QGVAR(InteractionsSelf), [_id, _actionIDs, _actions], false]; _id diff --git a/addons/interaction/functions/fn_addToTooltip.sqf b/addons/interaction/functions/fn_addToTooltip.sqf index b54b7c5716..894223b68e 100644 --- a/addons/interaction/functions/fn_addToTooltip.sqf +++ b/addons/interaction/functions/fn_addToTooltip.sqf @@ -1,3 +1,5 @@ // by commy2 -AGM_Interaction_CurrentTooltip pushBack (_this select 0); +#include "script_component.hpp" + +QGVAR(CurrentTooltip) pushBack (_this select 0); diff --git a/addons/interaction/functions/fn_applyButtons.sqf b/addons/interaction/functions/fn_applyButtons.sqf index 8bc732f946..3cd3eecded 100644 --- a/addons/interaction/functions/fn_applyButtons.sqf +++ b/addons/interaction/functions/fn_applyButtons.sqf @@ -1,17 +1,19 @@ // by commy2 +#include "script_component.hpp" + private ["_object", "_actions", "_dlgInteractionDialog", "_ctrlInteractionDialog", "_index", "_ctrlInteractionDialogIcon"]; -_object = AGM_Interaction_Target; -_actions = AGM_Interaction_Buttons; +_object = GVAR(Target); +_actions = GVAR(Buttons); disableSerialization; -_dlgInteractionDialog = uiNamespace getVariable "AGM_Interaction_Dialog"; +_dlgInteractionDialog = uiNamespace getVariable QGVAR(Dialog); /* for "_a" from 0 to (_count - 1) do { - _action = AGM_Interaction_Buttons select _a; + _action = GVAR(Buttons) select _a; _ctrlInteractionDialog = _dlgInteractionDialog displayCtrl (10 + _a); _ctrlInteractionDialog ctrlShow true; @@ -22,7 +24,7 @@ for "_a" from 0 to (_count - 1) do { _ctrlInteractionDialog = _dlgInteractionDialog displayCtrl 3; -AGM_Interaction_MainButton = "(findDisplay 1713999) closeDisplay 1;"; +GVAR(MainButton) = "(findDisplay 1713999) closeDisplay 1;"; if (_object isKindOf "Man") then { _ctrlInteractionDialog ctrlSetText (if (alive _object) then {name _object} else {_object getVariable ["AGM_Name", "Unknown"]}); @@ -37,7 +39,7 @@ for "_index" from 0 to 9 do { _ctrlInteractionDialogIcon = _dlgInteractionDialog displayCtrl (20 + _index); if (_index < _count) then { - _action = AGM_Interaction_Buttons select _index; + _action = GVAR(Buttons) select _index; _ctrlInteractionDialog ctrlSetText (_action select 0); _ctrlInteractionDialog ctrlEnable (call (_action select 2)); diff --git a/addons/interaction/functions/fn_canInteractWith.sqf b/addons/interaction/functions/fn_canInteractWith.sqf index 8766ff096e..036dd205b1 100644 --- a/addons/interaction/functions/fn_canInteractWith.sqf +++ b/addons/interaction/functions/fn_canInteractWith.sqf @@ -1,5 +1,7 @@ // by commy2 +#include "script_component.hpp" + private ["_unit", "_isCivilian"]; _unit = _this select 0; diff --git a/addons/interaction/functions/fn_canTapShoulder.sqf b/addons/interaction/functions/fn_canTapShoulder.sqf index 0966b53c37..5a7bc56549 100644 --- a/addons/interaction/functions/fn_canTapShoulder.sqf +++ b/addons/interaction/functions/fn_canTapShoulder.sqf @@ -1,5 +1,7 @@ // by commy2 +#include "script_component.hpp" + private ["_unit", "_target"]; _unit = _this select 0; diff --git a/addons/interaction/functions/fn_getActions2.sqf b/addons/interaction/functions/fn_getActions2.sqf index 2ede8ea968..96423963a8 100644 --- a/addons/interaction/functions/fn_getActions2.sqf +++ b/addons/interaction/functions/fn_getActions2.sqf @@ -1,4 +1,5 @@ // commy2 +#include "script_component.hpp" private ["_object", "_config", "_type", "_actions", "_configs"]; @@ -12,7 +13,7 @@ _configs = "_object isKindOf configName _x" configClasses (_config >> _type); // cache private ["_cache", "_cacheConfigs", "_cacheActions", "_cacheIndices"]; -_cache = uiNamespace getVariable ["AGM_Interaction_MenuCache", [[], [], []]]; +_cache = uiNamespace getVariable [QGVAR(MenuCache), [[], [], []]]; _cacheConfigs = _cache select 0; _cacheActions = _cache select 1; _cacheIndices = _cache select 2; @@ -44,7 +45,7 @@ _cacheIndices = _cache select 2; _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [" && {%1 call AGM_Core_canInteract} && {[AGM_player, AGM_Interaction_Target] call AGM_Core_fnc_canInteractWith}", getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE( && {%1 call EFUNC(core,canInteract)} && {[AGM_player, GVAR(Target)] call FUNC(canInteractWith)} ), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; @@ -67,9 +68,9 @@ _cacheIndices = _cache select 2; if (profileNamespace getVariable ["AGM_Interaction_FlowMenu", false]) then { _statement = if (getText (_action >> "statement") == "" && {count _subMenu > 1}) then { - compile format ["call AGM_Interaction_fnc_hideMenu;if(%2 == 1)then{['%1'] call AGM_Interaction_fnc_openSubMenuSelf;}else{['%1'] call AGM_Interaction_fnc_openSubMenu;};", _subMenu select 0, _subMenu select 1]; + compile format [QUOTE( call FUNC(hideMenu);if(%2 == 1)then{['%1'] call FUNC(openSubMenuSelf);}else{['%1'] call FUNC(openSubMenu);}; ), _subMenu select 0, _subMenu select 1]; } else { - compile ("call AGM_Interaction_fnc_hideMenu;" + getText (_action >> "statement")); + compile (QUOTE( call FUNC(hideMenu); ) + getText (_action >> "statement")); }; }; @@ -82,7 +83,7 @@ _cacheIndices = _cache select 2; private "_actionToCache"; _actionToCache = [_displayName, _statement, _condition, _priority, _subMenu, _icon, _tooltip, _conditionShow, _exceptions, _distance, _hotkey]; - if ((_showDisabled || {[_object, _player] call _condition}) && {_distance == 0 || {[_object, _distance] call AGM_Interaction_fnc_isInRange}}) then { + if ((_showDisabled || {[_object, _player] call _condition}) && {_distance == 0 || {[_object, _distance] call FUNC(isInRange)}}) then { _actions pushBack _actionToCache; }; @@ -96,9 +97,9 @@ _cacheIndices = _cache select 2; _cacheIndices pushBack _indexCache; _cache = [_cacheConfigs, _cacheActions, _cacheIndices]; - ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call AGM_Debug_fnc_log; + ["InteractionMenu", _action, {format ["%1 loaded into cache", _this]}] call EFUNC(debug, log); } else { - ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call AGM_Debug_fnc_log; + ["InteractionMenu", _action, {format ["%1 loaded from cache", _this]}] call EFUNC(debug, log); private ["_cachedAction", "_showDisabled"]; _cachedAction = _cacheActions select (_cacheIndices select _indexCache); @@ -108,13 +109,13 @@ _cacheIndices = _cache select 2; _showDisabled = [_object, _player] call (_cachedAction select 7); }; - if ((_showDisabled || {[_object, _player] call (_cachedAction select 2)}) && {[_object, (_cachedAction select 9)] call AGM_Interaction_fnc_isInRange || {(_cachedAction select 9) == 0}}) then { + if ((_showDisabled || {[_object, _player] call (_cachedAction select 2)}) && {[_object, (_cachedAction select 9)] call FUNC(isInRange) || {(_cachedAction select 9) == 0}}) then { _actions pushBack _cachedAction; }; }; } forEach _configActions; //Actions of this CfgVehicles class } forEach _configs; //CfgVehicles class -uiNamespace setVariable ["AGM_Interaction_MenuCache", _cache]; +uiNamespace setVariable [QGVAR(MenuCache), _cache]; _actions diff --git a/addons/interaction/functions/fn_getCaptivityStatus.sqf b/addons/interaction/functions/fn_getCaptivityStatus.sqf index 43538e882b..d904000e24 100644 --- a/addons/interaction/functions/fn_getCaptivityStatus.sqf +++ b/addons/interaction/functions/fn_getCaptivityStatus.sqf @@ -1,3 +1,4 @@ // by commy2 +#include "script_component.hpp" -_this call AGM_Core_fnc_getCaptivityStatus; +_this call EFUNC(core,getCaptivityStatus); diff --git a/addons/interaction/functions/fn_getDoor.sqf b/addons/interaction/functions/fn_getDoor.sqf index 19e5277873..c0d41fbfbd 100644 --- a/addons/interaction/functions/fn_getDoor.sqf +++ b/addons/interaction/functions/fn_getDoor.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private ["_distance", "_position0", "_position1", "_intersections", "_count", "_house", "_door", "_index", "_id"]; diff --git a/addons/interaction/functions/fn_getDoorAnimations.sqf b/addons/interaction/functions/fn_getDoorAnimations.sqf index 67e6788754..ebb820584a 100644 --- a/addons/interaction/functions/fn_getDoorAnimations.sqf +++ b/addons/interaction/functions/fn_getDoorAnimations.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private ["_house", "_door", "_animations", "_lockedVariable"]; diff --git a/addons/interaction/functions/fn_getDown.sqf b/addons/interaction/functions/fn_getDown.sqf index 73bae1c883..5d14d040f4 100644 --- a/addons/interaction/functions/fn_getDown.sqf +++ b/addons/interaction/functions/fn_getDown.sqf @@ -1,14 +1,15 @@ /* * Author: KoffeinFlummi - * + * * Forces a civilian to the ground. (chance of failure). - * + * * Arguments: * 0: Unit to be sent away (Object) * * Return value: * none */ +#include "script_component.hpp" #define RADIUS 10 diff --git a/addons/interaction/functions/fn_getSelectedButton.sqf b/addons/interaction/functions/fn_getSelectedButton.sqf index 3813811703..d1c801e1dc 100644 --- a/addons/interaction/functions/fn_getSelectedButton.sqf +++ b/addons/interaction/functions/fn_getSelectedButton.sqf @@ -1,10 +1,11 @@ // by commy2 +#include "script_component.hpp" #define MIN_DISTANCE 0.0065 private ["_position", "_distance", "_angle"]; -_position = uiNamespace getVariable ['AGM_Interaction_CursorPosition', [0.5, 0.5, 0]]; +_position = uiNamespace getVariable [QGVAR(CursorPosition), [0.5, 0.5, 0]]; _position = [((_position select 1) - 0.5) / safezoneH, ((_position select 2) - 0.5) / safezoneW, 0]; diff --git a/addons/interaction/functions/fn_hideMenu.sqf b/addons/interaction/functions/fn_hideMenu.sqf index 24e867b5b5..830cbb6449 100644 --- a/addons/interaction/functions/fn_hideMenu.sqf +++ b/addons/interaction/functions/fn_hideMenu.sqf @@ -1,22 +1,24 @@ /* Name: AGM_Interaction_fnc_hideMenu - + Author: Garth de Wet (LH) - + Description: Closes the Interaction menu - - Parameters: + + Parameters: Nothing - + Returns: Nothing - + Example: call AGM_Interaction_fnc_hideMenu; */ +#include "script_component.hpp" + closeDialog 0; (findDisplay 1713999) closeDisplay 1; -(uiNameSpace getVariable "AGM_Flow_Display") closeDisplay 0; -AGM_Interaction_MainButton = nil; -call AGM_Interaction_fnc_hideMouseHint; \ No newline at end of file +(uiNameSpace getVariable QGVAR(Flow_Display)) closeDisplay 0; +GVAR(MainButton) = nil; +call FUNC(hideMouseHint); \ No newline at end of file diff --git a/addons/interaction/functions/fn_hideMouseHint.sqf b/addons/interaction/functions/fn_hideMouseHint.sqf index f8f9b75b35..79ac3a45e8 100644 --- a/addons/interaction/functions/fn_hideMouseHint.sqf +++ b/addons/interaction/functions/fn_hideMouseHint.sqf @@ -1,21 +1,23 @@ /* Name: AGM_Interaction_fnc_hideMouseHint - + Author(s): Garth de Wet (LH) - + Description: Hides the interaction helper text with the mouse buttons at the bottom middle of the screen - + Parameters: Nothing - + Returns: Nothing - + Example: call AGM_Interaction_fnc_hideMouseHint; */ +#include "script_component.hpp" + if (isNull (uiNamespace getVariable ["AGM_Helper_Display", objNull])) exitWith{}; ("AGM_InteractionHelper" call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; diff --git a/addons/interaction/functions/fn_initialiseInteraction.sqf b/addons/interaction/functions/fn_initialiseInteraction.sqf index 556e3d0bd6..895656712b 100644 --- a/addons/interaction/functions/fn_initialiseInteraction.sqf +++ b/addons/interaction/functions/fn_initialiseInteraction.sqf @@ -19,62 +19,64 @@ Nothing Example: - [{"Default" call AGM_Interaction_fnc_openMenu;}, true, (profileNamespace getVariable ["AGM_Interaction_FlowMenu", false]), AGM_Interaction_Target] call AGM_Interaction_fnc_initialiseInteraction; + [{"Default" call AGM_Interaction_fnc_openMenu;}, true, (profileNamespace getVariable [QGVAR(FlowMenu), false]), GVAR(Target)] call AGM_Interaction_fnc_initialiseInteraction; */ +#include "script_component.hpp" + private ["_subMenu", "_selfMenu", "_target"]; -AGM_Interaction_MainButton = _this select 0; +GVAR(MainButton) = _this select 0; _subMenu = _this select 1; _selfMenu = _this select 3; _target = _this select 4; _player = AGM_player; _vehicle = vehicle _player; -//_object = [AGM_Interaction_Target, _player] select (AGM_Interaction_MenuType % 2 == 1); +//_object = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); -if !([_target, 5] call AGM_Interaction_fnc_isInRange) exitWith {}; +if !([_target, 5] call GVAR(isInRange)) exitWith {}; -AGM_Interaction_Shortcuts = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1]; +GVAR(Shortcuts) = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1]; // Flow menu if (_this select 2) then { - ("AGM_FlowMenu" call BIS_fnc_rscLayer) cutRsc ["AGM_FlowMenu", "PLAIN",0.5, false]; + (QGVAR(FlowMenu) call BIS_fnc_rscLayer) cutRsc [QGVAR(FlowMenu), "PLAIN",0.5, false]; AGM_Interaction_SelectedButton = 0; (findDisplay 1713999) closeDisplay 1; if (_player getVariable ["AGM_AcceptAction", -1] == -1) then { - [{if(isNil {AGM_Interaction_MainButton} || {!(profileNamespace getVariable ['AGM_Interaction_FlowMenu', false])})exitWith{false};(-(_this select 0) / 1.2) call AGM_Interaction_fnc_MoveDown;true}] call AGM_Core_fnc_addScrollWheelEventHandler; + [{if(isNil {GVAR(MainButton)} || {!(profileNamespace getVariable [QGVAR(FlowMenu), false])})exitWith{false};(-(_this select 0) / 1.2) call FUNC(MoveDown);true}] call EFUNC(core,addScrollWheelEventHandler); - _player setVariable ["AGM_AcceptAction", [_player, "DefaultAction", {(!isNil {AGM_Interaction_MainButton}) && {(profileNamespace getVariable ['AGM_Interaction_FlowMenu', false])}}, {_action = AGM_Interaction_Buttons select AGM_Interaction_SelectedButton;_target = AGM_Interaction_Target;_player = AGM_player;_vehicle = vehicle _player;if ([_target, _player] call (_action select 2)) then {call AGM_Interaction_fnc_hideMenu;if(count _action == 12) then{(_action select 11) call (_action select 1);}else{[_target, _player] call (_action select 1);};};}] call AGM_core_fnc_addActionEventHandler]; - _player setVariable ["AGM_AcceptAction", [_player, "menuBack", {(!isNil {AGM_Interaction_MainButton}) && {(profileNamespace getVariable ['AGM_Interaction_FlowMenu', false])}}, {call AGM_Interaction_MainButton;}] call AGM_core_fnc_addActionEventHandler]; + _player setVariable ["AGM_AcceptAction", [_player, "DefaultAction", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {_action = GVAR(Buttons) select AGM_Interaction_SelectedButton;_target = GVAR(Target);_player = AGM_player;_vehicle = vehicle _player;if ([_target, _player] call (_action select 2)) then {call FUNC(hideMenu);if(count _action == 12) then{(_action select 11) call (_action select 1);}else{[_target, _player] call (_action select 1);};};}] call EFUNC(core,addActionEventHandler)]; + _player setVariable ["AGM_AcceptAction", [_player, "menuBack", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {call GVAR(MainButton);}] call EFUNC(core,addActionEventHandler)]; }; - 0 call AGM_Interaction_fnc_moveDown; - [localize "STR_AGM_Interaction_MakeSelection", if (_subMenu)then{localize "STR_AGM_Interaction_Back"}else{""}, localize "STR_AGM_Interaction_ScrollHint"] call AGM_Interaction_fnc_showMouseHint; - ((uiNamespace getVariable "AGM_Flow_Display") displayCtrl (1210)) ctrlShow _subMenu; + 0 call FUNC(moveDown); + [localize "STR_AGM_Interaction_MakeSelection", if (_subMenu)then{localize "STR_AGM_Interaction_Back"}else{""}, localize "STR_AGM_Interaction_ScrollHint"] call FUNC(showMouseHint); + ((uiNamespace getVariable QGVAR(Flow_Display)) displayCtrl (1210)) ctrlShow _subMenu; }else{ // Rose - if (!isNull(uiNamespace getVariable "AGM_Flow_Display")) then { - (uiNameSpace getVariable "AGM_Flow_Display") closeDisplay 0; - call AGM_Interaction_fnc_hideMouseHint; + if (!isNull(uiNamespace getVariable QGVAR(Flow_Display))) then { + (uiNameSpace getVariable QGVAR(Flow_Display)) closeDisplay 0; + call FUNC(hideMouseHint); }; if (!_subMenu || {isNull (findDisplay 1713999)}) then { (findDisplay 1713999) closeDisplay 1; - (findDisplay 46) createDisplay "AGM_Interaction_Dialog"; + (findDisplay 46) createDisplay QGVAR(Dialog); // Add eventhandlers - (findDisplay 1713999) displayAddEventHandler ["KeyDown", "_this call AGM_Core_onKeyDown"]; - (findDisplay 1713999) displayAddEventHandler ["KeyUp", "_this call AGM_Core_onKeyUp"]; + (findDisplay 1713999) displayAddEventHandler ["KeyDown", QUOTE( _this call EFUNC(core,onKeyDown) )]; + (findDisplay 1713999) displayAddEventHandler ["KeyUp", QUOTE( _this call EFUNC(core,onKeyUp) )]; - (findDisplay 1713999) displayAddEventHandler ["KeyDown", "_this call AGM_Interaction_fnc_menuKeyInput"]; + (findDisplay 1713999) displayAddEventHandler ["KeyDown", QUOTE( _this call FUNC(menuKeyInput) )]; }; disableSerialization; - _dlgInteractionDialog = uiNamespace getVariable "AGM_Interaction_Dialog"; + _dlgInteractionDialog = uiNamespace getVariable QGVAR(Dialog); _ctrlInteractionDialog = _dlgInteractionDialog displayCtrl 3; - if (profileNamespace getVariable ["AGM_Interaction_AutoCenterCursor", true]) then {setMousePosition [0.5, 0.5]}; + if (profileNamespace getVariable [QGVAR(AutoCenterCursor), true]) then {setMousePosition [0.5, 0.5]}; if !(_subMenu) then { - _ctrlInteractionDialog ctrlSetText ([_target] call AGM_Core_fnc_getName); + _ctrlInteractionDialog ctrlSetText ([_target] call EFUNC(core,getName)); } else { _ctrlInteractionDialog ctrlSetText localize "STR_AGM_Interaction_Back"; }; - _buttons = AGM_Interaction_Buttons; + _buttons = GVAR(Buttons); _count = count _buttons; for "_i" from 0 to 9 do { @@ -94,7 +96,7 @@ if (_this select 2) then { _ctrlInteractionDialogShortcut ctrlSetText (_action select 10); //_ctrlInteractionDialogBackground ctrlShow true; - AGM_Interaction_Shortcuts set [_i, [_action select 10] call AGM_Core_fnc_letterToCode]; + GVAR(Shortcuts) set [_i, [_action select 10] call EFUNC(core,letterToCode)]; } else { _ctrlInteractionDialog ctrlSetText ""; _ctrlInteractionDialog ctrlEnable false; @@ -107,23 +109,23 @@ if (_this select 2) then { }; // Update Buttons - terminate (missionNamespace getVariable ["AGM_Interaction_updateMenuHandle", scriptNull]); + terminate (missionNamespace getVariable [QGVAR(updateMenuHandle), scriptNull]); - AGM_Interaction_updateMenuHandle = 0 spawn { + GVAR(updateMenuHandle) = 0 spawn { disableSerialization; - _dlgMenu = uiNamespace getVariable ["AGM_Interaction_Dialog", displayNull]; + _dlgMenu = uiNamespace getVariable [QGVAR(Dialog), displayNull]; _ctrlTooltip = _dlgMenu displayCtrl 40; _player = AGM_player; _vehicle = vehicle _player; - _target = [AGM_Interaction_Target, _player] select (AGM_Interaction_MenuType % 2 == 1); + _target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); waitUntil { - if !([_target, 5] call AGM_Interaction_fnc_isInRange) exitWith { + if !([_target, 5] call GVAR(isInRange)) exitWith { (findDisplay 1713999) closeDisplay 1 }; - AGM_Interaction_Tooltips = [[], [], [], [], [], [], [], [], [], []]; + GVAR(Tooltips) = [[], [], [], [], [], [], [], [], [], []]; { _ctrlText = _dlgMenu displayCtrl (10 + _forEachIndex); _ctrlIcon = _dlgMenu displayCtrl (20 + _forEachIndex); @@ -132,12 +134,12 @@ if (_this select 2) then { _conditionShow = _x select 7; _distance = _x select 9; - AGM_Interaction_CurrentTooltip = []; + GVAR(CurrentTooltip) = []; - _enable = (_distance == 0 || {[_target, _distance] call AGM_Interaction_fnc_isInRange}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}; + _enable = (_distance == 0 || {[_target, _distance] call GVAR(isInRange)}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}; if (isNil "_enable") then {_enable = false}; - AGM_Interaction_Tooltips set [_forEachIndex, AGM_Interaction_CurrentTooltip]; + GVAR(Tooltips) set [_forEachIndex, GVAR(CurrentTooltip)]; // apply conditional tooltips /*if (_forEachIndex == call AGM_Interaction_fnc_getSelectedButton) then { @@ -150,7 +152,7 @@ if (_this select 2) then { { _showTooltip = true; _tooltip = composeText [_tooltip, lineBreak, _x]; - } forEach (AGM_Interaction_Tooltips select _forEachIndex); + } forEach (GVAR(Tooltips) select _forEachIndex); _ctrlTooltip ctrlSetStructuredText _tooltip; _ctrlTooltip ctrlShow _showTooltip; @@ -158,7 +160,7 @@ if (_this select 2) then { _ctrlText ctrlEnable _enable; _ctrlIcon ctrlEnable _enable; - } forEach AGM_Interaction_Buttons; + } forEach GVAR(Buttons); sleep 0.5; isNull (findDisplay 1713999) diff --git a/addons/interaction/functions/fn_isInRange.sqf b/addons/interaction/functions/fn_isInRange.sqf index bb82f7af95..b40982a9cc 100644 --- a/addons/interaction/functions/fn_isInRange.sqf +++ b/addons/interaction/functions/fn_isInRange.sqf @@ -2,14 +2,15 @@ * Author: commy2 * * Check if the vehicle is in range of the player. - * + * * Argument: * 0: Vehicke (Object) * 1: Distance in meters (Number) - * + * * Return value: * (Bool) */ +#include "script_component.hpp" private ["_vehicle", "_distance", "_player"]; @@ -44,6 +45,6 @@ _position1 set [2, (_position1 select 2) - (getTerrainHeightASL _position1 min 0 if (_vehicle in lineIntersectsWith [_position0, _position1] || {_player distance _vehicle < _distance}) then { true } else { - ["Not in Range"] call AGM_Interaction_fnc_addToTooltip; + ["Not in Range"] call FUNC(addToTooltip); false } diff --git a/addons/interaction/functions/fn_joinTeam.sqf b/addons/interaction/functions/fn_joinTeam.sqf index c6db297c49..ad876771ad 100644 --- a/addons/interaction/functions/fn_joinTeam.sqf +++ b/addons/interaction/functions/fn_joinTeam.sqf @@ -1,12 +1,13 @@ // by commy2 +#include "script_component.hpp" private ["_unit", "_team", "_message"]; _unit = _this select 0; _team = _this select 1; -_unit setVariable ["AGM_assignedFireTeam", _team, true]; -[_unit, format ["{_this assignTeam '%1'}", _team]] call AGM_Core_fnc_execRemoteFnc; +_unit setVariable [QGVAR(assignedFireTeam), _team, true]; +[_unit, format ["{_this assignTeam '%1'}", _team]] call EFUNC(core,execRemoteFnc); if (_unit == AGM_player) then { _message = if (_team == "MAIN") then { @@ -16,5 +17,5 @@ if (_unit == AGM_player) then { format [localize "STR_AGM_Interaction_JoinedTeam", _team]; }; - [_message] call AGM_Core_fnc_displayTextStructured; + [_message] call EFUNC(core,displayTextStructured); }; diff --git a/addons/interaction/functions/fn_menuKeyInput.sqf b/addons/interaction/functions/fn_menuKeyInput.sqf index 786add7670..2390d6be14 100644 --- a/addons/interaction/functions/fn_menuKeyInput.sqf +++ b/addons/interaction/functions/fn_menuKeyInput.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private "_key"; @@ -6,10 +7,10 @@ _key = _this select 1; if (_key in [28, 57, 156, 200, 208, 203, 205, 201, 209]) exitWith {true}; -_index = AGM_Interaction_Shortcuts find _key; +_index = GVAR(Shortcuts) find _key; if (_index != -1 && {ctrlEnabled (findDisplay 1713999 displayCtrl (_index + 10))}) exitWith { - _index call AGM_Interaction_fnc_onClick; + _index call FUNC(onClick); true }; diff --git a/addons/interaction/functions/fn_moduleInteraction.sqf b/addons/interaction/functions/fn_moduleInteraction.sqf index 60f15e1215..b3246885be 100644 --- a/addons/interaction/functions/fn_moduleInteraction.sqf +++ b/addons/interaction/functions/fn_moduleInteraction.sqf @@ -9,12 +9,13 @@ * Return Value: * None */ +#include "script_component.hpp" _logic = _this select 0; _activated = _this select 2; if !(_activated) exitWith {}; -[_logic, "AGM_Interaction_EnableTeamManagement", "EnableTeamManagement"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, QGVAR(EnableTeamManagement), "EnableTeamManagement"] call EFUNC(core,readBooleanParameterFromModule); diag_log text "[AGM]: Interaction Module Initialized."; diff --git a/addons/interaction/functions/fn_onButtonDown.sqf b/addons/interaction/functions/fn_onButtonDown.sqf index 91a20d9fc7..fb047871b8 100644 --- a/addons/interaction/functions/fn_onButtonDown.sqf +++ b/addons/interaction/functions/fn_onButtonDown.sqf @@ -1,14 +1,15 @@ // by commy2 +#include "script_component.hpp" if (dialog) exitWith { closeDialog 0; }; if (isNull (findDisplay 1713999)) then { - if (AGM_player == vehicle AGM_player) then {"" call AGM_Interaction_fnc_openMenu} else {[AGM_player, vehicle AGM_player] call AGM_Interaction_fnc_openMenuSelectUI}; + if (AGM_player == vehicle AGM_player) then {"" call FUNC(openMenu)} else {[AGM_player, vehicle AGM_player] call FUNC(openMenuSelectUI)}; setMousePosition [0.5, 0.5]; } else { (findDisplay 1713999) closeDisplay 1; }; -[_player, "interactionMenuOpened", [_player, AGM_Interaction_Target, 0]] call AGM_Core_fnc_callCustomEventHandlers; +[_player, "interactionMenuOpened", [_player, GVAR(Target), 0]] call EFUNC(core,callCustomEventHandlers); diff --git a/addons/interaction/functions/fn_onButtonDownSelf.sqf b/addons/interaction/functions/fn_onButtonDownSelf.sqf index 90aa4b4aca..3da470d05c 100644 --- a/addons/interaction/functions/fn_onButtonDownSelf.sqf +++ b/addons/interaction/functions/fn_onButtonDownSelf.sqf @@ -1,14 +1,15 @@ // by commy2 +#include "script_component.hpp" if (dialog) exitWith { closeDialog 0; }; if (isNull (findDisplay 1713999)) then { - "" call AGM_Interaction_fnc_openMenuSelf; + "" call FUNC(openMenuSelf); setMousePosition [0.5, 0.5]; } else { (findDisplay 1713999) closeDisplay 1; }; -[_player, "interactionMenuOpened", [_player, AGM_Interaction_Target, 1]] call AGM_Core_fnc_callCustomEventHandlers; +[_player, "interactionMenuOpened", [_player, GVAR(Target), 1]] call EFUNC(core,callCustomEventHandlers); diff --git a/addons/interaction/functions/fn_onButtonUp.sqf b/addons/interaction/functions/fn_onButtonUp.sqf index 0466eee0dc..5e8d5aa27e 100644 --- a/addons/interaction/functions/fn_onButtonUp.sqf +++ b/addons/interaction/functions/fn_onButtonUp.sqf @@ -1,16 +1,17 @@ // by commy2 +#include "script_component.hpp" private ["_player", "_vehicle", "_target", "_count", "_index", "_action", "_statement", "_condition", "_conditionShow", "_exceptions", "_distance"]; _player = AGM_player; _vehicle = vehicle _player; -_target = [AGM_Interaction_Target, _player] select (AGM_Interaction_MenuType % 2 == 1); +_target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); -_count = count AGM_Interaction_Buttons; -_index = call AGM_Interaction_fnc_getSelectedButton; +_count = count GVAR(Buttons); +_index = call FUNC(getSelectedButton); _action = if (_index != -1 && {_index < _count}) then { - AGM_Interaction_Buttons select _index + GVAR(Buttons) select _index } else { ["", {}, {false}, 0, [], "", "", {false}, [], 0] }; @@ -20,25 +21,12 @@ closeDialog 0; - - - - - - - - - - - - - _statement = _action select 1; _condition = _action select 2; _conditionShow = _action select 7; _exceptions = _action select 8;// _distance = _action select 9; -if ((_distance == 0 || {[AGM_Interaction_Target, _distance] call AGM_Interaction_fnc_isInRange}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}) then { +if ((_distance == 0 || {[GVAR(Target), _distance] call FUNC(isInRange)}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}) then { [_target, _player] call _statement; }; diff --git a/addons/interaction/functions/fn_onClick.sqf b/addons/interaction/functions/fn_onClick.sqf index 6fb9a353fc..aa177e1331 100644 --- a/addons/interaction/functions/fn_onClick.sqf +++ b/addons/interaction/functions/fn_onClick.sqf @@ -1,16 +1,16 @@ // by commy2 - +#include "script_component.hpp" private ["_player", "_vehicle", "_target", "_count", "_index", "_action", "_subMenu", "_statement", "_condition", "_conditionShow", "_exceptions", "_distance"]; _player = AGM_player; _vehicle = vehicle _player; -_target = [AGM_Interaction_Target, _player] select (AGM_Interaction_MenuType % 2 == 1); +_target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); -_count = count AGM_Interaction_Buttons; -_index = _this; //call AGM_Interaction_fnc_getSelectedButton; +_count = count GVAR(Buttons); +_index = _this; _action = if (_index != -1 && {_index < _count}) then { - AGM_Interaction_Buttons select _index + GVAR(Buttons) select _index } else { ["", {}, {false}, 0, [], "", "", {false}, [], 0] }; @@ -19,7 +19,7 @@ _subMenu = _action select 4; // back if (_index == -1) exitWith { - call AGM_Interaction_MainButton; + call FUNC(MainButton); }; if (count _subMenu < 2) then { @@ -32,13 +32,13 @@ if (count _subMenu < 2) then { _exceptions = _action select 8;// _distance = _action select 9; - if ((_distance == 0 || {[AGM_Interaction_Target, _distance] call AGM_Interaction_fnc_isInRange}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}) then { + if ((_distance == 0 || {[GVAR(Target), _distance] call FUNC(isInRange)}) && {[_target, _player] call _condition} && {[_target, _player] call _conditionShow}) then { [_target, _player] call _statement; }; } else { if (_subMenu select 1 < 1) then { - [_subMenu select 0] call AGM_Interaction_fnc_openSubMenu; + [_subMenu select 0] call FUNC(openSubMenu); } else { - [_subMenu select 0] call AGM_Interaction_fnc_openSubMenuSelf; + [_subMenu select 0] call FUNC(openSubMenuSelf); }; }; diff --git a/addons/interaction/functions/fn_onSelectMenuDblClick.sqf b/addons/interaction/functions/fn_onSelectMenuDblClick.sqf index db7f326bd2..25d307a2eb 100644 --- a/addons/interaction/functions/fn_onSelectMenuDblClick.sqf +++ b/addons/interaction/functions/fn_onSelectMenuDblClick.sqf @@ -1,3 +1,4 @@ // by CorruptedHeart, commy2 +#include "script_component.hpp" -call compile (lbData [8866, lbCurSel 8866]) call AGM_Interaction_SelectAccept; +call compile (lbData [8866, lbCurSel 8866]) call GVAR(SelectAccept); diff --git a/addons/interaction/functions/fn_openDoor.sqf b/addons/interaction/functions/fn_openDoor.sqf index 98f21fe690..40536e6724 100644 --- a/addons/interaction/functions/fn_openDoor.sqf +++ b/addons/interaction/functions/fn_openDoor.sqf @@ -1,15 +1,16 @@ // by commy2 +#include "script_component.hpp" private ["_info", "_house", "_door", "_animations", "_lockedVariable"]; -_info = [2] call AGM_Interaction_fnc_getDoor; +_info = [2] call FUNC(getDoor); _house = _info select 0; _door = _info select 1; if (isNull _house) exitWith {}; -_animations = [_house, _door] call AGM_Interaction_fnc_getDoorAnimations; +_animations = [_house, _door] call FUNC(getDoorAnimations); _lockedVariable = _animations select 1; _animations = _animations select 0; @@ -21,7 +22,7 @@ if (_house animationPhase (_animations select 0) <= 0 && {_house getVariable [_l _lockedVariable spawn compile preprocessFileLineNumbers "\A3\Structures_F\scripts\LockedDoor_open.sqf"; }; -AGM_Interaction_isOpeningDoor = true; +GVAR(isOpeningDoor) = true; playSound "AGM_Sound_Click"; [_house, _animations] spawn { @@ -43,7 +44,7 @@ playSound "AGM_Sound_Click"; {_house animate [_x, _phase]} forEach _animations; - !AGM_Interaction_isOpeningDoor || {getPosASL AGM_player distance _position > 1} + !GVAR(isOpeningDoor) || {getPosASL AGM_player distance _position > 1} }; if (!_usedMouseWheel && {time < _time}) then { @@ -52,5 +53,5 @@ playSound "AGM_Sound_Click"; {_house animate [_x, _phase]} forEach _animations; }; - AGM_Interaction_isOpeningDoor = false; + GVAR(isOpeningDoor) = false; }; diff --git a/addons/interaction/functions/fn_openMenu.sqf b/addons/interaction/functions/fn_openMenu.sqf index 02fe1ba1ab..7785f2e4a4 100644 --- a/addons/interaction/functions/fn_openMenu.sqf +++ b/addons/interaction/functions/fn_openMenu.sqf @@ -1,6 +1,7 @@ // by commy2 +#include "script_component.hpp" private "_target"; -_target = [cursorTarget, AGM_Interaction_Target] select (_this == "Default"); +_target = [cursorTarget, GVAR(Target)] select (_this == "Default"); -[0, _target, ""] call AGM_Interaction_fnc_showMenu; +[0, _target, ""] call FUNC(showMenu); diff --git a/addons/interaction/functions/fn_openMenuSelectUI.sqf b/addons/interaction/functions/fn_openMenuSelectUI.sqf index dbac9e2f75..a08793948d 100644 --- a/addons/interaction/functions/fn_openMenuSelectUI.sqf +++ b/addons/interaction/functions/fn_openMenuSelectUI.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private ["_unit", "_vehicle", "_cargo"]; @@ -6,26 +7,26 @@ _unit = _this select 0; _vehicle = _this select 1; // allow interaction with all cargo slots and all ffv slots -_cargo = [_vehicle, ["cargo", "ffv"], true] call AGM_Core_fnc_getVehicleCrew; +_cargo = [_vehicle, ["cargo", "ffv"], true] call EFUNC(core,getVehicleCrew); // you can only interact if you are in cargo or ffv yourself. exit otherwise if !(_unit in _cargo) exitWith {}; -AGM_InteractionMenu_Crew = _cargo; +GVAR(InteractionMenu_Crew) = _cargo; // prepare: add header and "OK" button to select menu private "_actions"; -_actions = [localize "STR_AGM_Interaction_InteractionMenu", localize "STR_AGM_Interaction_Interact"] call AGM_Interaction_fnc_prepareSelectMenu; +_actions = [localize "STR_AGM_Interaction_InteractionMenu", localize "STR_AGM_Interaction_Interact"] call FUNC(prepareSelectMenu); // prepare: add all cargo units as options to select menu { if (_x != _unit) then { _actions = [ _actions, - [_x] call AGM_Core_fnc_getName, - "\AGM_Interaction\UI\dot_ca.paa", + [_x] call EFUNC(core,getName), + PATHOD(UI\dot_ca.paa), _forEachIndex - ] call AGM_Interaction_fnc_AddSelectableItem; + ] call FUNC(AddSelectableItem); }; } forEach _cargo; @@ -33,11 +34,11 @@ _actions = [localize "STR_AGM_Interaction_InteractionMenu", localize "STR_AGM_In [ _actions, { - call AGM_Interaction_fnc_hideMenu; - [0, AGM_InteractionMenu_Crew select _this, ""] spawn AGM_Interaction_fnc_showMenu; - AGM_InteractionMenu_Crew = nil; + call FUNC(hideMenu); + [0, GVAR(InteractionMenu_Crew) select _this, ""] spawn FUNC(showMenu); + GVAR(InteractionMenu_Crew) = nil; }, { - call AGM_Interaction_fnc_hideMenu; + call FUNC(hideMenu); } -] call AGM_Interaction_fnc_openSelectMenu; +] call FUNC(openSelectMenu); diff --git a/addons/interaction/functions/fn_openMenuSelf.sqf b/addons/interaction/functions/fn_openMenuSelf.sqf index e6056eb1ef..b93a1e5b43 100644 --- a/addons/interaction/functions/fn_openMenuSelf.sqf +++ b/addons/interaction/functions/fn_openMenuSelf.sqf @@ -1,3 +1,4 @@ // by commy2 +#include "script_component.hpp" -[1, AGM_player, ""] call AGM_Interaction_fnc_showMenu; +[1, AGM_player, ""] call FUNC(showMenu); diff --git a/addons/interaction/functions/fn_openSelectMenu.sqf b/addons/interaction/functions/fn_openSelectMenu.sqf index 069d1dbc8a..6da1310060 100644 --- a/addons/interaction/functions/fn_openSelectMenu.sqf +++ b/addons/interaction/functions/fn_openSelectMenu.sqf @@ -23,21 +23,23 @@ Example: */ -if (!(profileNamespace getVariable ["AGM_Interaction_FlowMenu", false])) then { - AGM_Interaction_SelectAccept = _this select 1; - AGM_Interaction_SelectCancel = _this select 2; - buttonSetAction [8855, "call AGM_Interaction_SelectCancel;"]; // cancel - buttonSetAction [8860, "(call compile (lbData [8866, lbCurSel 8866])) call AGM_Interaction_SelectAccept;"]; // accept +#include "script_component.hpp" + +if (!(profileNamespace getVariable [QGVAR(FlowMenu), false])) then { + GVAR(SelectAccept) = _this select 1; + GVAR(SelectCancel) = _this select 2; + buttonSetAction [8855, QUOTE( call GVAR(SelectCancel); )]; // cancel + buttonSetAction [8860, QUOTE( (call compile (lbData [8866, lbCurSel 8866])) call GVAR(SelectAccept); )]; // accept lbSetCurSel [8866, 0]; }else{ _customActions = _this select 0; _count = count _customActions; if (_count == 0) exitWith {}; - _customActions call AGM_Interaction_fnc_sortOptionsByPriority; + _customActions call FUNC(sortOptionsByPriority); for "_i" from 0 to _count -1 do { _action = _customActions select _i; _action set [1, (_this select 1)]; }; - AGM_Interaction_Buttons = _customActions; - [(_this select 2), true, true, false, AGM_player] call AGM_Interaction_fnc_initialiseInteraction; + GVAR(Buttons) = _customActions; + [(_this select 2), true, true, false, AGM_player] call FUNC(initialiseInteraction); }; diff --git a/addons/interaction/functions/fn_openSubMenu.sqf b/addons/interaction/functions/fn_openSubMenu.sqf index 7898d9e181..cda4e76537 100644 --- a/addons/interaction/functions/fn_openSubMenu.sqf +++ b/addons/interaction/functions/fn_openSubMenu.sqf @@ -1,3 +1,4 @@ // by commy2 +#include "script_component.hpp" -[2, AGM_Interaction_Target, _this select 0] call AGM_Interaction_fnc_showMenu; +[2, GVAR(Target), _this select 0] call FUNC(showMenu); diff --git a/addons/interaction/functions/fn_openSubMenuSelf.sqf b/addons/interaction/functions/fn_openSubMenuSelf.sqf index 966684c84f..9579347312 100644 --- a/addons/interaction/functions/fn_openSubMenuSelf.sqf +++ b/addons/interaction/functions/fn_openSubMenuSelf.sqf @@ -1,3 +1,4 @@ // by commy2 +#include "script_component.hpp" -[3, AGM_player, _this select 0] call AGM_Interaction_fnc_showMenu; +[3, AGM_player, _this select 0] call FUNC(showMenu); diff --git a/addons/interaction/functions/fn_prepareSelectMenu.sqf b/addons/interaction/functions/fn_prepareSelectMenu.sqf index bb84eaca12..3f5a05af8d 100644 --- a/addons/interaction/functions/fn_prepareSelectMenu.sqf +++ b/addons/interaction/functions/fn_prepareSelectMenu.sqf @@ -1,24 +1,26 @@ /* Name: AGM_Interaction_fnc_prepareSelectMenu - + Author: Garth de Wet (LH) - + Description: Prepares the select menu for use. - - Parameters: + + Parameters: 0: TEXT - Header text 1: TEXT - Approve button text - + Returns: ARRAY/NUMBER - container object for use with AddSelectableItem. - + Example: ["Select Explosive", "Place"] call AGM_Interaction_fnc_prepareSelectMenu; */ +#include "script_component.hpp" + private ["_buttonAction", "_header", "_buttonText", "_cancelButton"]; closeDialog 0; -if (!(profileNamespace getVariable ["AGM_Interaction_FlowMenu", false])) exitWith { +if (!(profileNamespace getVariable [QGVAR(FlowMenu), false])) exitWith { _header = _this select 0; _buttonText = _this select 1; if (isNil "_buttonText" or {_buttonText == ""}) then { diff --git a/addons/interaction/functions/fn_push.sqf b/addons/interaction/functions/fn_push.sqf index d4ce290d1e..f3ea625bcd 100644 --- a/addons/interaction/functions/fn_push.sqf +++ b/addons/interaction/functions/fn_push.sqf @@ -10,12 +10,13 @@ * Return Value: * None */ +#include "script_component.hpp" _boat = _this select 0; _velocity = _this select 1; if !(local _boat) exitWith { - [_this, "AGM_Interaction_fnc_push", _boat] call AGM_Core_fnc_execRemoteFnc; + [_this, QUOTE(FUNC(push)), _boat] call EFUNC(core,execRemoteFnc); }; _boat setVelocity _velocity; diff --git a/addons/interaction/functions/fn_removeInteraction.sqf b/addons/interaction/functions/fn_removeInteraction.sqf index b633ce0bc8..eec3c86a29 100644 --- a/addons/interaction/functions/fn_removeInteraction.sqf +++ b/addons/interaction/functions/fn_removeInteraction.sqf @@ -2,21 +2,22 @@ * Author: commy2 * * Remove an AGM action from an object. Note: This function is global. - * + * * Argument: * 0: Object (Object) * 1: ID of the action (Number) - * + * * Return value: * None. */ +#include "script_component.hpp" private ["_object", "_id", "_actionsVar", "_currentID", "_actionIDs", "_actions"]; _object = _this select 0; _id = _this select 1; -_actionsVar = _object getVariable ["AGM_Interactions", [-1, [], []]]; +_actionsVar = _object getVariable [QGVAR(Interactions), [-1, [], []]]; _currentID = _actionsVar select 0; _actionIDs = _actionsVar select 1; @@ -32,4 +33,4 @@ _actionIDs = _actionIDs - [-1]; _actions set [_id, []]; _actions = _actions - [[]]; -_object setVariable ["AGM_Interactions", [_currentID, _actionIDs, _actions], true]; +_object setVariable [QGVAR(Interactions), [_currentID, _actionIDs, _actions], true]; diff --git a/addons/interaction/functions/fn_removeInteractionSelf.sqf b/addons/interaction/functions/fn_removeInteractionSelf.sqf index 140c6f0502..5140b8d6a9 100644 --- a/addons/interaction/functions/fn_removeInteractionSelf.sqf +++ b/addons/interaction/functions/fn_removeInteractionSelf.sqf @@ -2,21 +2,21 @@ * Author: commy2 * * Remove an AGM self action from the player. - * + * * Argument: * 0: ID of the action (Number) - * + * * Return value: * None. */ - +#include "script_component.hpp" private ["_id", "_actionsVar", "_currentID", "_actionIDs", "_actions"]; _id = _this select 0; -_actionsVar = AGM_player getVariable ["AGM_InteractionsSelf", [-1, [], []]]; +_actionsVar = AGM_player getVariable [QGVAR(InteractionsSelf), [-1, [], []]]; _currentID = _actionsVar select 0; _actionIDs = _actionsVar select 1; @@ -32,4 +32,4 @@ _actionIDs = _actionIDs - [-1]; _actions set [_id, []]; _actions = _actions - [[]]; -AGM_player setVariable ["AGM_InteractionsSelf", [_currentID, _actionIDs, _actions], false]; +AGM_player setVariable [QGVAR(InteractionsSelf), [_currentID, _actionIDs, _actions], false]; diff --git a/addons/interaction/functions/fn_removeTag.sqf b/addons/interaction/functions/fn_removeTag.sqf index 9d37367f1c..c8372c701d 100644 --- a/addons/interaction/functions/fn_removeTag.sqf +++ b/addons/interaction/functions/fn_removeTag.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" 0 spawn { waitUntil {player getVariable ["AGM_Name", ""] != ""}; diff --git a/addons/interaction/functions/fn_sendAway.sqf b/addons/interaction/functions/fn_sendAway.sqf index a4434bbd12..ee7814a89e 100644 --- a/addons/interaction/functions/fn_sendAway.sqf +++ b/addons/interaction/functions/fn_sendAway.sqf @@ -1,14 +1,15 @@ /* * Author: KoffeinFlummi - * + * * Sends a civilian crowd away (chance of failure). - * + * * Arguments: * 0: Unit to be sent away (Object) * * Return value: * none */ +#include "script_component.hpp" #define DISTANCE 50 #define RADIUS 10 diff --git a/addons/interaction/functions/fn_setCaptivityStatus.sqf b/addons/interaction/functions/fn_setCaptivityStatus.sqf index 1055780cac..4de294c674 100644 --- a/addons/interaction/functions/fn_setCaptivityStatus.sqf +++ b/addons/interaction/functions/fn_setCaptivityStatus.sqf @@ -1,3 +1,4 @@ // by commy2 +#include "script_component.hpp" -_this call AGM_Core_fnc_setCaptivityStatus; +_this call EFUNC(core,setCaptivityStatus); diff --git a/addons/interaction/functions/fn_showMenu.sqf b/addons/interaction/functions/fn_showMenu.sqf index 291ab27331..18f7ead40a 100644 --- a/addons/interaction/functions/fn_showMenu.sqf +++ b/addons/interaction/functions/fn_showMenu.sqf @@ -1,74 +1,76 @@ /* Name: AGM_Interaction_fnc_showMenu - + Author: commy2 Garth de Wet (LH) aeroson - + Description: - - Parameters: + + Parameters: 0: NUMBER - Menu type (0 - interaction, 1 - self-interaction, 2 - sub-interaction, 3 - sub-self-interaction) 1: OBJECT - Target object 2: STRING - Sub-Menu ClassName - + Returns: Nothing - + Example: - [0, AGM_Interaction_Target] call AGM_Interaction_fnc_showMenu; + [0, GVAR(Target)] call AGM_Interaction_fnc_showMenu; [1, player] call AGM_Interaction_fnc_showMenu; - [2, AGM_Interaction_Target, "AGM_Explosives"] call AGM_Interaction_fnc_showMenu; + [2, GVAR(Target), "AGM_Explosives"] call AGM_Interaction_fnc_showMenu; [3, player, "AGM_Explosives"] call AGM_Interaction_fnc_showMenu; */ +#include "script_component.hpp" + private ["_player", "_vehicle", "_mainButtonAction", "_object", "_index", "_actions", "_result", "_menuType"]; -#define DEFAULT_ICON "\AGM_Interaction\UI\dot_ca.paa" +#define DEFAULT_ICON PATHOF(UI\dot_ca.paa) #define DEFAULT_DISTANCE 4 // seems to be 4 _player = AGM_player; _vehicle = vehicle _player; -AGM_Interaction_MenuType = _this select 0; // 0 Interaction, 1 Self Interaction +GVAR(MenuType) = _this select 0; // 0 Interaction, 1 Self Interaction _mainButtonAction = [ - {call AGM_Interaction_fnc_hideMenu}, - {call AGM_Interaction_fnc_hideMenu}, - {"Default" call AGM_Interaction_fnc_openMenu}, - {"Default" call AGM_Interaction_fnc_openMenuSelf} -] select AGM_Interaction_MenuType; + {call FUNC(hideMenu)}, + {call FUNC(hideMenu)}, + {"Default" call FUNC(openMenu)}, + {"Default" call FUNC(openMenuSelf)} +] select GVAR(MenuType); -_menuType = AGM_Interaction_MenuType % 2; -uiNamespace setVariable ["AGM_Interaction_CursorPosition", [controlNull, 0.5, 0.5, -1]]; +_menuType = GVAR(MenuType) % 2; +uiNamespace setVariable [QGVAR(CursorPosition), [controlNull, 0.5, 0.5, -1]]; -AGM_Interaction_Target = _this select 1; -_object = AGM_Interaction_Target; +GVAR(Target) = _this select 1; +_object = GVAR(Target); -if (_menuType == 0 && {(isNull (_object) || {!([_object, 4] call AGM_Interaction_fnc_isInRange)})}) exitWith {};//call ([AGM_Interaction_fnc_onButtonDown, AGM_Interaction_fnc_onButtonDownSelf] select _menuType)}; -if !([_player, _object] call AGM_Core_fnc_canInteractWith) exitWith {}; +if (_menuType == 0 && {(isNull (_object) || {!([_object, 4] call FUNC(isInRange))})}) exitWith {}; +if !([_player, _object] call EFUNC(core,canInteractWith)) exitWith {}; -// add actions or self actions of AGM_Interaction_Target +// add actions or self actions of GVAR(Target) _parents = [configFile >> "CfgVehicles" >> typeOf _object, true] call BIS_fnc_returnParents; -_result = [_object, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call AGM_Interaction_fnc_GetActions; -_actions = ([_object, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call AGM_Interaction_fnc_GetActions) select 0; +_result = [_object, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions); +_actions = ([_object, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions) select 0); // add self actions of vehicle _player if (_menuType == 1 && {_player != _vehicle}) then { _parents = [configFile >> "CfgVehicles" >> typeOf _vehicle, true] call BIS_fnc_returnParents; - _result = [_vehicle, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call AGM_Interaction_fnc_GetActions; - _actions = _actions + (([_vehicle, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call AGM_Interaction_fnc_GetActions) select 0); + _result = [_vehicle, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions); + _actions = _actions + (([_vehicle, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions) select 0)); }; // custom defined actions, stored in variable instead of cfg like above -if (AGM_Interaction_MenuType < 2) then { +if (GVAR(MenuType) < 2) then { private ["_customActions", "_customAction", "_displayName", "_distance","_condition","_statement","_showDisabled", "_priority"]; - // add interactions or self interactions of AGM_Interaction_Target - _customActions = (_object getVariable [["AGM_Interactions", "AGM_InteractionsSelf"] select _menuType, [-1, [], []]]) select 2; + // add interactions or self interactions of GVAR(Target) + _customActions = (_object getVariable [[QGVAR(Interactions), QGVAR(AGM_InteractionsSelf)] select _menuType, [-1, [], []]]) select 2; // add self interactions of vehicle _player if (_menuType == 1 && {_player != _vehicle}) then { - _customActions = _customActions + ((_vehicle getVariable [["AGM_Interactions", "AGM_InteractionsSelf"] select _menuType, [-1, [], []]]) select 2); + _customActions = _customActions + ((_vehicle getVariable [[QGVAR(Interactions), QGVAR(AGM_InteractionsSelf)] select _menuType, [-1, [], []]]) select 2); }; if(_menuType==0) then { @@ -85,7 +87,7 @@ if (AGM_Interaction_MenuType < 2) then { _showDisabled = _customAction select 4; _priority = _customAction select 5; - if ((_showDisabled || {[_object, _player] call _condition}) && {[_object, _distance] call AGM_Interaction_fnc_isInRange || {_distance == 0}}) then { + if ((_showDisabled || {[_object, _player] call _condition}) && {[_object, _distance] call FUNC(isInRange) || {_distance == 0}}) then { _actions pushBack [_displayName, _statement, _condition, _priority, [], DEFAULT_ICON, "", {true}, [], _distance, ""]; }; }; @@ -93,7 +95,7 @@ if (AGM_Interaction_MenuType < 2) then { } else { // self interactions do not have distance for "_index" from 0 to (count _customActions - 1) do { - + _customAction = _customActions select _index; _displayName = _customAction select 0; _condition = _customAction select 1; @@ -111,8 +113,8 @@ if (AGM_Interaction_MenuType < 2) then { }; -if (count _actions == 0) exitWith {};//call ([AGM_Interaction_fnc_onButtonDown, AGM_Interaction_fnc_onButtonDownSelf] select _menuType)}; +if (count _actions == 0) exitWith {}; -_actions call AGM_Interaction_fnc_sortOptionsByPriority; -AGM_Interaction_Buttons = _actions; -[_mainButtonAction, (_this select 2) != "", (profileNamespace getVariable ["AGM_Interaction_FlowMenu", false]), _menuType == 1, _object] call AGM_Interaction_fnc_initialiseInteraction; +_actions call FUNC(sortOptionsByPriority); +GVAR(Buttons) = _actions; +[_mainButtonAction, (_this select 2) != "", (profileNamespace getVariable [QGVAR(FlowMenu), false]), _menuType == 1, _object] call FUNC(initialiseInteraction); diff --git a/addons/interaction/functions/fn_showMouseHint.sqf b/addons/interaction/functions/fn_showMouseHint.sqf index a856e9d9c6..d2c18a9a1d 100644 --- a/addons/interaction/functions/fn_showMouseHint.sqf +++ b/addons/interaction/functions/fn_showMouseHint.sqf @@ -1,23 +1,25 @@ /* Name: AGM_Interaction_fnc_showMouseHint - + Author(s): Garth de Wet (LH) - + Description: Shows the interaction helper text with the mouse buttons at the bottom middle of the screen - + Parameters: 0: STRING - Left click text 1: STRING - Right click text 3: STRING - (Optional) Scroll text - + Returns: Nothing - + Example: ["Place Explosive", "Cancel"] call AGM_Interaction_fnc_showMouseHint; */ +#include "script_component.hpp" + #define GUI_GRID_W (0.025) #define GUI_GRID_H (0.04) private ["_leftClick", "_rightClick", "_scroll"]; @@ -28,7 +30,7 @@ if (count _this > 2) then { _scroll = _this select 2; }; -("AGM_InteractionHelper" call BIS_fnc_rscLayer) cutRsc ["AGM_InteractionHelper", "PLAIN",0.5, false]; +(QGVAR(InteractionHelper) call BIS_fnc_rscLayer) cutRsc [QGVAR(InteractionHelper), "PLAIN",0.5, false]; disableSerialization; _display = uiNamespace getVariable ["AGM_Helper_Display", objNull]; if (isNull _display) exitWith{}; diff --git a/addons/interaction/functions/fn_sortOptionsByPriority.sqf b/addons/interaction/functions/fn_sortOptionsByPriority.sqf index dd94cadfe4..d29ebd3e5f 100644 --- a/addons/interaction/functions/fn_sortOptionsByPriority.sqf +++ b/addons/interaction/functions/fn_sortOptionsByPriority.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private ["_actions", "_count", "_index", "_actionN", "_actionM"]; diff --git a/addons/interaction/functions/fn_tapShoulder.sqf b/addons/interaction/functions/fn_tapShoulder.sqf index 8d6340143f..1ab8f42487 100644 --- a/addons/interaction/functions/fn_tapShoulder.sqf +++ b/addons/interaction/functions/fn_tapShoulder.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" private ["_unit", "_message"]; @@ -8,13 +9,13 @@ _target = _this select 1; if (_target != AGM_player) exitWith { addCamShake [4, 0.5, 5]; if !(local _target) then { - [[_tapper, _target], "AGM_Interaction_fnc_tapShoulder", _target] call AGM_Core_fnc_execRemoteFnc; + [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(execRemoteFnc); }; }; addCamShake [4, 0.5, 5]; -//_message = format ["%1 tapped you on your shoulder.", [_unit] call AGM_Core_fnc_getName]; +//_message = format ["%1 tapped you on your shoulder.", [_unit] call EFUNC(core,getName)]; _message = localize "STR_AGM_Interaction_YouWereTapped"; -[_message] call AGM_Core_fnc_displayTextStructured; +[_message] call EFUNC(core,displayTextStructured); diff --git a/addons/interaction/functions/fn_updateTooltipPosition.sqf b/addons/interaction/functions/fn_updateTooltipPosition.sqf index 3df14635e0..c4b2a6e102 100644 --- a/addons/interaction/functions/fn_updateTooltipPosition.sqf +++ b/addons/interaction/functions/fn_updateTooltipPosition.sqf @@ -1,4 +1,5 @@ // by commy2 +#include "script_component.hpp" disableSerialization; _ctrl = ctrlParent (_this select 0) displayCtrl 40; From 1aa862bc3bdff0d2f7bf557474c57e2db5ad4377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Mon, 12 Jan 2015 01:20:02 -0300 Subject: [PATCH 06/18] Change stringtables and main variables prefixes to ACE --- addons/interaction/CfgEventHandlers.hpp | 4 +- addons/interaction/Menu_Config.hpp | 86 ++--- addons/interaction/config.cpp | 334 ++++++++---------- .../functions/fn_AddSelectableItem.sqf | 2 - .../interaction/functions/fn_GetActions.sqf | 10 +- addons/interaction/functions/fn_MoveDown.sqf | 8 +- .../functions/fn_addInteraction.sqf | 2 +- .../functions/fn_addInteractionSelf.sqf | 6 +- .../interaction/functions/fn_applyButtons.sqf | 2 +- .../functions/fn_canInteractWith.sqf | 2 +- .../functions/fn_canTapShoulder.sqf | 2 +- .../interaction/functions/fn_getActions2.sqf | 6 +- addons/interaction/functions/fn_getDoor.sqf | 7 - addons/interaction/functions/fn_getDown.sqf | 4 +- addons/interaction/functions/fn_hideMenu.sqf | 4 +- .../functions/fn_hideMouseHint.sqf | 8 +- .../functions/fn_initialiseInteraction.sqf | 22 +- addons/interaction/functions/fn_isInRange.sqf | 2 +- addons/interaction/functions/fn_joinTeam.sqf | 8 +- .../functions/fn_moduleInteraction.sqf | 2 +- .../interaction/functions/fn_onButtonDown.sqf | 2 +- .../interaction/functions/fn_onButtonUp.sqf | 2 +- addons/interaction/functions/fn_onClick.sqf | 2 +- addons/interaction/functions/fn_openDoor.sqf | 6 +- .../functions/fn_openMenuSelectUI.sqf | 2 +- .../interaction/functions/fn_openMenuSelf.sqf | 2 +- .../functions/fn_openSelectMenu.sqf | 4 +- .../functions/fn_openSubMenuSelf.sqf | 2 +- .../functions/fn_prepareSelectMenu.sqf | 8 +- .../functions/fn_removeInteraction.sqf | 2 +- .../functions/fn_removeInteractionSelf.sqf | 6 +- addons/interaction/functions/fn_removeTag.sqf | 6 +- addons/interaction/functions/fn_sendAway.sqf | 6 +- addons/interaction/functions/fn_showMenu.sqf | 24 +- .../functions/fn_showMouseHint.sqf | 6 +- .../interaction/functions/fn_tapShoulder.sqf | 4 +- addons/interaction/stringtable.xml | 112 +++--- 37 files changed, 316 insertions(+), 401 deletions(-) diff --git a/addons/interaction/CfgEventHandlers.hpp b/addons/interaction/CfgEventHandlers.hpp index e635014c46..359983754f 100644 --- a/addons/interaction/CfgEventHandlers.hpp +++ b/addons/interaction/CfgEventHandlers.hpp @@ -13,7 +13,7 @@ class Extended_PostInit_EventHandlers { class Extended_GetIn_EventHandlers { class All { class ADDONnu { - clientGetIn = QUOTE( if (_this select 2 == AGM_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}); + clientGetIn = QUOTE( if (_this select 2 == ACE_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}); }; }; }; @@ -21,7 +21,7 @@ class Extended_GetIn_EventHandlers { class Extended_GetOut_EventHandlers { class All { class ADDONnu { - clientGetOut = QUOTE( if (_this select 2 == AGM_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}); + clientGetOut = QUOTE( if (_this select 2 == ACE_player && {!isNull (findDisplay 1713999)}) then {(findDisplay 1713999) closeDisplay 1}); }; }; }; diff --git a/addons/interaction/Menu_Config.hpp b/addons/interaction/Menu_Config.hpp index cc66efa2e9..0a5ded72e6 100644 --- a/addons/interaction/Menu_Config.hpp +++ b/addons/interaction/Menu_Config.hpp @@ -3,9 +3,9 @@ #define VSPACE 0.5-0.3/9/2 class RscStructuredText; -class AGM_Interaction_Button_Base { +class ACE_Interaction_Button_Base { tooltip = ""; - //action = "AGM_Interaction_isMousePressed = true;(findDisplay 1713999) closeDisplay 1;_action = AGM_Interaction_Buttons select AGM_Interaction_SelectedButton;AGM_Interaction_SelectedButton = -1; if (call (_action select 2)) then {call (_action select 1)};"; + //action = "ACE_Interaction_isMousePressed = true;(findDisplay 1713999) closeDisplay 1;_action = ACE_Interaction_Buttons select ACE_Interaction_SelectedButton;ACE_Interaction_SelectedButton = -1; if (call (_action select 2)) then {call (_action select 1)};"; action = ""; idc = -1; @@ -46,14 +46,14 @@ class AGM_Interaction_Button_Base { #define ICON_BORDER 0.05 // Old command rose -class AGM_Interaction_Dialog { +class ACE_Interaction_Dialog { idd = 1713999; enableSimulation = 1; movingEnable = 0; - onLoad = "_dlgInteractionDialog = _this select 0; for '_a' from 10 to 19 do {(_dlgInteractionDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['AGM_Interaction_Dialog', _dlgInteractionDialog];"; + onLoad = "_dlgInteractionDialog = _this select 0; for '_a' from 10 to 19 do {(_dlgInteractionDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Interaction_Dialog', _dlgInteractionDialog];"; objects[] = {}; class controls { - class Interaction_BackgroundMain: AGM_Interaction_Button_Base { + class Interaction_BackgroundMain: ACE_Interaction_Button_Base { type = 0; style = 2; idc = 2; @@ -65,8 +65,8 @@ class AGM_Interaction_Dialog { h = "0.55 / 9 * safezoneH"; }; - class Interaction_ButtonMain: AGM_Interaction_Button_Base { - action = "-1 call AGM_Interaction_fnc_onClick;"; + class Interaction_ButtonMain: ACE_Interaction_Button_Base { + action = "-1 call ACE_Interaction_fnc_onClick;"; style = 2; tooltip = ""; text = "Interaction Menu"; @@ -82,7 +82,7 @@ class AGM_Interaction_Dialog { h = "0.55 / 9 * safezoneH"; }; - class Interaction_Background0: AGM_Interaction_Button_Base { + class Interaction_Background0: ACE_Interaction_Button_Base { type = 0; style = 2; idc = 40; @@ -157,7 +157,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; - class Interaction_Icon0: AGM_Interaction_Button_Base { + class Interaction_Icon0: ACE_Interaction_Button_Base { tooltip = ""; text = ""; idc = 20; @@ -233,7 +233,7 @@ class AGM_Interaction_Dialog { h = (0.3-ICON_BORDER) / 9 * safezoneH; }; - class Interaction_Shortcut0: AGM_Interaction_Button_Base { + class Interaction_Shortcut0: ACE_Interaction_Button_Base { tooltip = ""; text = ""; idc = 30; @@ -317,8 +317,8 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; - class Interaction_Button0: AGM_Interaction_Button_Base { - action = "0 call AGM_Interaction_fnc_onClick;"; + class Interaction_Button0: ACE_Interaction_Button_Base { + action = "0 call ACE_Interaction_fnc_onClick;"; style = 2; tooltip = ""; text = ""; @@ -333,7 +333,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button1: Interaction_Button0 { - action = "1 call AGM_Interaction_fnc_onClick;"; + action = "1 call ACE_Interaction_fnc_onClick;"; idc = 11; x = "(0.5-2.0/16/2 + 1.0 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 - 1.5 * 0.04) * safezoneH + safezoneY"; @@ -341,7 +341,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button2: Interaction_Button0 { - action = "2 call AGM_Interaction_fnc_onClick;"; + action = "2 call ACE_Interaction_fnc_onClick;"; idc = 12; x = "(0.5-2.0/16/2 + 1.25 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 - 0.5 * 0.04) * safezoneH + safezoneY"; @@ -349,7 +349,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button3: Interaction_Button0 { - action = "3 call AGM_Interaction_fnc_onClick;"; + action = "3 call ACE_Interaction_fnc_onClick;"; idc = 13; x = "(0.5-2.0/16/2 + 1.25 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 + 0.5 * 0.04) * safezoneH + safezoneY"; @@ -357,7 +357,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button4: Interaction_Button0 { - action = "4 call AGM_Interaction_fnc_onClick;"; + action = "4 call ACE_Interaction_fnc_onClick;"; idc = 14; x = "(0.5-2.0/16/2 + 1.0 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 + 1.5 * 0.04) * safezoneH + safezoneY"; @@ -365,7 +365,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button5: Interaction_Button0 { - action = "5 call AGM_Interaction_fnc_onClick;"; + action = "5 call ACE_Interaction_fnc_onClick;"; idc = 15; x = "(0.5-2.0/16/2 + 0 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 + 2.5 * 0.04) * safezoneH + safezoneY"; @@ -373,7 +373,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button6: Interaction_Button0 { - action = "6 call AGM_Interaction_fnc_onClick;"; + action = "6 call ACE_Interaction_fnc_onClick;"; idc = 16; x = "(0.5-2.0/16/2 - 1.0 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 + 1.5 * 0.04) * safezoneH + safezoneY"; @@ -381,7 +381,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button7: Interaction_Button0 { - action = "7 call AGM_Interaction_fnc_onClick;"; + action = "7 call ACE_Interaction_fnc_onClick;"; idc = 17; x = "(0.5-2.0/16/2 - 1.25 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 + 0.5 * 0.04) * safezoneH + safezoneY"; @@ -389,7 +389,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button8: Interaction_Button0 { - action = "8 call AGM_Interaction_fnc_onClick;"; + action = "8 call ACE_Interaction_fnc_onClick;"; idc = 18; x = "(0.5-2.0/16/2 - 1.25 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 - 0.5 * 0.04) * safezoneH + safezoneY"; @@ -397,7 +397,7 @@ class AGM_Interaction_Dialog { h = "0.3 / 9 * safezoneH"; }; class Interaction_Button9: Interaction_Button0 { - action = "9 call AGM_Interaction_fnc_onClick;"; + action = "9 call ACE_Interaction_fnc_onClick;"; idc = 19; x = "(0.5-2.0/16/2 - 1.0 * 0.1) * safezoneW + safezoneX"; y = "(0.5-0.3/9/2 - 1.5 * 0.04) * safezoneH + safezoneY"; @@ -412,7 +412,7 @@ class IGUIBack; class RscText; #define X_OFFSET 0.2 -class RscAGM_SelectAnItem { +class RscACE_SelectAnItem { idd = 8854; movingEnable = 0; class controls { @@ -433,7 +433,7 @@ class RscAGM_SelectAnItem { text = ""; }; class itemList:RscListBox { - onMouseButtonDblClick = "_this call AGM_Interaction_fnc_onSelectMenuDblClick"; + onMouseButtonDblClick = "_this call ACE_Interaction_fnc_onSelectMenuDblClick"; idc = 8866; x = X_OFFSET + 0.005; w = 0.59; @@ -441,7 +441,7 @@ class RscAGM_SelectAnItem { y = 0.06; }; - class cancelBtnBackground: AGM_Interaction_Button_Base { + class cancelBtnBackground: ACE_Interaction_Button_Base { type = 0; style = 2; idc = -1; @@ -452,7 +452,7 @@ class RscAGM_SelectAnItem { h = 0.1; y = 0.605; }; - class approveBtnBackground: AGM_Interaction_Button_Base { + class approveBtnBackground: ACE_Interaction_Button_Base { type = 0; style = 2; idc = -1; @@ -464,29 +464,29 @@ class RscAGM_SelectAnItem { w = 0.15; }; - class cancelBtn: AGM_Interaction_Button_Base { + class cancelBtn: ACE_Interaction_Button_Base { idc = 8855; x = X_OFFSET + 0.005; w = 0.15; h = 0.1; y = 0.605; style = 2; - text = $STR_AGM_Interaction_Back; //$STR_AGM_Interaction_CancelSelection; - action = "call AGM_Interaction_fnc_hideMenu;"; //'Default' call AGM_Interaction_fnc_openMenu; 'Default' call AGM_Interaction_fnc_openMenuSelf; + text = $STR_ACE_Interaction_Back; //$STR_ACE_Interaction_CancelSelection; + action = "call ACE_Interaction_fnc_hideMenu;"; //'Default' call ACE_Interaction_fnc_openMenu; 'Default' call ACE_Interaction_fnc_openMenuSelf; colorBackground[] = {0,0,0,0}; colorBackgroundDisabled[] = {0,0,0,0}; colorBackgroundActive[] = {1,1,1,0.2}; colorFocused[] = {0,0,0,0}; }; - class approveBtn: AGM_Interaction_Button_Base { + class approveBtn: ACE_Interaction_Button_Base { idc = 8860; x = X_OFFSET + 0.445; y = 0.605; h = 0.1; w = 0.15; style = 2; - text = $STR_AGM_Interaction_MakeSelection; - action = "call AGM_Interaction_fnc_hideMenu;"; + text = $STR_ACE_Interaction_MakeSelection; + action = "call ACE_Interaction_fnc_hideMenu;"; colorBackground[] = {0,0,0,0}; colorBackgroundDisabled[] = {0,0,0,0}; colorBackgroundActive[] = {1,1,1,0.2}; @@ -518,19 +518,19 @@ class RscInteractionText: RscText{ h = 1.5 * GUI_GRID_H; }; class RscTitles { - class AGM_FlowMenu { + class ACE_FlowMenu { idd = 9920; enableSimulation = 1; movingEnable = 0; fadeIn=0.5; fadeOut=0.5; duration = 10e10; - onLoad = "uiNamespace setVariable ['AGM_Flow_Display', _this select 0];"; + onLoad = "uiNamespace setVariable ['ACE_Flow_Display', _this select 0];"; class controls { class RearIcon: RscInteractionIcon{ idc = 999; - text = "AGM_interaction\UI\CenterIcon_ca.paa"; + text = "ACE_interaction\UI\CenterIcon_ca.paa"; x = 17.9 * GUI_GRID_W; y = 10 * GUI_GRID_H; w = 3.7 * GUI_GRID_H; @@ -570,7 +570,7 @@ class RscTitles { }; class BackIcon: RscInteractionIcon{ idc = 1210; - text = "AGM_interaction\UI\backArrow_ca.paa"; + text = "ACE_interaction\UI\backArrow_ca.paa"; x = 18.25 * GUI_GRID_W; y = 12.69 * GUI_GRID_H; w = 0.5 * GUI_GRID_W; @@ -587,45 +587,45 @@ class RscTitles { }; }; }; - class AGM_InteractionHelper { + class ACE_InteractionHelper { idd = 9930; enableSimulation = 1; movingEnable = 0; fadeIn=0.5; fadeOut=0.5; duration = 10e10; - onLoad = "uiNamespace setVariable ['AGM_Helper_Display', _this select 0];"; + onLoad = "uiNamespace setVariable ['ACE_Helper_Display', _this select 0];"; class controls { class SelectIcon: RscInteractionHelperIcon{ idc = 1200; - text = "AGM_interaction\UI\mouse_left_ca.paa"; + text = "ACE_interaction\UI\mouse_left_ca.paa"; y = 17.5 * GUI_GRID_H; }; class SelectText: RscInteractionText{ idc = 1000; y = 17 * GUI_GRID_H; - text = $STR_AGM_Interaction_MakeSelection; + text = $STR_ACE_Interaction_MakeSelection; }; class GoBackIcon: RscInteractionHelperIcon{ idc = 1201; - text = "AGM_interaction\UI\mouse_right_ca.paa"; + text = "ACE_interaction\UI\mouse_right_ca.paa"; y = 19.5 * GUI_GRID_H; }; class GoBackText: RscInteractionText{ idc = 1001; y = 19 * GUI_GRID_H; - text = $STR_AGM_Interaction_Back; + text = $STR_ACE_Interaction_Back; }; class ScrollIcon: RscInteractionHelperIcon{ idc = 1202; - text = "AGM_interaction\UI\mouse_scroll_ca.paa"; + text = "ACE_interaction\UI\mouse_scroll_ca.paa"; y = 18.5 * GUI_GRID_H; }; class ScrollText: RscInteractionText{ idc = 1002; y = 18 * GUI_GRID_H; - text = $STR_AGM_Interaction_ScrollHint; + text = $STR_ACE_Interaction_ScrollHint; }; }; }; diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index fb38eb63bb..ec1ea69fb2 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.60; - requiredAddons[] = {AGM_Core}; + requiredAddons[] = {ACE_Core}; version = "0.95"; versionStr = "0.95"; versionAr[] = {0,95,0}; @@ -16,93 +16,35 @@ class CfgPatches { #include "CfgEventHandlers.hpp" -/* -class CfgFunctions { - class AGM_Interaction { - class AGM_Interaction { - file = PATHOF(functions); - class addInteraction; - class addInteractionSelf; - class AddSelectableItem; - class addToTooltip; - class applyButtons; - class canInteractWith; - class canTapShoulder; - class getActions2; - class GetActions; - class getDoor; - class getDoorAnimations; - class getDown; - class getSelectedButton; - class hideMenu; - class hideMouseHint; - class initialiseInteraction; - class isInRange; - class joinTeam; - class menuKeyInput; - class moduleInteraction; - class moveDown; - class onButtonDown; - class onButtonDownSelf; - class onButtonUp; - class onClick; - class onSelectMenuDblClick; - class openDoor; - class openMenu; - class openMenuSelectUI; - class openMenuSelf; - class openSelectMenu; - class openSubMenu; - class openSubMenuSelf; - class prepareSelectMenu; - class push; - class removeInteraction; - class removeInteractionSelf; - class removeTag; - class sendAway; - class showMenu; - class showMouseHint; - class sortOptionsByPriority; - class tapShoulder; - class updateTooltipPosition; - - // backwards compatibility, remove in some patches - class getCaptivityStatus; - class setCaptivityStatus; - }; - }; -}; -*/ - -class AGM_Core_Default_Keys { +class ACE_Core_Default_Keys { class openInteractionMenuNew { - displayName = "$STR_AGM_Interaction_InteractionMenu"; + displayName = "$STR_ACE_Interaction_InteractionMenu"; condition = "true"; statement = QUOTE( call FUNC(onButtonDown) ); conditionUp = QUOTE( !isNull (findDisplay 1713999) && {profileNamespace getVariable [QUOTE(QGVAR(AutoCloseMenu)), false]} ); statementUp = QUOTE( if (GVAR(MenuType) mod 2 == 0) then {call FUNC(onButtonUp)}; ); - exceptions[] = {"AGM_Drag_isNotDragging", "AGM_Medical_canTreat", "AGM_Interaction_isNotEscorting", "AGM_Interaction_isNotSwimming"}; + exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Medical_canTreat", "ACE_Interaction_isNotEscorting", "ACE_Interaction_isNotSwimming"}; key = 219; shift = 0; control = 0; alt = 0; }; class openInteractionMenuSelfNew { - displayName = "$STR_AGM_Interaction_InteractionMenuSelf"; + displayName = "$STR_ACE_Interaction_InteractionMenuSelf"; condition = "true"; statement = QUOTE( call FUNC(onButtonDownSelf) ); conditionUp = QUOTE( !isNull (findDisplay 1713999) && {profileNamespace getVariable [QUOTE(QGVAR(AutoCloseMenu)), false]} ); statementUp = QUOTE( if (EGVAR(interaction,MenuType) mod 2 == 1) then {call FUNC(onButtonUp)}; ); - exceptions[] = {"AGM_Drag_isNotDragging", "AGM_Medical_canTreat", "AGM_Interaction_isNotEscorting", "AGM_Interaction_isNotSwimming", "AGM_Core_notOnMap"}; + exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Medical_canTreat", "ACE_Interaction_isNotEscorting", "ACE_Interaction_isNotSwimming", "ACE_Core_notOnMap"}; key = 219; shift = 0; control = 1; alt = 0; }; class openDoor { - displayName = "$STR_AGM_Interaction_OpenDoor"; + displayName = "$STR_ACE_Interaction_OpenDoor"; condition = QUOTE( !GVAR(isOpeningDoor) && {[2] call FUNC(getDoor) select 1 != ''} ); - statement = QUOTE( call AGM_Interaction_fnc_openDoor ); + statement = QUOTE( call ACE_Interaction_fnc_openDoor ); conditionUp = QUOTE( GVAR(isOpeningDoor) ); statementUp = QUOTE( GVAR(isOpeningDoor) = false;); key = 57; @@ -111,7 +53,7 @@ class AGM_Core_Default_Keys { alt = 0; }; class tapShoulder { - displayName = "$STR_AGM_Interaction_TapShoulder"; + displayName = "$STR_ACE_Interaction_TapShoulder"; condition = QUOTE( [_player, cursorTarget] call FUNC(canTapShoulder) ); statement = QUOTE( [_player, cursorTarget] call FUNC(tapShoulder); ); key = 20; @@ -120,12 +62,12 @@ class AGM_Core_Default_Keys { alt = 0; }; class modifierKey { - displayName = "$STR_AGM_Interaction_ModifierKey"; + displayName = "$STR_ACE_Interaction_ModifierKey"; condition = ""; statement = QUOTE( GVAR(Modifier) = 1; ); conditionUp = ""; statementUp = QUOTE( GVAR(Modifier) = 0; ); - exceptions[] = {"AGM_Drag_isNotDragging"}; + exceptions[] = {"ACE_Drag_isNotDragging"}; key = 29; shift = 0; control = 0; @@ -133,39 +75,39 @@ class AGM_Core_Default_Keys { }; }; -class AGM_Core_Options { +class ACE_Core_Options { class Interaction_FlowMenu { - displayName = "$STR_AGM_Interaction_FlowMenu"; + displayName = "$STR_ACE_Interaction_FlowMenu"; default = 0; }; class Interaction_AutoCloseMenu { - displayName = "$STR_AGM_Interaction_AutoCloseMenu"; + displayName = "$STR_ACE_Interaction_AutoCloseMenu"; default = 0; }; class Interaction_AutoCenterCursor { - displayName = "$STR_AGM_Interaction_AutoCenterCursor"; + displayName = "$STR_ACE_Interaction_AutoCenterCursor"; default = 1; }; }; -class AGM_Parameters { - AGM_Modifier = 0; +class ACE_Parameters { + ACE_Modifier = 0; }; -class AGM_Parameters_Boolean { - AGM_Interaction_EnableTeamManagement = 1; +class ACE_Parameters_Boolean { + ACE_Interaction_EnableTeamManagement = 1; }; -class AGM_Core_canInteractConditions { - class AGM_Interaction_isNotEscorting { - condition = QUOTE( !(_player getVariable ['AGM_isEscorting', false]) ); +class ACE_Core_canInteractConditions { + class ACE_Interaction_isNotEscorting { + condition = QUOTE( !(_player getVariable ['ACE_isEscorting', false]) ); }; - class AGM_Interaction_isNotCaptive { - condition = QUOTE( !(_player getVariable ['AGM_isCaptive', false]) ); + class ACE_Interaction_isNotCaptive { + condition = QUOTE( !(_player getVariable ['ACE_isCaptive', false]) ); }; - class AGM_Interaction_isNotSurrendering { - condition = QUOTE( !(_player getVariable ['AGM_isSurrender', false]) ); + class ACE_Interaction_isNotSurrendering { + condition = QUOTE( !(_player getVariable ['ACE_isSurrender', false]) ); }; - class AGM_Interaction_isNotSwimming { + class ACE_Interaction_isNotSwimming { condition = QUOTE( !underwater _player ); }; }; @@ -178,11 +120,11 @@ class AGM_Core_canInteractConditions { class CfgVehicles { class Module_F; - class AGM_ModuleInteraction: Module_F { - author = "$STR_AGM_Core_AGMTeam"; - category = "AGM"; + class ACE_ModuleInteraction: Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; displayName = "Interaction System"; - function = "AGM_Interaction_fnc_moduleInteraction"; + function = "ACE_Interaction_fnc_moduleInteraction"; scope = 2; isGlobal = 1; icon = PATHTOF(UI\IconInteraction_ca.paa); @@ -201,21 +143,21 @@ class CfgVehicles { class Man; class CAManBase: Man { - class AGM_Actions { - class AGM_TeamManagement { - displayName = "$STR_AGM_Interaction_TeamManagement"; + class ACE_Actions { + class ACE_TeamManagement { + displayName = "$STR_ACE_Interaction_TeamManagement"; distance = 4; condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} && {GVAR(EnableTeamManagement)} ); statement = ""; showDisabled = 0; priority = 3.2; icon = PATHOF(UI\team\team_management_ca.paa); - subMenu[] = {"AGM_TeamManagement", 0}; + subMenu[] = {"ACE_TeamManagement", 0}; hotkey = "M"; enableInside = 1; - class AGM_JoinTeamRed { - displayName = "$STR_AGM_Interaction_JoinTeamRed"; + class ACE_JoinTeamRed { + displayName = "$STR_ACE_Interaction_JoinTeamRed"; distance = 4; condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); statement = QUOTE( [_target, 'RED'] call FUNC(joinTeam) ); @@ -225,8 +167,8 @@ class CfgVehicles { hotkey = "R"; enableInside = 1; }; - class AGM_JoinTeamGreen { - displayName = "$STR_AGM_Interaction_JoinTeamGreen"; + class ACE_JoinTeamGreen { + displayName = "$STR_ACE_Interaction_JoinTeamGreen"; distance = 4; condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); statement = QUOTE( [_target, 'GREEN'] call FUNC(joinTeam) ); @@ -236,8 +178,8 @@ class CfgVehicles { hotkey = "G"; enableInside = 1; }; - class AGM_JoinTeamBlue { - displayName = "$STR_AGM_Interaction_JoinTeamBlue"; + class ACE_JoinTeamBlue { + displayName = "$STR_ACE_Interaction_JoinTeamBlue"; distance = 4; condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); statement = QUOTE( [_target, 'BLUE'] call FUNC(joinTeam) ); @@ -247,8 +189,8 @@ class CfgVehicles { hotkey = "B"; enableInside = 1; }; - class AGM_JoinTeamYellow { - displayName = "$STR_AGM_Interaction_JoinTeamYellow"; + class ACE_JoinTeamYellow { + displayName = "$STR_ACE_Interaction_JoinTeamYellow"; distance = 4; condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} ); statement = QUOTE( [_target, 'YELLOW'] call FUNC(joinTeam) ); @@ -259,8 +201,8 @@ class CfgVehicles { enableInside = 1; }; - class AGM_LeaveTeam { - displayName = "$STR_AGM_Interaction_LeaveTeam"; + class ACE_LeaveTeam { + displayName = "$STR_ACE_Interaction_LeaveTeam"; distance = 4; condition = QUOTE( alive _target && {!isPlayer _target} && {_target in units group _player} && {assignedTeam _player != 'MAIN'} ); statement = QUOTE( [_target, 'MAIN'] call FUNC(joinTeam) ); @@ -272,8 +214,8 @@ class CfgVehicles { }; }; - class AGM_TapShoulder { - displayName = "$STR_AGM_Interaction_TapShoulder"; + class ACE_TapShoulder { + displayName = "$STR_ACE_Interaction_TapShoulder"; distance = 4; condition = QUOTE( [_player, _target] call FUNC(canTapShoulder) ); statement = QUOTE( [_player, _target] call FUNC(tapShoulder) ); @@ -282,8 +224,8 @@ class CfgVehicles { hotkey = "Q"; enableInside = 1; }; - class AGM_JoinGroup { - displayName = "$STR_AGM_Interaction_JoinGroup"; + class ACE_JoinGroup { + displayName = "$STR_ACE_Interaction_JoinGroup"; distance = 4; condition = QUOTE( side group _player == side group _target && {group _player != group _target} ); statement = QUOTE( [_player] joinSilent group _target; ); @@ -294,24 +236,24 @@ class CfgVehicles { enableInside = 1; }; - class AGM_GetDown { - displayName = "$STR_AGM_Interaction_GetDown"; + class ACE_GetDown { + displayName = "$STR_ACE_Interaction_GetDown"; distance = 4; condition = QUOTE( [_target] call FUNC(canInteractWith) ); statement = QUOTE( [_target] call FUNC(getDown) ); showDisabled = 0; priority = 2.2; }; - class AGM_SendAway { - displayName = "$STR_AGM_Interaction_SendAway"; + class ACE_SendAway { + displayName = "$STR_ACE_Interaction_SendAway"; distance = 4; condition = QUOTE( [_target] call FUNC(canInteractWith) ); statement = QUOTE( [_target] call FUNC(sendAway) ); showDisabled = 0; priority = 2.0; }; - class AGM_Pardon { - displayName = "$STR_AGM_Interaction_Pardon"; + class ACE_Pardon { + displayName = "$STR_ACE_Interaction_Pardon"; distance = 4; condition = QUOTE( rating _target < -2000 && {alive _target} && {side group _player == side group _target} ); statement = QUOTE( [_target, '{_this addRating -rating _this}', _target] call EFUNC(core,execRemoteFnc) ); @@ -321,20 +263,20 @@ class CfgVehicles { }; }; - class AGM_SelfActions { - class AGM_TeamManagement { - displayName = "$STR_AGM_Interaction_TeamManagement"; + class ACE_SelfActions { + class ACE_TeamManagement { + displayName = "$STR_ACE_Interaction_TeamManagement"; condition = QUOTE( GVAR(EnableTeamManagement) ); statement = ""; showDisabled = 1; priority = 3.2; icon = PATHOF(UI\team\team_management_ca.paa); - subMenu[] = {"AGM_TeamManagement", 1}; + subMenu[] = {"ACE_TeamManagement", 1}; enableInside = 1; hotkey = "M"; - class AGM_JoinTeamRed { - displayName = "$STR_AGM_Interaction_JoinTeamRed"; + class ACE_JoinTeamRed { + displayName = "$STR_ACE_Interaction_JoinTeamRed"; condition = QUOTE( true ); statement = QUOTE( [_player, 'RED'] call FUNC(joinTeam) ); showDisabled = 1; @@ -343,8 +285,8 @@ class CfgVehicles { enableInside = 1; hotkey = "R"; }; - class AGM_JoinTeamGreen { - displayName = "$STR_AGM_Interaction_JoinTeamGreen"; + class ACE_JoinTeamGreen { + displayName = "$STR_ACE_Interaction_JoinTeamGreen"; condition = QUOTE( true ); statement = QUOTE( [_player, 'GREEN'] call FUNC(joinTeam) ); showDisabled = 1; @@ -353,8 +295,8 @@ class CfgVehicles { enableInside = 1; hotkey = "G"; }; - class AGM_JoinTeamBlue { - displayName = "$STR_AGM_Interaction_JoinTeamBlue"; + class ACE_JoinTeamBlue { + displayName = "$STR_ACE_Interaction_JoinTeamBlue"; condition = QUOTE( true ); statement = QUOTE( [_player, 'BLUE'] call FUNC(joinTeam) ); showDisabled = 1; @@ -363,8 +305,8 @@ class CfgVehicles { enableInside = 1; hotkey = "B"; }; - class AGM_JoinTeamYellow { - displayName = "$STR_AGM_Interaction_JoinTeamYellow"; + class ACE_JoinTeamYellow { + displayName = "$STR_ACE_Interaction_JoinTeamYellow"; condition = QUOTE( true ); statement = QUOTE( [_player, 'YELLOW'] call FUNC(joinTeam) ); showDisabled = 1; @@ -374,8 +316,8 @@ class CfgVehicles { hotkey = "Y"; }; - class AGM_LeaveTeam { - displayName = "$STR_AGM_Interaction_LeaveTeam"; + class ACE_LeaveTeam { + displayName = "$STR_ACE_Interaction_LeaveTeam"; condition = QUOTE( assignedTeam _player != 'MAIN' ); statement = QUOTE( [_player, 'MAIN'] call FUNC(joinTeam) ); showDisabled = 1; @@ -385,8 +327,8 @@ class CfgVehicles { hotkey = "N"; }; - class AGM_BecomeLeader { - displayName = "$STR_AGM_Interaction_BecomeLeader"; + class ACE_BecomeLeader { + displayName = "$STR_ACE_Interaction_BecomeLeader"; condition = QUOTE( count (units group _player) > 1 && {leader group _player != _player} ); statement = QUOTE( _newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player; ); showDisabled = 1; @@ -395,8 +337,8 @@ class CfgVehicles { enableInside = 1; hotkey = "L"; }; - class AGM_LeaveGroup { - displayName = "$STR_AGM_Interaction_LeaveGroup"; + class ACE_LeaveGroup { + displayName = "$STR_ACE_Interaction_LeaveGroup"; condition = QUOTE( count (units group _player) > 1 ); statement = QUOTE( _oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup; ); showDisabled = 1; @@ -408,120 +350,120 @@ class CfgVehicles { }; /* DANCE ANIMATION DOESN'T WORK :( - class AGM_Dance { - displayName = "$STR_AGM_Interaction_Dance"; - condition = "isClass (configFile >> 'CfgPatches' >> 'AGM_Movement') and !AGM_Dancing"; - statement = "AGM_Dancing = true; [-2, {_this switchMove 'TestDance';}, player] call CBA_fnc_globalExecute;"; + class ACE_Dance { + displayName = "$STR_ACE_Interaction_Dance"; + condition = "isClass (configFile >> 'CfgPatches' >> 'ACE_Movement') and !ACE_Dancing"; + statement = "ACE_Dancing = true; [-2, {_this switchMove 'TestDance';}, player] call CBA_fnc_globalExecute;"; showDisabled = 0; priority = -1.2; }; - class AGM_StopDancing { - displayName = "$STR_AGM_Interaction_StopDancing"; - condition = "AGM_Dancing"; - statement = "AGM_Dancing = false; [-2, {_this switchMove '';}, player] call CBA_fnc_globalExecute;"; + class ACE_StopDancing { + displayName = "$STR_ACE_Interaction_StopDancing"; + condition = "ACE_Dancing"; + statement = "ACE_Dancing = false; [-2, {_this switchMove '';}, player] call CBA_fnc_globalExecute;"; showDisabled = 0; priority = -1.2; }; */ - class AGM_Gestures { - displayName = "$STR_AGM_Interaction_Gestures"; + class ACE_Gestures { + displayName = "$STR_ACE_Interaction_Gestures"; condition = "canStand _target"; statement = ""; showDisabled = 1; priority = 3.5; - subMenu[] = {"AGM_Gestures", 1}; - icon = "AGM_Interaction\UI\gestures_ca.paa"; + subMenu[] = {"ACE_Gestures", 1}; + icon = "ACE_Interaction\UI\gestures_ca.paa"; hotkey = "G"; - /*class AGM_Gesture_Advance { - displayName = "$STR_AGM_Interaction_Gestures_Attack"; + /*class ACE_Gesture_Advance { + displayName = "$STR_ACE_Interaction_Gestures_Attack"; condition = "canStand _target"; statement = "_target playActionNow 'gestureAttack';"; showDisabled = 1; priority = 2.0; };*/ - class AGM_Gesture_Advance { - displayName = "$STR_AGM_Interaction_Gestures_Advance"; + class ACE_Gesture_Advance { + displayName = "$STR_ACE_Interaction_Gestures_Advance"; condition = "canStand _target"; statement = "_target playActionNow 'gestureAdvance';"; showDisabled = 1; priority = 1.9; hotkey = "1"; }; - class AGM_Gesture_Go { - displayName = "$STR_AGM_Interaction_Gestures_Go"; + class ACE_Gesture_Go { + displayName = "$STR_ACE_Interaction_Gestures_Go"; condition = "canStand _target"; statement = "_target playActionNow (['gestureGo', 'gestureGoB'] select (floor random 2));"; showDisabled = 1; priority = 1.8; hotkey = "2"; }; - class AGM_Gesture_Follow { - displayName = "$STR_AGM_Interaction_Gestures_Follow"; + class ACE_Gesture_Follow { + displayName = "$STR_ACE_Interaction_Gestures_Follow"; condition = "canStand _target"; statement = "_target playActionNow 'gestureFollow';"; showDisabled = 1; priority = 1.7; hotkey = "3"; }; - /*class AGM_Gesture_Point { - displayName = "$STR_AGM_Interaction_Gestures_Point"; + /*class ACE_Gesture_Point { + displayName = "$STR_ACE_Interaction_Gestures_Point"; condition = "canStand _target"; statement = "_target playActionNow 'gesturePoint';"; showDisabled = 1; priority = 1.6; };*/ - class AGM_Gesture_Up { - displayName = "$STR_AGM_Interaction_Gestures_Up"; + class ACE_Gesture_Up { + displayName = "$STR_ACE_Interaction_Gestures_Up"; condition = "canStand _target"; statement = "_target playActionNow 'gestureUp';"; showDisabled = 1; priority = 1.5; hotkey = "4"; }; - class AGM_Gesture_Cover { - displayName = "$STR_AGM_Interaction_Gestures_Cover"; + class ACE_Gesture_Cover { + displayName = "$STR_ACE_Interaction_Gestures_Cover"; condition = "canStand _target"; statement = "_target playActionNow 'gestureCover';"; showDisabled = 1; priority = 1.4; hotkey = "5"; }; - class AGM_Gesture_CeaseFire { - displayName = "$STR_AGM_Interaction_Gestures_Cease_Fire"; + class ACE_Gesture_CeaseFire { + displayName = "$STR_ACE_Interaction_Gestures_Cease_Fire"; condition = "canStand _target"; statement = "_target playActionNow 'gestureCeaseFire';"; showDisabled = 1; priority = 1.3; hotkey = "6"; }; - class AGM_Gesture_Freeze { - displayName = "$STR_AGM_Interaction_Gestures_Freeze"; + class ACE_Gesture_Freeze { + displayName = "$STR_ACE_Interaction_Gestures_Freeze"; condition = "canStand _target"; statement = "_target playActionNow 'gestureFreeze';"; showDisabled = 1; priority = 1.2; hotkey = "7"; }; - class AGM_Gesture_Yes { - displayName = "$STR_AGM_Interaction_Gestures_Yes"; + class ACE_Gesture_Yes { + displayName = "$STR_ACE_Interaction_Gestures_Yes"; condition = "canStand _target"; statement = "_target playActionNow (['gestureYes', 'gestureNod'] select (floor random 2));"; showDisabled = 1; priority = 1.1; hotkey = "8"; }; - class AGM_Gesture_No { - displayName = "$STR_AGM_Interaction_Gestures_No"; + class ACE_Gesture_No { + displayName = "$STR_ACE_Interaction_Gestures_No"; condition = "canStand _target"; statement = "_target playActionNow 'gestureNo';"; showDisabled = 1; priority = 1.0; hotkey = "9"; }; - class AGM_Gesture_Hi { - displayName = "$STR_AGM_Interaction_Gestures_Hi"; + class ACE_Gesture_Hi { + displayName = "$STR_ACE_Interaction_Gestures_Hi"; condition = "canStand _target"; statement = "_target playActionNow (['gestureHi', 'gestureHiB', 'gestureHiC'] select (floor random 3));"; showDisabled = 1; @@ -530,24 +472,24 @@ class CfgVehicles { }; }; - class AGM_Equipment { - displayName = "$STR_AGM_Interaction_Equipment"; + class ACE_Equipment { + displayName = "$STR_ACE_Interaction_Equipment"; condition = "true"; statement = ""; showDisabled = 1; priority = 4.5; icon = ""; // @todo - subMenu[] = {"AGM_Equipment", 1}; + subMenu[] = {"ACE_Equipment", 1}; enableInside = 1; hotkey = "E"; - class AGM_Dummy { + class ACE_Dummy { displayName = ""; condition = "false"; statement = ""; showDisabled = 1; priority = -99; - icon = "AGM_Core\UI\blank_CO.paa"; + icon = PATHOF(UI\blank_CO.paa); enableInside = 1; }; }; @@ -556,29 +498,29 @@ class CfgVehicles { class LandVehicle; class Car: LandVehicle { - class AGM_Actions {}; - class AGM_SelfActions {}; + class ACE_Actions {}; + class ACE_SelfActions {}; }; class Tank: LandVehicle { - class AGM_Actions {}; - class AGM_SelfActions {}; + class ACE_Actions {}; + class ACE_SelfActions {}; }; class Air; class Helicopter: Air { - class AGM_Actions {}; - class AGM_SelfActions {}; + class ACE_Actions {}; + class ACE_SelfActions {}; }; class Plane: Air { - class AGM_Actions {}; - class AGM_SelfActions {}; + class ACE_Actions {}; + class ACE_SelfActions {}; }; class Ship; class Ship_F: Ship { - class AGM_Actions { - class AGM_Push { - displayName = "$STR_AGM_Interaction_Push"; + class ACE_Actions { + class ACE_Push { + displayName = "$STR_ACE_Interaction_Push"; distance = 4; condition = QUOTE( getMass _target < 1000 and alive _target ); statement = QUOTE( [_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call FUNC(push); ); @@ -586,37 +528,37 @@ class CfgVehicles { priority = -1; }; }; - class AGM_SelfActions {}; + class ACE_SelfActions {}; }; class StaticWeapon: LandVehicle { - class AGM_Actions {}; - class AGM_SelfActions {}; + class ACE_Actions {}; + class ACE_SelfActions {}; }; class StaticMortar; class Mortar_01_base_F: StaticMortar { - class AGM_Actions {}; - class AGM_SelfActions {}; + class ACE_Actions {}; + class ACE_SelfActions {}; }; class Box_NATO_Support_F; - class AGM_Box_Misc: Box_NATO_Support_F { + class ACE_Box_Misc: Box_NATO_Support_F { class TransportItems { - MACRO_ADDITEM(AGM_CableTie,24) + MACRO_ADDITEM(ACE_CableTie,24) }; }; }; class CfgWeapons { - class AGM_ItemCore; + class ACE_ItemCore; class InventoryItem_Base_F; - class AGM_CableTie: AGM_ItemCore { - displayName = "$STR_AGM_Interaction_CableTie_Name"; - descriptionShort = "$STR_AGM_Interaction_CableTie_Description"; - model = PATHOF(agm_cabletie.p3d); - picture = PATHOF(UI\agm_cabletie_x_ca.paa); + class ACE_CableTie: ACE_ItemCore { + displayName = "$STR_ACE_Interaction_CableTie_Name"; + descriptionShort = "$STR_ACE_Interaction_CableTie_Description"; + model = PATHOF(ACE_cabletie.p3d); + picture = PATHOF(UI\ACE_cabletie_x_ca.paa); scope = 2; class ItemInfo: InventoryItem_Base_F { mass = 1; diff --git a/addons/interaction/functions/fn_AddSelectableItem.sqf b/addons/interaction/functions/fn_AddSelectableItem.sqf index 6ce0b6a3a9..8b7eb1da5a 100644 --- a/addons/interaction/functions/fn_AddSelectableItem.sqf +++ b/addons/interaction/functions/fn_AddSelectableItem.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_AddSelectableItem - Author: Garth de Wet (LH) Description: diff --git a/addons/interaction/functions/fn_GetActions.sqf b/addons/interaction/functions/fn_GetActions.sqf index b0b4bc14bd..41938c7faa 100644 --- a/addons/interaction/functions/fn_GetActions.sqf +++ b/addons/interaction/functions/fn_GetActions.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_GetActions - Author: commy2 Garth de Wet (LH) @@ -14,16 +12,16 @@ 3: ARRAY - Patches 4: CONFIG - Parent config (ConfigFile >> "CfgVehicles"/MissionConfigFile >> "CfgVehicles") 5: BOOL - Is mission config file? - 6: STRING - Classname ("AGM_Actions"/"AGM_SelfActions") + 6: STRING - Classname ("ACE_Actions"/"ACE_SelfActions") 7: STRING - Sub-class Returns: Nothing Example: - [player, [configfile >> "CfgVehicles" >> typeOf player, true] call BIS_fnc_returnParents, [], [],configfile >> "CfgVehicles", false, "AGM_Actions"] call AGM_Interaction_fnc_GetActions; + [player, [configfile >> "CfgVehicles" >> typeOf player, true] call BIS_fnc_returnParents, [], [],configfile >> "CfgVehicles", false, "ACE_Actions"] call ACE_Interaction_fnc_GetActions; - [player, [configfile >> "CfgVehicles" >> typeOf player, true] call BIS_fnc_returnParents, [], [],configfile >> "CfgVehicles", false, "AGM_SelfActions"] call AGM_Interaction_fnc_GetActions; + [player, [configfile >> "CfgVehicles" >> typeOf player, true] call BIS_fnc_returnParents, [], [],configfile >> "CfgVehicles", false, "ACE_SelfActions"] call ACE_Interaction_fnc_GetActions; */ #include "script_component.hpp" @@ -79,7 +77,7 @@ for "_i" from 0 to (_count - 1) do { _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[AGM_player, GVAR(Target)] call EFUNC(core,canInteractWith)} ), getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ACE_player, GVAR(Target)] call EFUNC(core,canInteractWith)} ), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; diff --git a/addons/interaction/functions/fn_MoveDown.sqf b/addons/interaction/functions/fn_MoveDown.sqf index 8f7a9c95ac..2221deab62 100644 --- a/addons/interaction/functions/fn_MoveDown.sqf +++ b/addons/interaction/functions/fn_MoveDown.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_MoveDown - Author: Garth de Wet (LH) Description: @@ -13,8 +11,8 @@ Nothing Example: - 1 call AGM_Interaction_fnc_MoveDown; - -1 call AGM_Interaction_fnc_MoveDown; + 1 call FUNC(MoveDown); + -1 call FUNC(MoveDown); */ #include "script_component.hpp" @@ -25,7 +23,7 @@ _count = (count GVAR(Buttons))- 1; GVAR(SelectedButton) = CLAMP(GVAR(SelectedButton) + _this, 0, _count); _target = GVAR(Target); -_player = AGM_player; +_player = ACE_player; _vehicle = vehicle _player; disableSerialization; diff --git a/addons/interaction/functions/fn_addInteraction.sqf b/addons/interaction/functions/fn_addInteraction.sqf index 6b41ed1dd6..5e8889891d 100644 --- a/addons/interaction/functions/fn_addInteraction.sqf +++ b/addons/interaction/functions/fn_addInteraction.sqf @@ -1,7 +1,7 @@ /* * Author: commy2 * - * Add an AGM action to an object. Note: This function is global. + * Add an ACE action to an object. Note: This function is global. * * Argument: * 0: Object the action should be assigned to (Object) diff --git a/addons/interaction/functions/fn_addInteractionSelf.sqf b/addons/interaction/functions/fn_addInteractionSelf.sqf index a84577f0c2..48773fcb99 100644 --- a/addons/interaction/functions/fn_addInteractionSelf.sqf +++ b/addons/interaction/functions/fn_addInteractionSelf.sqf @@ -1,7 +1,7 @@ /* * Author: commy2 * - * Add an AGM self action to the player. Execute this on the local machine of the player. + * Add an ACE self action to the player. Execute this on the local machine of the player. * * Argument: * 0: Name of the action shown in the menu (String) @@ -42,7 +42,7 @@ if (isNil "_priority") then { _priority = 0; }; -_actionsVar = AGM_player getVariable [QGVAR(InteractionsSelf), [-1, [], []]]; +_actionsVar = ACE_player getVariable [QGVAR(InteractionsSelf), [-1, [], []]]; _id = (_actionsVar select 0) + 1; _actionIDs = _actionsVar select 1; @@ -51,5 +51,5 @@ _actions = _actionsVar select 2; _actionIDs pushBack _id; _actions pushBack [_displayName, _condition, _statement, _showDisabled, _priority]; -AGM_player setVariable [QGVAR(InteractionsSelf), [_id, _actionIDs, _actions], false]; +ACE_player setVariable [QGVAR(InteractionsSelf), [_id, _actionIDs, _actions], false]; _id diff --git a/addons/interaction/functions/fn_applyButtons.sqf b/addons/interaction/functions/fn_applyButtons.sqf index 3cd3eecded..7459b1a7bf 100644 --- a/addons/interaction/functions/fn_applyButtons.sqf +++ b/addons/interaction/functions/fn_applyButtons.sqf @@ -27,7 +27,7 @@ _ctrlInteractionDialog = _dlgInteractionDialog displayCtrl 3; GVAR(MainButton) = "(findDisplay 1713999) closeDisplay 1;"; if (_object isKindOf "Man") then { - _ctrlInteractionDialog ctrlSetText (if (alive _object) then {name _object} else {_object getVariable ["AGM_Name", "Unknown"]}); + _ctrlInteractionDialog ctrlSetText (if (alive _object) then {name _object} else {_object getVariable ["ACE_Name", "Unknown"]}); } else { _ctrlInteractionDialog ctrlSetText (getText (configFile >> "CfgVehicles" >> typeOf _object >> "displayName")); }; diff --git a/addons/interaction/functions/fn_canInteractWith.sqf b/addons/interaction/functions/fn_canInteractWith.sqf index 036dd205b1..5a47782546 100644 --- a/addons/interaction/functions/fn_canInteractWith.sqf +++ b/addons/interaction/functions/fn_canInteractWith.sqf @@ -10,5 +10,5 @@ _isCivilian = _this select 1; if (isNil "_isCivilian") then {_isCivilian = true}; alive _unit -&& [side _unit != side AGM_player, side group _unit == civilian] select _isCivilian +&& [side _unit != side ACE_player, side group _unit == civilian] select _isCivilian //&& {count (weapons _unit) == 0} diff --git a/addons/interaction/functions/fn_canTapShoulder.sqf b/addons/interaction/functions/fn_canTapShoulder.sqf index 5a7bc56549..4ea9836117 100644 --- a/addons/interaction/functions/fn_canTapShoulder.sqf +++ b/addons/interaction/functions/fn_canTapShoulder.sqf @@ -10,4 +10,4 @@ _target = _this select 1; _target isKindOf "CAManBase" && {alive _target} && {_unit distance _target < 4} && -{!(_target getVariable ["AGM_isUnconscious", false])} +{!(_target getVariable ["ACE_isUnconscious", false])} diff --git a/addons/interaction/functions/fn_getActions2.sqf b/addons/interaction/functions/fn_getActions2.sqf index 96423963a8..84c720cfbb 100644 --- a/addons/interaction/functions/fn_getActions2.sqf +++ b/addons/interaction/functions/fn_getActions2.sqf @@ -5,7 +5,7 @@ private ["_object", "_config", "_type", "_actions", "_configs"]; _object = _this select 0; _config = _this select 1; // configFile, missionConfigFile -_type = _this select 2; // "AGM_CfgInteractions", "AGM_CfgInteractionsSelf" +_type = _this select 2; // "ACE_CfgInteractions", "ACE_CfgInteractionsSelf" _actions = _this select 3; // []; _configs = "_object isKindOf configName _x" configClasses (_config >> _type); @@ -45,7 +45,7 @@ _cacheIndices = _cache select 2; _condition = getText (_action >> "condition"); if (_condition == "") then {_condition = "true"}; - _condition = _condition + format [QUOTE( && {%1 call EFUNC(core,canInteract)} && {[AGM_player, GVAR(Target)] call FUNC(canInteractWith)} ), getArray (_action >> "exceptions")]; + _condition = _condition + format [QUOTE( && {%1 call EFUNC(core,canInteract)} && {[ACE_player, GVAR(Target)] call FUNC(canInteractWith)} ), getArray (_action >> "exceptions")]; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; _condition = compile _condition; @@ -66,7 +66,7 @@ _cacheIndices = _cache select 2; _statement = getText (_action >> "statement"); _statement = compile _statement; - if (profileNamespace getVariable ["AGM_Interaction_FlowMenu", false]) then { + if (profileNamespace getVariable ["ACE_Interaction_FlowMenu", false]) then { _statement = if (getText (_action >> "statement") == "" && {count _subMenu > 1}) then { compile format [QUOTE( call FUNC(hideMenu);if(%2 == 1)then{['%1'] call FUNC(openSubMenuSelf);}else{['%1'] call FUNC(openSubMenu);}; ), _subMenu select 0, _subMenu select 1]; } else { diff --git a/addons/interaction/functions/fn_getDoor.sqf b/addons/interaction/functions/fn_getDoor.sqf index c0d41fbfbd..91c2161d9f 100644 --- a/addons/interaction/functions/fn_getDoor.sqf +++ b/addons/interaction/functions/fn_getDoor.sqf @@ -23,10 +23,3 @@ _intersections = [_house, "GEOM"] intersect [_position0, _position1]; _door = _intersections select 0 select 0; if (isNil "_door") exitWith {[_house, ""]}; [_house, _door] - -/* -_house = cursorTarget; -_actions = "true" configClasses (configFile >> "CfgVehicles" >> typeOf _house >> "UserActions"); -_actions = [_actions, {getText (_x >> "statement")}] call AGM_Core_fnc_map; -_actions -*/ diff --git a/addons/interaction/functions/fn_getDown.sqf b/addons/interaction/functions/fn_getDown.sqf index 5d14d040f4..ead5dcd290 100644 --- a/addons/interaction/functions/fn_getDown.sqf +++ b/addons/interaction/functions/fn_getDown.sqf @@ -17,9 +17,9 @@ private ["_unit", "_chance", "_x"]; _unit = _this select 0; -AGM_player playActionNow "GestureGo"; // put something else here. +ACE_player playActionNow "GestureGo"; // put something else here. -if (count (weapons AGM_player) > 0) then { +if (count (weapons ACE_player) > 0) then { _chance = 0.8; } else { _chance = 0.5; diff --git a/addons/interaction/functions/fn_hideMenu.sqf b/addons/interaction/functions/fn_hideMenu.sqf index 830cbb6449..43444b7d99 100644 --- a/addons/interaction/functions/fn_hideMenu.sqf +++ b/addons/interaction/functions/fn_hideMenu.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_hideMenu - Author: Garth de Wet (LH) Description: @@ -13,7 +11,7 @@ Nothing Example: - call AGM_Interaction_fnc_hideMenu; + call FUNC(hideMenu); */ #include "script_component.hpp" diff --git a/addons/interaction/functions/fn_hideMouseHint.sqf b/addons/interaction/functions/fn_hideMouseHint.sqf index 79ac3a45e8..7553df59ee 100644 --- a/addons/interaction/functions/fn_hideMouseHint.sqf +++ b/addons/interaction/functions/fn_hideMouseHint.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_hideMouseHint - Author(s): Garth de Wet (LH) @@ -14,11 +12,11 @@ Nothing Example: - call AGM_Interaction_fnc_hideMouseHint; + call FUNC(hideMouseHint); */ #include "script_component.hpp" -if (isNull (uiNamespace getVariable ["AGM_Helper_Display", objNull])) exitWith{}; +if (isNull (uiNamespace getVariable ["ACE_Helper_Display", objNull])) exitWith{}; -("AGM_InteractionHelper" call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; +("ACE_InteractionHelper" call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; showHUD true; \ No newline at end of file diff --git a/addons/interaction/functions/fn_initialiseInteraction.sqf b/addons/interaction/functions/fn_initialiseInteraction.sqf index 895656712b..c951ea88d6 100644 --- a/addons/interaction/functions/fn_initialiseInteraction.sqf +++ b/addons/interaction/functions/fn_initialiseInteraction.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_initialiseInteraction - Author: commy2 Garth de Wet (LH) @@ -19,7 +17,7 @@ Nothing Example: - [{"Default" call AGM_Interaction_fnc_openMenu;}, true, (profileNamespace getVariable [QGVAR(FlowMenu), false]), GVAR(Target)] call AGM_Interaction_fnc_initialiseInteraction; + [{"Default" call FUNC(openMenu);}, true, (profileNamespace getVariable [QGVAR(FlowMenu), false]), GVAR(Target)] call FUNC(initialiseInteraction); */ #include "script_component.hpp" @@ -29,7 +27,7 @@ _subMenu = _this select 1; _selfMenu = _this select 3; _target = _this select 4; -_player = AGM_player; +_player = ACE_player; _vehicle = vehicle _player; //_object = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); @@ -40,16 +38,16 @@ GVAR(Shortcuts) = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1]; // Flow menu if (_this select 2) then { (QGVAR(FlowMenu) call BIS_fnc_rscLayer) cutRsc [QGVAR(FlowMenu), "PLAIN",0.5, false]; - AGM_Interaction_SelectedButton = 0; + ACE_Interaction_SelectedButton = 0; (findDisplay 1713999) closeDisplay 1; - if (_player getVariable ["AGM_AcceptAction", -1] == -1) then { + if (_player getVariable ["ACE_AcceptAction", -1] == -1) then { [{if(isNil {GVAR(MainButton)} || {!(profileNamespace getVariable [QGVAR(FlowMenu), false])})exitWith{false};(-(_this select 0) / 1.2) call FUNC(MoveDown);true}] call EFUNC(core,addScrollWheelEventHandler); - _player setVariable ["AGM_AcceptAction", [_player, "DefaultAction", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {_action = GVAR(Buttons) select AGM_Interaction_SelectedButton;_target = GVAR(Target);_player = AGM_player;_vehicle = vehicle _player;if ([_target, _player] call (_action select 2)) then {call FUNC(hideMenu);if(count _action == 12) then{(_action select 11) call (_action select 1);}else{[_target, _player] call (_action select 1);};};}] call EFUNC(core,addActionEventHandler)]; - _player setVariable ["AGM_AcceptAction", [_player, "menuBack", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {call GVAR(MainButton);}] call EFUNC(core,addActionEventHandler)]; + _player setVariable ["ACE_AcceptAction", [_player, "DefaultAction", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {_action = GVAR(Buttons) select ACE_Interaction_SelectedButton;_target = GVAR(Target);_player = ACE_player;_vehicle = vehicle _player;if ([_target, _player] call (_action select 2)) then {call FUNC(hideMenu);if(count _action == 12) then{(_action select 11) call (_action select 1);}else{[_target, _player] call (_action select 1);};};}] call EFUNC(core,addActionEventHandler)]; + _player setVariable ["ACE_AcceptAction", [_player, "menuBack", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {call GVAR(MainButton);}] call EFUNC(core,addActionEventHandler)]; }; 0 call FUNC(moveDown); - [localize "STR_AGM_Interaction_MakeSelection", if (_subMenu)then{localize "STR_AGM_Interaction_Back"}else{""}, localize "STR_AGM_Interaction_ScrollHint"] call FUNC(showMouseHint); + [localize "STR_ACE_Interaction_MakeSelection", if (_subMenu)then{localize "STR_ACE_Interaction_Back"}else{""}, localize "STR_ACE_Interaction_ScrollHint"] call FUNC(showMouseHint); ((uiNamespace getVariable QGVAR(Flow_Display)) displayCtrl (1210)) ctrlShow _subMenu; }else{ // Rose if (!isNull(uiNamespace getVariable QGVAR(Flow_Display))) then { @@ -73,7 +71,7 @@ if (_this select 2) then { if !(_subMenu) then { _ctrlInteractionDialog ctrlSetText ([_target] call EFUNC(core,getName)); } else { - _ctrlInteractionDialog ctrlSetText localize "STR_AGM_Interaction_Back"; + _ctrlInteractionDialog ctrlSetText localize "STR_ACE_Interaction_Back"; }; _buttons = GVAR(Buttons); @@ -116,7 +114,7 @@ if (_this select 2) then { _dlgMenu = uiNamespace getVariable [QGVAR(Dialog), displayNull]; _ctrlTooltip = _dlgMenu displayCtrl 40; - _player = AGM_player; + _player = ACE_player; _vehicle = vehicle _player; _target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); @@ -142,7 +140,7 @@ if (_this select 2) then { GVAR(Tooltips) set [_forEachIndex, GVAR(CurrentTooltip)]; // apply conditional tooltips - /*if (_forEachIndex == call AGM_Interaction_fnc_getSelectedButton) then { + /*if (_forEachIndex == call ACE_Interaction_fnc_getSelectedButton) then { _tooltip = _x select 6; _showTooltip = _tooltip != ""; diff --git a/addons/interaction/functions/fn_isInRange.sqf b/addons/interaction/functions/fn_isInRange.sqf index b40982a9cc..24b5793d6f 100644 --- a/addons/interaction/functions/fn_isInRange.sqf +++ b/addons/interaction/functions/fn_isInRange.sqf @@ -17,7 +17,7 @@ private ["_vehicle", "_distance", "_player"]; _vehicle = _this select 0; _distance = _this select 1; -_player = AGM_player; +_player = ACE_player; if (_vehicle isKindOf "Man") exitWith {_player distance _vehicle < _distance}; diff --git a/addons/interaction/functions/fn_joinTeam.sqf b/addons/interaction/functions/fn_joinTeam.sqf index ad876771ad..ad5d40c7f2 100644 --- a/addons/interaction/functions/fn_joinTeam.sqf +++ b/addons/interaction/functions/fn_joinTeam.sqf @@ -9,12 +9,12 @@ _team = _this select 1; _unit setVariable [QGVAR(assignedFireTeam), _team, true]; [_unit, format ["{_this assignTeam '%1'}", _team]] call EFUNC(core,execRemoteFnc); -if (_unit == AGM_player) then { +if (_unit == ACE_player) then { _message = if (_team == "MAIN") then { - localize "STR_AGM_Interaction_LeftTeam"; + localize "STR_ACE_Interaction_LeftTeam"; } else { - _team = localize format ["STR_AGM_Interaction_Team%1", _team]; - format [localize "STR_AGM_Interaction_JoinedTeam", _team]; + _team = localize format ["STR_ACE_Interaction_Team%1", _team]; + format [localize "STR_ACE_Interaction_JoinedTeam", _team]; }; [_message] call EFUNC(core,displayTextStructured); diff --git a/addons/interaction/functions/fn_moduleInteraction.sqf b/addons/interaction/functions/fn_moduleInteraction.sqf index b3246885be..2d488c9880 100644 --- a/addons/interaction/functions/fn_moduleInteraction.sqf +++ b/addons/interaction/functions/fn_moduleInteraction.sqf @@ -18,4 +18,4 @@ if !(_activated) exitWith {}; [_logic, QGVAR(EnableTeamManagement), "EnableTeamManagement"] call EFUNC(core,readBooleanParameterFromModule); -diag_log text "[AGM]: Interaction Module Initialized."; +diag_log text "[ACE]: Interaction Module Initialized."; diff --git a/addons/interaction/functions/fn_onButtonDown.sqf b/addons/interaction/functions/fn_onButtonDown.sqf index fb047871b8..59d42e062f 100644 --- a/addons/interaction/functions/fn_onButtonDown.sqf +++ b/addons/interaction/functions/fn_onButtonDown.sqf @@ -6,7 +6,7 @@ if (dialog) exitWith { }; if (isNull (findDisplay 1713999)) then { - if (AGM_player == vehicle AGM_player) then {"" call FUNC(openMenu)} else {[AGM_player, vehicle AGM_player] call FUNC(openMenuSelectUI)}; + if (ACE_player == vehicle ACE_player) then {"" call FUNC(openMenu)} else {[ACE_player, vehicle ACE_player] call FUNC(openMenuSelectUI)}; setMousePosition [0.5, 0.5]; } else { (findDisplay 1713999) closeDisplay 1; diff --git a/addons/interaction/functions/fn_onButtonUp.sqf b/addons/interaction/functions/fn_onButtonUp.sqf index 5e8d5aa27e..44c4e340f0 100644 --- a/addons/interaction/functions/fn_onButtonUp.sqf +++ b/addons/interaction/functions/fn_onButtonUp.sqf @@ -3,7 +3,7 @@ private ["_player", "_vehicle", "_target", "_count", "_index", "_action", "_statement", "_condition", "_conditionShow", "_exceptions", "_distance"]; -_player = AGM_player; +_player = ACE_player; _vehicle = vehicle _player; _target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); diff --git a/addons/interaction/functions/fn_onClick.sqf b/addons/interaction/functions/fn_onClick.sqf index aa177e1331..68047a5fba 100644 --- a/addons/interaction/functions/fn_onClick.sqf +++ b/addons/interaction/functions/fn_onClick.sqf @@ -2,7 +2,7 @@ #include "script_component.hpp" private ["_player", "_vehicle", "_target", "_count", "_index", "_action", "_subMenu", "_statement", "_condition", "_conditionShow", "_exceptions", "_distance"]; -_player = AGM_player; +_player = ACE_player; _vehicle = vehicle _player; _target = [GVAR(Target), _player] select (GVAR(MenuType) % 2 == 1); diff --git a/addons/interaction/functions/fn_openDoor.sqf b/addons/interaction/functions/fn_openDoor.sqf index 40536e6724..d8cd8b0693 100644 --- a/addons/interaction/functions/fn_openDoor.sqf +++ b/addons/interaction/functions/fn_openDoor.sqf @@ -23,14 +23,14 @@ if (_house animationPhase (_animations select 0) <= 0 && {_house getVariable [_l }; GVAR(isOpeningDoor) = true; -playSound "AGM_Sound_Click"; +playSound "ACE_Sound_Click"; [_house, _animations] spawn { _house = _this select 0; _animations = _this select 1; _phase = _house animationPhase (_animations select 0); - _position = getPosASL AGM_player; + _position = getPosASL ACE_player; _time = time + 0.2; _usedMouseWheel = false; @@ -44,7 +44,7 @@ playSound "AGM_Sound_Click"; {_house animate [_x, _phase]} forEach _animations; - !GVAR(isOpeningDoor) || {getPosASL AGM_player distance _position > 1} + !GVAR(isOpeningDoor) || {getPosASL ACE_player distance _position > 1} }; if (!_usedMouseWheel && {time < _time}) then { diff --git a/addons/interaction/functions/fn_openMenuSelectUI.sqf b/addons/interaction/functions/fn_openMenuSelectUI.sqf index a08793948d..552484abce 100644 --- a/addons/interaction/functions/fn_openMenuSelectUI.sqf +++ b/addons/interaction/functions/fn_openMenuSelectUI.sqf @@ -16,7 +16,7 @@ GVAR(InteractionMenu_Crew) = _cargo; // prepare: add header and "OK" button to select menu private "_actions"; -_actions = [localize "STR_AGM_Interaction_InteractionMenu", localize "STR_AGM_Interaction_Interact"] call FUNC(prepareSelectMenu); +_actions = [localize "STR_ACE_Interaction_InteractionMenu", localize "STR_ACE_Interaction_Interact"] call FUNC(prepareSelectMenu); // prepare: add all cargo units as options to select menu { diff --git a/addons/interaction/functions/fn_openMenuSelf.sqf b/addons/interaction/functions/fn_openMenuSelf.sqf index b93a1e5b43..9ce84f7287 100644 --- a/addons/interaction/functions/fn_openMenuSelf.sqf +++ b/addons/interaction/functions/fn_openMenuSelf.sqf @@ -1,4 +1,4 @@ // by commy2 #include "script_component.hpp" -[1, AGM_player, ""] call FUNC(showMenu); +[1, ACE_player, ""] call FUNC(showMenu); diff --git a/addons/interaction/functions/fn_openSelectMenu.sqf b/addons/interaction/functions/fn_openSelectMenu.sqf index 6da1310060..ae7d5ce21b 100644 --- a/addons/interaction/functions/fn_openSelectMenu.sqf +++ b/addons/interaction/functions/fn_openSelectMenu.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_openSelectMenu - Author: Garth de Wet (LH) Description: @@ -41,5 +39,5 @@ if (!(profileNamespace getVariable [QGVAR(FlowMenu), false])) then { _action set [1, (_this select 1)]; }; GVAR(Buttons) = _customActions; - [(_this select 2), true, true, false, AGM_player] call FUNC(initialiseInteraction); + [(_this select 2), true, true, false, ACE_player] call FUNC(initialiseInteraction); }; diff --git a/addons/interaction/functions/fn_openSubMenuSelf.sqf b/addons/interaction/functions/fn_openSubMenuSelf.sqf index 9579347312..e207603ebb 100644 --- a/addons/interaction/functions/fn_openSubMenuSelf.sqf +++ b/addons/interaction/functions/fn_openSubMenuSelf.sqf @@ -1,4 +1,4 @@ // by commy2 #include "script_component.hpp" -[3, AGM_player, _this select 0] call FUNC(showMenu); +[3, ACE_player, _this select 0] call FUNC(showMenu); diff --git a/addons/interaction/functions/fn_prepareSelectMenu.sqf b/addons/interaction/functions/fn_prepareSelectMenu.sqf index 3f5a05af8d..43c9eccdf1 100644 --- a/addons/interaction/functions/fn_prepareSelectMenu.sqf +++ b/addons/interaction/functions/fn_prepareSelectMenu.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_prepareSelectMenu - Author: Garth de Wet (LH) Description: @@ -14,7 +12,7 @@ ARRAY/NUMBER - container object for use with AddSelectableItem. Example: - ["Select Explosive", "Place"] call AGM_Interaction_fnc_prepareSelectMenu; + ["Select Explosive", "Place"] call FUNC(prepareSelectMenu); */ #include "script_component.hpp" @@ -24,9 +22,9 @@ if (!(profileNamespace getVariable [QGVAR(FlowMenu), false])) exitWith { _header = _this select 0; _buttonText = _this select 1; if (isNil "_buttonText" or {_buttonText == ""}) then { - _buttonText = localize "STR_AGM_Interaction_MakeSelection"; + _buttonText = localize "STR_ACE_Interaction_MakeSelection"; }; - createDialog "RscAGM_SelectAnItem"; + createDialog "RscACE_SelectAnItem"; ctrlSetText [8860, _buttonText]; ctrlSetText [8870, _header]; diff --git a/addons/interaction/functions/fn_removeInteraction.sqf b/addons/interaction/functions/fn_removeInteraction.sqf index eec3c86a29..141773da73 100644 --- a/addons/interaction/functions/fn_removeInteraction.sqf +++ b/addons/interaction/functions/fn_removeInteraction.sqf @@ -1,7 +1,7 @@ /* * Author: commy2 * - * Remove an AGM action from an object. Note: This function is global. + * Remove an ACE action from an object. Note: This function is global. * * Argument: * 0: Object (Object) diff --git a/addons/interaction/functions/fn_removeInteractionSelf.sqf b/addons/interaction/functions/fn_removeInteractionSelf.sqf index 5140b8d6a9..fce0f6a5a0 100644 --- a/addons/interaction/functions/fn_removeInteractionSelf.sqf +++ b/addons/interaction/functions/fn_removeInteractionSelf.sqf @@ -1,7 +1,7 @@ /* * Author: commy2 * - * Remove an AGM self action from the player. + * Remove an ACE self action from the player. * * Argument: * 0: ID of the action (Number) @@ -16,7 +16,7 @@ private ["_id", "_actionsVar", "_currentID", "_actionIDs", "_actions"]; _id = _this select 0; -_actionsVar = AGM_player getVariable [QGVAR(InteractionsSelf), [-1, [], []]]; +_actionsVar = ACE_player getVariable [QGVAR(InteractionsSelf), [-1, [], []]]; _currentID = _actionsVar select 0; _actionIDs = _actionsVar select 1; @@ -32,4 +32,4 @@ _actionIDs = _actionIDs - [-1]; _actions set [_id, []]; _actions = _actions - [[]]; -AGM_player setVariable [QGVAR(InteractionsSelf), [_currentID, _actionIDs, _actions], false]; +ACE_player setVariable [QGVAR(InteractionsSelf), [_currentID, _actionIDs, _actions], false]; diff --git a/addons/interaction/functions/fn_removeTag.sqf b/addons/interaction/functions/fn_removeTag.sqf index c8372c701d..7a9b9b4bc0 100644 --- a/addons/interaction/functions/fn_removeTag.sqf +++ b/addons/interaction/functions/fn_removeTag.sqf @@ -2,9 +2,9 @@ #include "script_component.hpp" 0 spawn { - waitUntil {player getVariable ["AGM_Name", ""] != ""}; + waitUntil {player getVariable ["ACE_Name", ""] != ""}; - _name = player getVariable ["AGM_Name", ""]; + _name = player getVariable ["ACE_Name", ""]; _name = toArray _name; _index = _name find (toArray "]" select 0); @@ -15,6 +15,6 @@ }; _name = _name - [-1]; _name = toString _name; - player setVariable ["AGM_Name", _name, true]; + player setVariable ["ACE_Name", _name, true]; }; }; diff --git a/addons/interaction/functions/fn_sendAway.sqf b/addons/interaction/functions/fn_sendAway.sqf index ee7814a89e..5cd6a9d43a 100644 --- a/addons/interaction/functions/fn_sendAway.sqf +++ b/addons/interaction/functions/fn_sendAway.sqf @@ -18,9 +18,9 @@ private ["_unit", "_chance", "_x"]; _unit = _this select 0; -AGM_player playActionNow "GestureGo"; +ACE_player playActionNow "GestureGo"; -if (count weapons AGM_player > 0) then { +if (count weapons ACE_player > 0) then { _chance = 0.8; } else { _chance = 0.5; @@ -31,6 +31,6 @@ if (count weapons AGM_player > 0) then { [-2, { (_this select 0) setUnitPos "AUTO"; (_this select 0) doMove [(getPos (_this select 0) select 0) + DISTANCE * (eyeDirection (_this select 1) select 0), (getPos (_this select 0) select 1) + DISTANCE * (eyeDirection (_this select 1) select 1), 0]; - }, [_x, AGM_player]] call CBA_fnc_globalExecute; + }, [_x, ACE_player]] call CBA_fnc_globalExecute; }; } foreach (_unit nearEntities ["Civilian", RADIUS]); diff --git a/addons/interaction/functions/fn_showMenu.sqf b/addons/interaction/functions/fn_showMenu.sqf index 18f7ead40a..58a6863bc3 100644 --- a/addons/interaction/functions/fn_showMenu.sqf +++ b/addons/interaction/functions/fn_showMenu.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_showMenu - Author: commy2 Garth de Wet (LH) @@ -17,17 +15,17 @@ Nothing Example: - [0, GVAR(Target)] call AGM_Interaction_fnc_showMenu; - [1, player] call AGM_Interaction_fnc_showMenu; - [2, GVAR(Target), "AGM_Explosives"] call AGM_Interaction_fnc_showMenu; - [3, player, "AGM_Explosives"] call AGM_Interaction_fnc_showMenu; + [0, GVAR(Target)] call FUNC(showMenu); + [1, player] call FUNC(showMenu); + [2, GVAR(Target), "ACE_Explosives"] call FUNC(showMenu); + [3, player, "ACE_Explosives"] call FUNC(showMenu); */ #include "script_component.hpp" private ["_player", "_vehicle", "_mainButtonAction", "_object", "_index", "_actions", "_result", "_menuType"]; #define DEFAULT_ICON PATHOF(UI\dot_ca.paa) #define DEFAULT_DISTANCE 4 // seems to be 4 -_player = AGM_player; +_player = ACE_player; _vehicle = vehicle _player; GVAR(MenuType) = _this select 0; // 0 Interaction, 1 Self Interaction @@ -50,14 +48,14 @@ if !([_player, _object] call EFUNC(core,canInteractWith)) exitWith {}; // add actions or self actions of GVAR(Target) _parents = [configFile >> "CfgVehicles" >> typeOf _object, true] call BIS_fnc_returnParents; -_result = [_object, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions); -_actions = ([_object, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions) select 0); +_result = [_object, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["ACE_Actions", "ACE_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions); +_actions = ([_object, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["ACE_Actions", "ACE_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions) select 0); // add self actions of vehicle _player if (_menuType == 1 && {_player != _vehicle}) then { _parents = [configFile >> "CfgVehicles" >> typeOf _vehicle, true] call BIS_fnc_returnParents; - _result = [_vehicle, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions); - _actions = _actions + (([_vehicle, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["AGM_Actions", "AGM_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions) select 0)); + _result = [_vehicle, _parents, [], [], missionConfigFile >> "CfgVehicles", true, ["ACE_Actions", "ACE_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions); + _actions = _actions + (([_vehicle, _parents, _result select 0, _result select 1,configFile >> "CfgVehicles", false, ["ACE_Actions", "ACE_SelfActions"] select _menuType, _this select 2] call FUNC(GetActions) select 0)); }; // custom defined actions, stored in variable instead of cfg like above @@ -66,11 +64,11 @@ if (GVAR(MenuType) < 2) then { private ["_customActions", "_customAction", "_displayName", "_distance","_condition","_statement","_showDisabled", "_priority"]; // add interactions or self interactions of GVAR(Target) - _customActions = (_object getVariable [[QGVAR(Interactions), QGVAR(AGM_InteractionsSelf)] select _menuType, [-1, [], []]]) select 2; + _customActions = (_object getVariable [[QGVAR(Interactions), QGVAR(ACE_InteractionsSelf)] select _menuType, [-1, [], []]]) select 2; // add self interactions of vehicle _player if (_menuType == 1 && {_player != _vehicle}) then { - _customActions = _customActions + ((_vehicle getVariable [[QGVAR(Interactions), QGVAR(AGM_InteractionsSelf)] select _menuType, [-1, [], []]]) select 2); + _customActions = _customActions + ((_vehicle getVariable [[QGVAR(Interactions), QGVAR(ACE_InteractionsSelf)] select _menuType, [-1, [], []]]) select 2); }; if(_menuType==0) then { diff --git a/addons/interaction/functions/fn_showMouseHint.sqf b/addons/interaction/functions/fn_showMouseHint.sqf index d2c18a9a1d..b162754b13 100644 --- a/addons/interaction/functions/fn_showMouseHint.sqf +++ b/addons/interaction/functions/fn_showMouseHint.sqf @@ -1,6 +1,4 @@ /* - Name: AGM_Interaction_fnc_showMouseHint - Author(s): Garth de Wet (LH) @@ -16,7 +14,7 @@ Nothing Example: - ["Place Explosive", "Cancel"] call AGM_Interaction_fnc_showMouseHint; + ["Place Explosive", "Cancel"] call FUNC(showMouseHint); */ #include "script_component.hpp" @@ -32,7 +30,7 @@ if (count _this > 2) then { (QGVAR(InteractionHelper) call BIS_fnc_rscLayer) cutRsc [QGVAR(InteractionHelper), "PLAIN",0.5, false]; disableSerialization; -_display = uiNamespace getVariable ["AGM_Helper_Display", objNull]; +_display = uiNamespace getVariable ["ACE_Helper_Display", objNull]; if (isNull _display) exitWith{}; (_display displayCtrl 1000) ctrlSetText _leftClick; diff --git a/addons/interaction/functions/fn_tapShoulder.sqf b/addons/interaction/functions/fn_tapShoulder.sqf index 1ab8f42487..a37aeafa64 100644 --- a/addons/interaction/functions/fn_tapShoulder.sqf +++ b/addons/interaction/functions/fn_tapShoulder.sqf @@ -6,7 +6,7 @@ private ["_unit", "_message"]; _tapper = _this select 0; _target = _this select 1; -if (_target != AGM_player) exitWith { +if (_target != ACE_player) exitWith { addCamShake [4, 0.5, 5]; if !(local _target) then { [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(execRemoteFnc); @@ -16,6 +16,6 @@ if (_target != AGM_player) exitWith { addCamShake [4, 0.5, 5]; //_message = format ["%1 tapped you on your shoulder.", [_unit] call EFUNC(core,getName)]; -_message = localize "STR_AGM_Interaction_YouWereTapped"; +_message = localize "STR_ACE_Interaction_YouWereTapped"; [_message] call EFUNC(core,displayTextStructured); diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 47670ccf75..e58e808687 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -1,8 +1,8 @@  - + - + Interaction Menu Interaktionsmenü Menú de interacción @@ -14,7 +14,7 @@ Menu de Interação Menù Interattivo - + Interaction Menu (Self) Interaktionsmenü (Selbst) Menú de interacción (Propia) @@ -26,7 +26,7 @@ Menu de Interação (Individual) Menù Interattivo (Individuale) - + Open / Close Door Tür öffnen / schließen Abrir / Cerrar puerta @@ -38,7 +38,7 @@ Abrir / Fechar Porta Apri / Chiudi la porta - + Lock Door Tür sperren Bloquear puerta @@ -50,7 +50,7 @@ Zablokuj drzwi Zamknout dveře - + Unlock Door Tür entsperren Desbloquear puerta @@ -62,7 +62,7 @@ Odblokuj drzwi Odemknout dveře - + Locked Door Tür gesperrt Puerta bloqueada @@ -74,7 +74,7 @@ Zablokowano drzwi Zamčené dveře - + Unlocked Door Tür entsperrt Puerta desbloqueada @@ -86,7 +86,7 @@ Odblokowano drzwi Odemčené dveře - + Join group Gruppe beitreten Unirse al grupo @@ -98,7 +98,7 @@ Unir-se ao grupo Unisciti alla squadra - + Leave Group Gruppe verlassen Dejar grupo @@ -110,7 +110,7 @@ Deixar grupo Lascia la squadra - + Become Leader Grp.-führung übern. Asumir el liderazgo @@ -122,7 +122,7 @@ Tornar-se Líder Prendi il comando - + DANCE! TANZEN! BAILAR! @@ -134,7 +134,7 @@ DANCE! Balla! - + Stop Dancing Tanzen abbrechen Dejar de bailar @@ -146,7 +146,7 @@ Parar de dançar Smetti di ballare - + << Back << Zurück << Atrás @@ -158,7 +158,7 @@ << Voltar << Indietro - + Gestures >> Gesten >> Gestos >> @@ -170,7 +170,7 @@ Gestos >> Segnali gestuali >> - + Attack Angreifen Atacar @@ -182,7 +182,7 @@ Atacar Attaccare - + Advance Vordringen Avanzar @@ -194,7 +194,7 @@ Avançar Avanzare - + Go Los Adelante @@ -206,7 +206,7 @@ Mover-se Muoversi - + Follow Folgen Seguirme @@ -218,7 +218,7 @@ Seguir Seguire - + Point Zeigen Señalar @@ -230,7 +230,7 @@ Apontar Puntare a - + Up Aufstehen Arriba @@ -242,7 +242,7 @@ Acima Alzarsi - + Cover Deckung Cubrirse @@ -254,7 +254,7 @@ Proteger-se Copertura - + Cease Fire Feuer einstellen Alto el fuego @@ -266,7 +266,7 @@ Cessar Fogo Cessare il Fuoco - + Freeze Keine Bewegung Alto @@ -278,7 +278,7 @@ Alto Fermi - + Hi Hallo Hola @@ -290,7 +290,7 @@ Olá Ciao - + Yes Ja Si @@ -302,7 +302,7 @@ Sim Si - + No Nein No @@ -314,7 +314,7 @@ Não No - + Put weapon on back Waffe wegstecken Arma a la espalda @@ -326,7 +326,7 @@ Colocar arma nas costas Metti l'arma in spalla - + Tap Shoulder Auf Schulter klopfen Tocar el hombro @@ -338,7 +338,7 @@ Tocar ombro Dai un colpetto - + You were tapped on the shoulder. Dir wurde auf die Schulter geklopft Te tocaron el hombro. @@ -350,7 +350,7 @@ Você foi tocado no ombro. Ti è stato dato un colpetto sulla spalla - + Cancel Abbrechen Cancelar @@ -362,7 +362,7 @@ Cancelar Mégse - + Select Wählen Seleccionar @@ -374,7 +374,7 @@ Selecionar Kiválaszt - + Go Away! Geh Weg! Aléjate! @@ -386,7 +386,7 @@ Vá Embora! Via di qui! - + Get Down! Auf Den Boden! Al suelo! @@ -398,7 +398,7 @@ Abaixe-se! A Terra! - + Team Management >> Team Management >> Gestión de equipo >> @@ -410,7 +410,7 @@ Organizzazione Squadra >> Csapat kezelés >> - + Red Rot Rojo @@ -422,7 +422,7 @@ Rosso Piros - + Green Grün Verde @@ -434,7 +434,7 @@ Verde Zöld - + Blue Blau Azul @@ -446,7 +446,7 @@ Blu Kék - + Yellow Gelb Amarillo @@ -458,7 +458,7 @@ Giallo Sárga - + Join Team Red Team Rot beitreten Unirse al equipo rojo @@ -470,7 +470,7 @@ Entra nella Squadra Rossa Csatlakozás a piros csapathoz - + Join Team Green Team Grün beitreten Unirse al equipo verde @@ -482,7 +482,7 @@ Entra nella Squadra Verde Csatlakozás a zöld csapathoz - + Join Team Blue Team Blau beitreten Unirse al equipo azul @@ -494,7 +494,7 @@ Entra nella Squadra Blu Csatlakozás a kék csapathoz - + Join Team Yellow Team Gelb beitreten Unirse al equipo amarillo @@ -506,7 +506,7 @@ Entra nella Squadra Gialla Csatlakozás a sárga csapathoz - + You joined Team %1 Du bist Team %1 beigetreten Te has unido al equipo %1 @@ -518,7 +518,7 @@ Sei entrato nella Squadra %1 Csatlakoztál a %1 csapathoz - + Leave Team Team verlassen Dejar equipo @@ -530,7 +530,7 @@ Lascia la Squadra Csapat elhagyása - + You left the Team Du hast das Team verlassen Has dejado el equipo @@ -542,7 +542,7 @@ Hai lasciato la squadra Elhagytad a csapatot - + Pardon Begnadigen Perdonar @@ -554,7 +554,7 @@ Perdona Megbocsátás - + Flow Menu Mausradmenü Flow Menu @@ -566,7 +566,7 @@ Menù a Scorrimento Legördülő menü - + Scroll Scrollen Przewiń @@ -578,7 +578,7 @@ Görgetés Otáčení - + Modifier Key Modifikator Modyfikator @@ -590,7 +590,7 @@ Módosító billentyű Modifikátor - + Not in Range Außer Reichweite Hors de portée. @@ -601,7 +601,7 @@ Poza zasięgiem Mimo dosah - + Close Menu on Key Release Menü nach Loslassen schließen Zamknij menu automatycznie @@ -611,7 +611,7 @@ Закрывать меню при отжатии клавиши Menu interakce (Na držení) - + Auto Center Cursor Mauszeiger automatisch zentrieren Auto-centrar cursor @@ -620,7 +620,7 @@ Egér auto-centrírozása Автоцентрирование курсора - + Equipment >> Ausrüstung >> Equipamiento >> @@ -630,7 +630,7 @@ Felszerelés >> Снаряжение >> - + Push Schieben Empujar @@ -640,7 +640,7 @@ Tolás Толкать - + Interact Interagiere Interakce From 9ce4f585ca96c0ae71370a17ce69ad02f98a222c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Mon, 12 Jan 2015 01:26:07 -0300 Subject: [PATCH 07/18] Change PREPF to PREP for interaction --- addons/interaction/XEH_preInit.sqf | 88 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf index d3ca2a3586..e5093f77f2 100644 --- a/addons/interaction/XEH_preInit.sqf +++ b/addons/interaction/XEH_preInit.sqf @@ -1,46 +1,46 @@ #include "script_component.hpp" -PREPF(addInteraction); -PREPF(addInteractionSelf); -PREPF(AddSelectableItem); -PREPF(addToTooltip); -PREPF(applyButtons); -PREPF(canInteractWith); -PREPF(canTapShoulder); -PREPF(getActions2); -PREPF(GetActions); -PREPF(getDoor); -PREPF(getDoorAnimations); -PREPF(getDown); -PREPF(getSelectedButton); -PREPF(hideMenu); -PREPF(hideMouseHint); -PREPF(initialiseInteraction); -PREPF(isInRange); -PREPF(joinTeam); -PREPF(menuKeyInput); -PREPF(moduleInteraction); -PREPF(moveDown); -PREPF(onButtonDown); -PREPF(onButtonDownSelf); -PREPF(onButtonUp); -PREPF(onClick); -PREPF(onSelectMenuDblClick); -PREPF(openDoor); -PREPF(openMenu); -PREPF(openMenuSelectUI); -PREPF(openMenuSelf); -PREPF(openSelectMenu); -PREPF(openSubMenu); -PREPF(openSubMenuSelf); -PREPF(prepareSelectMenu); -PREPF(push); -PREPF(removeInteraction); -PREPF(removeInteractionSelf); -PREPF(removeTag); -PREPF(sendAway); -PREPF(showMenu); -PREPF(showMouseHint); -PREPF(sortOptionsByPriority); -PREPF(tapShoulder); -PREPF(updateTooltipPosition); \ No newline at end of file +PREP(addInteraction); +PREP(addInteractionSelf); +PREP(AddSelectableItem); +PREP(addToTooltip); +PREP(applyButtons); +PREP(canInteractWith); +PREP(canTapShoulder); +PREP(getActions2); +PREP(GetActions); +PREP(getDoor); +PREP(getDoorAnimations); +PREP(getDown); +PREP(getSelectedButton); +PREP(hideMenu); +PREP(hideMouseHint); +PREP(initialiseInteraction); +PREP(isInRange); +PREP(joinTeam); +PREP(menuKeyInput); +PREP(moduleInteraction); +PREP(moveDown); +PREP(onButtonDown); +PREP(onButtonDownSelf); +PREP(onButtonUp); +PREP(onClick); +PREP(onSelectMenuDblClick); +PREP(openDoor); +PREP(openMenu); +PREP(openMenuSelectUI); +PREP(openMenuSelf); +PREP(openSelectMenu); +PREP(openSubMenu); +PREP(openSubMenuSelf); +PREP(prepareSelectMenu); +PREP(push); +PREP(removeInteraction); +PREP(removeInteractionSelf); +PREP(removeTag); +PREP(sendAway); +PREP(showMenu); +PREP(showMouseHint); +PREP(sortOptionsByPriority); +PREP(tapShoulder); +PREP(updateTooltipPosition); \ No newline at end of file From f3427938b301c28c62e7786a726757cbe84d78b6 Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 14:54:36 +0100 Subject: [PATCH 08/18] init --- .../_switchunits}/UI/IconSwitchUnits_ca.paa | Bin .../_switchunits}/clientInit.sqf | 0 .../_switchunits}/config.cpp | 0 .../functions/fn_addMapFunction.sqf | 0 .../functions/fn_handleMapClick.sqf | 0 .../_switchunits}/functions/fn_initPlayer.sqf | 0 .../_switchunits}/functions/fn_isValidAi.sqf | 0 .../functions/fn_markAiOnMap.sqf | 0 .../_switchunits}/functions/fn_module.sqf | 0 .../functions/fn_nearestPlayers.sqf | 0 .../_switchunits}/functions/fn_switchBack.sqf | 0 .../_switchunits}/functions/fn_switchUnit.sqf | 0 .../_switchunits}/stringtable.xml | 0 addons/switchunits/CfgEventHandlers.hpp | 5 ++ addons/switchunits/UI/IconSwitchUnits_ca.paa | Bin 0 -> 5625 bytes addons/switchunits/XEH_preInit.sqf | 11 +++ addons/switchunits/config.cpp | 17 ++++ .../functions/fnc_addMapFunction.sqf | 23 +++++ .../functions/fnc_handleMapClick.sqf | 41 +++++++++ .../switchunits/functions/fnc_initPlayer.sqf | 48 +++++++++++ .../switchunits/functions/fnc_isValidAi.sqf | 25 ++++++ .../switchunits/functions/fnc_markAiOnMap.sqf | 64 ++++++++++++++ addons/switchunits/functions/fnc_module.sqf | 38 +++++++++ .../functions/fnc_nearestPlayers.sqf | 31 +++++++ .../switchunits/functions/fnc_switchBack.sqf | 29 +++++++ .../switchunits/functions/fnc_switchUnit.sqf | 79 ++++++++++++++++++ addons/switchunits/script_component.hpp | 12 +++ 27 files changed, 423 insertions(+) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/UI/IconSwitchUnits_ca.paa (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/clientInit.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/config.cpp (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_addMapFunction.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_handleMapClick.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_initPlayer.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_isValidAi.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_markAiOnMap.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_module.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_nearestPlayers.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_switchBack.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/functions/fn_switchUnit.sqf (100%) rename {TO_MERGE/agm/SwitchUnits => addons/_switchunits}/stringtable.xml (100%) create mode 100644 addons/switchunits/CfgEventHandlers.hpp create mode 100644 addons/switchunits/UI/IconSwitchUnits_ca.paa create mode 100644 addons/switchunits/XEH_preInit.sqf create mode 100644 addons/switchunits/config.cpp create mode 100644 addons/switchunits/functions/fnc_addMapFunction.sqf create mode 100644 addons/switchunits/functions/fnc_handleMapClick.sqf create mode 100644 addons/switchunits/functions/fnc_initPlayer.sqf create mode 100644 addons/switchunits/functions/fnc_isValidAi.sqf create mode 100644 addons/switchunits/functions/fnc_markAiOnMap.sqf create mode 100644 addons/switchunits/functions/fnc_module.sqf create mode 100644 addons/switchunits/functions/fnc_nearestPlayers.sqf create mode 100644 addons/switchunits/functions/fnc_switchBack.sqf create mode 100644 addons/switchunits/functions/fnc_switchUnit.sqf create mode 100644 addons/switchunits/script_component.hpp diff --git a/TO_MERGE/agm/SwitchUnits/UI/IconSwitchUnits_ca.paa b/addons/_switchunits/UI/IconSwitchUnits_ca.paa similarity index 100% rename from TO_MERGE/agm/SwitchUnits/UI/IconSwitchUnits_ca.paa rename to addons/_switchunits/UI/IconSwitchUnits_ca.paa diff --git a/TO_MERGE/agm/SwitchUnits/clientInit.sqf b/addons/_switchunits/clientInit.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/clientInit.sqf rename to addons/_switchunits/clientInit.sqf diff --git a/TO_MERGE/agm/SwitchUnits/config.cpp b/addons/_switchunits/config.cpp similarity index 100% rename from TO_MERGE/agm/SwitchUnits/config.cpp rename to addons/_switchunits/config.cpp diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_addMapFunction.sqf b/addons/_switchunits/functions/fn_addMapFunction.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_addMapFunction.sqf rename to addons/_switchunits/functions/fn_addMapFunction.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_handleMapClick.sqf b/addons/_switchunits/functions/fn_handleMapClick.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_handleMapClick.sqf rename to addons/_switchunits/functions/fn_handleMapClick.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_initPlayer.sqf b/addons/_switchunits/functions/fn_initPlayer.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_initPlayer.sqf rename to addons/_switchunits/functions/fn_initPlayer.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_isValidAi.sqf b/addons/_switchunits/functions/fn_isValidAi.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_isValidAi.sqf rename to addons/_switchunits/functions/fn_isValidAi.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_markAiOnMap.sqf b/addons/_switchunits/functions/fn_markAiOnMap.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_markAiOnMap.sqf rename to addons/_switchunits/functions/fn_markAiOnMap.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_module.sqf b/addons/_switchunits/functions/fn_module.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_module.sqf rename to addons/_switchunits/functions/fn_module.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_nearestPlayers.sqf b/addons/_switchunits/functions/fn_nearestPlayers.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_nearestPlayers.sqf rename to addons/_switchunits/functions/fn_nearestPlayers.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_switchBack.sqf b/addons/_switchunits/functions/fn_switchBack.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_switchBack.sqf rename to addons/_switchunits/functions/fn_switchBack.sqf diff --git a/TO_MERGE/agm/SwitchUnits/functions/fn_switchUnit.sqf b/addons/_switchunits/functions/fn_switchUnit.sqf similarity index 100% rename from TO_MERGE/agm/SwitchUnits/functions/fn_switchUnit.sqf rename to addons/_switchunits/functions/fn_switchUnit.sqf diff --git a/TO_MERGE/agm/SwitchUnits/stringtable.xml b/addons/_switchunits/stringtable.xml similarity index 100% rename from TO_MERGE/agm/SwitchUnits/stringtable.xml rename to addons/_switchunits/stringtable.xml diff --git a/addons/switchunits/CfgEventHandlers.hpp b/addons/switchunits/CfgEventHandlers.hpp new file mode 100644 index 0000000000..8af0265fe2 --- /dev/null +++ b/addons/switchunits/CfgEventHandlers.hpp @@ -0,0 +1,5 @@ +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + }; +}; \ No newline at end of file diff --git a/addons/switchunits/UI/IconSwitchUnits_ca.paa b/addons/switchunits/UI/IconSwitchUnits_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..b5868f0423526e23d333d64c0059bd4cde278f1d GIT binary patch literal 5625 zcmds53s6+o89oavN(2!jiD5-xUE`yo=ni-47~C~oc??Rhh>sc>9!iV}yH467tyvd* zlrmaZX(eL~Zfiqp>|}&wy|%+NOJhej_`n)%ffW#gi$%fJRoIR9a{8aUp0gV|4slvL z(;jx0^WFb({{KJ!e;!wk)6$l#{7%}cB_Rl*hYug5OL)zaug`=v&@u8e~`+uU>4T z`u^MT!YHG9*B`gY==fRPcF8u16?LTN{*2;GmrZP~FJb-%tB3D4LC7dQSdB~m5`Z&Z zgN9zdfYBAlfYWPuK>4$}O)kFUQ9Rp< z-Cw*H!R%F`^lDW`wTjaJU3*k0V}GEY0wFt1lo{hfW-jj@@)$ML9-Z8eKuQ2eyx zhgb3?3clz|DxcZov5-D#lCD0}gK=@$tbUb^FnOg#0;NY0Tw!ddxC8PF$ch3Z$HH;boJ{&bdNbz`Ys za27457@e2JBNWEsrQCX?#1SSid0nH&+*|fje?E7}wk(<9Ve4b=zy&OxjU(zL|5Un$ zC`Usq%RhzJ+k)+W`&aZ^#8!>K>>tg4?$EFq3l`As)4$ZJ5gcZ*jpC@|e95+e{Ll^j z$ctxeVeyR`5Fc9F{rRBWI$#h=v)KITI=Cdq-5RD}*=Q5a*#x$p=^D%So`nw`Pl+#l ztV-WpOfkYbrAiyb@FL%p23)GYOEGr{i*eYip?Ea^n_Qk2ES31<{K*98 zD~&9^BjqPa`CT3IZgh$qV^drV=JHo=x}w9_7=5s=Y6s2Q~sLOYF%of15zC0 z#j9kwxw%nny@*|fWHPePOYNK5JCZ*%6P)MutbUuk_?`tn`sV(-u>}kM^&~v=l(7|3 z=t=g(v~Yzz_AVfUzth8liUnGKQ%`8YIMr8Zzce{`yFQoT&yh=m-C&Oo`|Zyw2IqtP z*cbn&#i8k({x*~_wHN$%+psr|;?eXiJOuUQkNpKZW)ub!f8kV>I}T_3@`LISMDb)Pe@Oo3>4SoTW$gri zZkdd6?R13lk4@DQwD_+Hl&?PvOY@+_Q5-c1arhAt_pLX~o{{sjJ_6DiEx2RfsN?b>zfp5Q#@N3MQDOh=g;|-20sVOa4d?9?H|toRf@{*DAy&6Qm3_#;(lHFHd0OuaA&J zgZ+{0w;|L%h1Y2o1Pg(Zy{r2*;%T#ytzXn2N*{^CD>?n5fb&OI4{&<@^?-WiE}6}h z_9Xd{`bOf9PC{{VQhpA_CnZ6i_&BJ(f59G!4t#hBdfGU=ySDv6qN8glMIM5}$Dls+ z+?`7&*nF=b_F{J&`6ZI!m6frMfb*B64SpznG_1PpGz{@Y3d#@Xje8iD2#RN0>y2$1 zQA4qReyAtD5h#6O4)=Kd%PYQ=ot>S7VDe!KJ8SavklqJp{%`}#zy5aD(Du@K$%*q+ zgQf@e1BnU@{x)rS{l!EpUvS%L0d-{lWvH{yLsVn(SX_Py=o04c1KwVG74Yl^ zZo|6sgk4;^8E|x6s)Zm@Ph@lOjfcmOCje2xWs|Gj>OW7DXQWZO4?Q~^);n0JkoGg5 zJ(@mj6S!g)pBbHCiPx}~+H*$o%^$BbErjCtN8-n)|4jKoAAVz}-@owQLlM6H(>LC; z_V52)e>{puh`eF&H5&Gjcrhl+c0n?wmsi0uJ%2kpW|UV|8e1#BFV!NEmH6vxn<@WD zeWT$SZoc4Ke>1;A<=0*pahfHdtjottBRVJ@l_!kX2H@}Az`qv;{nw-!?)um^+xx6+ zh%9MTUIYHE%v+z%*ZVUU=6Hu1Q=A`k9__q#I{Z+k{ z#&)yF^zXR^*KW?h=5u1Rb$y_HSzhNkxK`}y8ZySpP*7OHP1TSF2SfZiYmURYBs7=g zN5mrO7=utnSim+7_C!D5%)i+faBbLg3tkKS&VMb_Vy>`}-^lEFt@}MVb6$(1_D=Z? zU1p5Y)B6y5qgA@5!g#jc4?ja_+eLm%JYmL`uKi%p*iXo@fn0lPV<$~O@!23Qvft!7cOW2teZ#Tw9>XW%1#PSJfy-<~4~}#O z%x}d_j3)%(1#RZ=r&%T^kXL~+v_>G)Sis8Qr6xXju35*X<)x;E+Nkg957RKLCH(Nh zf#L*Ds`Ki=b?KE5ap`3E_CH)eFTPA}2LR_k*B0~Jxf}eu=kr%y*?TGf?G7p* - sided + + Returns: + VOID +*/ + +private ["_unit"]; +_unit = _this select 0; + +["theMapClick", "onMapSingleClick", { + [_this, _pos, _shift, _alt] call AGM_SwitchUnits_fnc_handleMapClick; +}, [_unit, _sides]] call BIS_fnc_addStackedEventHandler; diff --git a/addons/switchunits/functions/fnc_handleMapClick.sqf b/addons/switchunits/functions/fnc_handleMapClick.sqf new file mode 100644 index 0000000000..642baed1bd --- /dev/null +++ b/addons/switchunits/functions/fnc_handleMapClick.sqf @@ -0,0 +1,41 @@ +/* + Name: AGM_SwitchUnits_fnc_handleMapClick + + Author(s): + bux578 + + Description: + Finds the clicked unit + + Parameters: + 0: OBJECT - MapClickEventHandlerArgs + 0: OBJECT - unit to switch to + 1: ARRAY - sides + + Returns: + VOID +*/ + +private ["_args", "_currentPlayerUnit", "_sides", "_pos", "_sideNearest"]; + +_currentPlayerUnit = (_this select 0) select 0; +_sides = (_this select 0) select 1; +_pos = _this select 1; + +_sideNearest = []; + +{ + if ([_x] call AGM_SwitchUnits_fnc_isValidAi && (side group _x in _sides)) then { + _sideNearest pushBack _x; + }; +} forEach (nearestObjects [_pos, ["Man"], 20]); + + +if (count _sideNearest > 0) then { + private ["_switchUnit"]; + + _switchUnit = _sideNearest select 0; + [_currentPlayerUnit, _switchUnit] call AGM_SwitchUnits_fnc_switchUnit; + + openMap false; +}; diff --git a/addons/switchunits/functions/fnc_initPlayer.sqf b/addons/switchunits/functions/fnc_initPlayer.sqf new file mode 100644 index 0000000000..c3ee6ce7b2 --- /dev/null +++ b/addons/switchunits/functions/fnc_initPlayer.sqf @@ -0,0 +1,48 @@ +/* + Name: AGM_SwitchUnits_fnc_initPlayer + + Author(s): + bux578 + + Description: + Initializes the player + + Parameters: + 0: OBJECT - player + 1: ARRAY - Array containing selected sides + + Returns: + VOID +*/ + +private ["_playerUnit", "_sides"]; + +_playerUnit = _this select 0; +_sides = _this select 1; + +if (vehicle _playerUnit == _playerUnit) then { + + [_sides] call AGM_SwitchUnits_fnc_markAiOnMap; + + _playerUnit setVariable ["AGM_SwitchUnits_IsPlayerUnit", true]; + _playerUnit allowDamage false; + + AGM_SwitchUnits_OriginalUnit = _playerUnit; + AGM_SwitchUnits_OriginalName = [_playerUnit] call AGM_Core_fnc_getName; + AGM_SwitchUnits_OriginalGroup = group _playerUnit; + + // remove all starting gear of a player + removeAllWeapons _playerUnit; + removeGoggles _playerUnit; + removeHeadgear _playerUnit; + removeVest _playerUnit; + removeAllAssignedItems _playerUnit; + clearAllItemsFromBackpack _playerUnit; + removeBackpack _playerUnit; + _playerUnit linkItem "ItemMap"; + removeUniform _playerUnit; + + [_playerUnit, "AGM_SwitchUnits", true] call AGM_Core_fnc_setForceWalkStatus; + + [_playerUnit, _sides] call AGM_SwitchUnits_fnc_addMapFunction; +}; diff --git a/addons/switchunits/functions/fnc_isValidAi.sqf b/addons/switchunits/functions/fnc_isValidAi.sqf new file mode 100644 index 0000000000..f91b27ffbe --- /dev/null +++ b/addons/switchunits/functions/fnc_isValidAi.sqf @@ -0,0 +1,25 @@ +/* + Name: AGM_SwitchUnits_fnc_isValidAi + + Author(s): + bux578 + + Description: + Checks if AI is a valid target for switching + + Parameters: + 0: OBJECT - unit + + Returns: + VOID +*/ + +private ["_unit"]; + +_unit = _this select 0; + +!([_unit] call AGM_Core_fnc_isPlayer +|| {_unit in playableUnits} +|| {vehicle _unit != _unit} +|| {_unit getVariable ["AGM_SwitchUnits_IsPlayerUnit", false]} +|| {_unit getVariable ["AGM_SwitchUnits_IsPlayerControlled", false]}) diff --git a/addons/switchunits/functions/fnc_markAiOnMap.sqf b/addons/switchunits/functions/fnc_markAiOnMap.sqf new file mode 100644 index 0000000000..05865bc060 --- /dev/null +++ b/addons/switchunits/functions/fnc_markAiOnMap.sqf @@ -0,0 +1,64 @@ +/* + Name: AGM_SwitchUnits_fnc_markAiOnMap + + Author(s): + bux578 + + Description: + Creates markers for AI units for given sides + Marks players in a different color + + Parameters: + 0: OBJECT - side + + Returns: + VOID +*/ + +private ["_sidesToShow"]; +_sidesToShow = _this select 0; + +_sidesToShow spawn { + + private ["_sides", "_allMarkerNames"]; + _sides = _this; + _allMarkerNames = []; + + while { true } do { + sleep 1.5; + + // delete markers + { + deleteMarkerLocal _x; + } forEach _allMarkerNames; + + // create markers + { + if (([_x] call AGM_SwitchUnits_fnc_isValidAi && (side group _x in _sides)) || (_x getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])) then { + private ["_markerName", "_marker", "_markerColor"]; + + //_markerName = format ["%1", [_x] call AGM_Core_fnc_getName]; + _markerName = str _x; + + _marker = createMarkerLocal [_markerName, position _x]; + _markerName setMarkerTypeLocal "mil_triangle"; + _markerName setMarkerShapeLocal "ICON"; + _markerName setMarkerSizeLocal [0.5,0.7]; + _markerName setMarkerDirLocal getDir _x; + + // commy's one liner magic + _markerColor = format ["Color%1", side group _x]; + + if ((_x getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])) then { + _markerName setMarkerColorLocal "ColorOrange"; + _markerName setMarkerTextLocal (_x getVariable ["AGM_SwitchUnits_PlayerControlledName",""]); + } else { + _markerName setMarkerColorLocal _markerColor; + _markerName setMarkerTextLocal (getText (configFile >> "CfgVehicles" >> typeOf _x >> "displayName")); + }; + + _allMarkerNames pushBack _markerName; + }; + } forEach allUnits; + }; +}; diff --git a/addons/switchunits/functions/fnc_module.sqf b/addons/switchunits/functions/fnc_module.sqf new file mode 100644 index 0000000000..43ec26199a --- /dev/null +++ b/addons/switchunits/functions/fnc_module.sqf @@ -0,0 +1,38 @@ +/* + Name: AGM_SwitchUnits_fnc_module + + Author(s): + bux578 + + Description: + Initializes the SwitchUnits module + + Parameters: + 0: OBJECT - module logic + 1: ARRAY - list of affected units + 2: BOOLEAN - isActivated + + Returns: + BOOLEAN (Good practice to include one) +*/ + +if !(isServer) exitWith {}; + +_logic = _this select 0; +_activated = _this select 2; + +if !(_activated) exitWith {}; + +AGM_SwitchUnits_Module = true; + +["AGM_SwitchUnits_EnableSwitchUnits", true] call AGM_Core_fnc_setParameter; + +[_logic, "AGM_SwitchUnits_SwitchToWest", "SwitchToWest"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, "AGM_SwitchUnits_SwitchToEast", "SwitchToEast"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, "AGM_SwitchUnits_SwitchToIndependent", "SwitchToIndependent"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, "AGM_SwitchUnits_SwitchToCivilian", "SwitchToCivilian"] call AGM_Core_fnc_readBooleanParameterFromModule; + +[_logic, "AGM_SwitchUnits_EnableSafeZone", "EnableSafeZone"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, "AGM_SwitchUnits_SafeZoneRadius", "SafeZoneRadius"] call AGM_Core_fnc_readNumericParameterFromModule; + +diag_log text "[AGM]: SwitchUnits Module Initialized."; diff --git a/addons/switchunits/functions/fnc_nearestPlayers.sqf b/addons/switchunits/functions/fnc_nearestPlayers.sqf new file mode 100644 index 0000000000..04b185c455 --- /dev/null +++ b/addons/switchunits/functions/fnc_nearestPlayers.sqf @@ -0,0 +1,31 @@ +/* + Name: AGM_SwitchUnits_fnc_nearestPlayers + + Author(s): + bux578 + + Description: + Returns an array of alive players in a given radius around a given location + + Parameters: + 0: POSTION - Center position + 1: NUMBER - Radius + + Returns: + ARRAY - Player units +*/ + +private ["_position", "_radius", "_nearestPlayers"]; + +_position = _this select 0; +_radius = _this select 1; + +_nearestPlayers = []; + +{ + if ([_x] call AGM_Core_fnc_isPlayer && {alive _x}) then { + _nearestPlayers pushBack _x; + }; +} forEach (nearestObjects [_position, ["Man"], _radius]); + + _nearestPlayers diff --git a/addons/switchunits/functions/fnc_switchBack.sqf b/addons/switchunits/functions/fnc_switchBack.sqf new file mode 100644 index 0000000000..eba84d57f6 --- /dev/null +++ b/addons/switchunits/functions/fnc_switchBack.sqf @@ -0,0 +1,29 @@ +/* + Name: AGM_SwitchUnits_fnc_switchBack + + Author(s): + bux578 + + Description: + Switches back to the original player unit + This method needs to be "spawn"ed + + Parameters: + 0: OBJECT - original player unit + 1: OBJECT - respawned unit + + Returns: + VOID +*/ + +private ["_originalPlayerUnit", "_currentUnit"]; +_originalPlayerUnit = _this select 0; +_currentUnit = _this select 1; + +[_originalPlayerUnit] joinSilent AGM_SwitchUnits_OriginalGroup; + +waitUntil {local _originalPlayerUnit}; + +selectPlayer _originalPlayerUnit; + +deleteVehicle _currentUnit; diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf new file mode 100644 index 0000000000..ddb2a1d523 --- /dev/null +++ b/addons/switchunits/functions/fnc_switchUnit.sqf @@ -0,0 +1,79 @@ +/* + Name: AGM_SwitchUnits_fnc_switchUnit + + Author(s): + bux578 + + Description: + Selects the new given player unit + + Parameters: + 0: OBJECT - the unit to switch to + + Returns: + VOID +*/ + +private ["_newUnit"]; + +_newUnit = _this select 1; + +// don't switch to original player units +if (!([_newUnit] call AGM_SwitchUnits_fnc_isValidAi)) exitWith {}; + +_newUnit spawn { + private ["_unit", "_allNearestPlayers", "_oldUnit", "_respawnEhId", "_oldOwner", "_leave"]; + + _unit = _this; + + _leave = false; + + if (AGM_SwitchUnits_EnableSafeZone) then { + + _allNearestPlayers = [position _unit, AGM_SwitchUnits_SafeZoneRadius] call AGM_SwitchUnits_fnc_nearestPlayers; + _nearestEnemyPlayers = [_allNearestPlayers, {((side AGM_SwitchUnits_OriginalGroup) getFriend (side _this) < 0.6) && !(_this getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])}] call AGM_Core_fnc_filter; + + if (count _nearestEnemyPlayers > 0) exitWith { + _leave = true; + }; + }; + + // exitWith doesn't exit past the "if(EnableSafeZone)" block + if (_leave) exitWith { + [localize "STR_AGM_SwitchUnits_TooCloseToEnemy"] call AGM_Core_fnc_displayTextStructured; + }; + + // should switch locality + // This doesn't work anymore, because one's now able to switch to units from a different side + //[_unit] joinSilent group player; + [[_unit, player], "{(_this select 0) setVariable ['AGM_SwitchUnits_OriginalOwner', owner (_this select 0), true]; (_this select 0) setOwner owner (_this select 1)}", 1] call AGM_Core_fnc_execRemoteFnc; + + _oldUnit = player; + waitUntil {sleep 0.2; local _unit}; + + _oldUnit setVariable ["AGM_SwitchUnits_IsPlayerControlled", false, true]; + _oldUnit setVariable ["AGM_SwitchUnits_PlayerControlledName", "", true]; + + _respawnEhId = _unit getVariable ["AGM_SwitchUnits_RespawnEhId", -1]; + if (_respawnEhId != -1) then { + _oldUnit removeEventHandler ["Respawn", _respawnEhId]; + }; + + selectPlayer _unit; + + _unit setVariable ["AGM_SwitchUnits_IsPlayerControlled", true, true]; + _unit setVariable ["AGM_SwitchUnits_PlayerControlledName", AGM_SwitchUnits_OriginalName, true]; + + _respawnEhId = _unit addEventHandler ["Respawn", { + [AGM_SwitchUnits_OriginalUnit, _this select 0] spawn AGM_SwitchUnits_fnc_switchBack; + }]; + _unit setVariable ["AGM_SwitchUnits_RespawnEhId", _respawnEhId, true]; + + // set owner back to original owner + _oldOwner = _oldUnit getVariable["AGM_SwitchUnits_OriginalOwner", -1]; + if (_oldOwner > -1) then { + [[_oldUnit, _oldOwner], "{(_this select 0) setOwner (_this select 1)}", 1] call AGM_Core_fnc_execRemoteFnc; + }; + + [localize "STR_AGM_SwitchUnits_SwitchedUnit"] call AGM_Core_fnc_displayTextStructured; +}; diff --git a/addons/switchunits/script_component.hpp b/addons/switchunits/script_component.hpp new file mode 100644 index 0000000000..40058509c2 --- /dev/null +++ b/addons/switchunits/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT blank +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_BLANK + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_BLANK + #define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK +#endif + +#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file From 7afce2a2417a5812aeea06116faea9adab371a06 Mon Sep 17 00:00:00 2001 From: jodav Date: Mon, 12 Jan 2015 15:09:07 +0100 Subject: [PATCH 09/18] more work --- addons/_switchunits/stringtable.xml | 6 +++--- addons/switchunits/CfgEventHandlers.hpp | 8 +++++++- addons/switchunits/XEH_postInit.sqf | 23 +++++++++++++++++++++++ addons/switchunits/config.cpp | 12 ++++++------ addons/switchunits/script_component.hpp | 10 +++++----- addons/switchunits/stringtable.xml | 22 ++++++++++++++++++++++ 6 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 addons/switchunits/XEH_postInit.sqf create mode 100644 addons/switchunits/stringtable.xml diff --git a/addons/_switchunits/stringtable.xml b/addons/_switchunits/stringtable.xml index 76e9782e5d..b12e8dc17d 100644 --- a/addons/_switchunits/stringtable.xml +++ b/addons/_switchunits/stringtable.xml @@ -1,8 +1,8 @@  - + - + Switched unit Einheit gewechselt Юнит переключен @@ -10,7 +10,7 @@ Przełącz jednostkę Cambiado de unidad - + This unit is too close to the enemy. Diese Einheit ist zu nah am Feind. Юнит слишком близок к противнику diff --git a/addons/switchunits/CfgEventHandlers.hpp b/addons/switchunits/CfgEventHandlers.hpp index 8af0265fe2..35185e3a45 100644 --- a/addons/switchunits/CfgEventHandlers.hpp +++ b/addons/switchunits/CfgEventHandlers.hpp @@ -2,4 +2,10 @@ class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); }; -}; \ No newline at end of file +}; + +class Extended_PostInit_EventHandlers { + class ADDON { + postInit = QUOTE(call COMPILE_FILE(XEH_postInit) ); + }; +}; diff --git a/addons/switchunits/XEH_postInit.sqf b/addons/switchunits/XEH_postInit.sqf new file mode 100644 index 0000000000..6c769a5903 --- /dev/null +++ b/addons/switchunits/XEH_postInit.sqf @@ -0,0 +1,23 @@ +/* + Author(s): + bux578 +*/ + +0 spawn { + private ["_side"]; + + waitUntil {sleep 0.5; AGM_SwitchUnits_EnableSwitchUnits}; + + //_side = [west, east, independent, civilian] select AGM_SwitchUnits_SwitchUnitsAllowedForSide; + + _sides = []; + + if(AGM_SwitchUnits_SwitchToWest) then {_sides pushBack west}; + if(AGM_SwitchUnits_SwitchToEast) then {_sides pushBack east}; + if(AGM_SwitchUnits_SwitchToIndependent) then {_sides pushBack independent}; + if(AGM_SwitchUnits_SwitchToCivilian) then {_sides pushBack civilian}; + + if (player getVariable ["AGM_CanSwitchUnits", false]) then { + [player, _sides] call AGM_SwitchUnits_fnc_initPlayer; + }; +}; diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp index 628865c703..f69ceb691b 100644 --- a/addons/switchunits/config.cpp +++ b/addons/switchunits/config.cpp @@ -6,12 +6,12 @@ class CfgPatches { weapons[] = {}; requiredVersion = 0.60; requiredAddons[] = {"ace_core"}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {""}; - authorUrl = ""; + version = QUOTE(VERSION); + versionStr = QUOTE(VERSION); + versionAr[] = {VERSION_AR}; + author[] = {"bux578"}; + authorUrl = "https://github.com/bux578/"; }; }; -#include "CfgEventHandlers.hpp" \ No newline at end of file +#include "CfgEventHandlers.hpp" diff --git a/addons/switchunits/script_component.hpp b/addons/switchunits/script_component.hpp index 40058509c2..3c4c77c007 100644 --- a/addons/switchunits/script_component.hpp +++ b/addons/switchunits/script_component.hpp @@ -1,12 +1,12 @@ -#define COMPONENT blank +#define COMPONENT SwitchUnits #include "\z\ace\addons\main\script_mod.hpp" -#ifdef DEBUG_ENABLED_BLANK +#ifdef DEBUG_ENABLED_SwitchUnits #define DEBUG_MODE_FULL #endif -#ifdef DEBUG_SETTINGS_BLANK - #define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK +#ifdef DEBUG_SETTINGS_SwitchUnits + #define DEBUG_SETTINGS DEBUG_SETTINGS_SwitchUnits #endif -#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file +#include "\z\ace\addons\main\script_macros.hpp" diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml new file mode 100644 index 0000000000..76e9782e5d --- /dev/null +++ b/addons/switchunits/stringtable.xml @@ -0,0 +1,22 @@ + + + + + + Switched unit + Einheit gewechselt + Юнит переключен + Prohozená jednotka + Przełącz jednostkę + Cambiado de unidad + + + This unit is too close to the enemy. + Diese Einheit ist zu nah am Feind. + Юнит слишком близок к противнику + Tato jednotka je moc blízko k nepříteli. + Ta jednostka jest zbyt blisko przeciwnika. + Esta unidad está demasiado cerca del enemigo. + + + From 5da1bdf9c00b10a09f407e43071c0252973fe4df Mon Sep 17 00:00:00 2001 From: bux578 Date: Mon, 12 Jan 2015 15:47:22 +0100 Subject: [PATCH 10/18] finish cba'ing --- addons/switchunits/CfgEventHandlers.hpp | 2 +- addons/switchunits/CfgVehicles.hpp | 65 +++++++++++++++++++ addons/switchunits/config.cpp | 14 ++++ .../functions/fnc_addMapFunction.sqf | 4 +- .../functions/fnc_handleMapClick.sqf | 6 +- .../switchunits/functions/fnc_initPlayer.sqf | 16 +++-- .../switchunits/functions/fnc_isValidAi.sqf | 8 ++- .../switchunits/functions/fnc_markAiOnMap.sqf | 10 +-- addons/switchunits/functions/fnc_module.sqf | 22 ++++--- .../functions/fnc_nearestPlayers.sqf | 4 +- .../switchunits/functions/fnc_switchBack.sqf | 4 +- .../switchunits/functions/fnc_switchUnit.sqf | 34 +++++----- 12 files changed, 143 insertions(+), 46 deletions(-) create mode 100644 addons/switchunits/CfgVehicles.hpp diff --git a/addons/switchunits/CfgEventHandlers.hpp b/addons/switchunits/CfgEventHandlers.hpp index 35185e3a45..47dcd984d1 100644 --- a/addons/switchunits/CfgEventHandlers.hpp +++ b/addons/switchunits/CfgEventHandlers.hpp @@ -1,6 +1,6 @@ class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + init = QUOTE( call COMPILE_FILE(XEH_preInit) ); }; }; diff --git a/addons/switchunits/CfgVehicles.hpp b/addons/switchunits/CfgVehicles.hpp new file mode 100644 index 0000000000..04a08bd8d5 --- /dev/null +++ b/addons/switchunits/CfgVehicles.hpp @@ -0,0 +1,65 @@ +class CfgVehicles { + class Module_F; + class ACE_ModuleSwitchUnits: Module_F { + author = "$STR_ACE_Core_ACETeam"; + category = "ACE"; + displayName = "SwitchUnits System"; + function = FUNC(module); + scope = 2; + isGlobal = 1; + icon = PATHTOF(UI\IconSwitchUnits_ca.paa); + class Arguments { + class SwitchToWest { + displayName = "Switch to West?"; + description = "Allow switching to west units?"; + typeName = "BOOL"; + class values { + class Yes {name = "Yes"; value = 1;}; + class No {default = 1; name = "No"; value = 0;}; + }; + }; + class SwitchToEast { + displayName = "Switch to East?"; + description = "Allow switching to east units?"; + typeName = "BOOL"; + class values { + class Yes {name = "Yes"; value = 1;}; + class No {default = 1; name = "No"; value = 0;}; + }; + }; + class SwitchToIndependent { + displayName = "Switch to Independent?"; + description = "Allow switching to independent units?"; + typeName = "BOOL"; + class values { + class Yes {name = "Yes"; value = 1;}; + class No {default = 1; name = "No"; value = 0;}; + }; + }; + class SwitchToCivilian { + displayName = "Switch to Civilian?"; + description = "Allow switching to civilian units?"; + typeName = "BOOL"; + class values { + class Yes {name = "Yes"; value = 1;}; + class No {default = 1; name = "No"; value = 0;}; + }; + }; + class EnableSafeZone { + displayName = "Enable Safe Zone?"; + description = "Enable a safe zone around enemy units? Players can't switch to units inside of the safe zone."; + typeName = "BOOL"; + class values { + class Yes {default = 1; name = "Yes"; value = 1;}; + class No {name = "No"; value = 0;}; + }; + }; + class SafeZoneRadius { + displayName = "Safe Zone Radius"; + description = "The safe zone around players from a different team. Default: 200"; + typeName = "NUMBER"; + defaultValue = 100; + }; + }; + }; +}; diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp index f69ceb691b..63e81332cc 100644 --- a/addons/switchunits/config.cpp +++ b/addons/switchunits/config.cpp @@ -15,3 +15,17 @@ class CfgPatches { }; #include "CfgEventHandlers.hpp" +#include "CfgVehicles.hpp" + +class ACE_Parameters_Numeric { + GVAR(SafeZoneRadius) = 100; +}; + +class ACE_Parameters_Boolean { + GVAR(EnableSwitchUnits) = 0; + GVAR(SwitchToWest) = 0; + GVAR(SwitchToEast) = 0; + GVAR(SwitchToIndependent) = 0; + GVAR(SwitchToCivilian) = 0; + GVAR(EnableSafeZone) = 1; +}; diff --git a/addons/switchunits/functions/fnc_addMapFunction.sqf b/addons/switchunits/functions/fnc_addMapFunction.sqf index f65725aacf..0607d00fd3 100644 --- a/addons/switchunits/functions/fnc_addMapFunction.sqf +++ b/addons/switchunits/functions/fnc_addMapFunction.sqf @@ -15,9 +15,11 @@ VOID */ +#include "script_component.hpp" + private ["_unit"]; _unit = _this select 0; ["theMapClick", "onMapSingleClick", { - [_this, _pos, _shift, _alt] call AGM_SwitchUnits_fnc_handleMapClick; + [_this, _pos, _shift, _alt] call FUNC(handleMapClick); }, [_unit, _sides]] call BIS_fnc_addStackedEventHandler; diff --git a/addons/switchunits/functions/fnc_handleMapClick.sqf b/addons/switchunits/functions/fnc_handleMapClick.sqf index 642baed1bd..eb5da3ad10 100644 --- a/addons/switchunits/functions/fnc_handleMapClick.sqf +++ b/addons/switchunits/functions/fnc_handleMapClick.sqf @@ -16,6 +16,8 @@ VOID */ +#include "script_component.hpp" + private ["_args", "_currentPlayerUnit", "_sides", "_pos", "_sideNearest"]; _currentPlayerUnit = (_this select 0) select 0; @@ -25,7 +27,7 @@ _pos = _this select 1; _sideNearest = []; { - if ([_x] call AGM_SwitchUnits_fnc_isValidAi && (side group _x in _sides)) then { + if ([_x] call FUNC(isValidAi) && (side group _x in _sides)) then { _sideNearest pushBack _x; }; } forEach (nearestObjects [_pos, ["Man"], 20]); @@ -35,7 +37,7 @@ if (count _sideNearest > 0) then { private ["_switchUnit"]; _switchUnit = _sideNearest select 0; - [_currentPlayerUnit, _switchUnit] call AGM_SwitchUnits_fnc_switchUnit; + [_currentPlayerUnit, _switchUnit] call FUNC(switchUnit); openMap false; }; diff --git a/addons/switchunits/functions/fnc_initPlayer.sqf b/addons/switchunits/functions/fnc_initPlayer.sqf index c3ee6ce7b2..60e5eaabc7 100644 --- a/addons/switchunits/functions/fnc_initPlayer.sqf +++ b/addons/switchunits/functions/fnc_initPlayer.sqf @@ -15,6 +15,8 @@ VOID */ +#include "script_component.hpp" + private ["_playerUnit", "_sides"]; _playerUnit = _this select 0; @@ -22,14 +24,14 @@ _sides = _this select 1; if (vehicle _playerUnit == _playerUnit) then { - [_sides] call AGM_SwitchUnits_fnc_markAiOnMap; + [_sides] call FUNC(markAiOnMap); - _playerUnit setVariable ["AGM_SwitchUnits_IsPlayerUnit", true]; + _playerUnit setVariable [QGVAR(IsPlayerUnit), true]; _playerUnit allowDamage false; - AGM_SwitchUnits_OriginalUnit = _playerUnit; - AGM_SwitchUnits_OriginalName = [_playerUnit] call AGM_Core_fnc_getName; - AGM_SwitchUnits_OriginalGroup = group _playerUnit; + GVAR(OriginalUnit) = _playerUnit; + GVAR(OriginalName) = [_playerUnit] call EFUNC(Core, getName); + GVAR(OriginalGroup) = group _playerUnit; // remove all starting gear of a player removeAllWeapons _playerUnit; @@ -42,7 +44,7 @@ if (vehicle _playerUnit == _playerUnit) then { _playerUnit linkItem "ItemMap"; removeUniform _playerUnit; - [_playerUnit, "AGM_SwitchUnits", true] call AGM_Core_fnc_setForceWalkStatus; + [_playerUnit, "ACE_SwitchUnits", true] call EFUNC(Core, setForceWalkStatus); - [_playerUnit, _sides] call AGM_SwitchUnits_fnc_addMapFunction; + [_playerUnit, _sides] call AFUNC(addMapFunction); }; diff --git a/addons/switchunits/functions/fnc_isValidAi.sqf b/addons/switchunits/functions/fnc_isValidAi.sqf index f91b27ffbe..3803ce4fbd 100644 --- a/addons/switchunits/functions/fnc_isValidAi.sqf +++ b/addons/switchunits/functions/fnc_isValidAi.sqf @@ -14,12 +14,14 @@ VOID */ +#include "script_component.hpp" + private ["_unit"]; _unit = _this select 0; -!([_unit] call AGM_Core_fnc_isPlayer +!([_unit] call EFUNC(Core, isPlayer) || {_unit in playableUnits} || {vehicle _unit != _unit} -|| {_unit getVariable ["AGM_SwitchUnits_IsPlayerUnit", false]} -|| {_unit getVariable ["AGM_SwitchUnits_IsPlayerControlled", false]}) +|| {_unit getVariable [QGVAR(IsPlayerUnit), false]} +|| {_unit getVariable [QGVAR(IsPlayerControlled), false]}) diff --git a/addons/switchunits/functions/fnc_markAiOnMap.sqf b/addons/switchunits/functions/fnc_markAiOnMap.sqf index 05865bc060..79e72c7379 100644 --- a/addons/switchunits/functions/fnc_markAiOnMap.sqf +++ b/addons/switchunits/functions/fnc_markAiOnMap.sqf @@ -15,6 +15,8 @@ VOID */ +#include "script_component.hpp" + private ["_sidesToShow"]; _sidesToShow = _this select 0; @@ -34,10 +36,10 @@ _sidesToShow spawn { // create markers { - if (([_x] call AGM_SwitchUnits_fnc_isValidAi && (side group _x in _sides)) || (_x getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])) then { + if (([_x] call FUNC(isValidAi) && (side group _x in _sides)) || (_x getVariable [QGVAR(IsPlayerControlled), false])) then { private ["_markerName", "_marker", "_markerColor"]; - //_markerName = format ["%1", [_x] call AGM_Core_fnc_getName]; + //_markerName = format ["%1", [_x] call EFUNC(Core, getName)]; _markerName = str _x; _marker = createMarkerLocal [_markerName, position _x]; @@ -49,9 +51,9 @@ _sidesToShow spawn { // commy's one liner magic _markerColor = format ["Color%1", side group _x]; - if ((_x getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])) then { + if ((_x getVariable [QGVAR(IsPlayerControlled), false])) then { _markerName setMarkerColorLocal "ColorOrange"; - _markerName setMarkerTextLocal (_x getVariable ["AGM_SwitchUnits_PlayerControlledName",""]); + _markerName setMarkerTextLocal (_x getVariable [QGVAR(PlayerControlledName),""]); } else { _markerName setMarkerColorLocal _markerColor; _markerName setMarkerTextLocal (getText (configFile >> "CfgVehicles" >> typeOf _x >> "displayName")); diff --git a/addons/switchunits/functions/fnc_module.sqf b/addons/switchunits/functions/fnc_module.sqf index 43ec26199a..c614b9c6d7 100644 --- a/addons/switchunits/functions/fnc_module.sqf +++ b/addons/switchunits/functions/fnc_module.sqf @@ -16,6 +16,8 @@ BOOLEAN (Good practice to include one) */ +#include "script_component.hpp" + if !(isServer) exitWith {}; _logic = _this select 0; @@ -23,16 +25,16 @@ _activated = _this select 2; if !(_activated) exitWith {}; -AGM_SwitchUnits_Module = true; +GVAR(Module) = true; -["AGM_SwitchUnits_EnableSwitchUnits", true] call AGM_Core_fnc_setParameter; +[QGVAR(EnableSwitchUnits), true] call EFUNC(Core, setParameter); -[_logic, "AGM_SwitchUnits_SwitchToWest", "SwitchToWest"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SwitchToEast", "SwitchToEast"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SwitchToIndependent", "SwitchToIndependent"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SwitchToCivilian", "SwitchToCivilian"] call AGM_Core_fnc_readBooleanParameterFromModule; +[_logic, QGVAR(SwitchToWest), "SwitchToWest"] call EFUNC(Core, readBooleanParameterFromModule); +[_logic, QGVAR(SwitchToEast), "SwitchToEast"] call EFUNC(Core, readBooleanParameterFromModule); +[_logic, QGVAR(SwitchToIndependent), "SwitchToIndependent"] call EFUNC(Core, readBooleanParameterFromModule); +[_logic, QGVAR(SwitchToCivilian), "SwitchToCivilian"] call EFUNC(Core, readBooleanParameterFromModule); + +[_logic, QGVAR(EnableSafeZone), "EnableSafeZone"] call EFUNC(Core, readBooleanParameterFromModule); +[_logic, QGVAR(SafeZoneRadius), "SafeZoneRadius"] call EFUNC(Core, readNumericParameterFromModule); -[_logic, "AGM_SwitchUnits_EnableSafeZone", "EnableSafeZone"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SafeZoneRadius", "SafeZoneRadius"] call AGM_Core_fnc_readNumericParameterFromModule; - -diag_log text "[AGM]: SwitchUnits Module Initialized."; +diag_log text "[ACE]: SwitchUnits Module Initialized."; diff --git a/addons/switchunits/functions/fnc_nearestPlayers.sqf b/addons/switchunits/functions/fnc_nearestPlayers.sqf index 04b185c455..6475185171 100644 --- a/addons/switchunits/functions/fnc_nearestPlayers.sqf +++ b/addons/switchunits/functions/fnc_nearestPlayers.sqf @@ -15,6 +15,8 @@ ARRAY - Player units */ +#include "script_component.hpp" + private ["_position", "_radius", "_nearestPlayers"]; _position = _this select 0; @@ -23,7 +25,7 @@ _radius = _this select 1; _nearestPlayers = []; { - if ([_x] call AGM_Core_fnc_isPlayer && {alive _x}) then { + if ([_x] call EFUNC(Core, isPlayer) && {alive _x}) then { _nearestPlayers pushBack _x; }; } forEach (nearestObjects [_position, ["Man"], _radius]); diff --git a/addons/switchunits/functions/fnc_switchBack.sqf b/addons/switchunits/functions/fnc_switchBack.sqf index eba84d57f6..e9425c4fa4 100644 --- a/addons/switchunits/functions/fnc_switchBack.sqf +++ b/addons/switchunits/functions/fnc_switchBack.sqf @@ -16,11 +16,13 @@ VOID */ +#include "script_component.hpp" + private ["_originalPlayerUnit", "_currentUnit"]; _originalPlayerUnit = _this select 0; _currentUnit = _this select 1; -[_originalPlayerUnit] joinSilent AGM_SwitchUnits_OriginalGroup; +[_originalPlayerUnit] joinSilent GVAR(OriginalGroup); waitUntil {local _originalPlayerUnit}; diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf index ddb2a1d523..6002ee3f8f 100644 --- a/addons/switchunits/functions/fnc_switchUnit.sqf +++ b/addons/switchunits/functions/fnc_switchUnit.sqf @@ -14,12 +14,14 @@ VOID */ +#include "script_component.hpp" + private ["_newUnit"]; _newUnit = _this select 1; // don't switch to original player units -if (!([_newUnit] call AGM_SwitchUnits_fnc_isValidAi)) exitWith {}; +if (!([_newUnit] call FUNC(isValidAi))) exitWith {}; _newUnit spawn { private ["_unit", "_allNearestPlayers", "_oldUnit", "_respawnEhId", "_oldOwner", "_leave"]; @@ -28,10 +30,10 @@ _newUnit spawn { _leave = false; - if (AGM_SwitchUnits_EnableSafeZone) then { + if (GVAR(EnableSafeZone)) then { - _allNearestPlayers = [position _unit, AGM_SwitchUnits_SafeZoneRadius] call AGM_SwitchUnits_fnc_nearestPlayers; - _nearestEnemyPlayers = [_allNearestPlayers, {((side AGM_SwitchUnits_OriginalGroup) getFriend (side _this) < 0.6) && !(_this getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])}] call AGM_Core_fnc_filter; + _allNearestPlayers = [position _unit, GVAR(SafeZoneRadius)] call FUNC(nearestPlayers); + _nearestEnemyPlayers = [_allNearestPlayers, {((side GVAR(OriginalGroup)) getFriend (side _this) < 0.6) && !(_this getVariable [QGVAR(IsPlayerControlled), false])}] call EFUNC(Core, filter); if (count _nearestEnemyPlayers > 0) exitWith { _leave = true; @@ -40,40 +42,40 @@ _newUnit spawn { // exitWith doesn't exit past the "if(EnableSafeZone)" block if (_leave) exitWith { - [localize "STR_AGM_SwitchUnits_TooCloseToEnemy"] call AGM_Core_fnc_displayTextStructured; + [localize "STR_ACE_SwitchUnits_TooCloseToEnemy"] call EFUNC(Core, displayTextStructured); }; // should switch locality // This doesn't work anymore, because one's now able to switch to units from a different side //[_unit] joinSilent group player; - [[_unit, player], "{(_this select 0) setVariable ['AGM_SwitchUnits_OriginalOwner', owner (_this select 0), true]; (_this select 0) setOwner owner (_this select 1)}", 1] call AGM_Core_fnc_execRemoteFnc; + [[_unit, player], QUOTE({(_this select 0) setVariable [QGVAR(OriginalOwner), owner (_this select 0), true]; (_this select 0) setOwner owner (_this select 1)}), 1] call EFUNC(Core, execRemoteFnc); _oldUnit = player; waitUntil {sleep 0.2; local _unit}; - _oldUnit setVariable ["AGM_SwitchUnits_IsPlayerControlled", false, true]; - _oldUnit setVariable ["AGM_SwitchUnits_PlayerControlledName", "", true]; + _oldUnit setVariable [QGVAR(IsPlayerControlled), false, true]; + _oldUnit setVariable [QGVAR(PlayerControlledName), "", true]; - _respawnEhId = _unit getVariable ["AGM_SwitchUnits_RespawnEhId", -1]; + _respawnEhId = _unit getVariable [QGVAR(RespawnEhId), -1]; if (_respawnEhId != -1) then { _oldUnit removeEventHandler ["Respawn", _respawnEhId]; }; selectPlayer _unit; - _unit setVariable ["AGM_SwitchUnits_IsPlayerControlled", true, true]; - _unit setVariable ["AGM_SwitchUnits_PlayerControlledName", AGM_SwitchUnits_OriginalName, true]; + _unit setVariable [QGVAR(IsPlayerControlled), true, true]; + _unit setVariable [QGVAR(PlayerControlledName), GVAR(OriginalName), true]; _respawnEhId = _unit addEventHandler ["Respawn", { - [AGM_SwitchUnits_OriginalUnit, _this select 0] spawn AGM_SwitchUnits_fnc_switchBack; + [GVAR(OriginalUnit), _this select 0] spawn FUNC(switchBack); }]; - _unit setVariable ["AGM_SwitchUnits_RespawnEhId", _respawnEhId, true]; + _unit setVariable [QGVAR(RespawnEhId), _respawnEhId, true]; // set owner back to original owner - _oldOwner = _oldUnit getVariable["AGM_SwitchUnits_OriginalOwner", -1]; + _oldOwner = _oldUnit getVariable[QGVAR(OriginalOwner), -1]; if (_oldOwner > -1) then { - [[_oldUnit, _oldOwner], "{(_this select 0) setOwner (_this select 1)}", 1] call AGM_Core_fnc_execRemoteFnc; + [[_oldUnit, _oldOwner], QUOTE({(_this select 0) setOwner (_this select 1)}), 1] call EFUNC(Core, execRemoteFnc); }; - [localize "STR_AGM_SwitchUnits_SwitchedUnit"] call AGM_Core_fnc_displayTextStructured; + [localize "STR_ACE_SwitchUnits_SwitchedUnit"] call EFUNC(Core, displayTextStructured); }; From 91ba0c6a55fcf6ea8741c35b742c03f2cb9fe57b Mon Sep 17 00:00:00 2001 From: bux578 Date: Mon, 12 Jan 2015 15:48:32 +0100 Subject: [PATCH 11/18] remove temp folder didn't mean to push this --- addons/_switchunits/UI/IconSwitchUnits_ca.paa | Bin 5625 -> 0 bytes addons/_switchunits/clientInit.sqf | 23 --- addons/_switchunits/config.cpp | 140 ------------------ .../functions/fn_addMapFunction.sqf | 23 --- .../functions/fn_handleMapClick.sqf | 41 ----- .../_switchunits/functions/fn_initPlayer.sqf | 48 ------ .../_switchunits/functions/fn_isValidAi.sqf | 25 ---- .../_switchunits/functions/fn_markAiOnMap.sqf | 64 -------- addons/_switchunits/functions/fn_module.sqf | 38 ----- .../functions/fn_nearestPlayers.sqf | 31 ---- .../_switchunits/functions/fn_switchBack.sqf | 29 ---- .../_switchunits/functions/fn_switchUnit.sqf | 79 ---------- addons/_switchunits/stringtable.xml | 22 --- 13 files changed, 563 deletions(-) delete mode 100644 addons/_switchunits/UI/IconSwitchUnits_ca.paa delete mode 100644 addons/_switchunits/clientInit.sqf delete mode 100644 addons/_switchunits/config.cpp delete mode 100644 addons/_switchunits/functions/fn_addMapFunction.sqf delete mode 100644 addons/_switchunits/functions/fn_handleMapClick.sqf delete mode 100644 addons/_switchunits/functions/fn_initPlayer.sqf delete mode 100644 addons/_switchunits/functions/fn_isValidAi.sqf delete mode 100644 addons/_switchunits/functions/fn_markAiOnMap.sqf delete mode 100644 addons/_switchunits/functions/fn_module.sqf delete mode 100644 addons/_switchunits/functions/fn_nearestPlayers.sqf delete mode 100644 addons/_switchunits/functions/fn_switchBack.sqf delete mode 100644 addons/_switchunits/functions/fn_switchUnit.sqf delete mode 100644 addons/_switchunits/stringtable.xml diff --git a/addons/_switchunits/UI/IconSwitchUnits_ca.paa b/addons/_switchunits/UI/IconSwitchUnits_ca.paa deleted file mode 100644 index b5868f0423526e23d333d64c0059bd4cde278f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmds53s6+o89oavN(2!jiD5-xUE`yo=ni-47~C~oc??Rhh>sc>9!iV}yH467tyvd* zlrmaZX(eL~Zfiqp>|}&wy|%+NOJhej_`n)%ffW#gi$%fJRoIR9a{8aUp0gV|4slvL z(;jx0^WFb({{KJ!e;!wk)6$l#{7%}cB_Rl*hYug5OL)zaug`=v&@u8e~`+uU>4T z`u^MT!YHG9*B`gY==fRPcF8u16?LTN{*2;GmrZP~FJb-%tB3D4LC7dQSdB~m5`Z&Z zgN9zdfYBAlfYWPuK>4$}O)kFUQ9Rp< z-Cw*H!R%F`^lDW`wTjaJU3*k0V}GEY0wFt1lo{hfW-jj@@)$ML9-Z8eKuQ2eyx zhgb3?3clz|DxcZov5-D#lCD0}gK=@$tbUb^FnOg#0;NY0Tw!ddxC8PF$ch3Z$HH;boJ{&bdNbz`Ys za27457@e2JBNWEsrQCX?#1SSid0nH&+*|fje?E7}wk(<9Ve4b=zy&OxjU(zL|5Un$ zC`Usq%RhzJ+k)+W`&aZ^#8!>K>>tg4?$EFq3l`As)4$ZJ5gcZ*jpC@|e95+e{Ll^j z$ctxeVeyR`5Fc9F{rRBWI$#h=v)KITI=Cdq-5RD}*=Q5a*#x$p=^D%So`nw`Pl+#l ztV-WpOfkYbrAiyb@FL%p23)GYOEGr{i*eYip?Ea^n_Qk2ES31<{K*98 zD~&9^BjqPa`CT3IZgh$qV^drV=JHo=x}w9_7=5s=Y6s2Q~sLOYF%of15zC0 z#j9kwxw%nny@*|fWHPePOYNK5JCZ*%6P)MutbUuk_?`tn`sV(-u>}kM^&~v=l(7|3 z=t=g(v~Yzz_AVfUzth8liUnGKQ%`8YIMr8Zzce{`yFQoT&yh=m-C&Oo`|Zyw2IqtP z*cbn&#i8k({x*~_wHN$%+psr|;?eXiJOuUQkNpKZW)ub!f8kV>I}T_3@`LISMDb)Pe@Oo3>4SoTW$gri zZkdd6?R13lk4@DQwD_+Hl&?PvOY@+_Q5-c1arhAt_pLX~o{{sjJ_6DiEx2RfsN?b>zfp5Q#@N3MQDOh=g;|-20sVOa4d?9?H|toRf@{*DAy&6Qm3_#;(lHFHd0OuaA&J zgZ+{0w;|L%h1Y2o1Pg(Zy{r2*;%T#ytzXn2N*{^CD>?n5fb&OI4{&<@^?-WiE}6}h z_9Xd{`bOf9PC{{VQhpA_CnZ6i_&BJ(f59G!4t#hBdfGU=ySDv6qN8glMIM5}$Dls+ z+?`7&*nF=b_F{J&`6ZI!m6frMfb*B64SpznG_1PpGz{@Y3d#@Xje8iD2#RN0>y2$1 zQA4qReyAtD5h#6O4)=Kd%PYQ=ot>S7VDe!KJ8SavklqJp{%`}#zy5aD(Du@K$%*q+ zgQf@e1BnU@{x)rS{l!EpUvS%L0d-{lWvH{yLsVn(SX_Py=o04c1KwVG74Yl^ zZo|6sgk4;^8E|x6s)Zm@Ph@lOjfcmOCje2xWs|Gj>OW7DXQWZO4?Q~^);n0JkoGg5 zJ(@mj6S!g)pBbHCiPx}~+H*$o%^$BbErjCtN8-n)|4jKoAAVz}-@owQLlM6H(>LC; z_V52)e>{puh`eF&H5&Gjcrhl+c0n?wmsi0uJ%2kpW|UV|8e1#BFV!NEmH6vxn<@WD zeWT$SZoc4Ke>1;A<=0*pahfHdtjottBRVJ@l_!kX2H@}Az`qv;{nw-!?)um^+xx6+ zh%9MTUIYHE%v+z%*ZVUU=6Hu1Q=A`k9__q#I{Z+k{ z#&)yF^zXR^*KW?h=5u1Rb$y_HSzhNkxK`}y8ZySpP*7OHP1TSF2SfZiYmURYBs7=g zN5mrO7=utnSim+7_C!D5%)i+faBbLg3tkKS&VMb_Vy>`}-^lEFt@}MVb6$(1_D=Z? zU1p5Y)B6y5qgA@5!g#jc4?ja_+eLm%JYmL`uKi%p*iXo@fn0lPV<$~O@!23Qvft!7cOW2teZ#Tw9>XW%1#PSJfy-<~4~}#O z%x}d_j3)%(1#RZ=r&%T^kXL~+v_>G)Sis8Qr6xXju35*X<)x;E+Nkg957RKLCH(Nh zf#L*Ds`Ki=b?KE5ap`3E_CH)eFTPA}2LR_k*B0~Jxf}eu=kr%y*?TGf?G7p* - sided - - Returns: - VOID -*/ - -private ["_unit"]; -_unit = _this select 0; - -["theMapClick", "onMapSingleClick", { - [_this, _pos, _shift, _alt] call AGM_SwitchUnits_fnc_handleMapClick; -}, [_unit, _sides]] call BIS_fnc_addStackedEventHandler; diff --git a/addons/_switchunits/functions/fn_handleMapClick.sqf b/addons/_switchunits/functions/fn_handleMapClick.sqf deleted file mode 100644 index 642baed1bd..0000000000 --- a/addons/_switchunits/functions/fn_handleMapClick.sqf +++ /dev/null @@ -1,41 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_handleMapClick - - Author(s): - bux578 - - Description: - Finds the clicked unit - - Parameters: - 0: OBJECT - MapClickEventHandlerArgs - 0: OBJECT - unit to switch to - 1: ARRAY - sides - - Returns: - VOID -*/ - -private ["_args", "_currentPlayerUnit", "_sides", "_pos", "_sideNearest"]; - -_currentPlayerUnit = (_this select 0) select 0; -_sides = (_this select 0) select 1; -_pos = _this select 1; - -_sideNearest = []; - -{ - if ([_x] call AGM_SwitchUnits_fnc_isValidAi && (side group _x in _sides)) then { - _sideNearest pushBack _x; - }; -} forEach (nearestObjects [_pos, ["Man"], 20]); - - -if (count _sideNearest > 0) then { - private ["_switchUnit"]; - - _switchUnit = _sideNearest select 0; - [_currentPlayerUnit, _switchUnit] call AGM_SwitchUnits_fnc_switchUnit; - - openMap false; -}; diff --git a/addons/_switchunits/functions/fn_initPlayer.sqf b/addons/_switchunits/functions/fn_initPlayer.sqf deleted file mode 100644 index c3ee6ce7b2..0000000000 --- a/addons/_switchunits/functions/fn_initPlayer.sqf +++ /dev/null @@ -1,48 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_initPlayer - - Author(s): - bux578 - - Description: - Initializes the player - - Parameters: - 0: OBJECT - player - 1: ARRAY - Array containing selected sides - - Returns: - VOID -*/ - -private ["_playerUnit", "_sides"]; - -_playerUnit = _this select 0; -_sides = _this select 1; - -if (vehicle _playerUnit == _playerUnit) then { - - [_sides] call AGM_SwitchUnits_fnc_markAiOnMap; - - _playerUnit setVariable ["AGM_SwitchUnits_IsPlayerUnit", true]; - _playerUnit allowDamage false; - - AGM_SwitchUnits_OriginalUnit = _playerUnit; - AGM_SwitchUnits_OriginalName = [_playerUnit] call AGM_Core_fnc_getName; - AGM_SwitchUnits_OriginalGroup = group _playerUnit; - - // remove all starting gear of a player - removeAllWeapons _playerUnit; - removeGoggles _playerUnit; - removeHeadgear _playerUnit; - removeVest _playerUnit; - removeAllAssignedItems _playerUnit; - clearAllItemsFromBackpack _playerUnit; - removeBackpack _playerUnit; - _playerUnit linkItem "ItemMap"; - removeUniform _playerUnit; - - [_playerUnit, "AGM_SwitchUnits", true] call AGM_Core_fnc_setForceWalkStatus; - - [_playerUnit, _sides] call AGM_SwitchUnits_fnc_addMapFunction; -}; diff --git a/addons/_switchunits/functions/fn_isValidAi.sqf b/addons/_switchunits/functions/fn_isValidAi.sqf deleted file mode 100644 index f91b27ffbe..0000000000 --- a/addons/_switchunits/functions/fn_isValidAi.sqf +++ /dev/null @@ -1,25 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_isValidAi - - Author(s): - bux578 - - Description: - Checks if AI is a valid target for switching - - Parameters: - 0: OBJECT - unit - - Returns: - VOID -*/ - -private ["_unit"]; - -_unit = _this select 0; - -!([_unit] call AGM_Core_fnc_isPlayer -|| {_unit in playableUnits} -|| {vehicle _unit != _unit} -|| {_unit getVariable ["AGM_SwitchUnits_IsPlayerUnit", false]} -|| {_unit getVariable ["AGM_SwitchUnits_IsPlayerControlled", false]}) diff --git a/addons/_switchunits/functions/fn_markAiOnMap.sqf b/addons/_switchunits/functions/fn_markAiOnMap.sqf deleted file mode 100644 index 05865bc060..0000000000 --- a/addons/_switchunits/functions/fn_markAiOnMap.sqf +++ /dev/null @@ -1,64 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_markAiOnMap - - Author(s): - bux578 - - Description: - Creates markers for AI units for given sides - Marks players in a different color - - Parameters: - 0: OBJECT - side - - Returns: - VOID -*/ - -private ["_sidesToShow"]; -_sidesToShow = _this select 0; - -_sidesToShow spawn { - - private ["_sides", "_allMarkerNames"]; - _sides = _this; - _allMarkerNames = []; - - while { true } do { - sleep 1.5; - - // delete markers - { - deleteMarkerLocal _x; - } forEach _allMarkerNames; - - // create markers - { - if (([_x] call AGM_SwitchUnits_fnc_isValidAi && (side group _x in _sides)) || (_x getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])) then { - private ["_markerName", "_marker", "_markerColor"]; - - //_markerName = format ["%1", [_x] call AGM_Core_fnc_getName]; - _markerName = str _x; - - _marker = createMarkerLocal [_markerName, position _x]; - _markerName setMarkerTypeLocal "mil_triangle"; - _markerName setMarkerShapeLocal "ICON"; - _markerName setMarkerSizeLocal [0.5,0.7]; - _markerName setMarkerDirLocal getDir _x; - - // commy's one liner magic - _markerColor = format ["Color%1", side group _x]; - - if ((_x getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])) then { - _markerName setMarkerColorLocal "ColorOrange"; - _markerName setMarkerTextLocal (_x getVariable ["AGM_SwitchUnits_PlayerControlledName",""]); - } else { - _markerName setMarkerColorLocal _markerColor; - _markerName setMarkerTextLocal (getText (configFile >> "CfgVehicles" >> typeOf _x >> "displayName")); - }; - - _allMarkerNames pushBack _markerName; - }; - } forEach allUnits; - }; -}; diff --git a/addons/_switchunits/functions/fn_module.sqf b/addons/_switchunits/functions/fn_module.sqf deleted file mode 100644 index 43ec26199a..0000000000 --- a/addons/_switchunits/functions/fn_module.sqf +++ /dev/null @@ -1,38 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_module - - Author(s): - bux578 - - Description: - Initializes the SwitchUnits module - - Parameters: - 0: OBJECT - module logic - 1: ARRAY - list of affected units - 2: BOOLEAN - isActivated - - Returns: - BOOLEAN (Good practice to include one) -*/ - -if !(isServer) exitWith {}; - -_logic = _this select 0; -_activated = _this select 2; - -if !(_activated) exitWith {}; - -AGM_SwitchUnits_Module = true; - -["AGM_SwitchUnits_EnableSwitchUnits", true] call AGM_Core_fnc_setParameter; - -[_logic, "AGM_SwitchUnits_SwitchToWest", "SwitchToWest"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SwitchToEast", "SwitchToEast"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SwitchToIndependent", "SwitchToIndependent"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SwitchToCivilian", "SwitchToCivilian"] call AGM_Core_fnc_readBooleanParameterFromModule; - -[_logic, "AGM_SwitchUnits_EnableSafeZone", "EnableSafeZone"] call AGM_Core_fnc_readBooleanParameterFromModule; -[_logic, "AGM_SwitchUnits_SafeZoneRadius", "SafeZoneRadius"] call AGM_Core_fnc_readNumericParameterFromModule; - -diag_log text "[AGM]: SwitchUnits Module Initialized."; diff --git a/addons/_switchunits/functions/fn_nearestPlayers.sqf b/addons/_switchunits/functions/fn_nearestPlayers.sqf deleted file mode 100644 index 04b185c455..0000000000 --- a/addons/_switchunits/functions/fn_nearestPlayers.sqf +++ /dev/null @@ -1,31 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_nearestPlayers - - Author(s): - bux578 - - Description: - Returns an array of alive players in a given radius around a given location - - Parameters: - 0: POSTION - Center position - 1: NUMBER - Radius - - Returns: - ARRAY - Player units -*/ - -private ["_position", "_radius", "_nearestPlayers"]; - -_position = _this select 0; -_radius = _this select 1; - -_nearestPlayers = []; - -{ - if ([_x] call AGM_Core_fnc_isPlayer && {alive _x}) then { - _nearestPlayers pushBack _x; - }; -} forEach (nearestObjects [_position, ["Man"], _radius]); - - _nearestPlayers diff --git a/addons/_switchunits/functions/fn_switchBack.sqf b/addons/_switchunits/functions/fn_switchBack.sqf deleted file mode 100644 index eba84d57f6..0000000000 --- a/addons/_switchunits/functions/fn_switchBack.sqf +++ /dev/null @@ -1,29 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_switchBack - - Author(s): - bux578 - - Description: - Switches back to the original player unit - This method needs to be "spawn"ed - - Parameters: - 0: OBJECT - original player unit - 1: OBJECT - respawned unit - - Returns: - VOID -*/ - -private ["_originalPlayerUnit", "_currentUnit"]; -_originalPlayerUnit = _this select 0; -_currentUnit = _this select 1; - -[_originalPlayerUnit] joinSilent AGM_SwitchUnits_OriginalGroup; - -waitUntil {local _originalPlayerUnit}; - -selectPlayer _originalPlayerUnit; - -deleteVehicle _currentUnit; diff --git a/addons/_switchunits/functions/fn_switchUnit.sqf b/addons/_switchunits/functions/fn_switchUnit.sqf deleted file mode 100644 index ddb2a1d523..0000000000 --- a/addons/_switchunits/functions/fn_switchUnit.sqf +++ /dev/null @@ -1,79 +0,0 @@ -/* - Name: AGM_SwitchUnits_fnc_switchUnit - - Author(s): - bux578 - - Description: - Selects the new given player unit - - Parameters: - 0: OBJECT - the unit to switch to - - Returns: - VOID -*/ - -private ["_newUnit"]; - -_newUnit = _this select 1; - -// don't switch to original player units -if (!([_newUnit] call AGM_SwitchUnits_fnc_isValidAi)) exitWith {}; - -_newUnit spawn { - private ["_unit", "_allNearestPlayers", "_oldUnit", "_respawnEhId", "_oldOwner", "_leave"]; - - _unit = _this; - - _leave = false; - - if (AGM_SwitchUnits_EnableSafeZone) then { - - _allNearestPlayers = [position _unit, AGM_SwitchUnits_SafeZoneRadius] call AGM_SwitchUnits_fnc_nearestPlayers; - _nearestEnemyPlayers = [_allNearestPlayers, {((side AGM_SwitchUnits_OriginalGroup) getFriend (side _this) < 0.6) && !(_this getVariable ["AGM_SwitchUnits_IsPlayerControlled", false])}] call AGM_Core_fnc_filter; - - if (count _nearestEnemyPlayers > 0) exitWith { - _leave = true; - }; - }; - - // exitWith doesn't exit past the "if(EnableSafeZone)" block - if (_leave) exitWith { - [localize "STR_AGM_SwitchUnits_TooCloseToEnemy"] call AGM_Core_fnc_displayTextStructured; - }; - - // should switch locality - // This doesn't work anymore, because one's now able to switch to units from a different side - //[_unit] joinSilent group player; - [[_unit, player], "{(_this select 0) setVariable ['AGM_SwitchUnits_OriginalOwner', owner (_this select 0), true]; (_this select 0) setOwner owner (_this select 1)}", 1] call AGM_Core_fnc_execRemoteFnc; - - _oldUnit = player; - waitUntil {sleep 0.2; local _unit}; - - _oldUnit setVariable ["AGM_SwitchUnits_IsPlayerControlled", false, true]; - _oldUnit setVariable ["AGM_SwitchUnits_PlayerControlledName", "", true]; - - _respawnEhId = _unit getVariable ["AGM_SwitchUnits_RespawnEhId", -1]; - if (_respawnEhId != -1) then { - _oldUnit removeEventHandler ["Respawn", _respawnEhId]; - }; - - selectPlayer _unit; - - _unit setVariable ["AGM_SwitchUnits_IsPlayerControlled", true, true]; - _unit setVariable ["AGM_SwitchUnits_PlayerControlledName", AGM_SwitchUnits_OriginalName, true]; - - _respawnEhId = _unit addEventHandler ["Respawn", { - [AGM_SwitchUnits_OriginalUnit, _this select 0] spawn AGM_SwitchUnits_fnc_switchBack; - }]; - _unit setVariable ["AGM_SwitchUnits_RespawnEhId", _respawnEhId, true]; - - // set owner back to original owner - _oldOwner = _oldUnit getVariable["AGM_SwitchUnits_OriginalOwner", -1]; - if (_oldOwner > -1) then { - [[_oldUnit, _oldOwner], "{(_this select 0) setOwner (_this select 1)}", 1] call AGM_Core_fnc_execRemoteFnc; - }; - - [localize "STR_AGM_SwitchUnits_SwitchedUnit"] call AGM_Core_fnc_displayTextStructured; -}; diff --git a/addons/_switchunits/stringtable.xml b/addons/_switchunits/stringtable.xml deleted file mode 100644 index b12e8dc17d..0000000000 --- a/addons/_switchunits/stringtable.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Switched unit - Einheit gewechselt - Юнит переключен - Prohozená jednotka - Przełącz jednostkę - Cambiado de unidad - - - This unit is too close to the enemy. - Diese Einheit ist zu nah am Feind. - Юнит слишком близок к противнику - Tato jednotka je moc blízko k nepříteli. - Ta jednostka jest zbyt blisko przeciwnika. - Esta unidad está demasiado cerca del enemigo. - - - From 79549881306a4906a7a5e69950ec88e51057afbf Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 19:22:58 +0100 Subject: [PATCH 12/18] rename core to common --- addons/common/$PBOPREFIX$ | 1 + addons/{core => common}/CfgEventHandlers.hpp | 0 addons/{core => common}/CfgSounds.hpp | 0 addons/{core => common}/CfgVehicles.hpp | 16 +- addons/{core => common}/CfgWeapons.hpp | 0 addons/{core => common}/DefaultItems.hpp | 0 addons/{core => common}/FixAnimations.hpp | 0 addons/{core => common}/FixPickup.hpp | 0 addons/{core => common}/HintConfig.hpp | 0 addons/{core => common}/MainMenu.hpp | 4 +- addons/{core => common}/MenuConfig.hpp | 164 +++++++++--------- addons/{core => common}/NoVoice.hpp | 6 +- addons/{core => common}/ProgressScreen.hpp | 8 +- addons/{core => common}/RscInfoType.hpp | 2 +- .../{core => common}/UI/IconCheckPBO_ca.paa | Bin addons/{core => common}/UI/blank_CO.paa | Bin addons/{core => common}/UI/box_checked_ca.paa | Bin .../{core => common}/UI/box_unchecked_ca.paa | Bin addons/{core => common}/XEH_postInit.sqf | 4 +- addons/{core => common}/XEH_preInit.sqf | 2 +- addons/{core => common}/config.cpp | 10 +- .../{core => common}/data/agm_default.rvmat | 0 .../functions/fnc_addActionEventHandler.sqf | 2 +- .../fnc_addActionMenuEventHandler.sqf | 2 +- .../functions/fnc_addCameraEventHandler.sqf | 2 +- .../functions/fnc_addCustomEventHandler.sqf | 2 +- .../fnc_addInfoDisplayEventHandler.sqf | 2 +- ..._addInventoryDisplayLoadedEventHandler.sqf | 2 +- .../fnc_addMapMarkerCreatedEventHandler.sqf | 2 +- .../fnc_addScrollWheelEventHandler.sqf | 2 +- .../functions/fnc_addUnloadEventhandler.sqf | 2 +- .../functions/fnc_adminKick.sqf | 2 +- .../functions/fnc_ambientBrightness.sqf | 2 +- .../functions/fnc_applyForceWalkStatus.sqf | 2 +- .../functions/fnc_binarizeNumber.sqf | 2 +- .../functions/fnc_callCustomEventHandlers.sqf | 2 +- .../fnc_callCustomEventHandlersGlobal.sqf | 2 +- .../functions/fnc_canGetInPosition.sqf | 2 +- .../functions/fnc_canInteractWith.sqf | 2 +- .../functions/fnc_canUseWeapon.sqf | 2 +- .../fnc_changeProjectileDirection.sqf | 2 +- .../functions/fnc_checkPBOs.sqf | 2 +- .../{core => common}/functions/fnc_claim.sqf | 2 +- .../fnc_closeDialogIfTargetMoves.sqf | 2 +- .../functions/fnc_codeToLetter.sqf | 2 +- .../functions/fnc_codeToString.sqf | 2 +- .../functions/fnc_convertKeyCode.sqf | 2 +- .../functions/fnc_currentChannel.sqf | 2 +- .../functions/fnc_disableUserInput.sqf | 2 +- .../functions/fnc_displayText.sqf | 2 +- .../functions/fnc_displayTextPicture.sqf | 2 +- .../functions/fnc_displayTextStructured.sqf | 2 +- .../functions/fnc_doAnimation.sqf | 2 +- .../functions/fnc_endRadioTransmission.sqf | 2 +- .../functions/fnc_execPersistentFnc.sqf | 2 +- .../functions/fnc_execRemoteFnc.sqf | 2 +- .../functions/fnc_executePersistent.sqf | 2 +- .../functions/fnc_exportConfig.sqf | 2 +- .../{core => common}/functions/fnc_filter.sqf | 2 +- .../functions/fnc_fixCrateContent.sqf | 2 +- .../fnc_fixLoweredRifleAnimation.sqf | 2 +- .../functions/fnc_getCaptivityStatus.sqf | 2 +- .../functions/fnc_getChildren.sqf | 2 +- .../functions/fnc_getConfigCommander.sqf | 2 +- .../functions/fnc_getConfigGunner.sqf | 2 +- .../functions/fnc_getDefaultAnim.sqf | 2 +- .../functions/fnc_getDisplayConfigName.sqf | 2 +- .../functions/fnc_getDoorTurrets.sqf | 2 +- .../functions/fnc_getForceWalkStatus.sqf | 2 +- .../functions/fnc_getHitPoints.sqf | 2 +- .../fnc_getHitPointsWithSelections.sqf | 2 +- .../functions/fnc_getInPosition.sqf | 2 +- .../functions/fnc_getMarkerType.sqf | 2 +- .../functions/fnc_getName.sqf | 2 +- .../functions/fnc_getNumberFromMissionSQM.sqf | 2 +- .../functions/fnc_getPitchBankYaw.sqf | 2 +- .../functions/fnc_getStringFromMissionSQM.sqf | 2 +- .../fnc_getTargetAzimuthAndInclination.sqf | 2 +- .../functions/fnc_getTargetDistance.sqf | 2 +- .../functions/fnc_getTargetObject.sqf | 2 +- .../functions/fnc_getTurretCommander.sqf | 2 +- .../functions/fnc_getTurretConfigPath.sqf | 2 +- .../functions/fnc_getTurretCopilot.sqf | 2 +- .../functions/fnc_getTurretGunner.sqf | 2 +- .../functions/fnc_getTurretIndex.sqf | 2 +- .../functions/fnc_getTurrets.sqf | 2 +- .../functions/fnc_getTurretsFFV.sqf | 2 +- .../functions/fnc_getTurretsOther.sqf | 2 +- .../functions/fnc_getUavControlPosition.sqf | 2 +- .../functions/fnc_getVehicleCargo.sqf | 2 +- .../functions/fnc_getVehicleCodriver.sqf | 2 +- .../functions/fnc_getVehicleCrew.sqf | 2 +- .../fnc_getWeaponAzimuthAndInclination.sqf | 2 +- .../functions/fnc_getWeaponType.sqf | 2 +- .../functions/fnc_getWindDirection.sqf | 2 +- .../functions/fnc_goKneeling.sqf | 2 +- .../functions/fnc_hadamardProduct.sqf | 2 +- .../functions/fnc_inTransitionAnim.sqf | 2 +- .../functions/fnc_interpolateFromArray.sqf | 2 +- .../functions/fnc_isAutoWind.sqf | 2 +- .../{core => common}/functions/fnc_isEOD.sqf | 2 +- .../functions/fnc_isEngineer.sqf | 2 +- .../functions/fnc_isInBuilding.sqf | 2 +- .../functions/fnc_isMedic.sqf | 2 +- .../functions/fnc_isPlayer.sqf | 2 +- .../functions/fnc_isTurnedOut.sqf | 2 +- .../functions/fnc_letterToCode.sqf | 2 +- addons/{core => common}/functions/fnc_log.sqf | 2 +- .../functions/fnc_logControls.sqf | 2 +- .../functions/fnc_logDisplays.sqf | 2 +- addons/{core => common}/functions/fnc_map.sqf | 2 +- .../functions/fnc_moduleCheckPBOs.sqf | 2 +- .../functions/fnc_moduleLSDVehicles.sqf | 2 +- .../functions/fnc_monitor.sqf | 2 +- .../functions/fnc_muteUnit.sqf | 2 +- .../functions/fnc_numberToDigits.sqf | 2 +- .../functions/fnc_numberToDigitsString.sqf | 2 +- .../functions/fnc_onLoadRscDisplayChannel.sqf | 2 +- .../{core => common}/functions/fnc_owned.sqf | 2 +- .../{core => common}/functions/fnc_player.sqf | 2 +- addons/common/functions/fnc_playerSide.sqf | 4 + .../functions/fnc_progressBar.sqf | 2 +- .../functions/fnc_queueAnimation.sqf | 2 +- .../fnc_readBooleanParameterFromModule.sqf | 2 +- .../fnc_readNumericParameterFromModule.sqf | 2 +- .../fnc_removeActionEventHandler.sqf | 2 +- .../fnc_removeActionMenuEventHandler.sqf | 2 +- .../fnc_removeCameraEventHandler.sqf | 2 +- .../fnc_removeCustomEventHandler.sqf | 2 +- .../fnc_removeInfoDisplayEventHandler.sqf | 2 +- ...moveInventoryDisplayLoadedEventHandler.sqf | 2 +- ...fnc_removeMapMarkerCreatedEventHandler.sqf | 2 +- .../fnc_removeScrollWheelEventHandler.sqf | 2 +- .../functions/fnc_restoreVariablesJIP.sqf | 2 +- .../functions/fnc_revertKeyCodeLocalized.sqf | 2 +- .../functions/fnc_sanitizeString.sqf | 2 +- .../functions/fnc_serverLog.sqf | 2 +- .../functions/fnc_setCaptivityStatus.sqf | 2 +- .../functions/fnc_setForceWalkStatus.sqf | 2 +- .../functions/fnc_setKeyDefault.sqf | 2 +- .../functions/fnc_setName.sqf | 2 +- .../functions/fnc_setParameter.sqf | 2 +- .../functions/fnc_setPitchBankYaw.sqf | 2 +- .../functions/fnc_setVariableJIP.sqf | 2 +- .../functions/fnc_showUser.sqf | 2 +- .../functions/fnc_stringToColoredText.sqf | 2 +- .../functions/fnc_subString.sqf | 2 +- .../{core => common}/functions/fnc_toBin.sqf | 2 +- .../functions/fnc_toBitmask.sqf | 2 +- .../{core => common}/functions/fnc_toHex.sqf | 2 +- .../functions/fnc_toNumber.sqf | 2 +- .../functions/fnc_unmuteUnit.sqf | 2 +- addons/{core => common}/script_component.hpp | 8 +- addons/{core => common}/script_macros.hpp | 0 .../KeyInput/initCanInteractFunction.sqf | 2 +- .../scripts/KeyInput/initKeys.sqf | 2 +- .../scripts/KeyInput/initScrollWheel.sqf | 2 +- .../scripts/Version/checkVersionNumber.sqf | 8 +- .../scripts/assignedItemFix.sqf | 2 +- addons/{core => common}/scripts/closeMenu.sqf | 2 +- addons/{core => common}/scripts/editKey.sqf | 2 +- addons/{core => common}/scripts/keyInput.sqf | 2 +- .../{core => common}/scripts/keyRelease.sqf | 2 +- addons/{core => common}/scripts/nextKeys.sqf | 2 +- addons/{core => common}/scripts/openMenu.sqf | 2 +- .../scripts/readParameters.sqf | 2 +- .../{core => common}/scripts/toggleState.sqf | 2 +- addons/{core => common}/sounds/ACE_click.wav | Bin addons/{core => common}/stringtable.xml | 80 ++++----- addons/core/$PBOPREFIX$ | 1 - addons/core/functions/fnc_playerSide.sqf | 4 - 171 files changed, 298 insertions(+), 306 deletions(-) create mode 100644 addons/common/$PBOPREFIX$ rename addons/{core => common}/CfgEventHandlers.hpp (100%) rename addons/{core => common}/CfgSounds.hpp (100%) rename addons/{core => common}/CfgVehicles.hpp (85%) rename addons/{core => common}/CfgWeapons.hpp (100%) rename addons/{core => common}/DefaultItems.hpp (100%) rename addons/{core => common}/FixAnimations.hpp (100%) rename addons/{core => common}/FixPickup.hpp (100%) rename addons/{core => common}/HintConfig.hpp (100%) rename addons/{core => common}/MainMenu.hpp (96%) rename addons/{core => common}/MenuConfig.hpp (84%) rename addons/{core => common}/NoVoice.hpp (98%) rename addons/{core => common}/ProgressScreen.hpp (84%) rename addons/{core => common}/RscInfoType.hpp (97%) rename addons/{core => common}/UI/IconCheckPBO_ca.paa (100%) rename addons/{core => common}/UI/blank_CO.paa (100%) rename addons/{core => common}/UI/box_checked_ca.paa (100%) rename addons/{core => common}/UI/box_unchecked_ca.paa (100%) rename addons/{core => common}/XEH_postInit.sqf (98%) rename addons/{core => common}/XEH_preInit.sqf (99%) rename addons/{core => common}/config.cpp (90%) rename addons/{core => common}/data/agm_default.rvmat (100%) rename addons/{core => common}/functions/fnc_addActionEventHandler.sqf (97%) rename addons/{core => common}/functions/fnc_addActionMenuEventHandler.sqf (97%) rename addons/{core => common}/functions/fnc_addCameraEventHandler.sqf (95%) rename addons/{core => common}/functions/fnc_addCustomEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addInfoDisplayEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_addMapMarkerCreatedEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addScrollWheelEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addUnloadEventhandler.sqf (83%) rename addons/{core => common}/functions/fnc_adminKick.sqf (77%) rename addons/{core => common}/functions/fnc_ambientBrightness.sqf (83%) rename addons/{core => common}/functions/fnc_applyForceWalkStatus.sqf (89%) rename addons/{core => common}/functions/fnc_binarizeNumber.sqf (93%) rename addons/{core => common}/functions/fnc_callCustomEventHandlers.sqf (93%) rename addons/{core => common}/functions/fnc_callCustomEventHandlersGlobal.sqf (89%) rename addons/{core => common}/functions/fnc_canGetInPosition.sqf (99%) rename addons/{core => common}/functions/fnc_canInteractWith.sqf (80%) rename addons/{core => common}/functions/fnc_canUseWeapon.sqf (85%) rename addons/{core => common}/functions/fnc_changeProjectileDirection.sqf (97%) rename addons/{core => common}/functions/fnc_checkPBOs.sqf (94%) rename addons/{core => common}/functions/fnc_claim.sqf (94%) rename addons/{core => common}/functions/fnc_closeDialogIfTargetMoves.sqf (96%) rename addons/{core => common}/functions/fnc_codeToLetter.sqf (87%) rename addons/{core => common}/functions/fnc_codeToString.sqf (90%) rename addons/{core => common}/functions/fnc_convertKeyCode.sqf (91%) rename addons/{core => common}/functions/fnc_currentChannel.sqf (92%) rename addons/{core => common}/functions/fnc_disableUserInput.sqf (98%) rename addons/{core => common}/functions/fnc_displayText.sqf (96%) rename addons/{core => common}/functions/fnc_displayTextPicture.sqf (90%) rename addons/{core => common}/functions/fnc_displayTextStructured.sqf (95%) rename addons/{core => common}/functions/fnc_doAnimation.sqf (97%) rename addons/{core => common}/functions/fnc_endRadioTransmission.sqf (93%) rename addons/{core => common}/functions/fnc_execPersistentFnc.sqf (97%) rename addons/{core => common}/functions/fnc_execRemoteFnc.sqf (97%) rename addons/{core => common}/functions/fnc_executePersistent.sqf (87%) rename addons/{core => common}/functions/fnc_exportConfig.sqf (96%) rename addons/{core => common}/functions/fnc_filter.sqf (93%) rename addons/{core => common}/functions/fnc_fixCrateContent.sqf (93%) rename addons/{core => common}/functions/fnc_fixLoweredRifleAnimation.sqf (83%) rename addons/{core => common}/functions/fnc_getCaptivityStatus.sqf (93%) rename addons/{core => common}/functions/fnc_getChildren.sqf (84%) rename addons/{core => common}/functions/fnc_getConfigCommander.sqf (88%) rename addons/{core => common}/functions/fnc_getConfigGunner.sqf (88%) rename addons/{core => common}/functions/fnc_getDefaultAnim.sqf (94%) rename addons/{core => common}/functions/fnc_getDisplayConfigName.sqf (86%) rename addons/{core => common}/functions/fnc_getDoorTurrets.sqf (92%) rename addons/{core => common}/functions/fnc_getForceWalkStatus.sqf (94%) rename addons/{core => common}/functions/fnc_getHitPoints.sqf (95%) rename addons/{core => common}/functions/fnc_getHitPointsWithSelections.sqf (96%) rename addons/{core => common}/functions/fnc_getInPosition.sqf (99%) rename addons/{core => common}/functions/fnc_getMarkerType.sqf (98%) rename addons/{core => common}/functions/fnc_getName.sqf (93%) rename addons/{core => common}/functions/fnc_getNumberFromMissionSQM.sqf (88%) rename addons/{core => common}/functions/fnc_getPitchBankYaw.sqf (82%) rename addons/{core => common}/functions/fnc_getStringFromMissionSQM.sqf (96%) rename addons/{core => common}/functions/fnc_getTargetAzimuthAndInclination.sqf (92%) rename addons/{core => common}/functions/fnc_getTargetDistance.sqf (96%) rename addons/{core => common}/functions/fnc_getTargetObject.sqf (93%) rename addons/{core => common}/functions/fnc_getTurretCommander.sqf (91%) rename addons/{core => common}/functions/fnc_getTurretConfigPath.sqf (94%) rename addons/{core => common}/functions/fnc_getTurretCopilot.sqf (92%) rename addons/{core => common}/functions/fnc_getTurretGunner.sqf (91%) rename addons/{core => common}/functions/fnc_getTurretIndex.sqf (92%) rename addons/{core => common}/functions/fnc_getTurrets.sqf (95%) rename addons/{core => common}/functions/fnc_getTurretsFFV.sqf (91%) rename addons/{core => common}/functions/fnc_getTurretsOther.sqf (93%) rename addons/{core => common}/functions/fnc_getUavControlPosition.sqf (93%) rename addons/{core => common}/functions/fnc_getVehicleCargo.sqf (92%) rename addons/{core => common}/functions/fnc_getVehicleCodriver.sqf (91%) rename addons/{core => common}/functions/fnc_getVehicleCrew.sqf (93%) rename addons/{core => common}/functions/fnc_getWeaponAzimuthAndInclination.sqf (90%) rename addons/{core => common}/functions/fnc_getWeaponType.sqf (92%) rename addons/{core => common}/functions/fnc_getWindDirection.sqf (95%) rename addons/{core => common}/functions/fnc_goKneeling.sqf (93%) rename addons/{core => common}/functions/fnc_hadamardProduct.sqf (89%) rename addons/{core => common}/functions/fnc_inTransitionAnim.sqf (69%) rename addons/{core => common}/functions/fnc_interpolateFromArray.sqf (80%) rename addons/{core => common}/functions/fnc_isAutoWind.sqf (80%) rename addons/{core => common}/functions/fnc_isEOD.sqf (91%) rename addons/{core => common}/functions/fnc_isEngineer.sqf (86%) rename addons/{core => common}/functions/fnc_isInBuilding.sqf (95%) rename addons/{core => common}/functions/fnc_isMedic.sqf (85%) rename addons/{core => common}/functions/fnc_isPlayer.sqf (87%) rename addons/{core => common}/functions/fnc_isTurnedOut.sqf (95%) rename addons/{core => common}/functions/fnc_letterToCode.sqf (87%) rename addons/{core => common}/functions/fnc_log.sqf (92%) rename addons/{core => common}/functions/fnc_logControls.sqf (83%) rename addons/{core => common}/functions/fnc_logDisplays.sqf (81%) rename addons/{core => common}/functions/fnc_map.sqf (92%) rename addons/{core => common}/functions/fnc_moduleCheckPBOs.sqf (98%) rename addons/{core => common}/functions/fnc_moduleLSDVehicles.sqf (95%) rename addons/{core => common}/functions/fnc_monitor.sqf (77%) rename addons/{core => common}/functions/fnc_muteUnit.sqf (90%) rename addons/{core => common}/functions/fnc_numberToDigits.sqf (94%) rename addons/{core => common}/functions/fnc_numberToDigitsString.sqf (91%) rename addons/{core => common}/functions/fnc_onLoadRscDisplayChannel.sqf (93%) rename addons/{core => common}/functions/fnc_owned.sqf (68%) rename addons/{core => common}/functions/fnc_player.sqf (85%) create mode 100644 addons/common/functions/fnc_playerSide.sqf rename addons/{core => common}/functions/fnc_progressBar.sqf (96%) rename addons/{core => common}/functions/fnc_queueAnimation.sqf (82%) rename addons/{core => common}/functions/fnc_readBooleanParameterFromModule.sqf (94%) rename addons/{core => common}/functions/fnc_readNumericParameterFromModule.sqf (95%) rename addons/{core => common}/functions/fnc_removeActionEventHandler.sqf (95%) rename addons/{core => common}/functions/fnc_removeActionMenuEventHandler.sqf (95%) rename addons/{core => common}/functions/fnc_removeCameraEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_removeCustomEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_removeInfoDisplayEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf (92%) rename addons/{core => common}/functions/fnc_removeMapMarkerCreatedEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_removeScrollWheelEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_restoreVariablesJIP.sqf (92%) rename addons/{core => common}/functions/fnc_revertKeyCodeLocalized.sqf (95%) rename addons/{core => common}/functions/fnc_sanitizeString.sqf (94%) rename addons/{core => common}/functions/fnc_serverLog.sqf (71%) rename addons/{core => common}/functions/fnc_setCaptivityStatus.sqf (96%) rename addons/{core => common}/functions/fnc_setForceWalkStatus.sqf (97%) rename addons/{core => common}/functions/fnc_setKeyDefault.sqf (97%) rename addons/{core => common}/functions/fnc_setName.sqf (90%) rename addons/{core => common}/functions/fnc_setParameter.sqf (90%) rename addons/{core => common}/functions/fnc_setPitchBankYaw.sqf (95%) rename addons/{core => common}/functions/fnc_setVariableJIP.sqf (92%) rename addons/{core => common}/functions/fnc_showUser.sqf (75%) rename addons/{core => common}/functions/fnc_stringToColoredText.sqf (90%) rename addons/{core => common}/functions/fnc_subString.sqf (92%) rename addons/{core => common}/functions/fnc_toBin.sqf (91%) rename addons/{core => common}/functions/fnc_toBitmask.sqf (85%) rename addons/{core => common}/functions/fnc_toHex.sqf (93%) rename addons/{core => common}/functions/fnc_toNumber.sqf (82%) rename addons/{core => common}/functions/fnc_unmuteUnit.sqf (88%) rename addons/{core => common}/script_component.hpp (56%) rename addons/{core => common}/script_macros.hpp (100%) rename addons/{core => common}/scripts/KeyInput/initCanInteractFunction.sqf (91%) rename addons/{core => common}/scripts/KeyInput/initKeys.sqf (98%) rename addons/{core => common}/scripts/KeyInput/initScrollWheel.sqf (86%) rename addons/{core => common}/scripts/Version/checkVersionNumber.sqf (95%) rename addons/{core => common}/scripts/assignedItemFix.sqf (96%) rename addons/{core => common}/scripts/closeMenu.sqf (68%) rename addons/{core => common}/scripts/editKey.sqf (98%) rename addons/{core => common}/scripts/keyInput.sqf (93%) rename addons/{core => common}/scripts/keyRelease.sqf (59%) rename addons/{core => common}/scripts/nextKeys.sqf (98%) rename addons/{core => common}/scripts/openMenu.sqf (98%) rename addons/{core => common}/scripts/readParameters.sqf (96%) rename addons/{core => common}/scripts/toggleState.sqf (92%) rename addons/{core => common}/sounds/ACE_click.wav (100%) rename addons/{core => common}/stringtable.xml (90%) delete mode 100644 addons/core/$PBOPREFIX$ delete mode 100644 addons/core/functions/fnc_playerSide.sqf diff --git a/addons/common/$PBOPREFIX$ b/addons/common/$PBOPREFIX$ new file mode 100644 index 0000000000..a119c03af5 --- /dev/null +++ b/addons/common/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\common \ No newline at end of file diff --git a/addons/core/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp similarity index 100% rename from addons/core/CfgEventHandlers.hpp rename to addons/common/CfgEventHandlers.hpp diff --git a/addons/core/CfgSounds.hpp b/addons/common/CfgSounds.hpp similarity index 100% rename from addons/core/CfgSounds.hpp rename to addons/common/CfgSounds.hpp diff --git a/addons/core/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp similarity index 85% rename from addons/core/CfgVehicles.hpp rename to addons/common/CfgVehicles.hpp index 8c626b9047..bd1ffa8c73 100644 --- a/addons/core/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -14,8 +14,8 @@ class CfgVehicles { showIn3D = 0; onlyForPlayer = 1; shortcut = "DefaultAction"; - condition = "call ACE_Core_UserActionFireCondition"; - statement = "call ACE_Core_UserActionFire"; + condition = "call ACE_Common_UserActionFireCondition"; + statement = "call ACE_Common_UserActionFire"; userActionID = 100; }; }; @@ -26,10 +26,10 @@ class CfgVehicles { class Module_F; class ACE_ModuleCheckPBOs: Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Check PBOs"; - function = "ACE_Core_fnc_moduleCheckPBOs"; + function = "ACE_Common_fnc_moduleCheckPBOs"; scope = 2; isGlobal = 1; icon = PATHTOF(UI\IconCheckPBO_ca.paa); @@ -81,10 +81,10 @@ class CfgVehicles { }; class ACE_ModuleLSDVehicles: Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "LSD Vehicles"; - function = "ACE_Core_fnc_moduleLSDVehicles"; + function = "ACE_Common_fnc_moduleLSDVehicles"; scope = 2; isGlobal = 1; class Arguments { @@ -93,8 +93,8 @@ class CfgVehicles { class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "$STR_ACE_Core_MiscItems"; + author = "$STR_ACE_Common_ACETeam"; + displayName = "$STR_ACE_Common_MiscItems"; transportMaxWeapons = 9001; transportMaxMagazines = 9001; transportMaxItems = 9001; diff --git a/addons/core/CfgWeapons.hpp b/addons/common/CfgWeapons.hpp similarity index 100% rename from addons/core/CfgWeapons.hpp rename to addons/common/CfgWeapons.hpp diff --git a/addons/core/DefaultItems.hpp b/addons/common/DefaultItems.hpp similarity index 100% rename from addons/core/DefaultItems.hpp rename to addons/common/DefaultItems.hpp diff --git a/addons/core/FixAnimations.hpp b/addons/common/FixAnimations.hpp similarity index 100% rename from addons/core/FixAnimations.hpp rename to addons/common/FixAnimations.hpp diff --git a/addons/core/FixPickup.hpp b/addons/common/FixPickup.hpp similarity index 100% rename from addons/core/FixPickup.hpp rename to addons/common/FixPickup.hpp diff --git a/addons/core/HintConfig.hpp b/addons/common/HintConfig.hpp similarity index 100% rename from addons/core/HintConfig.hpp rename to addons/common/HintConfig.hpp diff --git a/addons/core/MainMenu.hpp b/addons/common/MainMenu.hpp similarity index 96% rename from addons/core/MainMenu.hpp rename to addons/common/MainMenu.hpp index 3d30ee2117..12ecb33c2b 100644 --- a/addons/core/MainMenu.hpp +++ b/addons/common/MainMenu.hpp @@ -29,7 +29,7 @@ class ACE_Tile_Base { right = 0; bottom = 0; }; - action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Core_openMenu;"; + action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Common_openMenu;"; animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)"; animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)"; animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)"; @@ -61,7 +61,7 @@ class ACE_Tile_Base { soundEscape[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEscape",0.09,1}; soundPush[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundPush",0.09,1}; style = "0x02 + 0xC0"; - text = "$STR_ACE_Core_Options"; + text = "$STR_ACE_Common_Options"; textureNoShortcut = "#(argb,8,8,3)color(0,0,0,0)"; tooltip = ""; tooltipColorBox[] = {1,1,1,1}; diff --git a/addons/core/MenuConfig.hpp b/addons/common/MenuConfig.hpp similarity index 84% rename from addons/core/MenuConfig.hpp rename to addons/common/MenuConfig.hpp index 5326b648eb..0acc081e65 100644 --- a/addons/core/MenuConfig.hpp +++ b/addons/common/MenuConfig.hpp @@ -3,7 +3,7 @@ #define VSPACE 0.3 #define BORDER 0.1 -class ACE_Core_Interactive_Button_Base { +class ACE_Common_Interactive_Button_Base { tooltip = ""; action = ""; @@ -46,7 +46,7 @@ class ACE_Core_Interactive_Button_Base { #define VSPACE2 0.05 #define BORDER 0.1 -class ACE_Core_Text_Button_Base { +class ACE_Common_Text_Button_Base { idc = 2; moving = 0; text = ""; @@ -65,10 +65,10 @@ class ACE_Core_Text_Button_Base { h = 0; }; -class ACE_Core_OptionsMenu_Dialog { +class ACE_Common_OptionsMenu_Dialog { idd = -1; movingEnable = true; - onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Core_MenuDialog', _dlgMenuDialog];"; + onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Common_MenuDialog', _dlgMenuDialog];"; objects[] = {}; class controlsBackground { @@ -95,7 +95,7 @@ class ACE_Core_OptionsMenu_Dialog { class Header { idc = 2; moving = 0; - text = "$STR_ACE_Core_Options"; + text = "$STR_ACE_Common_Options"; font = "PuristaMedium"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; lineSpacing = 0; @@ -112,7 +112,7 @@ class ACE_Core_OptionsMenu_Dialog { h = 0.3 / 9 * safezoneH; }; - class ACE_Logo : ACE_Core_Interactive_Button_Base { + class ACE_Logo : ACE_Common_Interactive_Button_Base { action = "closeDialog 0;"; type = 0; style = 48; @@ -128,7 +128,7 @@ class ACE_Core_OptionsMenu_Dialog { }; class controls { - class Text_Button0 : ACE_Core_Text_Button_Base { + class Text_Button0 : ACE_Common_Text_Button_Base { idc = 100; style = 0 + 0x800; x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; @@ -234,8 +234,8 @@ class ACE_Core_OptionsMenu_Dialog { ////////////////////////////////////////////////// - class Interactive_Button0 : ACE_Core_Interactive_Button_Base { - action = "ACE_Core_keySet = -1; [0] spawn ACE_Core_editKey"; + class Interactive_Button0 : ACE_Common_Interactive_Button_Base { + action = "ACE_Common_keySet = -1; [0] spawn ACE_Common_editKey"; sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 200; style = 2 + 0x800; @@ -246,115 +246,115 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_Button1 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [1] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [1] spawn ACE_Common_editKey"; idc = 201; y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button2 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [2] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [2] spawn ACE_Common_editKey"; idc = 202; y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button3 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [3] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [3] spawn ACE_Common_editKey"; idc = 203; y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button4 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [4] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [4] spawn ACE_Common_editKey"; idc = 204; y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button5 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [5] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [5] spawn ACE_Common_editKey"; idc = 205; y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button6 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [6] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [6] spawn ACE_Common_editKey"; idc = 206; y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button7 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [7] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [7] spawn ACE_Common_editKey"; idc = 207; y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button8 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [8] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [8] spawn ACE_Common_editKey"; idc = 208; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button9 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [9] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [9] spawn ACE_Common_editKey"; idc = 209; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button10 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [10] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [10] spawn ACE_Common_editKey"; idc = 210; y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button11 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [11] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [11] spawn ACE_Common_editKey"; idc = 211; y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button12 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [12] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [12] spawn ACE_Common_editKey"; idc = 212; y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button13 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [13] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [13] spawn ACE_Common_editKey"; idc = 213; y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button14 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [14] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [14] spawn ACE_Common_editKey"; idc = 214; y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button15 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [15] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [15] spawn ACE_Common_editKey"; idc = 215; y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button16 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [16] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [16] spawn ACE_Common_editKey"; idc = 216; y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button17 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [17] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [17] spawn ACE_Common_editKey"; idc = 217; y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button18 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [18] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [18] spawn ACE_Common_editKey"; idc = 218; y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button19 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [19] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [19] spawn ACE_Common_editKey"; idc = 219; y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; }; @@ -596,8 +596,8 @@ class ACE_Core_OptionsMenu_Dialog { ////////////////////////////////////////////////// - class Interactive_CheckboxButton0 : ACE_Core_Interactive_Button_Base { - action = "[0] call ACE_Core_toggleState"; + class Interactive_CheckboxButton0 : ACE_Common_Interactive_Button_Base { + action = "[0] call ACE_Common_toggleState"; idc = 500; colorBackground[] = {0, 0, 0, 0}; colorBackgroundActive[] = {0, 0, 0, 0}; @@ -609,115 +609,115 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_CheckboxButton1 : Interactive_CheckboxButton0 { - action = "[1] call ACE_Core_toggleState"; + action = "[1] call ACE_Common_toggleState"; idc = 501; y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton2 : Interactive_CheckboxButton0 { - action = "[2] call ACE_Core_toggleState"; + action = "[2] call ACE_Common_toggleState"; idc = 502; y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton3 : Interactive_CheckboxButton0 { - action = "[3] call ACE_Core_toggleState"; + action = "[3] call ACE_Common_toggleState"; idc = 503; y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton4 : Interactive_CheckboxButton0 { - action = "[4] call ACE_Core_toggleState"; + action = "[4] call ACE_Common_toggleState"; idc = 504; y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton5 : Interactive_CheckboxButton0 { - action = "[5] call ACE_Core_toggleState"; + action = "[5] call ACE_Common_toggleState"; idc = 505; y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton6 : Interactive_CheckboxButton0 { - action = "[6] call ACE_Core_toggleState"; + action = "[6] call ACE_Common_toggleState"; idc = 506; y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton7 : Interactive_CheckboxButton0 { - action = "[7] call ACE_Core_toggleState"; + action = "[7] call ACE_Common_toggleState"; idc = 507; y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton8 : Interactive_CheckboxButton0 { - action = "[8] call ACE_Core_toggleState"; + action = "[8] call ACE_Common_toggleState"; idc = 508; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton9 : Interactive_CheckboxButton0 { - action = "[9] call ACE_Core_toggleState"; + action = "[9] call ACE_Common_toggleState"; idc = 509; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton10 : Interactive_CheckboxButton0 { - action = "[10] call ACE_Core_toggleState"; + action = "[10] call ACE_Common_toggleState"; idc = 510; y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton11 : Interactive_CheckboxButton0 { - action = "[11] call ACE_Core_toggleState"; + action = "[11] call ACE_Common_toggleState"; idc = 511; y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton12 : Interactive_CheckboxButton0 { - action = "[12] call ACE_Core_toggleState"; + action = "[12] call ACE_Common_toggleState"; idc = 512; y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton13 : Interactive_CheckboxButton0 { - action = "[13] call ACE_Core_toggleState"; + action = "[13] call ACE_Common_toggleState"; idc = 513; y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton14 : Interactive_CheckboxButton0 { - action = "[14] call ACE_Core_toggleState"; + action = "[14] call ACE_Common_toggleState"; idc = 514; y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton15 : Interactive_CheckboxButton0 { - action = "[15] call ACE_Core_toggleState"; + action = "[15] call ACE_Common_toggleState"; idc = 515; y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton16 : Interactive_CheckboxButton0 { - action = "[16] call ACE_Core_toggleState"; + action = "[16] call ACE_Common_toggleState"; idc = 516; y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton17 : Interactive_CheckboxButton0 { - action = "[17] call ACE_Core_toggleState"; + action = "[17] call ACE_Common_toggleState"; idc = 517; y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton18 : Interactive_CheckboxButton0 { - action = "[18] call ACE_Core_toggleState"; + action = "[18] call ACE_Common_toggleState"; idc = 518; y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton19 : Interactive_CheckboxButton0 { - action = "[19] call ACE_Core_toggleState"; + action = "[19] call ACE_Common_toggleState"; idc = 519; y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; }; @@ -735,7 +735,7 @@ class ACE_Core_OptionsMenu_Dialog { }; /*class TextBox_Key_Shift : TextBox_KeyChange { - text = "$STR_ACE_Core_Shift"; + text = "$STR_ACE_Common_Shift"; idc = 21; colorText[] = {0.25,0.25,0.25,1}; colorBackground[] = {0,0,0,0}; @@ -746,22 +746,22 @@ class ACE_Core_OptionsMenu_Dialog { }; class TextBox_Key_Control : TextBox_Key_Shift { - text = "$STR_ACE_Core_Ctrl"; + text = "$STR_ACE_Common_Ctrl"; idc = 22; x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Alt : TextBox_Key_Shift { - text = "$STR_ACE_Core_Alt"; + text = "$STR_ACE_Common_Alt"; idc = 23; x = (3 / 4 * HSPACE2 + 7.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; };*/ class TextBox_Key_Shift : Interactive_Button0 { - action = "ACE_Core_keyNewTemp = [42, [false, false, false], 42];"; - text = "$STR_ACE_Core_Shift"; + action = "ACE_Common_keyNewTemp = [42, [false, false, false], 42];"; + text = "$STR_ACE_Common_Shift"; sizeEx = "0.7 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 21; colorText[] = {1,1,1,1}; @@ -773,40 +773,40 @@ class ACE_Core_OptionsMenu_Dialog { }; class TextBox_Key_Control : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [29, [false, false, false], 29];"; - text = "$STR_ACE_Core_Ctrl"; + action = "ACE_Common_keyNewTemp = [29, [false, false, false], 29];"; + text = "$STR_ACE_Common_Ctrl"; idc = 22; x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Alt : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [56, [false, false, false], 56];"; - text = "$STR_ACE_Core_Alt"; + action = "ACE_Common_keyNewTemp = [56, [false, false, false], 56];"; + text = "$STR_ACE_Common_Alt"; idc = 23; x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Shift_Right : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [54, [false, false, false], 54];"; - text = "$STR_ACE_Core_Shift_Right"; + action = "ACE_Common_keyNewTemp = [54, [false, false, false], 54];"; + text = "$STR_ACE_Common_Shift_Right"; idc = 27; x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Control_Right : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [157, [false, false, false], 157];"; - text = "$STR_ACE_Core_Ctrl_Right"; + action = "ACE_Common_keyNewTemp = [157, [false, false, false], 157];"; + text = "$STR_ACE_Common_Ctrl_Right"; idc = 28; x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Alt_Right : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [184, [false, false, false], 184];"; - text = "$STR_ACE_Core_Alt_Right"; + action = "ACE_Common_keyNewTemp = [184, [false, false, false], 184];"; + text = "$STR_ACE_Common_Alt_Right"; idc = 29; x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; @@ -825,16 +825,16 @@ class ACE_Core_OptionsMenu_Dialog { }; class TextBox_Key_Default : TextBox_Key_Shift { - action = "call ACE_Core_keysetDefault"; - text = "$STR_ACE_Core_KeyDefault"; + action = "call ACE_Common_keysetDefault"; + text = "$STR_ACE_Common_KeyDefault"; idc = 31; x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_None : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [0, [false, false, false], 0];"; - text = "$STR_ACE_Core_KeyNone"; + action = "ACE_Common_keyNewTemp = [0, [false, false, false], 0];"; + text = "$STR_ACE_Common_KeyNone"; idc = 32; x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; @@ -853,8 +853,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonV : Interactive_Button0 { - action = "ACE_Core_keySet = 1"; - text = "$STR_ACE_Core_Save"; + action = "ACE_Common_keySet = 1"; + text = "$STR_ACE_Common_Save"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 25; colorBackground[] = {0,0,0,0}; @@ -865,8 +865,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonW : Interactive_ButtonV { - action = "ACE_Core_keySet = -1"; - text = "$STR_ACE_Core_Cancel"; + action = "ACE_Common_keySet = -1"; + text = "$STR_ACE_Common_Cancel"; idc = 26; x = (HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; @@ -875,8 +875,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonX : Interactive_Button0 { - action = "ACE_Core_keySave = 1; closeDialog 0"; - text = "$STR_ACE_Core_Save"; + action = "ACE_Common_keySave = 1; closeDialog 0"; + text = "$STR_ACE_Common_Save"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 10; x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 2.5 * 0.1)) * safezoneW + safezoneX; @@ -886,8 +886,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonY : Interactive_Button0 { - action = "ACE_Core_keySave = -1; closeDialog 0"; - text = "$STR_ACE_Core_Cancel"; + action = "ACE_Common_keySave = -1; closeDialog 0"; + text = "$STR_ACE_Common_Cancel"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 11; x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 1 * 0.1)) * safezoneW + safezoneX; @@ -896,9 +896,9 @@ class ACE_Core_OptionsMenu_Dialog { h = 0.3 / 9 * safezoneH; }; - class Interactive_ButtonA : ACE_Core_Interactive_Button_Base { - action = "false call ACE_Core_nextKeys"; - text = "$STR_ACE_Core_Prev"; + class Interactive_ButtonA : ACE_Common_Interactive_Button_Base { + action = "false call ACE_Common_nextKeys"; + text = "$STR_ACE_Common_Prev"; idc = 12; style = 2 + 0x800; x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; @@ -908,13 +908,13 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonB : Interactive_ButtonA { - action = "true call ACE_Core_nextKeys"; - text = "$STR_ACE_Core_Next"; + action = "true call ACE_Common_nextKeys"; + text = "$STR_ACE_Common_Next"; idc = 13; x = (HSPACE2 + 3 * 0.1 + 2.0 / 16) * safezoneW + safezoneX; }; - class Interactive_ButtonC : ACE_Core_Text_Button_Base { + class Interactive_ButtonC : ACE_Common_Text_Button_Base { text = ""; idc = 14; style = 2 + 0x800; diff --git a/addons/core/NoVoice.hpp b/addons/common/NoVoice.hpp similarity index 98% rename from addons/core/NoVoice.hpp rename to addons/common/NoVoice.hpp index 7740ea071b..adfc674707 100644 --- a/addons/core/NoVoice.hpp +++ b/addons/common/NoVoice.hpp @@ -206,7 +206,7 @@ class ACE_RadioProtocolNoRadio: RadioProtocolBase { class CfgVoice { class ACE_NoVoice { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; protocol = "ACE_RadioProtocolNoRadio"; variants[] = {1}; directories[] = {"",""}; @@ -214,12 +214,12 @@ class CfgVoice { scope = 2; voiceType = ""; icon = "\a3\Ui_f\data\Map\Markers\Flags\nato_ca.paa"; - displayName = "$STR_ACE_Core_NoVoice"; + displayName = "$STR_ACE_Common_NoVoice"; }; }; class CfgVoiceTypes { class ACE_NoVoice { - name = "$STR_ACE_Core_NoVoice"; + name = "$STR_ACE_Common_NoVoice"; voices[] = {"ACE_NoVoice","ACE_NoVoice","ACE_NoVoice"}; preview = "ACE_NoVoice"; alternative = ""; diff --git a/addons/core/ProgressScreen.hpp b/addons/common/ProgressScreen.hpp similarity index 84% rename from addons/core/ProgressScreen.hpp rename to addons/common/ProgressScreen.hpp index ae2fa06e30..3c2858c07f 100644 --- a/addons/core/ProgressScreen.hpp +++ b/addons/common/ProgressScreen.hpp @@ -1,8 +1,8 @@ -class ACE_Core_ProgressBar_Dialog { +class ACE_Common_ProgressBar_Dialog { idd = -1; movingEnable = false; - onLoad = "uiNamespace setVariable ['ACE_Core_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Core_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; + onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; objects[] = {}; class controlsBackground { @@ -66,10 +66,10 @@ class ACE_Core_ProgressBar_Dialog { }; }; -class ACE_Core_DisableMouse_Dialog { +class ACE_Common_DisableMouse_Dialog { idd = -1; movingEnable = false; - onLoad = "uiNamespace setVariable ['ACE_Core_dlgDisableMouse', _this select 0];"; + onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];"; objects[] = {}; class controlsBackground { class Background { diff --git a/addons/core/RscInfoType.hpp b/addons/common/RscInfoType.hpp similarity index 97% rename from addons/core/RscInfoType.hpp rename to addons/common/RscInfoType.hpp index 91937c08fb..8bc45752cf 100644 --- a/addons/core/RscInfoType.hpp +++ b/addons/common/RscInfoType.hpp @@ -23,5 +23,5 @@ class RscDisplayInventory { }; class RscDisplayChannel { - onLoad = "_this call ACE_Core_fnc_onLoadRscDisplayChannel;"; + onLoad = QUOTE( _this call GVAR(onLoadRscDisplayChannel) ); }; diff --git a/addons/core/UI/IconCheckPBO_ca.paa b/addons/common/UI/IconCheckPBO_ca.paa similarity index 100% rename from addons/core/UI/IconCheckPBO_ca.paa rename to addons/common/UI/IconCheckPBO_ca.paa diff --git a/addons/core/UI/blank_CO.paa b/addons/common/UI/blank_CO.paa similarity index 100% rename from addons/core/UI/blank_CO.paa rename to addons/common/UI/blank_CO.paa diff --git a/addons/core/UI/box_checked_ca.paa b/addons/common/UI/box_checked_ca.paa similarity index 100% rename from addons/core/UI/box_checked_ca.paa rename to addons/common/UI/box_checked_ca.paa diff --git a/addons/core/UI/box_unchecked_ca.paa b/addons/common/UI/box_unchecked_ca.paa similarity index 100% rename from addons/core/UI/box_unchecked_ca.paa rename to addons/common/UI/box_unchecked_ca.paa diff --git a/addons/core/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf similarity index 98% rename from addons/core/XEH_postInit.sqf rename to addons/common/XEH_postInit.sqf index 893af442bc..4367367f74 100644 --- a/addons/core/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -1,4 +1,4 @@ -// ACE - Core +// ACE - Common #include "script_component.hpp" QGVAR(remoteFnc) addPublicVariableEventHandler { @@ -8,7 +8,7 @@ QGVAR(remoteFnc) addPublicVariableEventHandler { [missionNamespace] call FUNC(executePersistent); // check previous version number from profile -_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Core" >> "version"); +_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version"); _previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""]; if (_currentVersion != _previousVersion) then { diff --git a/addons/core/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf similarity index 99% rename from addons/core/XEH_preInit.sqf rename to addons/common/XEH_preInit.sqf index 953f25fa52..63421aa0cb 100644 --- a/addons/core/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -// ACE Core Function +// ACE Common Function PREP(addActionEventHandler); PREP(addActionMenuEventHandler); PREP(addCameraEventHandler); diff --git a/addons/core/config.cpp b/addons/common/config.cpp similarity index 90% rename from addons/core/config.cpp rename to addons/common/config.cpp index b8ca86acb3..1199529deb 100644 --- a/addons/core/config.cpp +++ b/addons/common/config.cpp @@ -21,14 +21,6 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" -class CfgFactionClasses { - class PREFIX { - displayName = QUOTE(PREFIX); - priority = 0.1; - side = 7; - }; -}; - class ACE_Rsc_Display_Base { idd = -1; type = 0; @@ -70,7 +62,7 @@ class GVAR(canInteractConditions) { class GVAR(Options) { class enableNumberHotkeys { - displayName = "$STR_ACE_Core_EnableNumberHotkeys"; + displayName = "$STR_ACE_Common_EnableNumberHotkeys"; default = 1; }; }; diff --git a/addons/core/data/agm_default.rvmat b/addons/common/data/agm_default.rvmat similarity index 100% rename from addons/core/data/agm_default.rvmat rename to addons/common/data/agm_default.rvmat diff --git a/addons/core/functions/fnc_addActionEventHandler.sqf b/addons/common/functions/fnc_addActionEventHandler.sqf similarity index 97% rename from addons/core/functions/fnc_addActionEventHandler.sqf rename to addons/common/functions/fnc_addActionEventHandler.sqf index 7ecf3481b8..e540bde53f 100644 --- a/addons/core/functions/fnc_addActionEventHandler.sqf +++ b/addons/common/functions/fnc_addActionEventHandler.sqf @@ -12,7 +12,7 @@ * Return value: * ID of the action (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_action", "_condition", "_statement", "_name", "_actionsVar", "_actionID", "_actions", "_id", "_actionIDs"]; diff --git a/addons/core/functions/fnc_addActionMenuEventHandler.sqf b/addons/common/functions/fnc_addActionMenuEventHandler.sqf similarity index 97% rename from addons/core/functions/fnc_addActionMenuEventHandler.sqf rename to addons/common/functions/fnc_addActionMenuEventHandler.sqf index d3976c09d4..6878f78575 100644 --- a/addons/core/functions/fnc_addActionMenuEventHandler.sqf +++ b/addons/common/functions/fnc_addActionMenuEventHandler.sqf @@ -16,7 +16,7 @@ * Return value: * ID of the action (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_displayName", "_action", "_condition", "_statement", "_condition2", "_statement2", "_priority", "_name", "_actionsVar", "_id", "_actionIDs", "_actions", "_nameVar", "_addAction", "_actionID"]; diff --git a/addons/core/functions/fnc_addCameraEventHandler.sqf b/addons/common/functions/fnc_addCameraEventHandler.sqf similarity index 95% rename from addons/core/functions/fnc_addCameraEventHandler.sqf rename to addons/common/functions/fnc_addCameraEventHandler.sqf index 1159886701..b0aaeac8e0 100644 --- a/addons/core/functions/fnc_addCameraEventHandler.sqf +++ b/addons/common/functions/fnc_addCameraEventHandler.sqf @@ -10,7 +10,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addCustomEventHandler.sqf b/addons/common/functions/fnc_addCustomEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addCustomEventHandler.sqf rename to addons/common/functions/fnc_addCustomEventHandler.sqf index 28e2a44950..975a191942 100644 --- a/addons/core/functions/fnc_addCustomEventHandler.sqf +++ b/addons/common/functions/fnc_addCustomEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_type", "_statement", "_name", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addInfoDisplayEventHandler.sqf b/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addInfoDisplayEventHandler.sqf rename to addons/common/functions/fnc_addInfoDisplayEventHandler.sqf index 07fe63aaac..08258db97d 100644 --- a/addons/core/functions/fnc_addInfoDisplayEventHandler.sqf +++ b/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf @@ -10,7 +10,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_type", "_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf b/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf rename to addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf index 7ecb461025..a7b83c1f1b 100644 --- a/addons/core/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf +++ b/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addMapMarkerCreatedEventHandler.sqf b/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addMapMarkerCreatedEventHandler.sqf rename to addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf index c4bb59d619..10631265bc 100644 --- a/addons/core/functions/fnc_addMapMarkerCreatedEventHandler.sqf +++ b/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addScrollWheelEventHandler.sqf b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addScrollWheelEventHandler.sqf rename to addons/common/functions/fnc_addScrollWheelEventHandler.sqf index ccec2db493..07ff213133 100644 --- a/addons/core/functions/fnc_addScrollWheelEventHandler.sqf +++ b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addUnloadEventhandler.sqf b/addons/common/functions/fnc_addUnloadEventhandler.sqf similarity index 83% rename from addons/core/functions/fnc_addUnloadEventhandler.sqf rename to addons/common/functions/fnc_addUnloadEventhandler.sqf index a60b8443b1..4d279c0f7a 100644 --- a/addons/core/functions/fnc_addUnloadEventhandler.sqf +++ b/addons/common/functions/fnc_addUnloadEventhandler.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_dlg"; diff --git a/addons/core/functions/fnc_adminKick.sqf b/addons/common/functions/fnc_adminKick.sqf similarity index 77% rename from addons/core/functions/fnc_adminKick.sqf rename to addons/common/functions/fnc_adminKick.sqf index 7f578abf46..ad8b133064 100644 --- a/addons/core/functions/fnc_adminKick.sqf +++ b/addons/common/functions/fnc_adminKick.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_name"; diff --git a/addons/core/functions/fnc_ambientBrightness.sqf b/addons/common/functions/fnc_ambientBrightness.sqf similarity index 83% rename from addons/core/functions/fnc_ambientBrightness.sqf rename to addons/common/functions/fnc_ambientBrightness.sqf index 1fa6e15c4f..2ab3be4834 100644 --- a/addons/core/functions/fnc_ambientBrightness.sqf +++ b/addons/common/functions/fnc_ambientBrightness.sqf @@ -9,6 +9,6 @@ * Return value: * Ambient brightness (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" sunOrMoon * sunOrMoon + moonIntensity/5 min 1 diff --git a/addons/core/functions/fnc_applyForceWalkStatus.sqf b/addons/common/functions/fnc_applyForceWalkStatus.sqf similarity index 89% rename from addons/core/functions/fnc_applyForceWalkStatus.sqf rename to addons/common/functions/fnc_applyForceWalkStatus.sqf index 7d5cba4d56..c090c236db 100644 --- a/addons/core/functions/fnc_applyForceWalkStatus.sqf +++ b/addons/common/functions/fnc_applyForceWalkStatus.sqf @@ -15,7 +15,7 @@ Returns: Example: [ACE_Player] call FUNC(applyForceWalkStatus) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_forceWalkNumber"]; diff --git a/addons/core/functions/fnc_binarizeNumber.sqf b/addons/common/functions/fnc_binarizeNumber.sqf similarity index 93% rename from addons/core/functions/fnc_binarizeNumber.sqf rename to addons/common/functions/fnc_binarizeNumber.sqf index 93914fc2f6..bba135b9b9 100644 --- a/addons/core/functions/fnc_binarizeNumber.sqf +++ b/addons/common/functions/fnc_binarizeNumber.sqf @@ -10,7 +10,7 @@ * Return value: * Booleans (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_array", "_index", "_rest"]; diff --git a/addons/core/functions/fnc_callCustomEventHandlers.sqf b/addons/common/functions/fnc_callCustomEventHandlers.sqf similarity index 93% rename from addons/core/functions/fnc_callCustomEventHandlers.sqf rename to addons/common/functions/fnc_callCustomEventHandlers.sqf index ff04610af2..9d2b7c2370 100644 --- a/addons/core/functions/fnc_callCustomEventHandlers.sqf +++ b/addons/common/functions/fnc_callCustomEventHandlers.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_type", "_argument", "_name", "_actions"]; diff --git a/addons/core/functions/fnc_callCustomEventHandlersGlobal.sqf b/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf similarity index 89% rename from addons/core/functions/fnc_callCustomEventHandlersGlobal.sqf rename to addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf index cd4cc3a5fd..5333a2e065 100644 --- a/addons/core/functions/fnc_callCustomEventHandlersGlobal.sqf +++ b/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf @@ -11,6 +11,6 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" [_this, QUOTE(FUNC(callCustomEventHandlers)), 2] call FUNC(execRemoteFnc); diff --git a/addons/core/functions/fnc_canGetInPosition.sqf b/addons/common/functions/fnc_canGetInPosition.sqf similarity index 99% rename from addons/core/functions/fnc_canGetInPosition.sqf rename to addons/common/functions/fnc_canGetInPosition.sqf index 6905552adb..9aaaa4518a 100644 --- a/addons/core/functions/fnc_canGetInPosition.sqf +++ b/addons/common/functions/fnc_canGetInPosition.sqf @@ -14,7 +14,7 @@ * Return Value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define CANGETINDRIVER (isNull (driver _vehicle) || {!alive driver _vehicle}) && {!lockedDriver _vehicle} && {getNumber (_config >> "isUav") != 1} #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1} diff --git a/addons/core/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf similarity index 80% rename from addons/core/functions/fnc_canInteractWith.sqf rename to addons/common/functions/fnc_canInteractWith.sqf index d9c3dea9f5..741c1474b4 100644 --- a/addons/core/functions/fnc_canInteractWith.sqf +++ b/addons/common/functions/fnc_canInteractWith.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_target", "_owner"]; diff --git a/addons/core/functions/fnc_canUseWeapon.sqf b/addons/common/functions/fnc_canUseWeapon.sqf similarity index 85% rename from addons/core/functions/fnc_canUseWeapon.sqf rename to addons/common/functions/fnc_canUseWeapon.sqf index 5dbe764fe3..4c686089df 100644 --- a/addons/core/functions/fnc_canUseWeapon.sqf +++ b/addons/common/functions/fnc_canUseWeapon.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" // returns true if the unit is on foot or in a ffv position diff --git a/addons/core/functions/fnc_changeProjectileDirection.sqf b/addons/common/functions/fnc_changeProjectileDirection.sqf similarity index 97% rename from addons/core/functions/fnc_changeProjectileDirection.sqf rename to addons/common/functions/fnc_changeProjectileDirection.sqf index 7f864d1b3c..43ff5243de 100644 --- a/addons/core/functions/fnc_changeProjectileDirection.sqf +++ b/addons/common/functions/fnc_changeProjectileDirection.sqf @@ -12,7 +12,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_projectile", "_adjustDir", "_adjustUp", "_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel"]; diff --git a/addons/core/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf similarity index 94% rename from addons/core/functions/fnc_checkPBOs.sqf rename to addons/common/functions/fnc_checkPBOs.sqf index 5329d65f4c..42f71ba8bd 100644 --- a/addons/core/functions/fnc_checkPBOs.sqf +++ b/addons/common/functions/fnc_checkPBOs.sqf @@ -14,7 +14,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_mode", "_checkAll", "_whitelist", "_logic"]; diff --git a/addons/core/functions/fnc_claim.sqf b/addons/common/functions/fnc_claim.sqf similarity index 94% rename from addons/core/functions/fnc_claim.sqf rename to addons/common/functions/fnc_claim.sqf index 09f4985d5d..3da556fe9f 100644 --- a/addons/core/functions/fnc_claim.sqf +++ b/addons/common/functions/fnc_claim.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_target", "_lockTarget", "_owner"]; diff --git a/addons/core/functions/fnc_closeDialogIfTargetMoves.sqf b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf similarity index 96% rename from addons/core/functions/fnc_closeDialogIfTargetMoves.sqf rename to addons/common/functions/fnc_closeDialogIfTargetMoves.sqf index 4c084b101a..417adffdf3 100644 --- a/addons/core/functions/fnc_closeDialogIfTargetMoves.sqf +++ b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf @@ -10,7 +10,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _this spawn { _target = _this select 0; diff --git a/addons/core/functions/fnc_codeToLetter.sqf b/addons/common/functions/fnc_codeToLetter.sqf similarity index 87% rename from addons/core/functions/fnc_codeToLetter.sqf rename to addons/common/functions/fnc_codeToLetter.sqf index b054db61b1..31e7241e16 100644 --- a/addons/core/functions/fnc_codeToLetter.sqf +++ b/addons/common/functions/fnc_codeToLetter.sqf @@ -1,4 +1,4 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" ["", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] select ([2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] find (_this select 0)) + 1 diff --git a/addons/core/functions/fnc_codeToString.sqf b/addons/common/functions/fnc_codeToString.sqf similarity index 90% rename from addons/core/functions/fnc_codeToString.sqf rename to addons/common/functions/fnc_codeToString.sqf index c7902d513c..fa7187cae9 100644 --- a/addons/core/functions/fnc_codeToString.sqf +++ b/addons/common/functions/fnc_codeToString.sqf @@ -9,7 +9,7 @@ * Return value: * Code (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_function"; diff --git a/addons/core/functions/fnc_convertKeyCode.sqf b/addons/common/functions/fnc_convertKeyCode.sqf similarity index 91% rename from addons/core/functions/fnc_convertKeyCode.sqf rename to addons/common/functions/fnc_convertKeyCode.sqf index bc12a47cfe..67c316fda8 100644 --- a/addons/core/functions/fnc_convertKeyCode.sqf +++ b/addons/common/functions/fnc_convertKeyCode.sqf @@ -12,7 +12,7 @@ * Return value: * Key code (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define KEY_MODIFIERS [42, 54, 29, 157, 56, 184] diff --git a/addons/core/functions/fnc_currentChannel.sqf b/addons/common/functions/fnc_currentChannel.sqf similarity index 92% rename from addons/core/functions/fnc_currentChannel.sqf rename to addons/common/functions/fnc_currentChannel.sqf index 382a30fcc3..15fd89a464 100644 --- a/addons/core/functions/fnc_currentChannel.sqf +++ b/addons/common/functions/fnc_currentChannel.sqf @@ -9,7 +9,7 @@ * Return value: * The current channel. Can be "group", "side", "global", "command", "vehicle" or "direct" (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define CHANNELS ["group", "side", "global", "command", "vehicle", "direct"] #define CHANNELS_LOCALIZED [localize "str_channel_group", localize "str_channel_side", localize "str_channel_global", localize "str_channel_command", localize "str_channel_vehicle", localize "str_channel_direct"] diff --git a/addons/core/functions/fnc_disableUserInput.sqf b/addons/common/functions/fnc_disableUserInput.sqf similarity index 98% rename from addons/core/functions/fnc_disableUserInput.sqf rename to addons/common/functions/fnc_disableUserInput.sqf index 3f8d1492e7..324f02d1b1 100644 --- a/addons/core/functions/fnc_disableUserInput.sqf +++ b/addons/common/functions/fnc_disableUserInput.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_state", "_dlg"]; diff --git a/addons/core/functions/fnc_displayText.sqf b/addons/common/functions/fnc_displayText.sqf similarity index 96% rename from addons/core/functions/fnc_displayText.sqf rename to addons/common/functions/fnc_displayText.sqf index 0ae5da307a..36feff14c0 100644 --- a/addons/core/functions/fnc_displayText.sqf +++ b/addons/common/functions/fnc_displayText.sqf @@ -12,7 +12,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define DEFAULT_PLAY_SOUND false #define DEFAULT_DELAY 2 diff --git a/addons/core/functions/fnc_displayTextPicture.sqf b/addons/common/functions/fnc_displayTextPicture.sqf similarity index 90% rename from addons/core/functions/fnc_displayTextPicture.sqf rename to addons/common/functions/fnc_displayTextPicture.sqf index 107b68f134..4b9a0255af 100644 --- a/addons/core/functions/fnc_displayTextPicture.sqf +++ b/addons/common/functions/fnc_displayTextPicture.sqf @@ -10,7 +10,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_text", "_image"]; diff --git a/addons/core/functions/fnc_displayTextStructured.sqf b/addons/common/functions/fnc_displayTextStructured.sqf similarity index 95% rename from addons/core/functions/fnc_displayTextStructured.sqf rename to addons/common/functions/fnc_displayTextStructured.sqf index f0f19740ab..aed3f0555a 100644 --- a/addons/core/functions/fnc_displayTextStructured.sqf +++ b/addons/common/functions/fnc_displayTextStructured.sqf @@ -10,7 +10,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_text", "_size", "_isShown", "_ctrlHint"]; diff --git a/addons/core/functions/fnc_doAnimation.sqf b/addons/common/functions/fnc_doAnimation.sqf similarity index 97% rename from addons/core/functions/fnc_doAnimation.sqf rename to addons/common/functions/fnc_doAnimation.sqf index 361cefa5c0..fb1483fcd1 100644 --- a/addons/core/functions/fnc_doAnimation.sqf +++ b/addons/common/functions/fnc_doAnimation.sqf @@ -14,7 +14,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_animation", "_priority", "_force"]; diff --git a/addons/core/functions/fnc_endRadioTransmission.sqf b/addons/common/functions/fnc_endRadioTransmission.sqf similarity index 93% rename from addons/core/functions/fnc_endRadioTransmission.sqf rename to addons/common/functions/fnc_endRadioTransmission.sqf index 175062e9ae..5d6ffe19b0 100644 --- a/addons/core/functions/fnc_endRadioTransmission.sqf +++ b/addons/common/functions/fnc_endRadioTransmission.sqf @@ -10,7 +10,7 @@ * None. * */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" // ACRE if (isClass (configFile >> "CfgPatches" >> "acre_main")) then { diff --git a/addons/core/functions/fnc_execPersistentFnc.sqf b/addons/common/functions/fnc_execPersistentFnc.sqf similarity index 97% rename from addons/core/functions/fnc_execPersistentFnc.sqf rename to addons/common/functions/fnc_execPersistentFnc.sqf index 24ddfe2611..542466d60c 100644 --- a/addons/core/functions/fnc_execPersistentFnc.sqf +++ b/addons/common/functions/fnc_execPersistentFnc.sqf @@ -12,7 +12,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_arguments", "_function", "_unit", "_name"]; diff --git a/addons/core/functions/fnc_execRemoteFnc.sqf b/addons/common/functions/fnc_execRemoteFnc.sqf similarity index 97% rename from addons/core/functions/fnc_execRemoteFnc.sqf rename to addons/common/functions/fnc_execRemoteFnc.sqf index de962c0615..e4091bf2f6 100644 --- a/addons/core/functions/fnc_execRemoteFnc.sqf +++ b/addons/common/functions/fnc_execRemoteFnc.sqf @@ -15,7 +15,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_arguments", "_function", "_unit", "_id"]; diff --git a/addons/core/functions/fnc_executePersistent.sqf b/addons/common/functions/fnc_executePersistent.sqf similarity index 87% rename from addons/core/functions/fnc_executePersistent.sqf rename to addons/common/functions/fnc_executePersistent.sqf index b77211901f..8e8f7375b0 100644 --- a/addons/core/functions/fnc_executePersistent.sqf +++ b/addons/common/functions/fnc_executePersistent.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_target"; diff --git a/addons/core/functions/fnc_exportConfig.sqf b/addons/common/functions/fnc_exportConfig.sqf similarity index 96% rename from addons/core/functions/fnc_exportConfig.sqf rename to addons/common/functions/fnc_exportConfig.sqf index cd6ccaffd4..3b157f0a81 100644 --- a/addons/core/functions/fnc_exportConfig.sqf +++ b/addons/common/functions/fnc_exportConfig.sqf @@ -4,7 +4,7 @@ (configFile >> "CfgAmmo") call FUNC(exportConfig); */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_fnc_logEntries"; diff --git a/addons/core/functions/fnc_filter.sqf b/addons/common/functions/fnc_filter.sqf similarity index 93% rename from addons/core/functions/fnc_filter.sqf rename to addons/common/functions/fnc_filter.sqf index a3e88904b1..3d61c7559e 100644 --- a/addons/core/functions/fnc_filter.sqf +++ b/addons/common/functions/fnc_filter.sqf @@ -13,7 +13,7 @@ * Usage: * [[0,1,2,3,4], {_this > 2}] call FUNC(filter) ==> [3,4] */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_code", "_newArray", "_index"]; diff --git a/addons/core/functions/fnc_fixCrateContent.sqf b/addons/common/functions/fnc_fixCrateContent.sqf similarity index 93% rename from addons/core/functions/fnc_fixCrateContent.sqf rename to addons/common/functions/fnc_fixCrateContent.sqf index 96db852a2f..d6e7f91cc6 100644 --- a/addons/core/functions/fnc_fixCrateContent.sqf +++ b/addons/common/functions/fnc_fixCrateContent.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_crate", "_weapons", "_items"]; diff --git a/addons/core/functions/fnc_fixLoweredRifleAnimation.sqf b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf similarity index 83% rename from addons/core/functions/fnc_fixLoweredRifleAnimation.sqf rename to addons/common/functions/fnc_fixLoweredRifleAnimation.sqf index a7bc056474..2a5a5d1224 100644 --- a/addons/core/functions/fnc_fixLoweredRifleAnimation.sqf +++ b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_getCaptivityStatus.sqf b/addons/common/functions/fnc_getCaptivityStatus.sqf similarity index 93% rename from addons/core/functions/fnc_getCaptivityStatus.sqf rename to addons/common/functions/fnc_getCaptivityStatus.sqf index 64efc0910d..857d78d5b1 100644 --- a/addons/core/functions/fnc_getCaptivityStatus.sqf +++ b/addons/common/functions/fnc_getCaptivityStatus.sqf @@ -9,7 +9,7 @@ * Return value: * Reasons, why the unit is a captive. An empty array is returned if the unit is not a captive (Array of Strings) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_captivityReasons", "_unitCaptivityStatus", "_unitCaptivityReasons"]; diff --git a/addons/core/functions/fnc_getChildren.sqf b/addons/common/functions/fnc_getChildren.sqf similarity index 84% rename from addons/core/functions/fnc_getChildren.sqf rename to addons/common/functions/fnc_getChildren.sqf index 1c76d96338..4fcf7af2fb 100644 --- a/addons/core/functions/fnc_getChildren.sqf +++ b/addons/common/functions/fnc_getChildren.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_name", "_cfgClass", "_classes"]; diff --git a/addons/core/functions/fnc_getConfigCommander.sqf b/addons/common/functions/fnc_getConfigCommander.sqf similarity index 88% rename from addons/core/functions/fnc_getConfigCommander.sqf rename to addons/common/functions/fnc_getConfigCommander.sqf index cc06ce859d..bb65331228 100644 --- a/addons/core/functions/fnc_getConfigCommander.sqf +++ b/addons/common/functions/fnc_getConfigCommander.sqf @@ -9,7 +9,7 @@ * Return value: * Commander config (Config) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_turret"]; diff --git a/addons/core/functions/fnc_getConfigGunner.sqf b/addons/common/functions/fnc_getConfigGunner.sqf similarity index 88% rename from addons/core/functions/fnc_getConfigGunner.sqf rename to addons/common/functions/fnc_getConfigGunner.sqf index c7546de55a..e4708599d8 100644 --- a/addons/core/functions/fnc_getConfigGunner.sqf +++ b/addons/common/functions/fnc_getConfigGunner.sqf @@ -9,7 +9,7 @@ * Return value: * Gunner config (Config) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_turret"]; diff --git a/addons/core/functions/fnc_getDefaultAnim.sqf b/addons/common/functions/fnc_getDefaultAnim.sqf similarity index 94% rename from addons/core/functions/fnc_getDefaultAnim.sqf rename to addons/common/functions/fnc_getDefaultAnim.sqf index 411c4e6c59..99636e36e7 100644 --- a/addons/core/functions/fnc_getDefaultAnim.sqf +++ b/addons/common/functions/fnc_getDefaultAnim.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_anim", "_stance"]; diff --git a/addons/core/functions/fnc_getDisplayConfigName.sqf b/addons/common/functions/fnc_getDisplayConfigName.sqf similarity index 86% rename from addons/core/functions/fnc_getDisplayConfigName.sqf rename to addons/common/functions/fnc_getDisplayConfigName.sqf index cf53b8f735..38623ff333 100644 --- a/addons/core/functions/fnc_getDisplayConfigName.sqf +++ b/addons/common/functions/fnc_getDisplayConfigName.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_configName", "_index"]; diff --git a/addons/core/functions/fnc_getDoorTurrets.sqf b/addons/common/functions/fnc_getDoorTurrets.sqf similarity index 92% rename from addons/core/functions/fnc_getDoorTurrets.sqf rename to addons/common/functions/fnc_getDoorTurrets.sqf index 54de39cd47..02d9dd6978 100644 --- a/addons/core/functions/fnc_getDoorTurrets.sqf +++ b/addons/common/functions/fnc_getDoorTurrets.sqf @@ -9,7 +9,7 @@ * Return value: * Turret indexes of the door gunner. Empty array means no gunner position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicleType", "_turrets", "_doorTurrets", "_config"]; diff --git a/addons/core/functions/fnc_getForceWalkStatus.sqf b/addons/common/functions/fnc_getForceWalkStatus.sqf similarity index 94% rename from addons/core/functions/fnc_getForceWalkStatus.sqf rename to addons/common/functions/fnc_getForceWalkStatus.sqf index e087bb7a8e..3d762b1cdd 100644 --- a/addons/core/functions/fnc_getForceWalkStatus.sqf +++ b/addons/common/functions/fnc_getForceWalkStatus.sqf @@ -15,7 +15,7 @@ Returns: Example: [ACE_Player] call FUNC(getForceWalkStatus) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_forceWalkReasons", "_unitForceWalkNumber", "_unitForceWalkStatus", "_unitForceWalkReasons"]; diff --git a/addons/core/functions/fnc_getHitPoints.sqf b/addons/common/functions/fnc_getHitPoints.sqf similarity index 95% rename from addons/core/functions/fnc_getHitPoints.sqf rename to addons/common/functions/fnc_getHitPoints.sqf index b3cbb85a3d..2b6c157891 100644 --- a/addons/core/functions/fnc_getHitPoints.sqf +++ b/addons/common/functions/fnc_getHitPoints.sqf @@ -9,7 +9,7 @@ * Return Value: * The hitpoints (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_hitpoints"]; diff --git a/addons/core/functions/fnc_getHitPointsWithSelections.sqf b/addons/common/functions/fnc_getHitPointsWithSelections.sqf similarity index 96% rename from addons/core/functions/fnc_getHitPointsWithSelections.sqf rename to addons/common/functions/fnc_getHitPointsWithSelections.sqf index a5e496eb88..f48489b130 100644 --- a/addons/core/functions/fnc_getHitPointsWithSelections.sqf +++ b/addons/common/functions/fnc_getHitPointsWithSelections.sqf @@ -9,7 +9,7 @@ * Return Value: * The hitpoints with selections. Format: [hitpoints, selections]. They correspond by index. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_hitpoints", "_selections"]; diff --git a/addons/core/functions/fnc_getInPosition.sqf b/addons/common/functions/fnc_getInPosition.sqf similarity index 99% rename from addons/core/functions/fnc_getInPosition.sqf rename to addons/common/functions/fnc_getInPosition.sqf index 577ae38d6a..4cc7705b3c 100644 --- a/addons/core/functions/fnc_getInPosition.sqf +++ b/addons/common/functions/fnc_getInPosition.sqf @@ -13,7 +13,7 @@ * Return Value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define CANGETINDRIVER (isNull (driver _vehicle) || {!alive driver _vehicle}) && {!lockedDriver _vehicle} && {getNumber (_config >> "isUav") != 1} #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1} diff --git a/addons/core/functions/fnc_getMarkerType.sqf b/addons/common/functions/fnc_getMarkerType.sqf similarity index 98% rename from addons/core/functions/fnc_getMarkerType.sqf rename to addons/common/functions/fnc_getMarkerType.sqf index a445eb7ae3..cfcfcc420d 100644 --- a/addons/core/functions/fnc_getMarkerType.sqf +++ b/addons/common/functions/fnc_getMarkerType.sqf @@ -9,7 +9,7 @@ * Return Value: * Marker Type (string) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _group = _this select 0; _leader = leader _group; diff --git a/addons/core/functions/fnc_getName.sqf b/addons/common/functions/fnc_getName.sqf similarity index 93% rename from addons/core/functions/fnc_getName.sqf rename to addons/common/functions/fnc_getName.sqf index d33a843cac..3bc0663f51 100644 --- a/addons/core/functions/fnc_getName.sqf +++ b/addons/common/functions/fnc_getName.sqf @@ -10,7 +10,7 @@ * Return value: * The name. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_showEffective", "_name"]; diff --git a/addons/core/functions/fnc_getNumberFromMissionSQM.sqf b/addons/common/functions/fnc_getNumberFromMissionSQM.sqf similarity index 88% rename from addons/core/functions/fnc_getNumberFromMissionSQM.sqf rename to addons/common/functions/fnc_getNumberFromMissionSQM.sqf index 0e33ef2e0b..7251a253a6 100644 --- a/addons/core/functions/fnc_getNumberFromMissionSQM.sqf +++ b/addons/common/functions/fnc_getNumberFromMissionSQM.sqf @@ -9,7 +9,7 @@ * Return value: * Value of the entry. Note: If the entry does not exist, it might return 0 or an entry with the same name of another class! (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_number"; diff --git a/addons/core/functions/fnc_getPitchBankYaw.sqf b/addons/common/functions/fnc_getPitchBankYaw.sqf similarity index 82% rename from addons/core/functions/fnc_getPitchBankYaw.sqf rename to addons/common/functions/fnc_getPitchBankYaw.sqf index 81ace0864c..3758b42931 100644 --- a/addons/core/functions/fnc_getPitchBankYaw.sqf +++ b/addons/common/functions/fnc_getPitchBankYaw.sqf @@ -9,6 +9,6 @@ * Return Value: * [pitch, bank, yaw] */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" ((_this select 0) call BIS_fnc_getPitchBank) + [getDir (_this select 0)] diff --git a/addons/core/functions/fnc_getStringFromMissionSQM.sqf b/addons/common/functions/fnc_getStringFromMissionSQM.sqf similarity index 96% rename from addons/core/functions/fnc_getStringFromMissionSQM.sqf rename to addons/common/functions/fnc_getStringFromMissionSQM.sqf index 6a67ad23a4..1fb22e51c8 100644 --- a/addons/core/functions/fnc_getStringFromMissionSQM.sqf +++ b/addons/common/functions/fnc_getStringFromMissionSQM.sqf @@ -9,7 +9,7 @@ * Return value: * Value of the entry. Note: If the entry does not exist, it might return an empty string or an entry with the same name of another class! (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_path", "_mission", "_a", "_class", "_index", "_array", "_b", "_entry"]; diff --git a/addons/core/functions/fnc_getTargetAzimuthAndInclination.sqf b/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf similarity index 92% rename from addons/core/functions/fnc_getTargetAzimuthAndInclination.sqf rename to addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf index d93c53b05d..0327a38f5d 100644 --- a/addons/core/functions/fnc_getTargetAzimuthAndInclination.sqf +++ b/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf @@ -10,7 +10,7 @@ * 0: Azimuth (Number) * 1: Inclination or 'slope' (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_position", "_direction", "_azimuth", "_inclination"]; diff --git a/addons/core/functions/fnc_getTargetDistance.sqf b/addons/common/functions/fnc_getTargetDistance.sqf similarity index 96% rename from addons/core/functions/fnc_getTargetDistance.sqf rename to addons/common/functions/fnc_getTargetDistance.sqf index a54b39c936..d30e880d21 100644 --- a/addons/core/functions/fnc_getTargetDistance.sqf +++ b/addons/common/functions/fnc_getTargetDistance.sqf @@ -11,7 +11,7 @@ * Return value: * Measured distance in meters. Can return maximal or minimal distance (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_interval", "_maxDistance", "_minDistance", "_position", "_laser", "_line", "_distance", "_iteration"]; diff --git a/addons/core/functions/fnc_getTargetObject.sqf b/addons/common/functions/fnc_getTargetObject.sqf similarity index 93% rename from addons/core/functions/fnc_getTargetObject.sqf rename to addons/common/functions/fnc_getTargetObject.sqf index 7bf161fc3c..5ad46b4f85 100644 --- a/addons/core/functions/fnc_getTargetObject.sqf +++ b/addons/common/functions/fnc_getTargetObject.sqf @@ -9,7 +9,7 @@ * Return value: * Nearest object directly in line of sight, if none objNull (Object) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_maxDistance", "_position", "_laser", "_intersects"]; diff --git a/addons/core/functions/fnc_getTurretCommander.sqf b/addons/common/functions/fnc_getTurretCommander.sqf similarity index 91% rename from addons/core/functions/fnc_getTurretCommander.sqf rename to addons/common/functions/fnc_getTurretCommander.sqf index c701e8d64a..ed68cbd7c5 100644 --- a/addons/core/functions/fnc_getTurretCommander.sqf +++ b/addons/common/functions/fnc_getTurretCommander.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles commander. Empty array means no observer position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretConfigPath.sqf b/addons/common/functions/fnc_getTurretConfigPath.sqf similarity index 94% rename from addons/core/functions/fnc_getTurretConfigPath.sqf rename to addons/common/functions/fnc_getTurretConfigPath.sqf index e49a518603..2d8f099ac8 100644 --- a/addons/core/functions/fnc_getTurretConfigPath.sqf +++ b/addons/common/functions/fnc_getTurretConfigPath.sqf @@ -10,7 +10,7 @@ * Return value: * Turret config (Config) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_config", "_turretIndex", "_index", "_offset", "_config2", "_foundClasses"]; diff --git a/addons/core/functions/fnc_getTurretCopilot.sqf b/addons/common/functions/fnc_getTurretCopilot.sqf similarity index 92% rename from addons/core/functions/fnc_getTurretCopilot.sqf rename to addons/common/functions/fnc_getTurretCopilot.sqf index 8f8dd9649f..ab31245777 100644 --- a/addons/core/functions/fnc_getTurretCopilot.sqf +++ b/addons/common/functions/fnc_getTurretCopilot.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no copilot position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretGunner.sqf b/addons/common/functions/fnc_getTurretGunner.sqf similarity index 91% rename from addons/core/functions/fnc_getTurretGunner.sqf rename to addons/common/functions/fnc_getTurretGunner.sqf index 04f49a81e1..4aeac062bc 100644 --- a/addons/core/functions/fnc_getTurretGunner.sqf +++ b/addons/common/functions/fnc_getTurretGunner.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no gunner position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretIndex.sqf b/addons/common/functions/fnc_getTurretIndex.sqf similarity index 92% rename from addons/core/functions/fnc_getTurretIndex.sqf rename to addons/common/functions/fnc_getTurretIndex.sqf index 9665414fe5..dca0581279 100644 --- a/addons/core/functions/fnc_getTurretIndex.sqf +++ b/addons/common/functions/fnc_getTurretIndex.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index array or config path. E.g: [0] for gunner or [0,0] for commander. Returns empty array if unit is not in a turret. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_vehicle", "_turrets", "_units", "_index"]; diff --git a/addons/core/functions/fnc_getTurrets.sqf b/addons/common/functions/fnc_getTurrets.sqf similarity index 95% rename from addons/core/functions/fnc_getTurrets.sqf rename to addons/common/functions/fnc_getTurrets.sqf index 0ffd164f85..2fa93678c3 100644 --- a/addons/core/functions/fnc_getTurrets.sqf +++ b/addons/common/functions/fnc_getTurrets.sqf @@ -9,7 +9,7 @@ * Return value: * All turret index arrays of the vehicle. E.g: [[0], [0,0]] (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_type", "_config", "_turrets", "_fnc_addTurret"]; diff --git a/addons/core/functions/fnc_getTurretsFFV.sqf b/addons/common/functions/fnc_getTurretsFFV.sqf similarity index 91% rename from addons/core/functions/fnc_getTurretsFFV.sqf rename to addons/common/functions/fnc_getTurretsFFV.sqf index a188517db8..f4c800a5b0 100644 --- a/addons/core/functions/fnc_getTurretsFFV.sqf +++ b/addons/common/functions/fnc_getTurretsFFV.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no ffv turrets. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretsOther.sqf b/addons/common/functions/fnc_getTurretsOther.sqf similarity index 93% rename from addons/core/functions/fnc_getTurretsOther.sqf rename to addons/common/functions/fnc_getTurretsOther.sqf index 0cc172dac4..ccb16f1102 100644 --- a/addons/core/functions/fnc_getTurretsOther.sqf +++ b/addons/common/functions/fnc_getTurretsOther.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no other turrets. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getUavControlPosition.sqf b/addons/common/functions/fnc_getUavControlPosition.sqf similarity index 93% rename from addons/core/functions/fnc_getUavControlPosition.sqf rename to addons/common/functions/fnc_getUavControlPosition.sqf index 4e482dee06..9e255efea3 100644 --- a/addons/core/functions/fnc_getUavControlPosition.sqf +++ b/addons/common/functions/fnc_getUavControlPosition.sqf @@ -18,7 +18,7 @@ Returns: Example: [ACE_Player] call FUNC(getUavControlPosition) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_uav", "_positionArray", "_playerIndex"]; diff --git a/addons/core/functions/fnc_getVehicleCargo.sqf b/addons/common/functions/fnc_getVehicleCargo.sqf similarity index 92% rename from addons/core/functions/fnc_getVehicleCargo.sqf rename to addons/common/functions/fnc_getVehicleCargo.sqf index 77ccdf955c..e5b0f235e7 100644 --- a/addons/core/functions/fnc_getVehicleCargo.sqf +++ b/addons/common/functions/fnc_getVehicleCargo.sqf @@ -9,7 +9,7 @@ * Return value: * Vehicle cargo positions. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_cargo", "_codrivers"]; diff --git a/addons/core/functions/fnc_getVehicleCodriver.sqf b/addons/common/functions/fnc_getVehicleCodriver.sqf similarity index 91% rename from addons/core/functions/fnc_getVehicleCodriver.sqf rename to addons/common/functions/fnc_getVehicleCodriver.sqf index 06d7414411..901a40ea2f 100644 --- a/addons/core/functions/fnc_getVehicleCodriver.sqf +++ b/addons/common/functions/fnc_getVehicleCodriver.sqf @@ -9,7 +9,7 @@ * Return value: * Vehicle codriver positions. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_cargo", "_codrivers"]; diff --git a/addons/core/functions/fnc_getVehicleCrew.sqf b/addons/common/functions/fnc_getVehicleCrew.sqf similarity index 93% rename from addons/core/functions/fnc_getVehicleCrew.sqf rename to addons/common/functions/fnc_getVehicleCrew.sqf index 2a24405b0f..bdbeb1cf22 100644 --- a/addons/core/functions/fnc_getVehicleCrew.sqf +++ b/addons/common/functions/fnc_getVehicleCrew.sqf @@ -10,7 +10,7 @@ * Return value: * Crew (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_types", "_crew"]; diff --git a/addons/core/functions/fnc_getWeaponAzimuthAndInclination.sqf b/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf similarity index 90% rename from addons/core/functions/fnc_getWeaponAzimuthAndInclination.sqf rename to addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf index 2cc007ba45..13b94d607d 100644 --- a/addons/core/functions/fnc_getWeaponAzimuthAndInclination.sqf +++ b/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf @@ -10,7 +10,7 @@ * 0: Azimuth (Number) * 1: Inclination or 'slope' (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_weapon", "_direction", "_azimuth", "_inclination"]; diff --git a/addons/core/functions/fnc_getWeaponType.sqf b/addons/common/functions/fnc_getWeaponType.sqf similarity index 92% rename from addons/core/functions/fnc_getWeaponType.sqf rename to addons/common/functions/fnc_getWeaponType.sqf index 48aec9f8f3..b95a4c389f 100644 --- a/addons/core/functions/fnc_getWeaponType.sqf +++ b/addons/common/functions/fnc_getWeaponType.sqf @@ -9,7 +9,7 @@ * Return value: * Slot index of the given class name, 1: primary, 2: secondary, 3: handgun, else: -1 (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_weapon", "_type", "_index"]; diff --git a/addons/core/functions/fnc_getWindDirection.sqf b/addons/common/functions/fnc_getWindDirection.sqf similarity index 95% rename from addons/core/functions/fnc_getWindDirection.sqf rename to addons/common/functions/fnc_getWindDirection.sqf index 282715c861..c6618d9958 100644 --- a/addons/core/functions/fnc_getWindDirection.sqf +++ b/addons/common/functions/fnc_getWindDirection.sqf @@ -9,7 +9,7 @@ * Return value: * Wind direction. (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" switch (round (windDir / 360 * 16)) do { case 1 : {localize QUOTE(DOUBLES(STR,GVAR(SSW)))}; diff --git a/addons/core/functions/fnc_goKneeling.sqf b/addons/common/functions/fnc_goKneeling.sqf similarity index 93% rename from addons/core/functions/fnc_goKneeling.sqf rename to addons/common/functions/fnc_goKneeling.sqf index 1188e5c1d7..846aac4712 100644 --- a/addons/core/functions/fnc_goKneeling.sqf +++ b/addons/common/functions/fnc_goKneeling.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_hadamardProduct.sqf b/addons/common/functions/fnc_hadamardProduct.sqf similarity index 89% rename from addons/core/functions/fnc_hadamardProduct.sqf rename to addons/common/functions/fnc_hadamardProduct.sqf index f31be8cf7c..c7011db943 100644 --- a/addons/core/functions/fnc_hadamardProduct.sqf +++ b/addons/common/functions/fnc_hadamardProduct.sqf @@ -11,7 +11,7 @@ * Return Value: * Hadamard Product */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _vector1 = _this select 0; _vector2 = _this select 1; diff --git a/addons/core/functions/fnc_inTransitionAnim.sqf b/addons/common/functions/fnc_inTransitionAnim.sqf similarity index 69% rename from addons/core/functions/fnc_inTransitionAnim.sqf rename to addons/common/functions/fnc_inTransitionAnim.sqf index 9b28aa1d8a..8dad063660 100644 --- a/addons/core/functions/fnc_inTransitionAnim.sqf +++ b/addons/common/functions/fnc_inTransitionAnim.sqf @@ -1,4 +1,4 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "looped") == 0 diff --git a/addons/core/functions/fnc_interpolateFromArray.sqf b/addons/common/functions/fnc_interpolateFromArray.sqf similarity index 80% rename from addons/core/functions/fnc_interpolateFromArray.sqf rename to addons/common/functions/fnc_interpolateFromArray.sqf index 20384d5341..79b5f2eff3 100644 --- a/addons/core/functions/fnc_interpolateFromArray.sqf +++ b/addons/common/functions/fnc_interpolateFromArray.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_value", "_min", "_max"]; diff --git a/addons/core/functions/fnc_isAutoWind.sqf b/addons/common/functions/fnc_isAutoWind.sqf similarity index 80% rename from addons/core/functions/fnc_isAutoWind.sqf rename to addons/common/functions/fnc_isAutoWind.sqf index 2fa1ce7a2a..87099a23e7 100644 --- a/addons/core/functions/fnc_isAutoWind.sqf +++ b/addons/common/functions/fnc_isAutoWind.sqf @@ -9,6 +9,6 @@ * Return value: * This mission has automatic wind? (Bool) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" ["Mission", "Intel", "windForced"] call FUNC(getNumberFromMissionSQM) != 1 diff --git a/addons/core/functions/fnc_isEOD.sqf b/addons/common/functions/fnc_isEOD.sqf similarity index 91% rename from addons/core/functions/fnc_isEOD.sqf rename to addons/common/functions/fnc_isEOD.sqf index 2bf7dfb057..7cc185c773 100644 --- a/addons/core/functions/fnc_isEOD.sqf +++ b/addons/common/functions/fnc_isEOD.sqf @@ -18,7 +18,7 @@ Example: _isSpecialist = [player] call FUNC(isEOD); */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_isEngineer.sqf b/addons/common/functions/fnc_isEngineer.sqf similarity index 86% rename from addons/core/functions/fnc_isEngineer.sqf rename to addons/common/functions/fnc_isEngineer.sqf index a5ed47018b..fa4d12cef6 100644 --- a/addons/core/functions/fnc_isEngineer.sqf +++ b/addons/common/functions/fnc_isEngineer.sqf @@ -9,7 +9,7 @@ * Return Value: * Bool: is the unit an engineer? */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_isInBuilding.sqf b/addons/common/functions/fnc_isInBuilding.sqf similarity index 95% rename from addons/core/functions/fnc_isInBuilding.sqf rename to addons/common/functions/fnc_isInBuilding.sqf index 1751f5a9c2..0b69318f8a 100644 --- a/addons/core/functions/fnc_isInBuilding.sqf +++ b/addons/common/functions/fnc_isInBuilding.sqf @@ -9,7 +9,7 @@ * Return value: * Is the unit in a building? (Bool) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define DISTANCE 10 diff --git a/addons/core/functions/fnc_isMedic.sqf b/addons/common/functions/fnc_isMedic.sqf similarity index 85% rename from addons/core/functions/fnc_isMedic.sqf rename to addons/common/functions/fnc_isMedic.sqf index c1c3dcf87b..dec244d0c0 100644 --- a/addons/core/functions/fnc_isMedic.sqf +++ b/addons/common/functions/fnc_isMedic.sqf @@ -9,7 +9,7 @@ * Return Value: * Bool: is unit medic? */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit"]; diff --git a/addons/core/functions/fnc_isPlayer.sqf b/addons/common/functions/fnc_isPlayer.sqf similarity index 87% rename from addons/core/functions/fnc_isPlayer.sqf rename to addons/common/functions/fnc_isPlayer.sqf index 0f646c760f..05b8484a0c 100644 --- a/addons/core/functions/fnc_isPlayer.sqf +++ b/addons/common/functions/fnc_isPlayer.sqf @@ -10,6 +10,6 @@ * Return Value: * Bool: is unit a player? */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" isPlayer (_this select 0) || {_this select 0 == call FUNC(player)} diff --git a/addons/core/functions/fnc_isTurnedOut.sqf b/addons/common/functions/fnc_isTurnedOut.sqf similarity index 95% rename from addons/core/functions/fnc_isTurnedOut.sqf rename to addons/common/functions/fnc_isTurnedOut.sqf index c373403193..b467df6e1a 100644 --- a/addons/core/functions/fnc_isTurnedOut.sqf +++ b/addons/common/functions/fnc_isTurnedOut.sqf @@ -9,7 +9,7 @@ * Return value: * Is the unit turned out or not? Will return false if there is no option to turn out in the first place. (Bool) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_vehicle", "_config", "_animation", "_action", "_inAction", "_turretIndex"]; diff --git a/addons/core/functions/fnc_letterToCode.sqf b/addons/common/functions/fnc_letterToCode.sqf similarity index 87% rename from addons/core/functions/fnc_letterToCode.sqf rename to addons/common/functions/fnc_letterToCode.sqf index a00bb46603..d50f6b87df 100644 --- a/addons/core/functions/fnc_letterToCode.sqf +++ b/addons/common/functions/fnc_letterToCode.sqf @@ -1,4 +1,4 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" [-1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] select (["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] find toUpper (_this select 0)) + 1 diff --git a/addons/core/functions/fnc_log.sqf b/addons/common/functions/fnc_log.sqf similarity index 92% rename from addons/core/functions/fnc_log.sqf rename to addons/common/functions/fnc_log.sqf index 907303a9c4..b778269845 100644 --- a/addons/core/functions/fnc_log.sqf +++ b/addons/common/functions/fnc_log.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if ((_this select 0) in (missionNamespace getVariable ["ACE_Debug", []])) then { private ["_type", "_argument", "_function", "_showInGame"]; diff --git a/addons/core/functions/fnc_logControls.sqf b/addons/common/functions/fnc_logControls.sqf similarity index 83% rename from addons/core/functions/fnc_logControls.sqf rename to addons/common/functions/fnc_logControls.sqf index db5efb9f90..39f611aa25 100644 --- a/addons/core/functions/fnc_logControls.sqf +++ b/addons/common/functions/fnc_logControls.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_index"]; diff --git a/addons/core/functions/fnc_logDisplays.sqf b/addons/common/functions/fnc_logDisplays.sqf similarity index 81% rename from addons/core/functions/fnc_logDisplays.sqf rename to addons/common/functions/fnc_logDisplays.sqf index b7474d0cf1..2e1bbb4634 100644 --- a/addons/core/functions/fnc_logDisplays.sqf +++ b/addons/common/functions/fnc_logDisplays.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_index"]; diff --git a/addons/core/functions/fnc_map.sqf b/addons/common/functions/fnc_map.sqf similarity index 92% rename from addons/core/functions/fnc_map.sqf rename to addons/common/functions/fnc_map.sqf index 8ee27f0435..07062a795b 100644 --- a/addons/core/functions/fnc_map.sqf +++ b/addons/common/functions/fnc_map.sqf @@ -13,7 +13,7 @@ * Usage: * [["2", "gobblecock", "25"], {parseNumber _this}] call FUNC(map) ==> [2, 0, 25] */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_code"]; diff --git a/addons/core/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf similarity index 98% rename from addons/core/functions/fnc_moduleCheckPBOs.sqf rename to addons/common/functions/fnc_moduleCheckPBOs.sqf index 946a92ed06..5bb95ec463 100644 --- a/addons/core/functions/fnc_moduleCheckPBOs.sqf +++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf @@ -9,7 +9,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _logic = _this select 0; _units = _this select 1; diff --git a/addons/core/functions/fnc_moduleLSDVehicles.sqf b/addons/common/functions/fnc_moduleLSDVehicles.sqf similarity index 95% rename from addons/core/functions/fnc_moduleLSDVehicles.sqf rename to addons/common/functions/fnc_moduleLSDVehicles.sqf index 9609deb041..0eba43a974 100644 --- a/addons/core/functions/fnc_moduleLSDVehicles.sqf +++ b/addons/common/functions/fnc_moduleLSDVehicles.sqf @@ -9,7 +9,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _logic = _this select 0; _units = _this select 1; diff --git a/addons/core/functions/fnc_monitor.sqf b/addons/common/functions/fnc_monitor.sqf similarity index 77% rename from addons/core/functions/fnc_monitor.sqf rename to addons/common/functions/fnc_monitor.sqf index edac532fd8..325deeff14 100644 --- a/addons/core/functions/fnc_monitor.sqf +++ b/addons/common/functions/fnc_monitor.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" terminate (missionNamespace getVariable [QGVAR(MonitorFnc), scriptNull]); diff --git a/addons/core/functions/fnc_muteUnit.sqf b/addons/common/functions/fnc_muteUnit.sqf similarity index 90% rename from addons/core/functions/fnc_muteUnit.sqf rename to addons/common/functions/fnc_muteUnit.sqf index fe32f5c55d..d0b21b777c 100644 --- a/addons/core/functions/fnc_muteUnit.sqf +++ b/addons/common/functions/fnc_muteUnit.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_speaker"]; diff --git a/addons/core/functions/fnc_numberToDigits.sqf b/addons/common/functions/fnc_numberToDigits.sqf similarity index 94% rename from addons/core/functions/fnc_numberToDigits.sqf rename to addons/common/functions/fnc_numberToDigits.sqf index 70c1fa1e1c..a95b051249 100644 --- a/addons/core/functions/fnc_numberToDigits.sqf +++ b/addons/common/functions/fnc_numberToDigits.sqf @@ -10,7 +10,7 @@ * Return value: * Digits. The maximum count is six digits. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_length", "_digits", "_index", "_count"]; diff --git a/addons/core/functions/fnc_numberToDigitsString.sqf b/addons/common/functions/fnc_numberToDigitsString.sqf similarity index 91% rename from addons/core/functions/fnc_numberToDigitsString.sqf rename to addons/common/functions/fnc_numberToDigitsString.sqf index 449c22ba53..88b457c0d8 100644 --- a/addons/core/functions/fnc_numberToDigitsString.sqf +++ b/addons/common/functions/fnc_numberToDigitsString.sqf @@ -10,7 +10,7 @@ * Return value: * Digits. The maximum length is six digits. (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_digits", "_count", "_string", "_index"]; diff --git a/addons/core/functions/fnc_onLoadRscDisplayChannel.sqf b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf similarity index 93% rename from addons/core/functions/fnc_onLoadRscDisplayChannel.sqf rename to addons/common/functions/fnc_onLoadRscDisplayChannel.sqf index 76c259aa8c..b853dcfeeb 100644 --- a/addons/core/functions/fnc_onLoadRscDisplayChannel.sqf +++ b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf @@ -13,7 +13,7 @@ Returns: Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" uiNamespace setVariable ["ACE_ctrlChannel", (_this select 0) displayCtrl 101]; diff --git a/addons/core/functions/fnc_owned.sqf b/addons/common/functions/fnc_owned.sqf similarity index 68% rename from addons/core/functions/fnc_owned.sqf rename to addons/common/functions/fnc_owned.sqf index 59d5d3229e..feeb223109 100644 --- a/addons/core/functions/fnc_owned.sqf +++ b/addons/common/functions/fnc_owned.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_object"; diff --git a/addons/core/functions/fnc_player.sqf b/addons/common/functions/fnc_player.sqf similarity index 85% rename from addons/core/functions/fnc_player.sqf rename to addons/common/functions/fnc_player.sqf index 49c76e86c9..7aba5a4c24 100644 --- a/addons/core/functions/fnc_player.sqf +++ b/addons/common/functions/fnc_player.sqf @@ -10,6 +10,6 @@ * Return Value: * Player controlled unit (object) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", player] diff --git a/addons/common/functions/fnc_playerSide.sqf b/addons/common/functions/fnc_playerSide.sqf new file mode 100644 index 0000000000..e1ee07750f --- /dev/null +++ b/addons/common/functions/fnc_playerSide.sqf @@ -0,0 +1,4 @@ +// by commy2 +#include "\z\ace\addons\common\script_component.hpp" + +side group ACE_player diff --git a/addons/core/functions/fnc_progressBar.sqf b/addons/common/functions/fnc_progressBar.sqf similarity index 96% rename from addons/core/functions/fnc_progressBar.sqf rename to addons/common/functions/fnc_progressBar.sqf index 891ad5edaa..59323bc3f3 100644 --- a/addons/core/functions/fnc_progressBar.sqf +++ b/addons/common/functions/fnc_progressBar.sqf @@ -13,7 +13,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" closeDialog 0; createDialog QGVAR(ProgressBar_Dialog); diff --git a/addons/core/functions/fnc_queueAnimation.sqf b/addons/common/functions/fnc_queueAnimation.sqf similarity index 82% rename from addons/core/functions/fnc_queueAnimation.sqf rename to addons/common/functions/fnc_queueAnimation.sqf index 256186d912..73535e1d54 100644 --- a/addons/core/functions/fnc_queueAnimation.sqf +++ b/addons/common/functions/fnc_queueAnimation.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" terminate (missionNamespace getVariable [QGVAR(waitForAnimationHandle), scriptNull]); diff --git a/addons/core/functions/fnc_readBooleanParameterFromModule.sqf b/addons/common/functions/fnc_readBooleanParameterFromModule.sqf similarity index 94% rename from addons/core/functions/fnc_readBooleanParameterFromModule.sqf rename to addons/common/functions/fnc_readBooleanParameterFromModule.sqf index 0738d107da..a4cf2b6bc0 100644 --- a/addons/core/functions/fnc_readBooleanParameterFromModule.sqf +++ b/addons/common/functions/fnc_readBooleanParameterFromModule.sqf @@ -11,7 +11,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_logic", "_parameterName", "_moduleParameterName"]; diff --git a/addons/core/functions/fnc_readNumericParameterFromModule.sqf b/addons/common/functions/fnc_readNumericParameterFromModule.sqf similarity index 95% rename from addons/core/functions/fnc_readNumericParameterFromModule.sqf rename to addons/common/functions/fnc_readNumericParameterFromModule.sqf index 4e174e6248..cdb2f2a409 100644 --- a/addons/core/functions/fnc_readNumericParameterFromModule.sqf +++ b/addons/common/functions/fnc_readNumericParameterFromModule.sqf @@ -11,7 +11,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_logic", "_parameterName", "_moduleParameterName", "_value"]; diff --git a/addons/core/functions/fnc_removeActionEventHandler.sqf b/addons/common/functions/fnc_removeActionEventHandler.sqf similarity index 95% rename from addons/core/functions/fnc_removeActionEventHandler.sqf rename to addons/common/functions/fnc_removeActionEventHandler.sqf index e706e21369..5e5783dcc3 100644 --- a/addons/core/functions/fnc_removeActionEventHandler.sqf +++ b/addons/common/functions/fnc_removeActionEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_action", "_id", "_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs", "_count"]; diff --git a/addons/core/functions/fnc_removeActionMenuEventHandler.sqf b/addons/common/functions/fnc_removeActionMenuEventHandler.sqf similarity index 95% rename from addons/core/functions/fnc_removeActionMenuEventHandler.sqf rename to addons/common/functions/fnc_removeActionMenuEventHandler.sqf index 2efab72c12..5614752aba 100644 --- a/addons/core/functions/fnc_removeActionMenuEventHandler.sqf +++ b/addons/common/functions/fnc_removeActionMenuEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_action", "_id", "_name", "_actionsVar", "_currentID", "_actionIDs", "_actions", "_actionID", "_nameVar"]; diff --git a/addons/core/functions/fnc_removeCameraEventHandler.sqf b/addons/common/functions/fnc_removeCameraEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeCameraEventHandler.sqf rename to addons/common/functions/fnc_removeCameraEventHandler.sqf index 3b8c6ecd34..66c2382481 100644 --- a/addons/core/functions/fnc_removeCameraEventHandler.sqf +++ b/addons/common/functions/fnc_removeCameraEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeCustomEventHandler.sqf b/addons/common/functions/fnc_removeCustomEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_removeCustomEventHandler.sqf rename to addons/common/functions/fnc_removeCustomEventHandler.sqf index 02290c6e51..419a349a72 100644 --- a/addons/core/functions/fnc_removeCustomEventHandler.sqf +++ b/addons/common/functions/fnc_removeCustomEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_type", "_id", "_name", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeInfoDisplayEventHandler.sqf b/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeInfoDisplayEventHandler.sqf rename to addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf index ecbfa3969a..002c75364c 100644 --- a/addons/core/functions/fnc_removeInfoDisplayEventHandler.sqf +++ b/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf @@ -10,7 +10,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_type", "_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf b/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf similarity index 92% rename from addons/core/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf rename to addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf index efe8c10709..64e6263d8b 100644 --- a/addons/core/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf +++ b/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeMapMarkerCreatedEventHandler.sqf b/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeMapMarkerCreatedEventHandler.sqf rename to addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf index 9724a73d22..aaba83a56c 100644 --- a/addons/core/functions/fnc_removeMapMarkerCreatedEventHandler.sqf +++ b/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeScrollWheelEventHandler.sqf b/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeScrollWheelEventHandler.sqf rename to addons/common/functions/fnc_removeScrollWheelEventHandler.sqf index 8d17d8ea40..4246360666 100644 --- a/addons/core/functions/fnc_removeScrollWheelEventHandler.sqf +++ b/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_restoreVariablesJIP.sqf b/addons/common/functions/fnc_restoreVariablesJIP.sqf similarity index 92% rename from addons/core/functions/fnc_restoreVariablesJIP.sqf rename to addons/common/functions/fnc_restoreVariablesJIP.sqf index 96e2871f2b..2aaad78c81 100644 --- a/addons/core/functions/fnc_restoreVariablesJIP.sqf +++ b/addons/common/functions/fnc_restoreVariablesJIP.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_respawnVariables"]; diff --git a/addons/core/functions/fnc_revertKeyCodeLocalized.sqf b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf similarity index 95% rename from addons/core/functions/fnc_revertKeyCodeLocalized.sqf rename to addons/common/functions/fnc_revertKeyCodeLocalized.sqf index eeb42aaeb7..f30bf2bc82 100644 --- a/addons/core/functions/fnc_revertKeyCodeLocalized.sqf +++ b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf @@ -9,7 +9,7 @@ * Return value: * What input will result in the given key code? (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_keyCode", "_key", "_alt", "_ctrl", "_shft"]; diff --git a/addons/core/functions/fnc_sanitizeString.sqf b/addons/common/functions/fnc_sanitizeString.sqf similarity index 94% rename from addons/core/functions/fnc_sanitizeString.sqf rename to addons/common/functions/fnc_sanitizeString.sqf index 2892d2f0e0..29809f4dca 100644 --- a/addons/core/functions/fnc_sanitizeString.sqf +++ b/addons/common/functions/fnc_sanitizeString.sqf @@ -10,7 +10,7 @@ * Return Value: * Sanitized string */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_string", "_removeTags", "_array", "_arrayNew"]; diff --git a/addons/core/functions/fnc_serverLog.sqf b/addons/common/functions/fnc_serverLog.sqf similarity index 71% rename from addons/core/functions/fnc_serverLog.sqf rename to addons/common/functions/fnc_serverLog.sqf index d95c2f141d..fedeb4fe88 100644 --- a/addons/core/functions/fnc_serverLog.sqf +++ b/addons/common/functions/fnc_serverLog.sqf @@ -1,5 +1,5 @@ // by CAA-Picard -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if (isServer) then { diag_log _this; diff --git a/addons/core/functions/fnc_setCaptivityStatus.sqf b/addons/common/functions/fnc_setCaptivityStatus.sqf similarity index 96% rename from addons/core/functions/fnc_setCaptivityStatus.sqf rename to addons/common/functions/fnc_setCaptivityStatus.sqf index 5a5ad366cb..4c95926960 100644 --- a/addons/core/functions/fnc_setCaptivityStatus.sqf +++ b/addons/common/functions/fnc_setCaptivityStatus.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_reason", "_status", "_captivityReasons", "_unitCaptivityReasons", "_captivityReasonsBooleans", "_bitmask"]; diff --git a/addons/core/functions/fnc_setForceWalkStatus.sqf b/addons/common/functions/fnc_setForceWalkStatus.sqf similarity index 97% rename from addons/core/functions/fnc_setForceWalkStatus.sqf rename to addons/common/functions/fnc_setForceWalkStatus.sqf index 41e9b49be1..45aa6715ed 100644 --- a/addons/core/functions/fnc_setForceWalkStatus.sqf +++ b/addons/common/functions/fnc_setForceWalkStatus.sqf @@ -18,7 +18,7 @@ Returns: Example: [ACE_Player, "BrokenLeg", true] call FUNC(setForceWalkStatus) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_reason", "_status", "_forceWalkReasons", "_unitForceWalkReasons", "_forceWalkReasonsBooleans", "_bitmaskNumber"]; diff --git a/addons/core/functions/fnc_setKeyDefault.sqf b/addons/common/functions/fnc_setKeyDefault.sqf similarity index 97% rename from addons/core/functions/fnc_setKeyDefault.sqf rename to addons/common/functions/fnc_setKeyDefault.sqf index 7d79d1b2f7..210e18e1c7 100644 --- a/addons/core/functions/fnc_setKeyDefault.sqf +++ b/addons/common/functions/fnc_setKeyDefault.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_overwrite", "_saveProfile", "_config", "_count", "_index", "_configFile", "_name", "_key", "_shft", "_ctrl", "_alt", "_keyCode", "_state"]; diff --git a/addons/core/functions/fnc_setName.sqf b/addons/common/functions/fnc_setName.sqf similarity index 90% rename from addons/core/functions/fnc_setName.sqf rename to addons/common/functions/fnc_setName.sqf index b4c59c4b95..3dfe18650a 100644 --- a/addons/core/functions/fnc_setName.sqf +++ b/addons/common/functions/fnc_setName.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_name"]; diff --git a/addons/core/functions/fnc_setParameter.sqf b/addons/common/functions/fnc_setParameter.sqf similarity index 90% rename from addons/core/functions/fnc_setParameter.sqf rename to addons/common/functions/fnc_setParameter.sqf index 6881f935bc..8ecccd9d71 100644 --- a/addons/core/functions/fnc_setParameter.sqf +++ b/addons/common/functions/fnc_setParameter.sqf @@ -10,7 +10,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_name", "_value"]; diff --git a/addons/core/functions/fnc_setPitchBankYaw.sqf b/addons/common/functions/fnc_setPitchBankYaw.sqf similarity index 95% rename from addons/core/functions/fnc_setPitchBankYaw.sqf rename to addons/common/functions/fnc_setPitchBankYaw.sqf index 3b9a6c0020..8e8696d2b9 100644 --- a/addons/core/functions/fnc_setPitchBankYaw.sqf +++ b/addons/common/functions/fnc_setPitchBankYaw.sqf @@ -13,7 +13,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_aroundX", "_aroundY", "_aroundZ", "_dirX", "_dirY", "_dirZ", "_upX", "_upY", "_upZ", "_dir", "_up", "_dirXTemp", "_upXTemp"]; diff --git a/addons/core/functions/fnc_setVariableJIP.sqf b/addons/common/functions/fnc_setVariableJIP.sqf similarity index 92% rename from addons/core/functions/fnc_setVariableJIP.sqf rename to addons/common/functions/fnc_setVariableJIP.sqf index ec9eb84a13..6f932079c5 100644 --- a/addons/core/functions/fnc_setVariableJIP.sqf +++ b/addons/common/functions/fnc_setVariableJIP.sqf @@ -11,7 +11,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_varName", "_value", "_respawnVariables"]; diff --git a/addons/core/functions/fnc_showUser.sqf b/addons/common/functions/fnc_showUser.sqf similarity index 75% rename from addons/core/functions/fnc_showUser.sqf rename to addons/common/functions/fnc_showUser.sqf index f07b9349ea..3510cdc93f 100644 --- a/addons/core/functions/fnc_showUser.sqf +++ b/addons/common/functions/fnc_showUser.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_object"; diff --git a/addons/core/functions/fnc_stringToColoredText.sqf b/addons/common/functions/fnc_stringToColoredText.sqf similarity index 90% rename from addons/core/functions/fnc_stringToColoredText.sqf rename to addons/common/functions/fnc_stringToColoredText.sqf index 1335601ced..90a8912f49 100644 --- a/addons/core/functions/fnc_stringToColoredText.sqf +++ b/addons/common/functions/fnc_stringToColoredText.sqf @@ -10,7 +10,7 @@ * Return value: * Text */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_string", "_color"]; diff --git a/addons/core/functions/fnc_subString.sqf b/addons/common/functions/fnc_subString.sqf similarity index 92% rename from addons/core/functions/fnc_subString.sqf rename to addons/common/functions/fnc_subString.sqf index 8360068069..bf3cfa0156 100644 --- a/addons/core/functions/fnc_subString.sqf +++ b/addons/common/functions/fnc_subString.sqf @@ -11,7 +11,7 @@ * Return Value: * String when successfull / False when not */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _string = _this select 0; _index = _this select 1; diff --git a/addons/core/functions/fnc_toBin.sqf b/addons/common/functions/fnc_toBin.sqf similarity index 91% rename from addons/core/functions/fnc_toBin.sqf rename to addons/common/functions/fnc_toBin.sqf index 18cd4bf04f..0bfaf399ac 100644 --- a/addons/core/functions/fnc_toBin.sqf +++ b/addons/common/functions/fnc_toBin.sqf @@ -10,7 +10,7 @@ A number Return Value: A binary number, String */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_sign", "_bin", "_rest"]; diff --git a/addons/core/functions/fnc_toBitmask.sqf b/addons/common/functions/fnc_toBitmask.sqf similarity index 85% rename from addons/core/functions/fnc_toBitmask.sqf rename to addons/common/functions/fnc_toBitmask.sqf index da4ce1cc11..c628700645 100644 --- a/addons/core/functions/fnc_toBitmask.sqf +++ b/addons/common/functions/fnc_toBitmask.sqf @@ -9,7 +9,7 @@ * Return value: * Bitmask (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_result"]; diff --git a/addons/core/functions/fnc_toHex.sqf b/addons/common/functions/fnc_toHex.sqf similarity index 93% rename from addons/core/functions/fnc_toHex.sqf rename to addons/common/functions/fnc_toHex.sqf index a4f58a123a..521cf1ddce 100644 --- a/addons/core/functions/fnc_toHex.sqf +++ b/addons/common/functions/fnc_toHex.sqf @@ -10,7 +10,7 @@ A number Return Value: A hexadecimal number, String */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_sign", "_hex", "_rest"]; diff --git a/addons/core/functions/fnc_toNumber.sqf b/addons/common/functions/fnc_toNumber.sqf similarity index 82% rename from addons/core/functions/fnc_toNumber.sqf rename to addons/common/functions/fnc_toNumber.sqf index c68377b0f7..c9c0169b9d 100644 --- a/addons/core/functions/fnc_toNumber.sqf +++ b/addons/common/functions/fnc_toNumber.sqf @@ -16,7 +16,7 @@ Example: _number = ["102"] call FUNC(toNumber); */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if (typeName (_this select 0) == "SCALAR") exitWith { (_this select 0) diff --git a/addons/core/functions/fnc_unmuteUnit.sqf b/addons/common/functions/fnc_unmuteUnit.sqf similarity index 88% rename from addons/core/functions/fnc_unmuteUnit.sqf rename to addons/common/functions/fnc_unmuteUnit.sqf index d41f023791..ed8cff1032 100644 --- a/addons/core/functions/fnc_unmuteUnit.sqf +++ b/addons/common/functions/fnc_unmuteUnit.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_speaker"]; diff --git a/addons/core/script_component.hpp b/addons/common/script_component.hpp similarity index 56% rename from addons/core/script_component.hpp rename to addons/common/script_component.hpp index 2acc976dc0..cbb8741c94 100644 --- a/addons/core/script_component.hpp +++ b/addons/common/script_component.hpp @@ -1,14 +1,14 @@ -#define COMPONENT core +#define COMPONENT common #include "\z\ace\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL -#ifdef DEBUG_ENABLED_MAIN +#ifdef DEBUG_ENABLED_COMMON #define DEBUG_MODE_FULL #endif -#ifdef DEBUG_SETTINGS_MAIN - #define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN +#ifdef DEBUG_ENABLED_COMMON + #define DEBUG_SETTINGS DEBUG_ENABLED_COMMON #endif #include "\z\ace\addons\main\script_macros.hpp" diff --git a/addons/core/script_macros.hpp b/addons/common/script_macros.hpp similarity index 100% rename from addons/core/script_macros.hpp rename to addons/common/script_macros.hpp diff --git a/addons/core/scripts/KeyInput/initCanInteractFunction.sqf b/addons/common/scripts/KeyInput/initCanInteractFunction.sqf similarity index 91% rename from addons/core/scripts/KeyInput/initCanInteractFunction.sqf rename to addons/common/scripts/KeyInput/initCanInteractFunction.sqf index 29237b6fdd..ed99ad18c8 100644 --- a/addons/core/scripts/KeyInput/initCanInteractFunction.sqf +++ b/addons/common/scripts/KeyInput/initCanInteractFunction.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_function", "_configFile", "_count", "_index", "_config", "_configName", "_condition"]; diff --git a/addons/core/scripts/KeyInput/initKeys.sqf b/addons/common/scripts/KeyInput/initKeys.sqf similarity index 98% rename from addons/core/scripts/KeyInput/initKeys.sqf rename to addons/common/scripts/KeyInput/initKeys.sqf index 91c50b2511..c4a88ede68 100644 --- a/addons/core/scripts/KeyInput/initKeys.sqf +++ b/addons/common/scripts/KeyInput/initKeys.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _config = configFile >> QGVAR(Default_Keys); _count = count _config; diff --git a/addons/core/scripts/KeyInput/initScrollWheel.sqf b/addons/common/scripts/KeyInput/initScrollWheel.sqf similarity index 86% rename from addons/core/scripts/KeyInput/initScrollWheel.sqf rename to addons/common/scripts/KeyInput/initScrollWheel.sqf index c2d2c4d2d7..a55ebafa43 100644 --- a/addons/core/scripts/KeyInput/initScrollWheel.sqf +++ b/addons/common/scripts/KeyInput/initScrollWheel.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" GVAR(ScrollWheelFrame) = diag_frameno; diff --git a/addons/core/scripts/Version/checkVersionNumber.sqf b/addons/common/scripts/Version/checkVersionNumber.sqf similarity index 95% rename from addons/core/scripts/Version/checkVersionNumber.sqf rename to addons/common/scripts/Version/checkVersionNumber.sqf index 44b5738e00..d89200c3e1 100644 --- a/addons/core/scripts/Version/checkVersionNumber.sqf +++ b/addons/common/scripts/Version/checkVersionNumber.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" sleep 1; //wait for module @@ -19,7 +19,7 @@ if (missionNamespace getVariable ["ACE_Version_CheckAll", false]) then { } forEach activatedAddons; }; -_versionMain = parseNumber getText (configFile >> "CfgPatches" >> "ACE_Core" >> "version"); +_versionMain = parseNumber getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version"); _versions = []; { @@ -28,7 +28,7 @@ _versions = []; } forEach _files; if (isServer) then { - diag_log text format ["[ACE] Server: ACE_core is Version %1.", _versionMain]; + diag_log text format ["[ACE] Server: ACE_Common is Version %1.", _versionMain]; { if (toLower _x find "ACE_" == 0) then {// @@ -42,7 +42,7 @@ if (isServer) then { ACE_Version_ServerVersions = [_files, _versions]; publicVariable "ACE_Version_ServerVersions"; } else { - diag_log text format ["[ACE] Client: ACE_core is Version %1.", _versionMain]; + diag_log text format ["[ACE] Client: ACE_Common is Version %1.", _versionMain]; { if (toLower _x find "ACE_" == 0) then {// diff --git a/addons/core/scripts/assignedItemFix.sqf b/addons/common/scripts/assignedItemFix.sqf similarity index 96% rename from addons/core/scripts/assignedItemFix.sqf rename to addons/common/scripts/assignedItemFix.sqf index 4b031c1220..77a1c410df 100644 --- a/addons/core/scripts/assignedItemFix.sqf +++ b/addons/common/scripts/assignedItemFix.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if (isNil "ACE_itemFix") then { ACE_isMapEnabled = call {_config = missionConfigFile >> "showMap"; !isNumber _config || {getNumber _config == 1}}; diff --git a/addons/core/scripts/closeMenu.sqf b/addons/common/scripts/closeMenu.sqf similarity index 68% rename from addons/core/scripts/closeMenu.sqf rename to addons/common/scripts/closeMenu.sqf index 1b8e4d7814..88c8db10a0 100644 --- a/addons/core/scripts/closeMenu.sqf +++ b/addons/common/scripts/closeMenu.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" closeDialog 0; [localize QUOTE(DOUBLES(STR,GVAR(ProfileNotSaved)))] call FUNC(displayTextStructured); diff --git a/addons/core/scripts/editKey.sqf b/addons/common/scripts/editKey.sqf similarity index 98% rename from addons/core/scripts/editKey.sqf rename to addons/common/scripts/editKey.sqf index 8069b37452..0f7518c758 100644 --- a/addons/core/scripts/editKey.sqf +++ b/addons/common/scripts/editKey.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define GRAY [0.25, 0.25, 0.25, 1] #define WHITE [1, 1, 1, 1] diff --git a/addons/core/scripts/keyInput.sqf b/addons/common/scripts/keyInput.sqf similarity index 93% rename from addons/core/scripts/keyInput.sqf rename to addons/common/scripts/keyInput.sqf index 031f03afb1..eab0e56448 100644 --- a/addons/core/scripts/keyInput.sqf +++ b/addons/common/scripts/keyInput.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define FORBIDDEN_KEYS [42, 54, 29, 157, 56, 184, 0, 183, 197, 1] diff --git a/addons/core/scripts/keyRelease.sqf b/addons/common/scripts/keyRelease.sqf similarity index 59% rename from addons/core/scripts/keyRelease.sqf rename to addons/common/scripts/keyRelease.sqf index 27f58b1b73..0d5542241d 100644 --- a/addons/core/scripts/keyRelease.sqf +++ b/addons/common/scripts/keyRelease.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _keyIndex = _this select 1; diff --git a/addons/core/scripts/nextKeys.sqf b/addons/common/scripts/nextKeys.sqf similarity index 98% rename from addons/core/scripts/nextKeys.sqf rename to addons/common/scripts/nextKeys.sqf index f3ba8ce6d1..004c3de992 100644 --- a/addons/core/scripts/nextKeys.sqf +++ b/addons/common/scripts/nextKeys.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define OFFSET_1 100 #define OFFSET_2 200 diff --git a/addons/core/scripts/openMenu.sqf b/addons/common/scripts/openMenu.sqf similarity index 98% rename from addons/core/scripts/openMenu.sqf rename to addons/common/scripts/openMenu.sqf index 2aee613907..018c9f8ccb 100644 --- a/addons/core/scripts/openMenu.sqf +++ b/addons/common/scripts/openMenu.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define OFFSET_1 100 #define OFFSET_2 200 diff --git a/addons/core/scripts/readParameters.sqf b/addons/common/scripts/readParameters.sqf similarity index 96% rename from addons/core/scripts/readParameters.sqf rename to addons/common/scripts/readParameters.sqf index 31343e2f53..505776abd0 100644 --- a/addons/core/scripts/readParameters.sqf +++ b/addons/common/scripts/readParameters.sqf @@ -1,5 +1,5 @@ // by CAA-Picard -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" // Read ACE_Parameters from config and set them on the mission namespace _config = configFile >> "ACE_Parameters_Numeric"; diff --git a/addons/core/scripts/toggleState.sqf b/addons/common/scripts/toggleState.sqf similarity index 92% rename from addons/core/scripts/toggleState.sqf rename to addons/common/scripts/toggleState.sqf index ea64572047..3643b00c19 100644 --- a/addons/core/scripts/toggleState.sqf +++ b/addons/common/scripts/toggleState.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _index = _this select 0; diff --git a/addons/core/sounds/ACE_click.wav b/addons/common/sounds/ACE_click.wav similarity index 100% rename from addons/core/sounds/ACE_click.wav rename to addons/common/sounds/ACE_click.wav diff --git a/addons/core/stringtable.xml b/addons/common/stringtable.xml similarity index 90% rename from addons/core/stringtable.xml rename to addons/common/stringtable.xml index bc20e646b0..f3606f77a1 100644 --- a/addons/core/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1,8 +1,8 @@  - - + + ACE-Team ACE-Team ACE-Team @@ -14,7 +14,7 @@ ACE-Team ACE-Team - + Save Speichern Guardar @@ -26,7 +26,7 @@ Mentés Salva - + Cancel Abbrechen Cancelar @@ -38,7 +38,7 @@ Mégse Annulla - + ACE Options ACE Optionen Opciones ACE @@ -50,7 +50,7 @@ ACE Opciók Opzioni ACE - + Shift Umschalt Shift @@ -62,7 +62,7 @@ Shift Shift - + Ctrl Strg Ctrl @@ -74,7 +74,7 @@ Ctrl Ctrl - + Alt Alt Alt @@ -86,7 +86,7 @@ Alt Alt - + Shift right Umschalt rechts Shift derecho @@ -98,7 +98,7 @@ Jobb Shift Shift destro - + Ctrl right Strg rechts Ctrl derecho @@ -110,7 +110,7 @@ Jobb Ctrl Ctrl destro - + Alt right Alt Gr Alt derecho @@ -122,7 +122,7 @@ Alt Gr Alt Gr - + Default Standard Por defecto @@ -134,7 +134,7 @@ Alapértelmezett Standard - + None Keiner Ninguna @@ -146,7 +146,7 @@ Semmi Non assegnato - + 2x %1 2x %1 2x %1 @@ -158,7 +158,7 @@ 2x %1 2x %1 - + Hold %1 %1 halten Mantener %1 @@ -170,7 +170,7 @@ %1 Nyomvatartása Tieni premuto %1 - + Profile saved Profil gespeichert Perfil guardado @@ -182,7 +182,7 @@ Profil elmentve Profilo salvato - + Profile not saved Profil nicht gespeichert Perfil no guardado @@ -195,7 +195,7 @@ Profilo non salvato - + N N N @@ -207,7 +207,7 @@ É N - + NNE NNO NNE @@ -219,7 +219,7 @@ ÉÉK NNE - + NE NO NE @@ -231,7 +231,7 @@ ÉK NE - + ENE ONO ENE @@ -243,7 +243,7 @@ KÉK ENE - + E O E @@ -255,7 +255,7 @@ K E - + ESE OSO ESE @@ -267,7 +267,7 @@ KDK ESE - + SE SO SE @@ -279,7 +279,7 @@ DK SE - + SSE SSO SSE @@ -291,7 +291,7 @@ DDK SSE - + S S S @@ -303,7 +303,7 @@ D S - + SSW SSW SSO @@ -315,7 +315,7 @@ DDNy SSO - + SW SW SO @@ -327,7 +327,7 @@ DNy SO - + WSW WSW OSO @@ -339,7 +339,7 @@ NyDNy OSO - + W W O @@ -351,7 +351,7 @@ Ny O - + WNW WNW ONO @@ -363,7 +363,7 @@ NyÉNy ONO - + NW NW NO @@ -375,7 +375,7 @@ ÉNy NO - + NNW NNW NNO @@ -387,7 +387,7 @@ ÉÉNy NNO - + Action cancelled. Aktion abgebrochen. Acción cancelada. @@ -399,7 +399,7 @@ Művelet megszakítva. Azione cancellata. - + < Prev < Zurück < Anterior. @@ -411,7 +411,7 @@ < Előző < Prec - + Next > Weiter > Siguiente > @@ -423,7 +423,7 @@ Következő > Prossimo > - + [ACE] Miscellaneous Items [ACE] Verschiedenes [ACE] Objetos varios @@ -435,7 +435,7 @@ [ACE] Egyéb tárgyak [ACE] Oggetti vari - + Disable Command Menu Befehlsmenü ausschalten Desactivar menú de mando @@ -445,7 +445,7 @@ Выключить командное меню Parancsnoki menü kikapcsolása - + Unknown Unbekannt Desconocido @@ -454,7 +454,7 @@ Неизвестно Ismeretlen - + No Voice Keine Stimme Sin voz diff --git a/addons/core/$PBOPREFIX$ b/addons/core/$PBOPREFIX$ deleted file mode 100644 index cf1ff42a75..0000000000 --- a/addons/core/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ace\addons\core \ No newline at end of file diff --git a/addons/core/functions/fnc_playerSide.sqf b/addons/core/functions/fnc_playerSide.sqf deleted file mode 100644 index 924e3e23d5..0000000000 --- a/addons/core/functions/fnc_playerSide.sqf +++ /dev/null @@ -1,4 +0,0 @@ -// by commy2 -#include "\z\ace\addons\core\script_component.hpp" - -side group ACE_player From 1ea2afaec5a91b2b70e1b9a9f4589a1c94737b9d Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 20:11:36 +0100 Subject: [PATCH 13/18] some macros --- addons/common/RscInfoType.hpp | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/common/RscInfoType.hpp b/addons/common/RscInfoType.hpp index 8bc45752cf..ead66065e3 100644 --- a/addons/common/RscInfoType.hpp +++ b/addons/common/RscInfoType.hpp @@ -1,27 +1,27 @@ class RscInGameUI { - class RscUnitInfo; - class RscUnitInfoSoldier: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgSoldier', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoSoldier', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoTank: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgVehicle', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoVehicle', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoAir: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgAircraft', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAircraft', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoShip: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgShip', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoShip', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoParachute: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgParachute', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoParachute', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; + class RscUnitInfo; + class RscUnitInfoSoldier: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgSoldier', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoSoldier', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoTank: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgVehicle', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoVehicle', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoAir: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgAircraft', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAircraft', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoShip: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgShip', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoShip', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoParachute: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgParachute', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoParachute', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; }; class RscDisplayInventory { - onLoad = "[""onLoad"",_this,""RscDisplayInventory"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInventory', [-1, [], []]]) select 2);"; + onLoad = "[""onLoad"",_this,""RscDisplayInventory"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInventory', [-1, [], []]]) select 2);"; }; class RscDisplayChannel { - onLoad = QUOTE( _this call GVAR(onLoadRscDisplayChannel) ); + onLoad = QUOTE(_this call GVAR(onLoadRscDisplayChannel)); }; From 72e3d7519b2aa39e9088902b42781a37b4177ea7 Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 20:27:43 +0100 Subject: [PATCH 14/18] formating --- addons/common/config.cpp | 12 +- addons/main/config.cpp | 81 +- addons/ragdolls/config.cpp | 1518 ++++++----- addons/ragdolls/script_component.hpp | 4 +- addons/realisticnames/config.cpp | 2746 ++++++++++---------- addons/realisticnames/script_component.hpp | 4 +- addons/realisticnames/stringtable.xml | 2428 ++++++++--------- addons/thermals/config.cpp | 64 +- addons/thermals/script_component.hpp | 4 +- extras/blank_module/CfgEventHandlers.hpp | 6 +- extras/blank_module/config.cpp | 22 +- extras/blank_module/script_component.hpp | 4 +- 12 files changed, 3442 insertions(+), 3451 deletions(-) diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 1199529deb..8c234e4c85 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -3,16 +3,12 @@ class CfgPatches { class ADDON { units[] = {"ACE_Box_Misc"}; - weapons[] = {"ACE_ItemCore", "ACE_FakePrimaryWeapon"}; - requiredVersion = 0.60; - requiredAddons[] = { - "ace_main" - }; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; + weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_main"}; author[] = {"KoffeinFlummi"}; authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; }; }; diff --git a/addons/main/config.cpp b/addons/main/config.cpp index 0bad03d89c..3b8c600e22 100644 --- a/addons/main/config.cpp +++ b/addons/main/config.cpp @@ -1,11 +1,12 @@ #include "script_component.hpp" + class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = { - "a3_air_f", + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "a3_air_f", "a3_air_f_beta", "a3_air_f_beta_heli_attack_01", "a3_air_f_beta_heli_attack_02", @@ -491,48 +492,48 @@ class CfgPatches { "a3_weapons_f_vests", "a3data", "extended_eventhandlers", "CBA_UI", "CBA_XEH", "CBA_XEH_A3" - }; - author[] = {"ACE Team"}; - authorUrl = ""; - versionDesc = "A.C.E."; - versionAct = "['MAIN',_this] execVM '\z\ace\addons\main\about.sqf';"; - VERSION_CONFIG; - }; + }; + author[] = {"ACE Team"}; + authorUrl = ""; + versionDesc = "A.C.E."; + versionAct = "['MAIN',_this] execVM '\z\ace\addons\main\about.sqf';"; + VERSION_CONFIG; + }; }; class CfgMods { - class PREFIX { - dir = "@ACE"; - name = "Core - Advanced Combat Environment"; - picture = "A3\Ui_f\data\Logos\arma3_expansion_alpha_ca"; - hidePicture = "true"; - hideName = "true"; - actionName = "Website"; - action = "http://ace.dev-heaven.net"; - description = "Bugtracker: "; - }; + class PREFIX { + dir = "@ACE"; + name = "Core - Advanced Combat Environment"; + picture = "A3\Ui_f\data\Logos\arma3_expansion_alpha_ca"; + hidePicture = "true"; + hideName = "true"; + actionName = "Website"; + action = "http://ace.dev-heaven.net"; + description = "Bugtracker: "; + }; }; class CfgSettings { - class CBA { - class Versioning { - class PREFIX { - level = DEFAULT_VERSIONING_LEVEL; - handler = "ace_common_fnc_mismatch"; - class Dependencies { - CBA[]={"cba_main", {1,0,0}, "true"}; - XEH[]={"cba_xeh", {1,0,0}, "true"}; - }; - }; - }; + class CBA { + class Versioning { + class PREFIX { + level = DEFAULT_VERSIONING_LEVEL; + handler = "ace_common_fnc_mismatch"; + class Dependencies { + CBA[]={"cba_main", {1,0,0}, "true"}; + XEH[]={"cba_xeh", {1,0,0}, "true"}; + }; + }; + }; /* - class Registry { - class PREFIX { - removed[] = {}; - }; - }; + class Registry { + class PREFIX { + removed[] = {}; + }; + }; */ - }; + }; }; #include "CfgModuleCategories.hpp" diff --git a/addons/ragdolls/config.cpp b/addons/ragdolls/config.cpp index dba3b10a7c..3d9198a41d 100644 --- a/addons/ragdolls/config.cpp +++ b/addons/ragdolls/config.cpp @@ -1,17 +1,15 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = 0.60; - requiredAddons[] = {ace_core}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {"KoffeinFlummi", "Opticalsnare"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - }; + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author[] = {"KoffeinFlummi", "Opticalsnare"}; + authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; + }; }; /* @@ -21,783 +19,783 @@ class CfgPatches { */ class PhysXParams { - epeImpulseDamageCoef = 1320.0; - impulseForceRagdollCoef = 200; - impulseTorqueRagdollCoef = 100; - maxRagdollImpulseForceMagnitude = 500; - maxRagdollImpulseTorqueMagnitude = 150; - ragdollHitDmgLimit = "0.01f"; - ragdollHitForceCoef = "20f"; - ragdollHitTime = "0.05f"; - ragdollOnCollideForceCoef = "20.0f"; - ragdollOnCollideMassLimit = "0.0f"; - ragdollOnCollideMaxForce = "25.0f"; - ragdollOnCollideMaxOffset = "2.0f"; - ragdollOnCollideMaxOffsetSpeed = "50.0f"; - ragdollOnCollideSpeedLimit = "2500.0f"; - ragdollOnCollideVehicleImpulseCoef = "0.5f"; - ragdollUnconsciousSleepCoef = "0f"; - ragdollUnderwaterBuoyancyCoef = 9.7; - ragdollUnderwaterResistanceCoef = 0.005; - ragdollVehicleCollision = 1; + epeImpulseDamageCoef = 1320.0; + impulseForceRagdollCoef = 200; + impulseTorqueRagdollCoef = 100; + maxRagdollImpulseForceMagnitude = 500; + maxRagdollImpulseTorqueMagnitude = 150; + ragdollHitDmgLimit = "0.01f"; + ragdollHitForceCoef = "20f"; + ragdollHitTime = "0.05f"; + ragdollOnCollideForceCoef = "20.0f"; + ragdollOnCollideMassLimit = "0.0f"; + ragdollOnCollideMaxForce = "25.0f"; + ragdollOnCollideMaxOffset = "2.0f"; + ragdollOnCollideMaxOffsetSpeed = "50.0f"; + ragdollOnCollideSpeedLimit = "2500.0f"; + ragdollOnCollideVehicleImpulseCoef = "0.5f"; + ragdollUnconsciousSleepCoef = "0f"; + ragdollUnderwaterBuoyancyCoef = 9.7; + ragdollUnderwaterResistanceCoef = 0.005; + ragdollVehicleCollision = 1; }; class RagDollDefaultLimit { - value = 0; - restitution = 0.9; - hardness = 0.5; + value = 0; + restitution = 0.9; + hardness = 0.5; }; class RagDollDefaultSpring { - enabled = 0; - value = 0.5; - damper = 1; - targetValue = 0; + enabled = 0; + value = 0.5; + damper = 1; + targetValue = 0; }; class RagDollSphericalJoint { - class TwistLimitLow : RagDollDefaultLimit {}; + class TwistLimitLow : RagDollDefaultLimit {}; - class TwistLimitHigh : RagDollDefaultLimit {}; + class TwistLimitHigh : RagDollDefaultLimit {}; - class SwingLimit : RagDollDefaultLimit {}; + class SwingLimit : RagDollDefaultLimit {}; - class TwistSpring : RagDollDefaultSpring { - enabled = 1; - }; + class TwistSpring : RagDollDefaultSpring { + enabled = 1; + }; - class SwingSpring : RagDollDefaultSpring { - enabled = 1; - damper = 2; - }; + class SwingSpring : RagDollDefaultSpring { + enabled = 1; + damper = 2; + }; - class JointSpring : RagDollDefaultSpring { - enabled = 0; - }; - type = "spherical"; - enableCollision = 0; - projectionDistance = 0.05; - projectionMode = "point"; + class JointSpring : RagDollDefaultSpring { + enabled = 0; + }; + type = "spherical"; + enableCollision = 0; + projectionDistance = 0.05; + projectionMode = "point"; }; class RagDollRevoluteJoint { - class LimitLow : RagDollDefaultLimit {}; + class LimitLow : RagDollDefaultLimit {}; - class LimitHigh : RagDollDefaultLimit {}; + class LimitHigh : RagDollDefaultLimit {}; - class Spring : RagDollDefaultSpring { - enabled = 0; - }; - type = "revolute"; - enableCollision = 0; - projectionDistance = 0.05; - projectionMode = "point"; + class Spring : RagDollDefaultSpring { + enabled = 0; + }; + type = "revolute"; + enableCollision = 0; + projectionDistance = 0.05; + projectionMode = "point"; }; class RagDollD6Joint_PX3 { - type = "D6"; - enableCollision = 0; - projectionDistance = 0.05; - projectionMode = "point"; - swingLimitY = "0.0f"; - swingLimitZ = "0.0f"; - swingSpring = "0.0f"; - swingDamping = "0.0f"; - swingRestitution = "0.6f"; - swingContactDistance = "0.05f"; - twistLimitLower = "0.0f"; - twistLimitUpper = "0.0f"; - twistSpring = "0.0f"; - twistDamping = "0.0f"; - twistRestitution = "0.6f"; - twistContactDistance = "0.05f"; - driveSpring = "20.0f"; - driveDamping = "20.0f"; - driveMaxForce = "1000000.0f"; - driveUseAcceleration = 1; - driveLinearVelocity[] = {0, 0, 0}; - driveAngularVelocity[] = {0, 0, 0}; + type = "D6"; + enableCollision = 0; + projectionDistance = 0.05; + projectionMode = "point"; + swingLimitY = "0.0f"; + swingLimitZ = "0.0f"; + swingSpring = "0.0f"; + swingDamping = "0.0f"; + swingRestitution = "0.6f"; + swingContactDistance = "0.05f"; + twistLimitLower = "0.0f"; + twistLimitUpper = "0.0f"; + twistSpring = "0.0f"; + twistDamping = "0.0f"; + twistRestitution = "0.6f"; + twistContactDistance = "0.05f"; + driveSpring = "20.0f"; + driveDamping = "20.0f"; + driveMaxForce = "1000000.0f"; + driveUseAcceleration = 1; + driveLinearVelocity[] = {0, 0, 0}; + driveAngularVelocity[] = {0, 0, 0}; }; class CfgRagDollSkeletons { - class BaseRagdoll { - primaryWeaponBone = ""; - secondaryWeaponBone = ""; - networkBonePrimary = ""; - networkBoneSecondary = ""; - weaponSleepLinearVelocity = 20; - weaponSleepAngularVelocity = 20; - weaponDropMinTime = 1.0; - weaponDropMaxTime = 100.0; - weaponDistanceLimit = "10f"; - weaponDistanceLimitTime = "5.0f"; - sleepLinearVelocity = 0.05; - sleepAngularVelocity = 0.05; - simulateMinTime = 30; - simulateMaxTime = 100.0; - simulateDistanceLimit = "0.05f"; - simulateDistanceLimitTime = "5.0f"; - recoveryBlendTime = "0.5f"; - recoveryCosLimit = "0.3f"; - recoveryDistLimit = "0.7f"; - animBlendTime = "0.0f"; - }; - - class Soldier : BaseRagdoll { - primaryWeaponBone = "weapon"; - secondaryWeaponBone = "launcher"; - networkBonePrimary = "chest"; - networkBoneSecondary = "pelvis"; - draggingMask = "dragging"; - hitMask = "hit"; - hitMaskUnderwater = "hitUnderwater"; - - class WeaponLinkBones { - class LinkBone1 { - bone = "leftHand"; - canBeDropped = 1; - prefference = "1.0f"; - }; - - class LinkBone2 { - bone = "rightHand"; - canBeDropped = 1; - prefference = "2.0f"; - }; - - class LinkBone3 { - bone = "chest"; - canBeDropped = 1; - prefference = "1.0f"; - }; + class BaseRagdoll { + primaryWeaponBone = ""; + secondaryWeaponBone = ""; + networkBonePrimary = ""; + networkBoneSecondary = ""; + weaponSleepLinearVelocity = 20; + weaponSleepAngularVelocity = 20; + weaponDropMinTime = 1.0; + weaponDropMaxTime = 100.0; + weaponDistanceLimit = "10f"; + weaponDistanceLimitTime = "5.0f"; + sleepLinearVelocity = 0.05; + sleepAngularVelocity = 0.05; + simulateMinTime = 30; + simulateMaxTime = 100.0; + simulateDistanceLimit = "0.05f"; + simulateDistanceLimitTime = "5.0f"; + recoveryBlendTime = "0.5f"; + recoveryCosLimit = "0.3f"; + recoveryDistLimit = "0.7f"; + animBlendTime = "0.0f"; }; - class Masks { - class DraggingMask { - name = "dragging"; - mask[] = {{"pelvis", 0, 1}, {"chest", 0, 1}, {"head", "0.6f", 0}, {"leftArm", 1, 0}, {"leftForeArm", 1, 0}, {"leftHand", 1, 0}, {"rightArm", 1, 0}, {"rightForeArm", 1, 0}, {"rightHand", 1, 0}, {"leftUpLeg", 1, 0}, {"leftLeg", 1, 0}, {"leftFoot", 1, 0}, {"rightUpLeg", 1, 0}, {"rightLeg", 1, 0}, {"rightFoot", 1, 0}, {"weapon", 0, 1}, {"launcher", 0, 1}}; - }; + class Soldier : BaseRagdoll { + primaryWeaponBone = "weapon"; + secondaryWeaponBone = "launcher"; + networkBonePrimary = "chest"; + networkBoneSecondary = "pelvis"; + draggingMask = "dragging"; + hitMask = "hit"; + hitMaskUnderwater = "hitUnderwater"; - class HitMask { - name = "hit"; - mask[] = {{"pelvis", 1, 0}, {"chest", 1, 0}, {"head", 1, 0}, {"leftArm", 1, 0}, {"leftForeArm", 1, 0}, {"leftHand", 1, 0}, {"rightArm", 1, 0}, {"rightForeArm", 1, 0}, {"rightHand", 1, 0}, {"leftUpLeg", 1, 0}, {"leftLeg", 1, 0}, {"leftFoot", 1, 1}, {"rightUpLeg", 1, 0}, {"rightLeg", 1, 0}, {"rightFoot", 1, 1}, {"weapon", 1, 0}, {"launcher", 1, 0}}; - }; + class WeaponLinkBones { + class LinkBone1 { + bone = "leftHand"; + canBeDropped = 1; + prefference = "1.0f"; + }; - class HitMaskUnderwater { - name = "hitUnderwater"; - mask[] = {{"pelvis", 1, 1}, {"chest", 1, 1}, {"head", 1, 0}, {"leftArm", 1, 0}, {"leftForeArm", 1, 0}, {"leftHand", 1, 0}, {"rightArm", 1, 0}, {"rightForeArm", 1, 0}, {"rightHand", 1, 0}, {"leftUpLeg", 1, 0}, {"leftLeg", 1, 0}, {"leftFoot", 1, 0}, {"rightUpLeg", 1, 0}, {"rightLeg", 1, 0}, {"rightFoot", 1, 0}, {"weapon", 1, 0}, {"launcher", 1, 0}}; - }; + class LinkBone2 { + bone = "rightHand"; + canBeDropped = 1; + prefference = "2.0f"; + }; + + class LinkBone3 { + bone = "chest"; + canBeDropped = 1; + prefference = "1.0f"; + }; + }; + + class Masks { + class DraggingMask { + name = "dragging"; + mask[] = {{"pelvis", 0, 1}, {"chest", 0, 1}, {"head", "0.6f", 0}, {"leftArm", 1, 0}, {"leftForeArm", 1, 0}, {"leftHand", 1, 0}, {"rightArm", 1, 0}, {"rightForeArm", 1, 0}, {"rightHand", 1, 0}, {"leftUpLeg", 1, 0}, {"leftLeg", 1, 0}, {"leftFoot", 1, 0}, {"rightUpLeg", 1, 0}, {"rightLeg", 1, 0}, {"rightFoot", 1, 0}, {"weapon", 0, 1}, {"launcher", 0, 1}}; + }; + + class HitMask { + name = "hit"; + mask[] = {{"pelvis", 1, 0}, {"chest", 1, 0}, {"head", 1, 0}, {"leftArm", 1, 0}, {"leftForeArm", 1, 0}, {"leftHand", 1, 0}, {"rightArm", 1, 0}, {"rightForeArm", 1, 0}, {"rightHand", 1, 0}, {"leftUpLeg", 1, 0}, {"leftLeg", 1, 0}, {"leftFoot", 1, 1}, {"rightUpLeg", 1, 0}, {"rightLeg", 1, 0}, {"rightFoot", 1, 1}, {"weapon", 1, 0}, {"launcher", 1, 0}}; + }; + + class HitMaskUnderwater { + name = "hitUnderwater"; + mask[] = {{"pelvis", 1, 1}, {"chest", 1, 1}, {"head", 1, 0}, {"leftArm", 1, 0}, {"leftForeArm", 1, 0}, {"leftHand", 1, 0}, {"rightArm", 1, 0}, {"rightForeArm", 1, 0}, {"rightHand", 1, 0}, {"leftUpLeg", 1, 0}, {"leftLeg", 1, 0}, {"leftFoot", 1, 0}, {"rightUpLeg", 1, 0}, {"rightLeg", 1, 0}, {"rightFoot", 1, 0}, {"weapon", 1, 0}, {"launcher", 1, 0}}; + }; + }; + + class BaseRagdollBone { + material = "Ragdoll"; + childrenUseStartTrans = 1; + }; + + class Bones { + class Pelvis : BaseRagdollBone { + name = "pelvis"; + type = "capsule"; + startBone = "pelvis"; + endBone = "spine2"; + mass = 15; + radius = 0.12; + networkType = "root"; + }; + + class Chest : BaseRagdollBone { + name = "chest"; + type = "capsule"; + startBone = "spine1"; + endBone = "neck"; + radius = 0.16; + mass = 15; + }; + + class Head : BaseRagdollBone { + name = "head"; + type = "sphere"; + startBone = "head"; + mass = 8; + radius = 0.16; + }; + + class LeftArm : BaseRagdollBone { + name = "leftArm"; + type = "capsule"; + startBone = "leftArm"; + endBone = "leftForeArm"; + mass = 8; + }; + + class LeftForeArm : BaseRagdollBone { + name = "leftForeArm"; + type = "capsule"; + startBone = "leftForeArm"; + endBone = "leftHand"; + mass = 6; + }; + + class LeftHand : BaseRagdollBone { + name = "leftHand"; + type = "sphere"; + startBone = "leftHand"; + mass = 6; + radius = 0.08; + childrenUseStartTrans = 0; + networkType = "leftHand"; + }; + + class RightArm : BaseRagdollBone { + name = "rightArm"; + type = "capsule"; + startBone = "rightArm"; + endBone = "rightForeArm"; + mass = 8; + }; + + class RightForeArm : BaseRagdollBone { + name = "rightForeArm"; + type = "capsule"; + startBone = "rightForeArm"; + endBone = "rightHand"; + mass = 6; + }; + + class RightHand : BaseRagdollBone { + name = "rightHand"; + type = "sphere"; + startBone = "rightHand"; + mass = 6; + radius = 0.08; + childrenUseStartTrans = 0; + networkType = "rightHand"; + }; + + class LeftUpLeg : BaseRagdollBone { + name = "leftUpLeg"; + type = "capsule"; + startBone = "leftUpLeg"; + endBone = "leftLeg"; + mass = 15; + }; + + class LeftLeg : BaseRagdollBone { + name = "leftLeg"; + type = "capsule"; + startBone = "leftLeg"; + endBone = "leftFoot"; + mass = 10; + }; + + class LeftFoot : BaseRagdollBone { + name = "leftFoot"; + type = "box"; + startBone = "leftFoot"; + size[] = {0.15, 0.035, 0.07}; + mass = 8; + networkType = "leftFoot"; + }; + + class RightUpLeg : BaseRagdollBone { + name = "rightUpLeg"; + type = "capsule"; + startBone = "rightUpLeg"; + endBone = "rightLeg"; + mass = 15; + }; + + class RightLeg : BaseRagdollBone { + name = "rightLeg"; + type = "capsule"; + startBone = "rightLeg"; + endBone = "rightFoot"; + mass = 10; + }; + + class RightFoot : BaseRagdollBone { + name = "rightFoot"; + type = "box"; + startBone = "rightFoot"; + size[] = {0.15, 0.035, 0.07}; + mass = 8; + networkType = "rightFoot"; + }; + + class Weapon : BaseRagdollBone { + name = "weapon"; + type = "weapon"; + startBone = "weapon"; + endPosRelToStart[] = {0.0, 1.0, 0.0}; + mass = 3; + }; + + class Launcher : BaseRagdollBone { + name = "launcher"; + type = "weapon"; + startBone = "launcher"; + endPosRelToStart[] = {1.0, 0.0, 0.0}; + mass = 3; + }; + }; + + class JointsPX2 { + class Pelvis_Chest_PX2 : RagDollSphericalJoint { + name = "pelvis_chest"; + bone1 = "pelvis"; + bone2 = "chest"; + axis[] = {0, 1, 0.3}; + + class SwingLimit : SwingLimit { + value = 25; + }; + + class TwistLimitLow : TwistLimitLow { + value = -15; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 25; + }; + }; + + class Chest_Head_PX2 : RagDollSphericalJoint { + name = "chest_head"; + bone1 = "chest"; + bone2 = "head"; + + class SwingLimit : SwingLimit { + value = 20; + }; + + class TwistLimitLow : TwistLimitLow { + value = -15; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 15; + }; + }; + + class Chest_LeftArm_PX2 : RagDollSphericalJoint { + name = "chest_leftArm"; + bone1 = "chest"; + bone2 = "leftArm"; + axis[] = {-1, 0.0, 0.5}; + enableCollision = 1; + + class SwingLimit : SwingLimit { + value = 60; + }; + + class TwistLimitLow : TwistLimitLow { + value = -20; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 20; + }; + }; + + class LeftArm_LeftForeArm_PX2 : RagDollRevoluteJoint { + name = "leftArm_leftForeArm"; + bone1 = "leftArm"; + bone2 = "leftForeArm"; + axis[] = {1, -1, 0.2}; + + class LimitLow : LimitLow { + value = -2; + }; + + class LimitHigh : LimitHigh { + value = 60; + }; + }; + + class LeftForeArm_LeftHand_PX2 : RagDollSphericalJoint { + name = "leftForeArm_leftHand"; + bone1 = "leftForeArm"; + bone2 = "leftHand"; + + class SwingLimit : SwingLimit { + value = 20; + }; + + class TwistLimitLow : TwistLimitLow { + value = -5; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 5; + }; + }; + + class Chest_RightArm_PX2 : RagDollSphericalJoint { + name = "chest_rightArm"; + bone1 = "chest"; + bone2 = "rightArm"; + axis[] = {1, 0.0, 0.5}; + enableCollision = 1; + + class SwingLimit : SwingLimit { + value = 60; + }; + + class TwistLimitLow : TwistLimitLow { + value = -20; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 20; + }; + }; + + class RightArm_RightForeArm_PX2 : RagDollRevoluteJoint { + name = "rightArm_rightForeArm"; + bone1 = "rightArm"; + bone2 = "rightForeArm"; + axis[] = {1, 1, -0.2}; + + class LimitLow : LimitLow { + value = -2; + }; + + class LimitHigh : LimitHigh { + value = 60; + }; + }; + + class RightForeArm_RightHand_PX2 : RagDollSphericalJoint { + name = "rightForeArm_rightHand"; + bone1 = "rightForeArm"; + bone2 = "rightHand"; + + class SwingLimit : SwingLimit { + value = 20; + }; + + class TwistLimitLow : TwistLimitLow { + value = -5; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 5; + }; + }; + + class Pelvis_LeftUpLeg_PX2 : RagDollSphericalJoint { + name = "pelvis_leftUpLeg"; + bone1 = "pelvis"; + bone2 = "leftUpLeg"; + axis[] = {-1.5, -1.1, 2}; + enableCollision = 1; + + class SwingLimit : SwingLimit { + value = 45; + }; + + class TwistLimitLow : TwistLimitLow { + value = -10; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 20; + }; + }; + + class LeftUpLeg_LeftLeg_PX2 : RagDollRevoluteJoint { + name = "leftUpLeg_leftLeg"; + bone1 = "leftUpLeg"; + bone2 = "leftLeg"; + axis[] = {-1, 0, 0}; + + class LimitLow : LimitLow { + value = -5; + }; + + class LimitHigh : LimitHigh { + value = 110; + }; + }; + + class LeftLeg_LeftFoot_PX2 : RagDollRevoluteJoint { + name = "leftLeg_leftFoot"; + bone1 = "leftLeg"; + bone2 = "leftFoot"; + axis[] = {-1, 0, 0}; + + class LimitLow : LimitLow { + value = -15; + }; + + class LimitHigh : LimitHigh { + value = 45; + }; + }; + + class Pelvis_RightUpLeg_PX2 : RagDollSphericalJoint { + name = "pelvis_rightUpLeg"; + bone1 = "pelvis"; + bone2 = "rightUpLeg"; + axis[] = {1.5, -1.1, 2}; + enableCollision = 1; + + class SwingLimit : SwingLimit { + value = 45; + }; + + class TwistLimitLow : TwistLimitLow { + value = -10; + }; + + class TwistLimitHigh : TwistLimitHigh { + value = 20; + }; + }; + + class RightUpLeg_RightLeg_PX2 : RagDollRevoluteJoint { + name = "rightUpLeg_rightLeg"; + bone1 = "rightUpLeg"; + bone2 = "rightLeg"; + axis[] = {-1, 0, 0}; + + class LimitLow : LimitLow { + value = -5; + }; + + class LimitHigh : LimitHigh { + value = 110; + }; + }; + + class RightLeg_RightFoot_PX2 : RagDollRevoluteJoint { + name = "rightLeg_rightFoot"; + bone1 = "rightLeg"; + bone2 = "rightFoot"; + axis[] = {-1, 0, 0}; + + class LimitLow : LimitLow { + value = -15; + }; + + class LimitHigh : LimitHigh { + value = 45; + }; + }; + }; + + class JointsPX3 { + class Pelvis_Chest_PX3 : RagDollD6Joint_PX3 { + name = "pelvis_chest"; + bone1 = "pelvis"; + bone2 = "chest"; + axis[] = {0, 1, 0.3}; + enableCollision = 0; + swingLimitY = 30; + swingLimitZ = 30; + twistLimitLower = -25; + twistLimitUpper = 25; + driveSpring = 30; + driveDamping = 30; + driveSpringWater = 5; + driveDampingWater = 5; + }; + + class Chest_Head_PX3 : RagDollD6Joint_PX3 { + name = "chest_head"; + bone1 = "chest"; + bone2 = "head"; + swingLimitY = 45; + swingLimitZ = 45; + twistLimitLower = -40; + twistLimitUpper = 40; + driveSpring = 15.0; + driveDamping = 30; + driveSpringWater = 1.5; + driveDampingWater = 3.0; + twistSpring = 15.0; + twistDamping = 30.0; + }; + + class Chest_LeftArm_PX3 : RagDollD6Joint_PX3 { + name = "chest_leftArm"; + bone1 = "chest"; + bone2 = "leftArm"; + enableCollision = 1; + swingLimitY = 85; + swingLimitZ = 85; + twistLimitLower = -60; + twistLimitUpper = 60; + driveSpring = 30; + driveDamping = 30; + driveSpringWater = 3; + driveDampingWater = 3; + }; + + class LeftArm_LeftForeArm_PX3 : RagDollD6Joint_PX3 { + name = "leftArm_leftForeArm"; + bone1 = "leftArm"; + bone2 = "leftForeArm"; + axis[] = {-1, 1, -0.2}; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -5; + twistLimitUpper = 150; + driveSpring = 10; + driveDamping = 10; + driveSpringWater = 1; + driveDampingWater = 1; + }; + + class LeftForeArm_LeftHand_PX3 : RagDollD6Joint_PX3 { + name = "leftForeArm_leftHand"; + bone1 = "leftForeArm"; + bone2 = "leftHand"; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -20; + twistLimitUpper = 20; + driveSpring = 10; + driveDamping = 10; + driveSpringWater = 1; + driveDampingWater = 1; + }; + + class Chest_RightArm_PX3 : RagDollD6Joint_PX3 { + name = "chest_rightArm"; + bone1 = "chest"; + bone2 = "rightArm"; + enableCollision = 1; + swingLimitY = 85; + swingLimitZ = 85; + twistLimitLower = -60; + twistLimitUpper = 60; + driveSpring = 30; + driveDamping = 30; + driveSpringWater = 3; + driveDampingWater = 3; + }; + + class RightArm_RightForeArm_PX3 : RagDollD6Joint_PX3 { + name = "rightArm_rightForeArm"; + bone1 = "rightArm"; + bone2 = "rightForeArm"; + axis[] = {-1, -1, 0.2}; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -5; + twistLimitUpper = 150; + driveSpring = 10; + driveDamping = 10; + driveSpringWater = 1; + driveDampingWater = 1; + }; + + class RightForeArm_RightHand_PX3 : RagDollD6Joint_PX3 { + name = "rightForeArm_rightHand"; + bone1 = "rightForeArm"; + bone2 = "rightHand"; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -20; + twistLimitUpper = 20; + driveSpring = 10; + driveDamping = 10; + driveSpringWater = 1; + driveDampingWater = 1; + }; + + class Pelvis_LeftUpLeg_PX3 : RagDollD6Joint_PX3 { + name = "pelvis_leftUpLeg"; + bone1 = "pelvis"; + bone2 = "leftUpLeg"; + enableCollision = 1; + swingLimitY = 35; + swingLimitZ = 35; + twistLimitLower = -10; + twistLimitUpper = 60; + driveSpring = 30; + driveDamping = 30; + driveSpringWater = 3; + driveDampingWater = 3; + twistDamping = 30.0; + }; + + class LeftUpLeg_LeftLeg_PX3 : RagDollD6Joint_PX3 { + name = "leftUpLeg_leftLeg"; + bone1 = "leftUpLeg"; + bone2 = "leftLeg"; + axis[] = {1, 0, 0}; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -5; + twistLimitUpper = 120; + driveSpring = 20; + driveDamping = 20; + driveSpringWater = 2; + driveDampingWater = 2; + }; + + class LeftLeg_LeftFoot_PX3 : RagDollD6Joint_PX3 { + name = "leftLeg_leftFoot"; + bone1 = "leftLeg"; + bone2 = "leftFoot"; + axis[] = {1, 0, 0}; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -15; + twistLimitUpper = 45; + driveSpring = 20; + driveDamping = 20; + driveSpringWater = 2; + driveDampingWater = 2; + }; + + class Pelvis_RightUpLeg_PX3 : RagDollD6Joint_PX3 { + name = "pelvis_rightUpLeg"; + bone1 = "pelvis"; + bone2 = "rightUpLeg"; + enableCollision = 1; + swingLimitY = 35; + swingLimitZ = 35; + twistLimitLower = -10; + twistLimitUpper = 60; + driveSpring = 30; + driveDamping = 30; + driveSpringWater = 3; + driveDampingWater = 3; + twistDamping = 30.0; + }; + + class RightUpLeg_RightLeg_PX3 : RagDollD6Joint_PX3 { + name = "rightUpLeg_rightLeg"; + bone1 = "rightUpLeg"; + bone2 = "rightLeg"; + axis[] = {1, 0, 0}; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -5; + twistLimitUpper = 120; + driveSpring = 20; + driveDamping = 20; + driveSpringWater = 2; + driveDampingWater = 2; + }; + + class RightLeg_RightFoot_PX3 : RagDollD6Joint_PX3 { + name = "rightLeg_rightFoot"; + bone1 = "rightLeg"; + bone2 = "rightFoot"; + axis[] = {1, 0, 0}; + swingLimitY = 10; + swingLimitZ = 10; + twistLimitLower = -15; + twistLimitUpper = 45; + driveSpring = 20; + driveDamping = 20; + driveSpringWater = 2; + driveDampingWater = 2; + }; + }; }; - - class BaseRagdollBone { - material = "Ragdoll"; - childrenUseStartTrans = 1; - }; - - class Bones { - class Pelvis : BaseRagdollBone { - name = "pelvis"; - type = "capsule"; - startBone = "pelvis"; - endBone = "spine2"; - mass = 15; - radius = 0.12; - networkType = "root"; - }; - - class Chest : BaseRagdollBone { - name = "chest"; - type = "capsule"; - startBone = "spine1"; - endBone = "neck"; - radius = 0.16; - mass = 15; - }; - - class Head : BaseRagdollBone { - name = "head"; - type = "sphere"; - startBone = "head"; - mass = 8; - radius = 0.16; - }; - - class LeftArm : BaseRagdollBone { - name = "leftArm"; - type = "capsule"; - startBone = "leftArm"; - endBone = "leftForeArm"; - mass = 8; - }; - - class LeftForeArm : BaseRagdollBone { - name = "leftForeArm"; - type = "capsule"; - startBone = "leftForeArm"; - endBone = "leftHand"; - mass = 6; - }; - - class LeftHand : BaseRagdollBone { - name = "leftHand"; - type = "sphere"; - startBone = "leftHand"; - mass = 6; - radius = 0.08; - childrenUseStartTrans = 0; - networkType = "leftHand"; - }; - - class RightArm : BaseRagdollBone { - name = "rightArm"; - type = "capsule"; - startBone = "rightArm"; - endBone = "rightForeArm"; - mass = 8; - }; - - class RightForeArm : BaseRagdollBone { - name = "rightForeArm"; - type = "capsule"; - startBone = "rightForeArm"; - endBone = "rightHand"; - mass = 6; - }; - - class RightHand : BaseRagdollBone { - name = "rightHand"; - type = "sphere"; - startBone = "rightHand"; - mass = 6; - radius = 0.08; - childrenUseStartTrans = 0; - networkType = "rightHand"; - }; - - class LeftUpLeg : BaseRagdollBone { - name = "leftUpLeg"; - type = "capsule"; - startBone = "leftUpLeg"; - endBone = "leftLeg"; - mass = 15; - }; - - class LeftLeg : BaseRagdollBone { - name = "leftLeg"; - type = "capsule"; - startBone = "leftLeg"; - endBone = "leftFoot"; - mass = 10; - }; - - class LeftFoot : BaseRagdollBone { - name = "leftFoot"; - type = "box"; - startBone = "leftFoot"; - size[] = {0.15, 0.035, 0.07}; - mass = 8; - networkType = "leftFoot"; - }; - - class RightUpLeg : BaseRagdollBone { - name = "rightUpLeg"; - type = "capsule"; - startBone = "rightUpLeg"; - endBone = "rightLeg"; - mass = 15; - }; - - class RightLeg : BaseRagdollBone { - name = "rightLeg"; - type = "capsule"; - startBone = "rightLeg"; - endBone = "rightFoot"; - mass = 10; - }; - - class RightFoot : BaseRagdollBone { - name = "rightFoot"; - type = "box"; - startBone = "rightFoot"; - size[] = {0.15, 0.035, 0.07}; - mass = 8; - networkType = "rightFoot"; - }; - - class Weapon : BaseRagdollBone { - name = "weapon"; - type = "weapon"; - startBone = "weapon"; - endPosRelToStart[] = {0.0, 1.0, 0.0}; - mass = 3; - }; - - class Launcher : BaseRagdollBone { - name = "launcher"; - type = "weapon"; - startBone = "launcher"; - endPosRelToStart[] = {1.0, 0.0, 0.0}; - mass = 3; - }; - }; - - class JointsPX2 { - class Pelvis_Chest_PX2 : RagDollSphericalJoint { - name = "pelvis_chest"; - bone1 = "pelvis"; - bone2 = "chest"; - axis[] = {0, 1, 0.3}; - - class SwingLimit : SwingLimit { - value = 25; - }; - - class TwistLimitLow : TwistLimitLow { - value = -15; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 25; - }; - }; - - class Chest_Head_PX2 : RagDollSphericalJoint { - name = "chest_head"; - bone1 = "chest"; - bone2 = "head"; - - class SwingLimit : SwingLimit { - value = 20; - }; - - class TwistLimitLow : TwistLimitLow { - value = -15; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 15; - }; - }; - - class Chest_LeftArm_PX2 : RagDollSphericalJoint { - name = "chest_leftArm"; - bone1 = "chest"; - bone2 = "leftArm"; - axis[] = {-1, 0.0, 0.5}; - enableCollision = 1; - - class SwingLimit : SwingLimit { - value = 60; - }; - - class TwistLimitLow : TwistLimitLow { - value = -20; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 20; - }; - }; - - class LeftArm_LeftForeArm_PX2 : RagDollRevoluteJoint { - name = "leftArm_leftForeArm"; - bone1 = "leftArm"; - bone2 = "leftForeArm"; - axis[] = {1, -1, 0.2}; - - class LimitLow : LimitLow { - value = -2; - }; - - class LimitHigh : LimitHigh { - value = 60; - }; - }; - - class LeftForeArm_LeftHand_PX2 : RagDollSphericalJoint { - name = "leftForeArm_leftHand"; - bone1 = "leftForeArm"; - bone2 = "leftHand"; - - class SwingLimit : SwingLimit { - value = 20; - }; - - class TwistLimitLow : TwistLimitLow { - value = -5; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 5; - }; - }; - - class Chest_RightArm_PX2 : RagDollSphericalJoint { - name = "chest_rightArm"; - bone1 = "chest"; - bone2 = "rightArm"; - axis[] = {1, 0.0, 0.5}; - enableCollision = 1; - - class SwingLimit : SwingLimit { - value = 60; - }; - - class TwistLimitLow : TwistLimitLow { - value = -20; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 20; - }; - }; - - class RightArm_RightForeArm_PX2 : RagDollRevoluteJoint { - name = "rightArm_rightForeArm"; - bone1 = "rightArm"; - bone2 = "rightForeArm"; - axis[] = {1, 1, -0.2}; - - class LimitLow : LimitLow { - value = -2; - }; - - class LimitHigh : LimitHigh { - value = 60; - }; - }; - - class RightForeArm_RightHand_PX2 : RagDollSphericalJoint { - name = "rightForeArm_rightHand"; - bone1 = "rightForeArm"; - bone2 = "rightHand"; - - class SwingLimit : SwingLimit { - value = 20; - }; - - class TwistLimitLow : TwistLimitLow { - value = -5; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 5; - }; - }; - - class Pelvis_LeftUpLeg_PX2 : RagDollSphericalJoint { - name = "pelvis_leftUpLeg"; - bone1 = "pelvis"; - bone2 = "leftUpLeg"; - axis[] = {-1.5, -1.1, 2}; - enableCollision = 1; - - class SwingLimit : SwingLimit { - value = 45; - }; - - class TwistLimitLow : TwistLimitLow { - value = -10; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 20; - }; - }; - - class LeftUpLeg_LeftLeg_PX2 : RagDollRevoluteJoint { - name = "leftUpLeg_leftLeg"; - bone1 = "leftUpLeg"; - bone2 = "leftLeg"; - axis[] = {-1, 0, 0}; - - class LimitLow : LimitLow { - value = -5; - }; - - class LimitHigh : LimitHigh { - value = 110; - }; - }; - - class LeftLeg_LeftFoot_PX2 : RagDollRevoluteJoint { - name = "leftLeg_leftFoot"; - bone1 = "leftLeg"; - bone2 = "leftFoot"; - axis[] = {-1, 0, 0}; - - class LimitLow : LimitLow { - value = -15; - }; - - class LimitHigh : LimitHigh { - value = 45; - }; - }; - - class Pelvis_RightUpLeg_PX2 : RagDollSphericalJoint { - name = "pelvis_rightUpLeg"; - bone1 = "pelvis"; - bone2 = "rightUpLeg"; - axis[] = {1.5, -1.1, 2}; - enableCollision = 1; - - class SwingLimit : SwingLimit { - value = 45; - }; - - class TwistLimitLow : TwistLimitLow { - value = -10; - }; - - class TwistLimitHigh : TwistLimitHigh { - value = 20; - }; - }; - - class RightUpLeg_RightLeg_PX2 : RagDollRevoluteJoint { - name = "rightUpLeg_rightLeg"; - bone1 = "rightUpLeg"; - bone2 = "rightLeg"; - axis[] = {-1, 0, 0}; - - class LimitLow : LimitLow { - value = -5; - }; - - class LimitHigh : LimitHigh { - value = 110; - }; - }; - - class RightLeg_RightFoot_PX2 : RagDollRevoluteJoint { - name = "rightLeg_rightFoot"; - bone1 = "rightLeg"; - bone2 = "rightFoot"; - axis[] = {-1, 0, 0}; - - class LimitLow : LimitLow { - value = -15; - }; - - class LimitHigh : LimitHigh { - value = 45; - }; - }; - }; - - class JointsPX3 { - class Pelvis_Chest_PX3 : RagDollD6Joint_PX3 { - name = "pelvis_chest"; - bone1 = "pelvis"; - bone2 = "chest"; - axis[] = {0, 1, 0.3}; - enableCollision = 0; - swingLimitY = 30; - swingLimitZ = 30; - twistLimitLower = -25; - twistLimitUpper = 25; - driveSpring = 30; - driveDamping = 30; - driveSpringWater = 5; - driveDampingWater = 5; - }; - - class Chest_Head_PX3 : RagDollD6Joint_PX3 { - name = "chest_head"; - bone1 = "chest"; - bone2 = "head"; - swingLimitY = 45; - swingLimitZ = 45; - twistLimitLower = -40; - twistLimitUpper = 40; - driveSpring = 15.0; - driveDamping = 30; - driveSpringWater = 1.5; - driveDampingWater = 3.0; - twistSpring = 15.0; - twistDamping = 30.0; - }; - - class Chest_LeftArm_PX3 : RagDollD6Joint_PX3 { - name = "chest_leftArm"; - bone1 = "chest"; - bone2 = "leftArm"; - enableCollision = 1; - swingLimitY = 85; - swingLimitZ = 85; - twistLimitLower = -60; - twistLimitUpper = 60; - driveSpring = 30; - driveDamping = 30; - driveSpringWater = 3; - driveDampingWater = 3; - }; - - class LeftArm_LeftForeArm_PX3 : RagDollD6Joint_PX3 { - name = "leftArm_leftForeArm"; - bone1 = "leftArm"; - bone2 = "leftForeArm"; - axis[] = {-1, 1, -0.2}; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -5; - twistLimitUpper = 150; - driveSpring = 10; - driveDamping = 10; - driveSpringWater = 1; - driveDampingWater = 1; - }; - - class LeftForeArm_LeftHand_PX3 : RagDollD6Joint_PX3 { - name = "leftForeArm_leftHand"; - bone1 = "leftForeArm"; - bone2 = "leftHand"; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -20; - twistLimitUpper = 20; - driveSpring = 10; - driveDamping = 10; - driveSpringWater = 1; - driveDampingWater = 1; - }; - - class Chest_RightArm_PX3 : RagDollD6Joint_PX3 { - name = "chest_rightArm"; - bone1 = "chest"; - bone2 = "rightArm"; - enableCollision = 1; - swingLimitY = 85; - swingLimitZ = 85; - twistLimitLower = -60; - twistLimitUpper = 60; - driveSpring = 30; - driveDamping = 30; - driveSpringWater = 3; - driveDampingWater = 3; - }; - - class RightArm_RightForeArm_PX3 : RagDollD6Joint_PX3 { - name = "rightArm_rightForeArm"; - bone1 = "rightArm"; - bone2 = "rightForeArm"; - axis[] = {-1, -1, 0.2}; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -5; - twistLimitUpper = 150; - driveSpring = 10; - driveDamping = 10; - driveSpringWater = 1; - driveDampingWater = 1; - }; - - class RightForeArm_RightHand_PX3 : RagDollD6Joint_PX3 { - name = "rightForeArm_rightHand"; - bone1 = "rightForeArm"; - bone2 = "rightHand"; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -20; - twistLimitUpper = 20; - driveSpring = 10; - driveDamping = 10; - driveSpringWater = 1; - driveDampingWater = 1; - }; - - class Pelvis_LeftUpLeg_PX3 : RagDollD6Joint_PX3 { - name = "pelvis_leftUpLeg"; - bone1 = "pelvis"; - bone2 = "leftUpLeg"; - enableCollision = 1; - swingLimitY = 35; - swingLimitZ = 35; - twistLimitLower = -10; - twistLimitUpper = 60; - driveSpring = 30; - driveDamping = 30; - driveSpringWater = 3; - driveDampingWater = 3; - twistDamping = 30.0; - }; - - class LeftUpLeg_LeftLeg_PX3 : RagDollD6Joint_PX3 { - name = "leftUpLeg_leftLeg"; - bone1 = "leftUpLeg"; - bone2 = "leftLeg"; - axis[] = {1, 0, 0}; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -5; - twistLimitUpper = 120; - driveSpring = 20; - driveDamping = 20; - driveSpringWater = 2; - driveDampingWater = 2; - }; - - class LeftLeg_LeftFoot_PX3 : RagDollD6Joint_PX3 { - name = "leftLeg_leftFoot"; - bone1 = "leftLeg"; - bone2 = "leftFoot"; - axis[] = {1, 0, 0}; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -15; - twistLimitUpper = 45; - driveSpring = 20; - driveDamping = 20; - driveSpringWater = 2; - driveDampingWater = 2; - }; - - class Pelvis_RightUpLeg_PX3 : RagDollD6Joint_PX3 { - name = "pelvis_rightUpLeg"; - bone1 = "pelvis"; - bone2 = "rightUpLeg"; - enableCollision = 1; - swingLimitY = 35; - swingLimitZ = 35; - twistLimitLower = -10; - twistLimitUpper = 60; - driveSpring = 30; - driveDamping = 30; - driveSpringWater = 3; - driveDampingWater = 3; - twistDamping = 30.0; - }; - - class RightUpLeg_RightLeg_PX3 : RagDollD6Joint_PX3 { - name = "rightUpLeg_rightLeg"; - bone1 = "rightUpLeg"; - bone2 = "rightLeg"; - axis[] = {1, 0, 0}; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -5; - twistLimitUpper = 120; - driveSpring = 20; - driveDamping = 20; - driveSpringWater = 2; - driveDampingWater = 2; - }; - - class RightLeg_RightFoot_PX3 : RagDollD6Joint_PX3 { - name = "rightLeg_rightFoot"; - bone1 = "rightLeg"; - bone2 = "rightFoot"; - axis[] = {1, 0, 0}; - swingLimitY = 10; - swingLimitZ = 10; - twistLimitLower = -15; - twistLimitUpper = 45; - driveSpring = 20; - driveDamping = 20; - driveSpringWater = 2; - driveDampingWater = 2; - }; - }; - }; }; diff --git a/addons/ragdolls/script_component.hpp b/addons/ragdolls/script_component.hpp index f0306957b0..e2bcf10441 100644 --- a/addons/ragdolls/script_component.hpp +++ b/addons/ragdolls/script_component.hpp @@ -2,11 +2,11 @@ #include "\z\ace\Addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_RAGDOLLS - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_ENABLED_RAGDOLLS - #define DEBUG_SETTINGS DEBUG_ENABLED_RAGDOLLS + #define DEBUG_SETTINGS DEBUG_ENABLED_RAGDOLLS #endif #include "\z\ace\Addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/realisticnames/config.cpp b/addons/realisticnames/config.cpp index 51afc36eb2..347d0c1b2e 100644 --- a/addons/realisticnames/config.cpp +++ b/addons/realisticnames/config.cpp @@ -1,1449 +1,1447 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = 0.60; - requiredAddons[] = {ace_core}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {"KoffeinFlummi", "TaoSensai", "commy2"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - }; + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author[] = {"KoffeinFlummi","TaoSensai","commy2"}; + authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; + }; }; // VEHICLES class CfgVehicles { - // static weapons - class StaticMGWeapon; - class HMG_01_base_F: StaticMGWeapon { - displayName = "$STR_ACE_RealisticNames_HMG_01_Name"; - }; - class HMG_01_A_base_F: HMG_01_base_F { - displayName = "$STR_ACE_RealisticNames_HMG_01_A_Name"; - }; - class HMG_01_high_base_F: HMG_01_base_F { - displayName = "$STR_ACE_RealisticNames_HMG_01_high_Name"; - }; - - class AT_01_base_F; - class B_static_AT_F: AT_01_base_F { - displayName = "$STR_ACE_RealisticNames_static_AT_Name"; - }; - class O_static_AT_F: AT_01_base_F { - displayName = "$STR_ACE_RealisticNames_static_AT_Name"; - }; - class I_static_AT_F: AT_01_base_F { - displayName = "$STR_ACE_RealisticNames_static_AT_Name"; - }; - - class AA_01_base_F; - class B_static_AA_F: AA_01_base_F { - displayName = "$STR_ACE_RealisticNames_static_AA_Name"; - }; - class O_static_AA_F: AA_01_base_F { - displayName = "$STR_ACE_RealisticNames_static_AA_Name"; - }; - class I_static_AA_F: AA_01_base_F { - displayName = "$STR_ACE_RealisticNames_static_AA_Name"; - }; - - class GMG_TriPod; - class GMG_01_base_F: GMG_TriPod { - displayName = "$STR_ACE_RealisticNames_GMG_01_Name"; - }; - class GMG_01_A_base_F: GMG_01_base_F { - displayName = "$STR_ACE_RealisticNames_GMG_01_A_Name"; - }; - class GMG_01_high_base_F: GMG_01_base_F { - displayName = "$STR_ACE_RealisticNames_GMG_01_high_Name"; - }; - - // M-ATV - class MRAP_01_base_F; - class B_MRAP_01_F: MRAP_01_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_01_Name"; - }; - - class MRAP_01_gmg_base_F: MRAP_01_base_F {}; - class B_MRAP_01_gmg_F: MRAP_01_gmg_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_01_gmg_Name"; - }; - - class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F {}; - class B_MRAP_01_hmg_F: MRAP_01_hmg_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_01_hmg_Name"; - }; - - // punisher - class MRAP_02_base_F; - class O_MRAP_02_F: MRAP_02_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_02_Name"; - }; - - class MRAP_02_hmg_base_F: MRAP_02_base_F {}; - class O_MRAP_02_hmg_F: MRAP_02_hmg_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_02_hmg_Name"; - }; - - class MRAP_02_gmg_base_F: MRAP_02_hmg_base_F {}; - class O_MRAP_02_gmg_F: MRAP_02_gmg_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_02_gmg_Name"; - }; - - // strider - class MRAP_03_base_F; - class I_MRAP_03_F: MRAP_03_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_03_Name"; - }; - - class MRAP_03_hmg_base_F: MRAP_03_base_F {}; - class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_03_hmg_Name"; - }; - - class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F {}; - class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F { - displayName = "$STR_ACE_RealisticNames_MRAP_03_gmg_Name"; - }; - - // merkava derivates - class MBT_01_base_F; - class B_MBT_01_base_F: MBT_01_base_F {}; - - class B_MBT_01_cannon_F: B_MBT_01_base_F { - displayName = "$STR_ACE_RealisticNames_MBT_01_cannon_Name"; - }; - class B_MBT_01_TUSK_F: B_MBT_01_cannon_F { - displayName = "$STR_ACE_RealisticNames_MBT_01_TUSK_Name"; - }; - - class MBT_01_arty_base_F: MBT_01_base_F {}; - class B_MBT_01_arty_base_F: MBT_01_arty_base_F {}; - - class B_MBT_01_arty_F: B_MBT_01_arty_base_F { - displayName = "$STR_ACE_RealisticNames_MBT_01_arty_Name"; - }; - - class MBT_01_mlrs_base_F: MBT_01_base_F {}; - class B_MBT_01_mlrs_base_F: MBT_01_mlrs_base_F {}; - - class B_MBT_01_mlrs_F: B_MBT_01_mlrs_base_F { - displayName = "$STR_ACE_RealisticNames_MBT_01_mlrs_Name"; // Fictional name, (probably wrong) hebrew translation of storm. - }; - - // T100 derivates - class MBT_02_base_F; - class O_MBT_02_base_F: MBT_02_base_F {}; - - class O_MBT_02_cannon_F: O_MBT_02_base_F { - displayName = "$STR_ACE_RealisticNames_MBT_02_cannon_Name"; - }; - - class MBT_02_arty_base_F: MBT_02_base_F {}; - class O_MBT_02_arty_base_F: MBT_02_arty_base_F {}; - - class O_MBT_02_arty_F: O_MBT_02_arty_base_F { - displayName = "$STR_ACE_RealisticNames_MBT_02_arty_Name"; - }; - - // leopard sg - class I_MBT_03_base_F; - class I_MBT_03_cannon_F: I_MBT_03_base_F { - displayName = "$STR_ACE_RealisticNames_MBT_03_cannon_Name"; - }; - - // tracked apcs - class B_APC_Tracked_01_base_F; - class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_rcws_Name"; - }; - - class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_AA_Name"; // Fictional name, (probably wrong) hebrew translation of cheetah. - }; - - class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_CRV_Name"; - }; - - class O_APC_Tracked_02_base_F; - class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Tracked_02_cannon_Name"; - }; - - class O_APC_Tracked_02_AA_F: O_APC_Tracked_02_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Tracked_02_AA_Name"; - }; - - class I_APC_tracked_03_base_F; - class I_APC_tracked_03_cannon_F: I_APC_tracked_03_base_F { - displayName = "$STR_ACE_RealisticNames_APC_tracked_03_cannon_Name"; - }; - - // wheeled apcs - class B_APC_Wheeled_01_base_F; - class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Wheeled_cannon_Name"; - }; - - class O_APC_Wheeled_02_base_F; - class O_APC_Wheeled_02_rcws_F: O_APC_Wheeled_02_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Wheeled_02_rcws_Name"; - }; - - class I_APC_Wheeled_03_base_F; - class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F { - displayName = "$STR_ACE_RealisticNames_APC_Wheeled_03_cannon_Name"; - }; - - // trucks - class Truck_01_base_F; - class B_Truck_01_transport_F: Truck_01_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_transport_Name"; - }; - class B_Truck_01_covered_F: B_Truck_01_transport_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_covered_Name"; - }; - class B_Truck_01_mover_F: B_Truck_01_transport_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_mover_Name"; - }; - class B_Truck_01_box_F: B_Truck_01_mover_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_box_Name"; - }; - class B_Truck_01_medical_F: B_Truck_01_transport_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_medical_Name"; - }; - class B_Truck_01_ammo_F: B_Truck_01_mover_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_ammo_Name"; - }; - class B_Truck_01_fuel_F: B_Truck_01_mover_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_fuel_Name"; - }; - class B_Truck_01_Repair_F: B_Truck_01_mover_F { - displayName = "$STR_ACE_RealisticNames_Truck_01_Repair_Name"; - }; - - class Truck_02_base_F; - class O_Truck_02_transport_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name"; - }; - class O_Truck_02_covered_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name"; - }; - class O_Truck_02_ammo_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name"; - }; - class O_Truck_02_fuel_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name"; - }; - class O_Truck_02_box_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name"; - }; - class O_Truck_02_medical_F: O_Truck_02_box_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name"; - }; - - class I_Truck_02_transport_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name"; - }; - class I_Truck_02_covered_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name"; - }; - class I_Truck_02_ammo_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name"; - }; - class I_Truck_02_fuel_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name"; - }; - class I_Truck_02_box_F: Truck_02_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name"; - }; - class I_Truck_02_medical_F: I_Truck_02_box_F { - displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name"; - }; - - class Truck_03_base_F; - class O_Truck_03_transport_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_transport_Name"; - }; - class O_Truck_03_covered_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_covered_Name"; - }; - class O_Truck_03_device_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_device_Name"; - }; - class O_Truck_03_ammo_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_ammo_Name"; - }; - class O_Truck_03_fuel_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_fuel_Name"; - }; - class O_Truck_03_repair_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_repair_Name"; - }; - class O_Truck_03_medical_F: Truck_03_base_F { - displayName = "$STR_ACE_RealisticNames_Truck_03_medical_Name"; - }; - - // helicopters - class Heli_Attack_01_base_F; - class B_Heli_Attack_01_F: Heli_Attack_01_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Attack_01_Name"; - }; - - class Heli_Light_01_base_F; - class B_Heli_Light_01_F: Heli_Light_01_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Light_01_Name"; - }; - - class Heli_Light_01_armed_base_F; - class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Light_01_armed_Name"; - }; - - class Heli_Light_01_civil_base_F: Heli_Light_01_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Light_01_civil_Name"; - }; - - class B_Heli_Transport_03_base_F; - class B_Heli_Transport_03_F: B_Heli_Transport_03_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_Name"; - }; - - class B_Heli_Transport_03_unarmed_base_F: B_Heli_Transport_03_base_F {}; - class B_Heli_Transport_03_unarmed_F: B_Heli_Transport_03_unarmed_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_unarmed_Name"; - }; - - class Heli_Light_02_base_F; - class O_Heli_Light_02_F: Heli_Light_02_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Light_02_Name"; - }; - class O_Heli_Light_02_unarmed_F: Heli_Light_02_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Light_02_unarmed_Name"; - }; - - class I_Heli_light_03_base_F; - class I_Heli_light_03_F: I_Heli_light_03_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_light_03_Name"; - }; - - class I_Heli_light_03_unarmed_base_F; - class I_Heli_light_03_unarmed_F: I_Heli_light_03_unarmed_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_light_03_unarmed_Name"; - }; - - class Heli_Transport_02_base_F; - class I_Heli_Transport_02_F: Heli_Transport_02_base_F { - displayName = "$STR_ACE_RealisticNames_Heli_Transport_02_Name"; - }; - - // planes - class Plane_CAS_01_base_F; - class B_Plane_CAS_01_F: Plane_CAS_01_base_F { - displayName = "$STR_ACE_RealisticNames_Plane_CAS_01_Name"; - }; - - class Plane_CAS_02_base_F; - class O_Plane_CAS_02_F: Plane_CAS_02_base_F { - displayName = "$STR_ACE_RealisticNames_Plane_CAS_02_Name"; - }; - - class Plane_Fighter_03_base_F; - class I_Plane_Fighter_03_CAS_F: Plane_Fighter_03_base_F { - displayName = "$STR_ACE_RealisticNames_Plane_Fighter_03_CAS_Name"; - }; - - class I_Plane_Fighter_03_AA_F: I_Plane_Fighter_03_CAS_F { - displayName = "$STR_ACE_RealisticNames_Plane_Fighter_03_AA_Name"; - }; - - // uavs - class UAV_02_base_F; - class B_UAV_02_F: UAV_02_base_F { - displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; - }; - class O_UAV_02_F: UAV_02_base_F { - displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; - }; - class I_UAV_02_F: UAV_02_base_F { - displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; - }; - - class UAV_02_CAS_base_F: UAV_02_base_F {}; - class B_UAV_02_CAS_F: UAV_02_CAS_base_F { - displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; - }; - class O_UAV_02_CAS_F: UAV_02_CAS_base_F { - displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; - }; - class I_UAV_02_CAS_F: UAV_02_CAS_base_F { - displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; - }; - - // pistols - class Pistol_Base_F; - class Weapon_hgun_P07_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_P07_Name"; - }; - - class Weapon_hgun_Rook40_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Rook40_Name"; - }; - - class Weapon_hgun_ACPC2_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_ACPC2_Name"; - }; - - class Weapon_hgun_Pistol_heavy_01_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name"; - }; - - class Weapon_hgun_Pistol_heavy_02_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name"; - }; - - class Weapon_hgun_Pistol_Signal_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Pistol_Signal_Name"; - }; - - // rocket launchers - class Launcher_Base_F; - class Weapon_launch_NLAW_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; - }; - - class Weapon_launch_RPG32_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; - }; - - class Weapon_launch_Titan_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; - }; - - class Weapon_launch_Titan_short_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; - }; - - class Weapon_launch_B_Titan_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; - }; - //class Weapon_launch_I_Titan_F: Weapon_launch_B_Titan_F {}; - //class Weapon_launch_O_Titan_F: Weapon_launch_B_Titan_F {}; - - class Weapon_launch_launch_B_Titan_short_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; - }; - //class Weapon_launch_I_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; - //class Weapon_launch_O_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; - - // rifles - - // MX - class Weapon_Base_F; - class Weapon_arifle_MX_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_Name"; - }; - - class Weapon_arifle_MXC_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MXC_Name"; - }; - - class Weapon_arifle_MX_GL_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Name"; - }; - - class Weapon_arifle_MX_SW_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Name"; - }; - - class Weapon_arifle_MXM_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MXM_Name"; - }; - - // Katiba - class Weapon_arifle_Katiba_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Katiba_Name"; - }; - - class Weapon_arifle_Katiba_C_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Katiba_C_Name"; - }; - - class Weapon_arifle_Katiba_GL_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Katiba_GL_Name"; - }; - - // F2000 - class Weapon_arifle_Mk20_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_Name"; - }; - - class Weapon_arifle_Mk20_plain_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_plain_Name"; - }; - - class Weapon_arifle_Mk20C_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_Name"; - }; - - class Weapon_arifle_Mk20C_plain_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_plain_Name"; - }; - - class Weapon_arifle_Mk20_GL_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_Name"; - }; - - class Weapon_arifle_Mk20_GL_plain_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name"; - }; - - // TAR-21 - class Weapon_arifle_TRG21_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_TRG21_Name"; - }; - - class Weapon_arifle_TRG20_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_TRG20_Name"; - }; - - class Weapon_arifle_TRG21_GL_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_TRG21_GL_Name"; - }; - - // sub machine guns - class Weapon_SMG_01_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_SMG_01_Name"; - }; - - class Weapon_SMG_02_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_SMG_02_Name"; - }; - - class Weapon_hgun_PDW2000_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_PDW2000_Name"; - }; - - class Weapon_arifle_SDAR_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_SDAR_Name"; - }; - - // machine guns - class Weapon_LMG_Mk200_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_LMG_Mk200_Name"; - }; - - class Weapon_LMG_Zafir_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_LMG_Zafir_Name"; - }; - - // sniper rifles - class Weapon_srifle_EBR_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_srifle_EBR_Name"; - }; - - class Weapon_srifle_GM6_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_srifle_GM6_Name"; - }; - - class Weapon_srifle_GM6_camo_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_srifle_GM6_camo_Name"; - }; - - class Weapon_srifle_LRR_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_srifle_LRR_Name"; - }; - - class Weapon_srifle_LRR_camo_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_srifle_LRR_camo_Name"; - }; - - class Weapon_srifle_DMR_01_F: Weapon_Base_F { - displayName = "$STR_ACE_RealisticNames_srifle_DMR_01_Name"; - }; + // static weapons + class StaticMGWeapon; + class HMG_01_base_F: StaticMGWeapon { + displayName = "$STR_ACE_RealisticNames_HMG_01_Name"; + }; + class HMG_01_A_base_F: HMG_01_base_F { + displayName = "$STR_ACE_RealisticNames_HMG_01_A_Name"; + }; + class HMG_01_high_base_F: HMG_01_base_F { + displayName = "$STR_ACE_RealisticNames_HMG_01_high_Name"; + }; + + class AT_01_base_F; + class B_static_AT_F: AT_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AT_Name"; + }; + class O_static_AT_F: AT_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AT_Name"; + }; + class I_static_AT_F: AT_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AT_Name"; + }; + + class AA_01_base_F; + class B_static_AA_F: AA_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AA_Name"; + }; + class O_static_AA_F: AA_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AA_Name"; + }; + class I_static_AA_F: AA_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AA_Name"; + }; + + class GMG_TriPod; + class GMG_01_base_F: GMG_TriPod { + displayName = "$STR_ACE_RealisticNames_GMG_01_Name"; + }; + class GMG_01_A_base_F: GMG_01_base_F { + displayName = "$STR_ACE_RealisticNames_GMG_01_A_Name"; + }; + class GMG_01_high_base_F: GMG_01_base_F { + displayName = "$STR_ACE_RealisticNames_GMG_01_high_Name"; + }; + + // M-ATV + class MRAP_01_base_F; + class B_MRAP_01_F: MRAP_01_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_01_Name"; + }; + + class MRAP_01_gmg_base_F: MRAP_01_base_F {}; + class B_MRAP_01_gmg_F: MRAP_01_gmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_01_gmg_Name"; + }; + + class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F {}; + class B_MRAP_01_hmg_F: MRAP_01_hmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_01_hmg_Name"; + }; + + // punisher + class MRAP_02_base_F; + class O_MRAP_02_F: MRAP_02_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_02_Name"; + }; + + class MRAP_02_hmg_base_F: MRAP_02_base_F {}; + class O_MRAP_02_hmg_F: MRAP_02_hmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_02_hmg_Name"; + }; + + class MRAP_02_gmg_base_F: MRAP_02_hmg_base_F {}; + class O_MRAP_02_gmg_F: MRAP_02_gmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_02_gmg_Name"; + }; + + // strider + class MRAP_03_base_F; + class I_MRAP_03_F: MRAP_03_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_03_Name"; + }; + + class MRAP_03_hmg_base_F: MRAP_03_base_F {}; + class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_03_hmg_Name"; + }; + + class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F {}; + class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_03_gmg_Name"; + }; + + // merkava derivates + class MBT_01_base_F; + class B_MBT_01_base_F: MBT_01_base_F {}; + + class B_MBT_01_cannon_F: B_MBT_01_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_01_cannon_Name"; + }; + class B_MBT_01_TUSK_F: B_MBT_01_cannon_F { + displayName = "$STR_ACE_RealisticNames_MBT_01_TUSK_Name"; + }; + + class MBT_01_arty_base_F: MBT_01_base_F {}; + class B_MBT_01_arty_base_F: MBT_01_arty_base_F {}; + + class B_MBT_01_arty_F: B_MBT_01_arty_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_01_arty_Name"; + }; + + class MBT_01_mlrs_base_F: MBT_01_base_F {}; + class B_MBT_01_mlrs_base_F: MBT_01_mlrs_base_F {}; + + class B_MBT_01_mlrs_F: B_MBT_01_mlrs_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_01_mlrs_Name"; // Fictional name, (probably wrong) hebrew translation of storm. + }; + + // T100 derivates + class MBT_02_base_F; + class O_MBT_02_base_F: MBT_02_base_F {}; + + class O_MBT_02_cannon_F: O_MBT_02_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_02_cannon_Name"; + }; + + class MBT_02_arty_base_F: MBT_02_base_F {}; + class O_MBT_02_arty_base_F: MBT_02_arty_base_F {}; + + class O_MBT_02_arty_F: O_MBT_02_arty_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_02_arty_Name"; + }; + + // leopard sg + class I_MBT_03_base_F; + class I_MBT_03_cannon_F: I_MBT_03_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_03_cannon_Name"; + }; + + // tracked apcs + class B_APC_Tracked_01_base_F; + class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_rcws_Name"; + }; + + class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_AA_Name"; // Fictional name, (probably wrong) hebrew translation of cheetah. + }; + + class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_CRV_Name"; + }; + + class O_APC_Tracked_02_base_F; + class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_02_cannon_Name"; + }; + + class O_APC_Tracked_02_AA_F: O_APC_Tracked_02_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_02_AA_Name"; + }; + + class I_APC_tracked_03_base_F; + class I_APC_tracked_03_cannon_F: I_APC_tracked_03_base_F { + displayName = "$STR_ACE_RealisticNames_APC_tracked_03_cannon_Name"; + }; + + // wheeled apcs + class B_APC_Wheeled_01_base_F; + class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Wheeled_cannon_Name"; + }; + + class O_APC_Wheeled_02_base_F; + class O_APC_Wheeled_02_rcws_F: O_APC_Wheeled_02_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Wheeled_02_rcws_Name"; + }; + + class I_APC_Wheeled_03_base_F; + class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Wheeled_03_cannon_Name"; + }; + + // trucks + class Truck_01_base_F; + class B_Truck_01_transport_F: Truck_01_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_transport_Name"; + }; + class B_Truck_01_covered_F: B_Truck_01_transport_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_covered_Name"; + }; + class B_Truck_01_mover_F: B_Truck_01_transport_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_mover_Name"; + }; + class B_Truck_01_box_F: B_Truck_01_mover_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_box_Name"; + }; + class B_Truck_01_medical_F: B_Truck_01_transport_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_medical_Name"; + }; + class B_Truck_01_ammo_F: B_Truck_01_mover_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_ammo_Name"; + }; + class B_Truck_01_fuel_F: B_Truck_01_mover_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_fuel_Name"; + }; + class B_Truck_01_Repair_F: B_Truck_01_mover_F { + displayName = "$STR_ACE_RealisticNames_Truck_01_Repair_Name"; + }; + + class Truck_02_base_F; + class O_Truck_02_transport_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name"; + }; + class O_Truck_02_covered_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name"; + }; + class O_Truck_02_ammo_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name"; + }; + class O_Truck_02_fuel_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name"; + }; + class O_Truck_02_box_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name"; + }; + class O_Truck_02_medical_F: O_Truck_02_box_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name"; + }; + + class I_Truck_02_transport_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name"; + }; + class I_Truck_02_covered_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name"; + }; + class I_Truck_02_ammo_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name"; + }; + class I_Truck_02_fuel_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name"; + }; + class I_Truck_02_box_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name"; + }; + class I_Truck_02_medical_F: I_Truck_02_box_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name"; + }; + + class Truck_03_base_F; + class O_Truck_03_transport_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_transport_Name"; + }; + class O_Truck_03_covered_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_covered_Name"; + }; + class O_Truck_03_device_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_device_Name"; + }; + class O_Truck_03_ammo_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_ammo_Name"; + }; + class O_Truck_03_fuel_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_fuel_Name"; + }; + class O_Truck_03_repair_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_repair_Name"; + }; + class O_Truck_03_medical_F: Truck_03_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_03_medical_Name"; + }; + + // helicopters + class Heli_Attack_01_base_F; + class B_Heli_Attack_01_F: Heli_Attack_01_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Attack_01_Name"; + }; + + class Heli_Light_01_base_F; + class B_Heli_Light_01_F: Heli_Light_01_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_01_Name"; + }; + + class Heli_Light_01_armed_base_F; + class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_01_armed_Name"; + }; + + class Heli_Light_01_civil_base_F: Heli_Light_01_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_01_civil_Name"; + }; + + class B_Heli_Transport_03_base_F; + class B_Heli_Transport_03_F: B_Heli_Transport_03_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_Name"; + }; + + class B_Heli_Transport_03_unarmed_base_F: B_Heli_Transport_03_base_F {}; + class B_Heli_Transport_03_unarmed_F: B_Heli_Transport_03_unarmed_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_unarmed_Name"; + }; + + class Heli_Light_02_base_F; + class O_Heli_Light_02_F: Heli_Light_02_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_02_Name"; + }; + class O_Heli_Light_02_unarmed_F: Heli_Light_02_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_02_unarmed_Name"; + }; + + class I_Heli_light_03_base_F; + class I_Heli_light_03_F: I_Heli_light_03_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_light_03_Name"; + }; + + class I_Heli_light_03_unarmed_base_F; + class I_Heli_light_03_unarmed_F: I_Heli_light_03_unarmed_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_light_03_unarmed_Name"; + }; + + class Heli_Transport_02_base_F; + class I_Heli_Transport_02_F: Heli_Transport_02_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Transport_02_Name"; + }; + + // planes + class Plane_CAS_01_base_F; + class B_Plane_CAS_01_F: Plane_CAS_01_base_F { + displayName = "$STR_ACE_RealisticNames_Plane_CAS_01_Name"; + }; + + class Plane_CAS_02_base_F; + class O_Plane_CAS_02_F: Plane_CAS_02_base_F { + displayName = "$STR_ACE_RealisticNames_Plane_CAS_02_Name"; + }; + + class Plane_Fighter_03_base_F; + class I_Plane_Fighter_03_CAS_F: Plane_Fighter_03_base_F { + displayName = "$STR_ACE_RealisticNames_Plane_Fighter_03_CAS_Name"; + }; + + class I_Plane_Fighter_03_AA_F: I_Plane_Fighter_03_CAS_F { + displayName = "$STR_ACE_RealisticNames_Plane_Fighter_03_AA_Name"; + }; + + // uavs + class UAV_02_base_F; + class B_UAV_02_F: UAV_02_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; + }; + class O_UAV_02_F: UAV_02_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; + }; + class I_UAV_02_F: UAV_02_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; + }; + + class UAV_02_CAS_base_F: UAV_02_base_F {}; + class B_UAV_02_CAS_F: UAV_02_CAS_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; + }; + class O_UAV_02_CAS_F: UAV_02_CAS_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; + }; + class I_UAV_02_CAS_F: UAV_02_CAS_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; + }; + + // pistols + class Pistol_Base_F; + class Weapon_hgun_P07_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_P07_Name"; + }; + + class Weapon_hgun_Rook40_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Rook40_Name"; + }; + + class Weapon_hgun_ACPC2_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_ACPC2_Name"; + }; + + class Weapon_hgun_Pistol_heavy_01_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name"; + }; + + class Weapon_hgun_Pistol_heavy_02_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name"; + }; + + class Weapon_hgun_Pistol_Signal_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_Signal_Name"; + }; + + // rocket launchers + class Launcher_Base_F; + class Weapon_launch_NLAW_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; + }; + + class Weapon_launch_RPG32_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; + }; + + class Weapon_launch_Titan_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; + }; + + class Weapon_launch_Titan_short_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; + }; + + class Weapon_launch_B_Titan_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; + }; + //class Weapon_launch_I_Titan_F: Weapon_launch_B_Titan_F {}; + //class Weapon_launch_O_Titan_F: Weapon_launch_B_Titan_F {}; + + class Weapon_launch_launch_B_Titan_short_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; + }; + //class Weapon_launch_I_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; + //class Weapon_launch_O_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; + + // rifles + + // MX + class Weapon_Base_F; + class Weapon_arifle_MX_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_Name"; + }; + + class Weapon_arifle_MXC_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXC_Name"; + }; + + class Weapon_arifle_MX_GL_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Name"; + }; + + class Weapon_arifle_MX_SW_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Name"; + }; + + class Weapon_arifle_MXM_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXM_Name"; + }; + + // Katiba + class Weapon_arifle_Katiba_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_Name"; + }; + + class Weapon_arifle_Katiba_C_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_C_Name"; + }; + + class Weapon_arifle_Katiba_GL_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_GL_Name"; + }; + + // F2000 + class Weapon_arifle_Mk20_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_Name"; + }; + + class Weapon_arifle_Mk20_plain_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_plain_Name"; + }; + + class Weapon_arifle_Mk20C_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_Name"; + }; + + class Weapon_arifle_Mk20C_plain_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_plain_Name"; + }; + + class Weapon_arifle_Mk20_GL_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_Name"; + }; + + class Weapon_arifle_Mk20_GL_plain_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name"; + }; + + // TAR-21 + class Weapon_arifle_TRG21_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_Name"; + }; + + class Weapon_arifle_TRG20_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG20_Name"; + }; + + class Weapon_arifle_TRG21_GL_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_GL_Name"; + }; + + // sub machine guns + class Weapon_SMG_01_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_SMG_01_Name"; + }; + + class Weapon_SMG_02_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_SMG_02_Name"; + }; + + class Weapon_hgun_PDW2000_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_PDW2000_Name"; + }; + + class Weapon_arifle_SDAR_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_SDAR_Name"; + }; + + // machine guns + class Weapon_LMG_Mk200_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_LMG_Mk200_Name"; + }; + + class Weapon_LMG_Zafir_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_LMG_Zafir_Name"; + }; + + // sniper rifles + class Weapon_srifle_EBR_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_srifle_EBR_Name"; + }; + + class Weapon_srifle_GM6_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_srifle_GM6_Name"; + }; + + class Weapon_srifle_GM6_camo_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_srifle_GM6_camo_Name"; + }; + + class Weapon_srifle_LRR_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_srifle_LRR_Name"; + }; + + class Weapon_srifle_LRR_camo_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_srifle_LRR_camo_Name"; + }; + + class Weapon_srifle_DMR_01_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_srifle_DMR_01_Name"; + }; }; // WEAPONS class Mode_FullAuto; class CfgWeapons { - // assault rifles + // assault rifles - // MX - class arifle_MX_Base_F; - class arifle_MX_F: arifle_MX_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_Name"; - }; - class arifle_MX_Black_F: arifle_MX_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_Black_Name"; - }; - - class arifle_MXC_F: arifle_MX_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MXC_Name"; - }; - class arifle_MXC_Black_F: arifle_MXC_F { - displayName = "$STR_ACE_RealisticNames_arifle_MXC_Black_Name"; - }; - - class arifle_MX_GL_F: arifle_MX_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Name"; - }; - class arifle_MX_GL_Black_F: arifle_MX_GL_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Black_Name"; - }; - - class arifle_MX_SW_F: arifle_MX_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Name"; - }; - class arifle_MX_SW_Black_F: arifle_MX_SW_F { - displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Black_Name"; - }; - - class arifle_MXM_F: arifle_MX_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_MXM_Name"; - }; - class arifle_MXM_Black_F: arifle_MXM_F { - displayName = "$STR_ACE_RealisticNames_arifle_MXM_Black_Name"; - }; - - // Katiba - class arifle_katiba_Base_F; - class arifle_Katiba_F: arifle_katiba_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Katiba_Name"; - }; - class arifle_Katiba_GL_F: arifle_katiba_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Katiba_GL_Name"; - }; - class arifle_Katiba_C_F: arifle_katiba_Base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Katiba_C_Name"; - }; - - // SDAR - class SDAR_base_F; - class arifle_SDAR_F: SDAR_base_F { - displayName = "$STR_ACE_RealisticNames_arifle_SDAR_Name"; - }; - - // TAR-21 - class Tavor_base_F; - class arifle_TRG21_F: Tavor_base_F { - displayName = "$STR_ACE_RealisticNames_arifle_TRG21_Name"; - }; - class arifle_TRG21_GL_F: arifle_TRG21_F { - displayName = "$STR_ACE_RealisticNames_arifle_TRG21_GL_Name"; - }; - class arifle_TRG20_F: Tavor_base_F { - displayName = "$STR_ACE_RealisticNames_arifle_TRG20_Name"; - }; - - // F2000 - class mk20_base_F; - class arifle_Mk20_F: mk20_base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_Name"; - }; - class arifle_Mk20_plain_F: arifle_Mk20_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_plain_Name"; - }; - - class arifle_Mk20C_F: mk20_base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_Name"; - }; - class arifle_Mk20C_plain_F: arifle_Mk20C_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_plain_Name"; - }; - - class arifle_Mk20_GL_F: mk20_base_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_Name"; - }; - class arifle_Mk20_GL_plain_F: arifle_Mk20_GL_F { - displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name"; - }; - - // Vector - class SMG_01_Base; - class SMG_01_F: SMG_01_Base { - displayName = "$STR_ACE_RealisticNames_SMG_01_Name"; - }; - - // Scorpion - class SMG_02_base_F; - class SMG_02_F: SMG_02_base_F { - displayName = "$STR_ACE_RealisticNames_SMG_02_Name"; - }; - - // PDW 2000 - class pdw2000_base_F; - class hgun_pdw2000_F: pdw2000_base_F { - displayName = "$STR_ACE_RealisticNames_hgun_PDW2000_Name"; - }; - - // pistols - class Pistol_Base_F; - class hgun_P07_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_P07_Name"; - }; - - class hgun_Rook40_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Rook40_Name"; - }; - - class hgun_ACPC2_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_ACPC2_Name"; - }; - - class hgun_Pistol_heavy_01_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name"; - }; - - class hgun_Pistol_heavy_02_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name"; - }; - - class hgun_Pistol_Signal_F: Pistol_Base_F { - displayName = "$STR_ACE_RealisticNames_hgun_Pistol_Signal_Name"; - }; - - // machine guns - class Rifle_Long_Base_F; - class LMG_Mk200_F: Rifle_Long_Base_F { - displayName = "$STR_ACE_RealisticNames_LMG_Mk200_Name"; - }; - - class LMG_Zafir_F: Rifle_Long_Base_F { - displayName = "$STR_ACE_RealisticNames_LMG_Zafir_Name"; - }; - - // sniper rifles - class EBR_base_F; - class srifle_EBR_F: EBR_base_F { - displayName = "$STR_ACE_RealisticNames_srifle_EBR_Name"; - }; - - class LRR_base_F; - class srifle_LRR_F: LRR_base_F { - displayName = "$STR_ACE_RealisticNames_srifle_LRR_Name"; - }; - class srifle_LRR_camo_F: srifle_LRR_F { - displayName = "$STR_ACE_RealisticNames_srifle_LRR_camo_Name"; - }; - - class GM6_base_F; - class srifle_GM6_F: GM6_base_F { - displayName = "$STR_ACE_RealisticNames_srifle_GM6_Name"; - }; - class srifle_GM6_camo_F: srifle_GM6_F { - displayName = "$STR_ACE_RealisticNames_srifle_GM6_camo_Name"; - }; - - class DMR_01_base_F; - class srifle_DMR_01_F: DMR_01_base_F { - displayName = "$STR_ACE_RealisticNames_srifle_DMR_01_Name"; - }; - - // launchers - class Launcher_Base_F; - class launch_RPG32_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; - }; - - class launch_Titan_base: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; - }; - class launch_Titan_short_base: launch_Titan_base { - displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; - }; - - class launch_NLAW_F: Launcher_Base_F { - displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; - }; - - // vehicle weapons - - // gatlings - class CannonCore; - class gatling_20mm: CannonCore { - //displayName = ""; - class manual: CannonCore { - //displayName = ""; + // MX + class arifle_MX_Base_F; + class arifle_MX_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_Name"; }; - }; - class Twin_Cannon_20mm: gatling_20mm { - displayName = "Plamen PL-20"; - class manual: manual { - displayName = "Plamen PL-20"; - }; - }; - - class gatling_30mm: CannonCore { // This is a fictional veresion of the GSh-6-30, with 3 barrels - displayName = "GSh-3-30"; - class LowROF: Mode_FullAuto { - displayName = "GSh-3-30"; - }; - }; - - class Gatling_30mm_Plane_CAS_01_F: CannonCore { - displayName = "GAU-8"; - class LowROF: Mode_FullAuto { - displayName = "GAU-8"; - }; - }; - - class Cannon_30mm_Plane_CAS_02_F: CannonCore { - displayName = "GSh-301"; - class LowROF: Mode_FullAuto { - displayName = "GSh-301"; - }; - }; - - // missiles - class RocketPods; - class Missile_AA_04_Plane_CAS_01_F: RocketPods { - displayName = "AIM-9 Sidewinder"; - }; - class Missile_AA_03_Plane_CAS_02_F: Missile_AA_04_Plane_CAS_01_F { - displayName = "Wympel R-73"; - }; - - class MissileLauncher; - class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher { - displayName = "AGM-65 Maverick"; - }; - class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F { - displayName = "Kh-25MTP"; - }; - - // rockets - class Rocket_04_HE_Plane_CAS_01_F: RocketPods { - displayName = "Hydra 70"; - class Burst: RocketPods { - displayName = "Hydra 70"; - }; - }; - class Rocket_04_AP_Plane_CAS_01_F: Rocket_04_HE_Plane_CAS_01_F { - displayName = "Hydra 70"; - }; - - class Rocket_03_HE_Plane_CAS_02_F: Rocket_04_HE_Plane_CAS_01_F { - displayName = "S-8"; - class Burst: Burst { - displayName = "S-8"; - }; - }; - class Rocket_03_AP_Plane_CAS_02_F: Rocket_04_AP_Plane_CAS_01_F { - displayName = "S-8"; - class Burst: Burst { - displayName = "S-8"; - }; - }; - - class rockets_Skyfire: RocketPods { - displayName = "Skyfire-70"; - class Burst: RocketPods { - displayName = "Skyfire-70"; - }; - }; - - // more missiles - class missiles_DAR: RocketPods { - displayName = "Hydra 70"; - class Burst: RocketPods { - displayName = "Hydra 70"; - }; - }; - - class missiles_DAGR: RocketPods { - displayName = "DAGR"; - class Burst: RocketPods { - displayName = "DAGR"; - }; - }; - - class missiles_ASRAAM: MissileLauncher { - displayName = "AIM-132 ASRAAM"; - }; - - class missiles_Zephyr: MissileLauncher { - displayName = "AIM-120A AMRAAM"; - }; - - class missiles_SCALPEL: RocketPods { // according to zGuba, this is what it's based on - displayName = "9K121 Vikhr"; - }; - - // bomb - class Bomb_04_Plane_CAS_01_F: RocketPods { - //displayName = ""; - }; - class Bomb_03_Plane_CAS_02_F: Bomb_04_Plane_CAS_01_F { - displayName = "FAB-250M-54"; - }; - - // machine guns - class MGunCore; - class M134_minigun: MGunCore { - displayName = "2x M134 Minigun"; - }; - - class LMG_RCWS; - class MGun; - - class LMG_Minigun: LMG_RCWS { - displayName = "M134 Minigun"; - class manual: MGun { - displayName = "M134 Minigun"; - }; - }; - - class HMG_127: LMG_RCWS { - displayName = "M2"; - class manual: MGun { - displayName = "M2"; - }; - }; - - class HMG_01: HMG_127 { - displayName = "XM312"; - }; - class HMG_M2: HMG_01 { - displayName = "M2"; - }; - - class HMG_NSVT: HMG_127 { - displayName = "NSVT"; - class manual: manual { - displayName = "NSVT"; - }; - }; - - // grenade launchers - class GMG_F; - class GMG_20mm: GMG_F { - displayName = "XM307"; - class manual: GMG_F { - displayName = "XM307"; - }; - }; - - class GMG_40mm: GMG_F { - displayName = "Mk 19"; - class manual: GMG_F { - displayName = "Mk 19"; - }; - }; - - // autocannons - class autocannon_35mm: CannonCore { - displayName = "GDF-001"; - class manual: CannonCore { - displayName = "GDF-001"; - }; - }; - - // aa missiles - class missiles_titan: MissileLauncher { - displayName = "Mini-Spike"; - }; - - // mortar - class mortar_155mm_AMOS: CannonCore { - displayName = "L/52"; - }; - - // artillery rockets - class rockets_230mm_GAT: RocketPods { - displayName = "M269"; - }; - - // tank guns - class cannon_120mm: CannonCore { - class player; - displayName = "MG251"; - }; - - class cannon_120mm_long: cannon_120mm { - displayName = "L/55"; - class player: player {}; - }; - - class cannon_105mm: cannon_120mm { - displayName = "M68"; - class player: player { - displayName = "M68"; - }; - }; - - class cannon_125mm: cannon_120mm { - displayName = "2A46"; - }; - - // coax machine guns - class LMG_coax: LMG_RCWS { - displayName = "PKT"; - }; - - class ACE_LMG_coax_MBT_01: LMG_coax { - displayName = "MAG 58"; - }; - - class ACE_LMG_coax_APC_Tracked_03: LMG_coax { - displayName = "L94A1"; - }; - - // more autocannons - class autocannon_Base_F; - class autocannon_40mm_CTWS: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; - class AP: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; + class arifle_MX_Black_F: arifle_MX_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_Black_Name"; }; - class HE: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; + class arifle_MXC_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXC_Name"; }; - }; - - class autocannon_30mm_CTWS: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; - class AP: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; + class arifle_MXC_Black_F: arifle_MXC_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXC_Black_Name"; }; - class HE: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; + class arifle_MX_GL_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Name"; }; - }; - - class autocannon_30mm: autocannon_30mm_CTWS { - displayName = "L21A1 RARDEN"; - class AP: AP { - displayName = "L21A1 RARDEN"; + class arifle_MX_GL_Black_F: arifle_MX_GL_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Black_Name"; }; - class HE: HE { - displayName = "L21A1 RARDEN"; + class arifle_MX_SW_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Name"; + }; + class arifle_MX_SW_Black_F: arifle_MX_SW_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Black_Name"; + }; + + class arifle_MXM_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXM_Name"; + }; + class arifle_MXM_Black_F: arifle_MXM_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXM_Black_Name"; + }; + + // Katiba + class arifle_katiba_Base_F; + class arifle_Katiba_F: arifle_katiba_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_Name"; + }; + class arifle_Katiba_GL_F: arifle_katiba_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_GL_Name"; + }; + class arifle_Katiba_C_F: arifle_katiba_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_C_Name"; + }; + + // SDAR + class SDAR_base_F; + class arifle_SDAR_F: SDAR_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_SDAR_Name"; + }; + + // TAR-21 + class Tavor_base_F; + class arifle_TRG21_F: Tavor_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_Name"; + }; + class arifle_TRG21_GL_F: arifle_TRG21_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_GL_Name"; + }; + class arifle_TRG20_F: Tavor_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG20_Name"; + }; + + // F2000 + class mk20_base_F; + class arifle_Mk20_F: mk20_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_Name"; + }; + class arifle_Mk20_plain_F: arifle_Mk20_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_plain_Name"; + }; + + class arifle_Mk20C_F: mk20_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_Name"; + }; + class arifle_Mk20C_plain_F: arifle_Mk20C_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_plain_Name"; + }; + + class arifle_Mk20_GL_F: mk20_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_Name"; + }; + class arifle_Mk20_GL_plain_F: arifle_Mk20_GL_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name"; + }; + + // Vector + class SMG_01_Base; + class SMG_01_F: SMG_01_Base { + displayName = "$STR_ACE_RealisticNames_SMG_01_Name"; + }; + + // Scorpion + class SMG_02_base_F; + class SMG_02_F: SMG_02_base_F { + displayName = "$STR_ACE_RealisticNames_SMG_02_Name"; + }; + + // PDW 2000 + class pdw2000_base_F; + class hgun_pdw2000_F: pdw2000_base_F { + displayName = "$STR_ACE_RealisticNames_hgun_PDW2000_Name"; + }; + + // pistols + class Pistol_Base_F; + class hgun_P07_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_P07_Name"; + }; + + class hgun_Rook40_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Rook40_Name"; + }; + + class hgun_ACPC2_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_ACPC2_Name"; + }; + + class hgun_Pistol_heavy_01_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name"; + }; + + class hgun_Pistol_heavy_02_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name"; + }; + + class hgun_Pistol_Signal_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_Signal_Name"; + }; + + // machine guns + class Rifle_Long_Base_F; + class LMG_Mk200_F: Rifle_Long_Base_F { + displayName = "$STR_ACE_RealisticNames_LMG_Mk200_Name"; + }; + + class LMG_Zafir_F: Rifle_Long_Base_F { + displayName = "$STR_ACE_RealisticNames_LMG_Zafir_Name"; + }; + + // sniper rifles + class EBR_base_F; + class srifle_EBR_F: EBR_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_EBR_Name"; + }; + + class LRR_base_F; + class srifle_LRR_F: LRR_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_LRR_Name"; + }; + class srifle_LRR_camo_F: srifle_LRR_F { + displayName = "$STR_ACE_RealisticNames_srifle_LRR_camo_Name"; + }; + + class GM6_base_F; + class srifle_GM6_F: GM6_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_GM6_Name"; + }; + class srifle_GM6_camo_F: srifle_GM6_F { + displayName = "$STR_ACE_RealisticNames_srifle_GM6_camo_Name"; + }; + + class DMR_01_base_F; + class srifle_DMR_01_F: DMR_01_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_DMR_01_Name"; + }; + + // launchers + class Launcher_Base_F; + class launch_RPG32_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; + }; + + class launch_Titan_base: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; + }; + class launch_Titan_short_base: launch_Titan_base { + displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; + }; + + class launch_NLAW_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; + }; + + // vehicle weapons + + // gatlings + class CannonCore; + class gatling_20mm: CannonCore { + //displayName = ""; + class manual: CannonCore { + //displayName = ""; + }; + }; + class Twin_Cannon_20mm: gatling_20mm { + displayName = "Plamen PL-20"; + class manual: manual { + displayName = "Plamen PL-20"; + }; + }; + + class gatling_30mm: CannonCore { // This is a fictional veresion of the GSh-6-30, with 3 barrels + displayName = "GSh-3-30"; + class LowROF: Mode_FullAuto { + displayName = "GSh-3-30"; + }; + }; + + class Gatling_30mm_Plane_CAS_01_F: CannonCore { + displayName = "GAU-8"; + class LowROF: Mode_FullAuto { + displayName = "GAU-8"; + }; + }; + + class Cannon_30mm_Plane_CAS_02_F: CannonCore { + displayName = "GSh-301"; + class LowROF: Mode_FullAuto { + displayName = "GSh-301"; + }; + }; + + // missiles + class RocketPods; + class Missile_AA_04_Plane_CAS_01_F: RocketPods { + displayName = "AIM-9 Sidewinder"; + }; + class Missile_AA_03_Plane_CAS_02_F: Missile_AA_04_Plane_CAS_01_F { + displayName = "Wympel R-73"; + }; + + class MissileLauncher; + class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher { + displayName = "AGM-65 Maverick"; + }; + class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F { + displayName = "Kh-25MTP"; + }; + + // rockets + class Rocket_04_HE_Plane_CAS_01_F: RocketPods { + displayName = "Hydra 70"; + class Burst: RocketPods { + displayName = "Hydra 70"; + }; + }; + class Rocket_04_AP_Plane_CAS_01_F: Rocket_04_HE_Plane_CAS_01_F { + displayName = "Hydra 70"; + }; + + class Rocket_03_HE_Plane_CAS_02_F: Rocket_04_HE_Plane_CAS_01_F { + displayName = "S-8"; + class Burst: Burst { + displayName = "S-8"; + }; + }; + class Rocket_03_AP_Plane_CAS_02_F: Rocket_04_AP_Plane_CAS_01_F { + displayName = "S-8"; + class Burst: Burst { + displayName = "S-8"; + }; + }; + + class rockets_Skyfire: RocketPods { + displayName = "Skyfire-70"; + class Burst: RocketPods { + displayName = "Skyfire-70"; + }; + }; + + // more missiles + class missiles_DAR: RocketPods { + displayName = "Hydra 70"; + class Burst: RocketPods { + displayName = "Hydra 70"; + }; + }; + + class missiles_DAGR: RocketPods { + displayName = "DAGR"; + class Burst: RocketPods { + displayName = "DAGR"; + }; + }; + + class missiles_ASRAAM: MissileLauncher { + displayName = "AIM-132 ASRAAM"; + }; + + class missiles_Zephyr: MissileLauncher { + displayName = "AIM-120A AMRAAM"; + }; + + class missiles_SCALPEL: RocketPods { // according to zGuba, this is what it's based on + displayName = "9K121 Vikhr"; + }; + + // bomb + class Bomb_04_Plane_CAS_01_F: RocketPods { + //displayName = ""; + }; + class Bomb_03_Plane_CAS_02_F: Bomb_04_Plane_CAS_01_F { + displayName = "FAB-250M-54"; + }; + + // machine guns + class MGunCore; + class M134_minigun: MGunCore { + displayName = "2x M134 Minigun"; + }; + + class LMG_RCWS; + class MGun; + + class LMG_Minigun: LMG_RCWS { + displayName = "M134 Minigun"; + class manual: MGun { + displayName = "M134 Minigun"; + }; + }; + + class HMG_127: LMG_RCWS { + displayName = "M2"; + class manual: MGun { + displayName = "M2"; + }; + }; + + class HMG_01: HMG_127 { + displayName = "XM312"; + }; + class HMG_M2: HMG_01 { + displayName = "M2"; + }; + + class HMG_NSVT: HMG_127 { + displayName = "NSVT"; + class manual: manual { + displayName = "NSVT"; + }; + }; + + // grenade launchers + class GMG_F; + class GMG_20mm: GMG_F { + displayName = "XM307"; + class manual: GMG_F { + displayName = "XM307"; + }; + }; + + class GMG_40mm: GMG_F { + displayName = "Mk 19"; + class manual: GMG_F { + displayName = "Mk 19"; + }; + }; + + // autocannons + class autocannon_35mm: CannonCore { + displayName = "GDF-001"; + class manual: CannonCore { + displayName = "GDF-001"; + }; + }; + + // aa missiles + class missiles_titan: MissileLauncher { + displayName = "Mini-Spike"; + }; + + // mortar + class mortar_155mm_AMOS: CannonCore { + displayName = "L/52"; + }; + + // artillery rockets + class rockets_230mm_GAT: RocketPods { + displayName = "M269"; + }; + + // tank guns + class cannon_120mm: CannonCore { + class player; + displayName = "MG251"; + }; + + class cannon_120mm_long: cannon_120mm { + displayName = "L/55"; + class player: player {}; + }; + + class cannon_105mm: cannon_120mm { + displayName = "M68"; + class player: player { + displayName = "M68"; + }; + }; + + class cannon_125mm: cannon_120mm { + displayName = "2A46"; + }; + + // coax machine guns + class LMG_coax: LMG_RCWS { + displayName = "PKT"; + }; + + class ACE_LMG_coax_MBT_01: LMG_coax { + displayName = "MAG 58"; + }; + + class ACE_LMG_coax_APC_Tracked_03: LMG_coax { + displayName = "L94A1"; + }; + + // more autocannons + class autocannon_Base_F; + class autocannon_40mm_CTWS: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + class AP: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + }; + + class HE: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + }; + }; + + class autocannon_30mm_CTWS: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + class AP: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + }; + + class HE: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + }; + }; + + class autocannon_30mm: autocannon_30mm_CTWS { + displayName = "L21A1 RARDEN"; + class AP: AP { + displayName = "L21A1 RARDEN"; + }; + + class HE: HE { + displayName = "L21A1 RARDEN"; + }; }; - }; }; class CfgMagazines { - class VehicleMagazine; - class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { - displayNameShort = "30mm HEI"; - }; + class VehicleMagazine; + class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { + displayNameShort = "30mm HEI"; + }; - class 7Rnd_Rocket_04_HE_F: VehicleMagazine { - displayNameShort = "70mm HE"; - }; - class 7Rnd_Rocket_04_AP_F: 7Rnd_Rocket_04_HE_F { - displayNameShort = "70mm AP"; - }; + class 7Rnd_Rocket_04_HE_F: VehicleMagazine { + displayNameShort = "70mm HE"; + }; + class 7Rnd_Rocket_04_AP_F: 7Rnd_Rocket_04_HE_F { + displayNameShort = "70mm AP"; + }; - class 24Rnd_PG_missiles: VehicleMagazine { - displayNameShort = "70mm HE"; - }; - class 12Rnd_PG_missiles: 24Rnd_PG_missiles { - displayNameShort = "70mm HE"; - }; + class 24Rnd_PG_missiles: VehicleMagazine { + displayNameShort = "70mm HE"; + }; + class 12Rnd_PG_missiles: 24Rnd_PG_missiles { + displayNameShort = "70mm HE"; + }; - class 2000Rnd_65x39_Belt; - class 5000Rnd_762x51_Belt: 2000Rnd_65x39_Belt { - displayNameShort = "7.62mm"; - }; - class 5000Rnd_762x51_Yellow_Belt: 5000Rnd_762x51_Belt { - displayNameShort = "7.62mm"; - }; + class 2000Rnd_65x39_Belt; + class 5000Rnd_762x51_Belt: 2000Rnd_65x39_Belt { + displayNameShort = "7.62mm"; + }; + class 5000Rnd_762x51_Yellow_Belt: 5000Rnd_762x51_Belt { + displayNameShort = "7.62mm"; + }; - class 500Rnd_127x99_mag: VehicleMagazine { - displayNameShort = "12.7mm"; - }; - class 500Rnd_127x99_mag_Tracer_Green: 500Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 500Rnd_127x99_mag_Tracer_Red: 500Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 500Rnd_127x99_mag_Tracer_Yellow: 500Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; + class 500Rnd_127x99_mag: VehicleMagazine { + displayNameShort = "12.7mm"; + }; + class 500Rnd_127x99_mag_Tracer_Green: 500Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 500Rnd_127x99_mag_Tracer_Red: 500Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 500Rnd_127x99_mag_Tracer_Yellow: 500Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; - class 200Rnd_127x99_mag: 500Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 200Rnd_127x99_mag_Tracer_Green: 200Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 200Rnd_127x99_mag_Tracer_Red: 200Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 200Rnd_127x99_mag_Tracer_Yellow: 200Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; + class 200Rnd_127x99_mag: 500Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 200Rnd_127x99_mag_Tracer_Green: 200Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 200Rnd_127x99_mag_Tracer_Red: 200Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 200Rnd_127x99_mag_Tracer_Yellow: 200Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; - class 100Rnd_127x99_mag: 500Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 100Rnd_127x99_mag_Tracer_Green: 100Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 100Rnd_127x99_mag_Tracer_Red: 100Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; - class 100Rnd_127x99_mag_Tracer_Yellow: 100Rnd_127x99_mag { - displayNameShort = "12.7mm"; - }; + class 100Rnd_127x99_mag: 500Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 100Rnd_127x99_mag_Tracer_Green: 100Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 100Rnd_127x99_mag_Tracer_Red: 100Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; + class 100Rnd_127x99_mag_Tracer_Yellow: 100Rnd_127x99_mag { + displayNameShort = "12.7mm"; + }; - class 200Rnd_40mm_G_belt: VehicleMagazine { - displayNameShort = "40mm HE"; - }; + class 200Rnd_40mm_G_belt: VehicleMagazine { + displayNameShort = "40mm HE"; + }; - class 24Rnd_missiles: VehicleMagazine { - displayNameShort = "70mm HE"; - }; + class 24Rnd_missiles: VehicleMagazine { + displayNameShort = "70mm HE"; + }; - class 300Rnd_20mm_shells: VehicleMagazine { - displayNameShort = "20mm HE"; - }; + class 300Rnd_20mm_shells: VehicleMagazine { + displayNameShort = "20mm HE"; + }; - class 14Rnd_80mm_rockets: VehicleMagazine { - displayNameShort = "70mm HE"; - }; + class 14Rnd_80mm_rockets: VehicleMagazine { + displayNameShort = "70mm HE"; + }; - class 250Rnd_30mm_HE_shells: VehicleMagazine { - displayNameShort = "30mm HE"; - }; - class 250Rnd_30mm_APDS_shells: 250Rnd_30mm_HE_shells { - displayNameShort = "30mm APDS"; - }; + class 250Rnd_30mm_HE_shells: VehicleMagazine { + displayNameShort = "30mm HE"; + }; + class 250Rnd_30mm_APDS_shells: 250Rnd_30mm_HE_shells { + displayNameShort = "30mm APDS"; + }; - class 20Rnd_Rocket_03_HE_F: 7Rnd_Rocket_04_HE_F { - displayNameShort = "80mm HE"; - }; + class 20Rnd_Rocket_03_HE_F: 7Rnd_Rocket_04_HE_F { + displayNameShort = "80mm HE"; + }; - class 20Rnd_Rocket_03_AP_F: 7Rnd_Rocket_04_AP_F { - displayNameShort = "80mm AP"; - }; + class 20Rnd_Rocket_03_AP_F: 7Rnd_Rocket_04_AP_F { + displayNameShort = "80mm AP"; + }; - class 500Rnd_Cannon_30mm_Plane_CAS_02_F: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { - displayNameShort = "30mm HEI-T"; - }; + class 500Rnd_Cannon_30mm_Plane_CAS_02_F: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { + displayNameShort = "30mm HEI-T"; + }; - class 680Rnd_35mm_AA_shells: VehicleMagazine { - displayNameShort = "35mm HEI"; - }; - class 680Rnd_35mm_AA_shells_Tracer_Red: 680Rnd_35mm_AA_shells { - displayNameShort = "35mm HEI-T"; - }; - class 680Rnd_35mm_AA_shells_Tracer_Green: 680Rnd_35mm_AA_shells { - displayNameShort = "35mm HEI-T"; - }; - class 680Rnd_35mm_AA_shells_Tracer_Yellow: 680Rnd_35mm_AA_shells { - displayNameShort = "35mm HEI-T"; - }; + class 680Rnd_35mm_AA_shells: VehicleMagazine { + displayNameShort = "35mm HEI"; + }; + class 680Rnd_35mm_AA_shells_Tracer_Red: 680Rnd_35mm_AA_shells { + displayNameShort = "35mm HEI-T"; + }; + class 680Rnd_35mm_AA_shells_Tracer_Green: 680Rnd_35mm_AA_shells { + displayNameShort = "35mm HEI-T"; + }; + class 680Rnd_35mm_AA_shells_Tracer_Yellow: 680Rnd_35mm_AA_shells { + displayNameShort = "35mm HEI-T"; + }; - class 32Rnd_155mm_Mo_shells: VehicleMagazine { - displayNameShort = "155mm HE"; - }; - class 6Rnd_155mm_Mo_smoke: 32Rnd_155mm_Mo_shells { - displayNameShort = "155mm Smoke"; - }; - class 6Rnd_155mm_Mo_mine: 6Rnd_155mm_Mo_smoke { - displayNameShort = "155mm Mines"; - }; - class 6Rnd_155mm_Mo_AT_mine: 6Rnd_155mm_Mo_smoke { - displayNameShort = "155mm AT Mines"; - }; - class 2Rnd_155mm_Mo_Cluster: 6Rnd_155mm_Mo_smoke { - displayNameShort = "155mm Cluster"; - }; - class 2Rnd_155mm_Mo_guided: 6Rnd_155mm_Mo_smoke { - displayNameShort = "155mm Guided"; - }; - class 2Rnd_155mm_Mo_LG: 6Rnd_155mm_Mo_smoke { - displayNameShort = "155mm Laser Guided"; - }; + class 32Rnd_155mm_Mo_shells: VehicleMagazine { + displayNameShort = "155mm HE"; + }; + class 6Rnd_155mm_Mo_smoke: 32Rnd_155mm_Mo_shells { + displayNameShort = "155mm Smoke"; + }; + class 6Rnd_155mm_Mo_mine: 6Rnd_155mm_Mo_smoke { + displayNameShort = "155mm Mines"; + }; + class 6Rnd_155mm_Mo_AT_mine: 6Rnd_155mm_Mo_smoke { + displayNameShort = "155mm AT Mines"; + }; + class 2Rnd_155mm_Mo_Cluster: 6Rnd_155mm_Mo_smoke { + displayNameShort = "155mm Cluster"; + }; + class 2Rnd_155mm_Mo_guided: 6Rnd_155mm_Mo_smoke { + displayNameShort = "155mm Guided"; + }; + class 2Rnd_155mm_Mo_LG: 6Rnd_155mm_Mo_smoke { + displayNameShort = "155mm Laser Guided"; + }; - class 12Rnd_230mm_rockets: 14Rnd_80mm_rockets { - displayName = "227mm HE Missile"; - displayNameShort = "227mm HE"; - }; + class 12Rnd_230mm_rockets: 14Rnd_80mm_rockets { + displayName = "227mm HE Missile"; + displayNameShort = "227mm HE"; + }; - class 30Rnd_120mm_HE_shells: VehicleMagazine { - displayNameShort = "120mm HE"; - }; - class 30Rnd_120mm_HE_shells_Tracer_Red: 30Rnd_120mm_HE_shells { - displayNameShort = "120mm HE-T"; - }; - class 30Rnd_120mm_HE_shells_Tracer_Green: 30Rnd_120mm_HE_shells { - displayNameShort = "120mm HE-T"; - }; - class 30Rnd_120mm_HE_shells_Tracer_Yellow: 30Rnd_120mm_HE_shells { - displayNameShort = "120mm HE-T"; - }; + class 30Rnd_120mm_HE_shells: VehicleMagazine { + displayNameShort = "120mm HE"; + }; + class 30Rnd_120mm_HE_shells_Tracer_Red: 30Rnd_120mm_HE_shells { + displayNameShort = "120mm HE-T"; + }; + class 30Rnd_120mm_HE_shells_Tracer_Green: 30Rnd_120mm_HE_shells { + displayNameShort = "120mm HE-T"; + }; + class 30Rnd_120mm_HE_shells_Tracer_Yellow: 30Rnd_120mm_HE_shells { + displayNameShort = "120mm HE-T"; + }; - class 30Rnd_120mm_APFSDS_shells: 30Rnd_120mm_HE_shells { - displayNameShort = "120mm AP"; - }; - class 30Rnd_120mm_APFSDS_shells_Tracer_Red: 30Rnd_120mm_APFSDS_shells { - displayNameShort = "120mm AP-T"; - }; - class 30Rnd_120mm_APFSDS_shells_Tracer_Green: 30Rnd_120mm_APFSDS_shells { - displayNameShort = "120mm AP-T"; - }; - class 30Rnd_120mm_APFSDS_shells_Tracer_Yellow: 30Rnd_120mm_APFSDS_shells { - displayNameShort = "120mm AP-T"; - }; + class 30Rnd_120mm_APFSDS_shells: 30Rnd_120mm_HE_shells { + displayNameShort = "120mm AP"; + }; + class 30Rnd_120mm_APFSDS_shells_Tracer_Red: 30Rnd_120mm_APFSDS_shells { + displayNameShort = "120mm AP-T"; + }; + class 30Rnd_120mm_APFSDS_shells_Tracer_Green: 30Rnd_120mm_APFSDS_shells { + displayNameShort = "120mm AP-T"; + }; + class 30Rnd_120mm_APFSDS_shells_Tracer_Yellow: 30Rnd_120mm_APFSDS_shells { + displayNameShort = "120mm AP-T"; + }; - class 200Rnd_762x51_Belt: VehicleMagazine { - displayNameShort = "7.62mm"; - }; - class 200Rnd_762x51_Belt_Red: 200Rnd_762x51_Belt {}; - class 200Rnd_762x51_Belt_Green: 200Rnd_762x51_Belt {}; - class 200Rnd_762x51_Belt_Yellow: 200Rnd_762x51_Belt {}; - class 200Rnd_762x51_Belt_T_Red: 200Rnd_762x51_Belt_Red { - displayNameShort = "7.62mm"; - }; - class 200Rnd_762x51_Belt_T_Green: 200Rnd_762x51_Belt_Green { - displayNameShort = "7.62mm"; - }; - class 200Rnd_762x51_Belt_T_Yellow: 200Rnd_762x51_Belt_Yellow { - displayNameShort = "7.62mm"; - }; + class 200Rnd_762x51_Belt: VehicleMagazine { + displayNameShort = "7.62mm"; + }; + class 200Rnd_762x51_Belt_Red: 200Rnd_762x51_Belt {}; + class 200Rnd_762x51_Belt_Green: 200Rnd_762x51_Belt {}; + class 200Rnd_762x51_Belt_Yellow: 200Rnd_762x51_Belt {}; + class 200Rnd_762x51_Belt_T_Red: 200Rnd_762x51_Belt_Red { + displayNameShort = "7.62mm"; + }; + class 200Rnd_762x51_Belt_T_Green: 200Rnd_762x51_Belt_Green { + displayNameShort = "7.62mm"; + }; + class 200Rnd_762x51_Belt_T_Yellow: 200Rnd_762x51_Belt_Yellow { + displayNameShort = "7.62mm"; + }; - class 2000Rnd_762x51_Belt_Red; - class 2000Rnd_762x51_Belt_T_Red: 2000Rnd_762x51_Belt_Red { - displayNameShort = "7.62mm"; - }; + class 2000Rnd_762x51_Belt_Red; + class 2000Rnd_762x51_Belt_T_Red: 2000Rnd_762x51_Belt_Red { + displayNameShort = "7.62mm"; + }; - class 2000Rnd_762x51_Belt_Green; - class 2000Rnd_762x51_Belt_T_Green: 2000Rnd_762x51_Belt_Green { - displayNameShort = "7.62mm"; - }; + class 2000Rnd_762x51_Belt_Green; + class 2000Rnd_762x51_Belt_T_Green: 2000Rnd_762x51_Belt_Green { + displayNameShort = "7.62mm"; + }; - class 2000Rnd_762x51_Belt_Yellow; - class 2000Rnd_762x51_Belt_T_Yellow: 2000Rnd_762x51_Belt_Yellow { - displayNameShort = "7.62mm"; - }; + class 2000Rnd_762x51_Belt_Yellow; + class 2000Rnd_762x51_Belt_T_Yellow: 2000Rnd_762x51_Belt_Yellow { + displayNameShort = "7.62mm"; + }; - class 1000Rnd_762x51_Belt_Red; - class 1000Rnd_762x51_Belt_T_Red: 1000Rnd_762x51_Belt_Red { - displayNameShort = "7.62mm"; - }; + class 1000Rnd_762x51_Belt_Red; + class 1000Rnd_762x51_Belt_T_Red: 1000Rnd_762x51_Belt_Red { + displayNameShort = "7.62mm"; + }; - class 1000Rnd_762x51_Belt_Green; - class 1000Rnd_762x51_Belt_T_Green: 1000Rnd_762x51_Belt_Green { - displayNameShort = "7.62mm"; - }; + class 1000Rnd_762x51_Belt_Green; + class 1000Rnd_762x51_Belt_T_Green: 1000Rnd_762x51_Belt_Green { + displayNameShort = "7.62mm"; + }; - class 1000Rnd_762x51_Belt_Yellow; - class 1000Rnd_762x51_Belt_T_Yellow: 1000Rnd_762x51_Belt_Yellow { - displayNameShort = "7.62mm"; - }; + class 1000Rnd_762x51_Belt_Yellow; + class 1000Rnd_762x51_Belt_T_Yellow: 1000Rnd_762x51_Belt_Yellow { + displayNameShort = "7.62mm"; + }; - class 16Rnd_120mm_HE_shells; - class 12Rnd_125mm_HE: 16Rnd_120mm_HE_shells { - displayNameShort = "125mm HE"; - }; + class 16Rnd_120mm_HE_shells; + class 12Rnd_125mm_HE: 16Rnd_120mm_HE_shells { + displayNameShort = "125mm HE"; + }; - class 16Rnd_120mm_HE_shells_Tracer_Red; - class 12Rnd_125mm_HE_T_Red: 16Rnd_120mm_HE_shells_Tracer_Red { - displayNameShort = "125mm HE-T"; - }; + class 16Rnd_120mm_HE_shells_Tracer_Red; + class 12Rnd_125mm_HE_T_Red: 16Rnd_120mm_HE_shells_Tracer_Red { + displayNameShort = "125mm HE-T"; + }; - class 16Rnd_120mm_HE_shells_Tracer_Green; - class 12Rnd_125mm_HE_T_Green: 16Rnd_120mm_HE_shells_Tracer_Green { - displayNameShort = "125mm HE-T"; - }; + class 16Rnd_120mm_HE_shells_Tracer_Green; + class 12Rnd_125mm_HE_T_Green: 16Rnd_120mm_HE_shells_Tracer_Green { + displayNameShort = "125mm HE-T"; + }; - class 16Rnd_120mm_HE_shells_Tracer_Yellow; - class 12Rnd_125mm_HE_T_Yellow: 16Rnd_120mm_HE_shells_Tracer_Yellow { - displayNameShort = "125mm HE-T"; - }; + class 16Rnd_120mm_HE_shells_Tracer_Yellow; + class 12Rnd_125mm_HE_T_Yellow: 16Rnd_120mm_HE_shells_Tracer_Yellow { + displayNameShort = "125mm HE-T"; + }; - class 12Rnd_125mm_HEAT: 12Rnd_125mm_HE { - displayNameShort = "125mm MP"; - }; - class 12Rnd_125mm_HEAT_T_Red: 12Rnd_125mm_HEAT { - displayNameShort = "125mm MP-T"; - }; - class 12Rnd_125mm_HEAT_T_Green: 12Rnd_125mm_HEAT { - displayNameShort = "125mm MP-T"; - }; - class 12Rnd_125mm_HEAT_T_Yellow: 12Rnd_125mm_HEAT { - displayNameShort = "125mm MP-T"; - }; + class 12Rnd_125mm_HEAT: 12Rnd_125mm_HE { + displayNameShort = "125mm MP"; + }; + class 12Rnd_125mm_HEAT_T_Red: 12Rnd_125mm_HEAT { + displayNameShort = "125mm MP-T"; + }; + class 12Rnd_125mm_HEAT_T_Green: 12Rnd_125mm_HEAT { + displayNameShort = "125mm MP-T"; + }; + class 12Rnd_125mm_HEAT_T_Yellow: 12Rnd_125mm_HEAT { + displayNameShort = "125mm MP-T"; + }; - class 32Rnd_120mm_APFSDS_shells; - class 24Rnd_125mm_APFSDS: 32Rnd_120mm_APFSDS_shells { - displayNameShort = "125mm AP"; - }; + class 32Rnd_120mm_APFSDS_shells; + class 24Rnd_125mm_APFSDS: 32Rnd_120mm_APFSDS_shells { + displayNameShort = "125mm AP"; + }; - class 32Rnd_120mm_APFSDS_shells_Tracer_Red; - class 24Rnd_125mm_APFSDS_T_Red: 32Rnd_120mm_APFSDS_shells_Tracer_Red { - displayNameShort = "125mm AP-T"; - }; + class 32Rnd_120mm_APFSDS_shells_Tracer_Red; + class 24Rnd_125mm_APFSDS_T_Red: 32Rnd_120mm_APFSDS_shells_Tracer_Red { + displayNameShort = "125mm AP-T"; + }; - class 32Rnd_120mm_APFSDS_shells_Tracer_Green; - class 24Rnd_125mm_APFSDS_T_Green: 32Rnd_120mm_APFSDS_shells_Tracer_Green { - displayNameShort = "125mm AP-T"; - }; + class 32Rnd_120mm_APFSDS_shells_Tracer_Green; + class 24Rnd_125mm_APFSDS_T_Green: 32Rnd_120mm_APFSDS_shells_Tracer_Green { + displayNameShort = "125mm AP-T"; + }; - class 32Rnd_120mm_APFSDS_shells_Tracer_Yellow; - class 24Rnd_125mm_APFSDS_T_Yellow: 32Rnd_120mm_APFSDS_shells_Tracer_Yellow { - displayNameShort = "125mm AP-T"; - }; + class 32Rnd_120mm_APFSDS_shells_Tracer_Yellow; + class 24Rnd_125mm_APFSDS_T_Yellow: 32Rnd_120mm_APFSDS_shells_Tracer_Yellow { + displayNameShort = "125mm AP-T"; + }; - class 20Rnd_105mm_HEAT_MP: 12Rnd_125mm_HEAT { - displayNameShort = "105mm MP"; - }; - class 20Rnd_105mm_HEAT_MP_T_Red: 20Rnd_105mm_HEAT_MP { - displayNameShort = "105mm MP-T"; - }; - class 20Rnd_105mm_HEAT_MP_T_Green: 20Rnd_105mm_HEAT_MP { - displayNameShort = "105mm MP-T"; - }; - class 20Rnd_105mm_HEAT_MP_T_Yellow: 20Rnd_105mm_HEAT_MP { - displayNameShort = "105mm MP-T"; - }; + class 20Rnd_105mm_HEAT_MP: 12Rnd_125mm_HEAT { + displayNameShort = "105mm MP"; + }; + class 20Rnd_105mm_HEAT_MP_T_Red: 20Rnd_105mm_HEAT_MP { + displayNameShort = "105mm MP-T"; + }; + class 20Rnd_105mm_HEAT_MP_T_Green: 20Rnd_105mm_HEAT_MP { + displayNameShort = "105mm MP-T"; + }; + class 20Rnd_105mm_HEAT_MP_T_Yellow: 20Rnd_105mm_HEAT_MP { + displayNameShort = "105mm MP-T"; + }; - class 40Rnd_105mm_APFSDS: 24Rnd_125mm_APFSDS { - displayNameShort = "105mm AP"; - }; - class 40Rnd_105mm_APFSDS_T_Red: 40Rnd_105mm_APFSDS { - displayNameShort = "105mm AP-T"; - }; - class 40Rnd_105mm_APFSDS_T_Green: 40Rnd_105mm_APFSDS { - displayNameShort = "105mm AP-T"; - }; - class 40Rnd_105mm_APFSDS_T_Yellow: 40Rnd_105mm_APFSDS { - displayNameShort = "105mm AP-T"; - }; + class 40Rnd_105mm_APFSDS: 24Rnd_125mm_APFSDS { + displayNameShort = "105mm AP"; + }; + class 40Rnd_105mm_APFSDS_T_Red: 40Rnd_105mm_APFSDS { + displayNameShort = "105mm AP-T"; + }; + class 40Rnd_105mm_APFSDS_T_Green: 40Rnd_105mm_APFSDS { + displayNameShort = "105mm AP-T"; + }; + class 40Rnd_105mm_APFSDS_T_Yellow: 40Rnd_105mm_APFSDS { + displayNameShort = "105mm AP-T"; + }; - class 60Rnd_40mm_GPR_shells: VehicleMagazine { - displayNameShort = "40mm GPR"; - }; - class 60Rnd_40mm_GPR_Tracer_Red_shells: 60Rnd_40mm_GPR_shells { - displayNameShort = "40mm GPR-T"; - }; - class 60Rnd_40mm_GPR_Tracer_Green_shells: 60Rnd_40mm_GPR_shells { - displayNameShort = "40mm GPR-T"; - }; - class 60Rnd_40mm_GPR_Tracer_Yellow_shells: 60Rnd_40mm_GPR_shells { - displayNameShort = "40mm GPR-T"; - }; + class 60Rnd_40mm_GPR_shells: VehicleMagazine { + displayNameShort = "40mm GPR"; + }; + class 60Rnd_40mm_GPR_Tracer_Red_shells: 60Rnd_40mm_GPR_shells { + displayNameShort = "40mm GPR-T"; + }; + class 60Rnd_40mm_GPR_Tracer_Green_shells: 60Rnd_40mm_GPR_shells { + displayNameShort = "40mm GPR-T"; + }; + class 60Rnd_40mm_GPR_Tracer_Yellow_shells: 60Rnd_40mm_GPR_shells { + displayNameShort = "40mm GPR-T"; + }; - class 40Rnd_40mm_APFSDS_shells: 60Rnd_40mm_GPR_shells { - displayNameShort = "40mm AP"; - }; - class 40Rnd_40mm_APFSDS_Tracer_Red_shells: 40Rnd_40mm_APFSDS_shells { - displayNameShort = "40mm AP-T"; - }; - class 40Rnd_40mm_APFSDS_Tracer_Green_shells: 40Rnd_40mm_APFSDS_Tracer_Red_shells { - displayNameShort = "40mm AP-T"; - }; - class 40Rnd_40mm_APFSDS_Tracer_Yellow_shells: 40Rnd_40mm_APFSDS_Tracer_Red_shells { - displayNameShort = "40mm AP-T"; - }; + class 40Rnd_40mm_APFSDS_shells: 60Rnd_40mm_GPR_shells { + displayNameShort = "40mm AP"; + }; + class 40Rnd_40mm_APFSDS_Tracer_Red_shells: 40Rnd_40mm_APFSDS_shells { + displayNameShort = "40mm AP-T"; + }; + class 40Rnd_40mm_APFSDS_Tracer_Green_shells: 40Rnd_40mm_APFSDS_Tracer_Red_shells { + displayNameShort = "40mm AP-T"; + }; + class 40Rnd_40mm_APFSDS_Tracer_Yellow_shells: 40Rnd_40mm_APFSDS_Tracer_Red_shells { + displayNameShort = "40mm AP-T"; + }; - class 450Rnd_127x108_Ball: VehicleMagazine { - displayNameShort = "12.7mm"; - }; + class 450Rnd_127x108_Ball: VehicleMagazine { + displayNameShort = "12.7mm"; + }; - class 140Rnd_30mm_MP_shells: 250Rnd_30mm_HE_shells { - displayNameShort = "30mm MP"; - }; - class 140Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells { - displayNameShort = "30mm MP-T"; - }; - class 140Rnd_30mm_MP_shells_Tracer_Green: 140Rnd_30mm_MP_shells_Tracer_Red { - displayNameShort = "30mm MP-T"; - }; - class 140Rnd_30mm_MP_shells_Tracer_Yellow: 140Rnd_30mm_MP_shells_Tracer_Red { - displayNameShort = "30mm MP-T"; - }; + class 140Rnd_30mm_MP_shells: 250Rnd_30mm_HE_shells { + displayNameShort = "30mm MP"; + }; + class 140Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells { + displayNameShort = "30mm MP-T"; + }; + class 140Rnd_30mm_MP_shells_Tracer_Green: 140Rnd_30mm_MP_shells_Tracer_Red { + displayNameShort = "30mm MP-T"; + }; + class 140Rnd_30mm_MP_shells_Tracer_Yellow: 140Rnd_30mm_MP_shells_Tracer_Red { + displayNameShort = "30mm MP-T"; + }; - class 60Rnd_30mm_APFSDS_shells: 250Rnd_30mm_HE_shells { - displayNameShort = "30mm AP"; - }; - class 60Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells { - displayNameShort = "30mm AP-T"; - }; - class 60Rnd_30mm_APFSDS_shells_Tracer_Green: 60Rnd_30mm_APFSDS_shells { - displayNameShort = "30mm AP-T"; - }; - class 60Rnd_30mm_APFSDS_shells_Tracer_Yellow: 60Rnd_30mm_APFSDS_shells { - displayNameShort = "30mm AP-T"; - }; + class 60Rnd_30mm_APFSDS_shells: 250Rnd_30mm_HE_shells { + displayNameShort = "30mm AP"; + }; + class 60Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells { + displayNameShort = "30mm AP-T"; + }; + class 60Rnd_30mm_APFSDS_shells_Tracer_Green: 60Rnd_30mm_APFSDS_shells { + displayNameShort = "30mm AP-T"; + }; + class 60Rnd_30mm_APFSDS_shells_Tracer_Yellow: 60Rnd_30mm_APFSDS_shells { + displayNameShort = "30mm AP-T"; + }; - class 200Rnd_20mm_G_belt: VehicleMagazine { - displayNameShort = "20mm HE"; - }; - class 40Rnd_20mm_G_belt: 200Rnd_20mm_G_belt { - displayNameShort = "20mm HE"; - }; + class 200Rnd_20mm_G_belt: VehicleMagazine { + displayNameShort = "20mm HE"; + }; + class 40Rnd_20mm_G_belt: 200Rnd_20mm_G_belt { + displayNameShort = "20mm HE"; + }; - // mines - class CA_Magazine; - // http://en.wikipedia.org/wiki/M15_mine - class ATMine_Range_Mag: CA_Magazine { - displayName = "$STR_ACE_RealisticNames_ATMine_Name"; - }; - // http://en.wikipedia.org/wiki/VS-50_mine - class APERSMine_Range_Mag: ATMine_Range_Mag { - displayName = "$STR_ACE_RealisticNames_APERSMine_Name"; - }; - // https://www.buymilsurp.com/us-m26-antipersonnel-bounding-mine-p-5419.html - class APERSBoundingMine_Range_Mag: ATMine_Range_Mag { - displayName = "$STR_ACE_RealisticNames_APERSBoundingMine_Name"; - }; - // http://en.wikipedia.org/wiki/PMR-3_mine - class APERSTripMine_Wire_Mag: ATMine_Range_Mag { - displayName = "$STR_ACE_RealisticNames_APERSTripwireMine_Name"; - }; - // the following ones can be found here: http://www.dtic.mil/dtic/tr/fulltext/u2/a567897.pdf - class SLAMDirectionalMine_Wire_Mag: ATMine_Range_Mag { - displayName = "$STR_ACE_RealisticNames_SLAM_Name"; - }; + // mines + class CA_Magazine; + // http://en.wikipedia.org/wiki/M15_mine + class ATMine_Range_Mag: CA_Magazine { + displayName = "$STR_ACE_RealisticNames_ATMine_Name"; + }; + // http://en.wikipedia.org/wiki/VS-50_mine + class APERSMine_Range_Mag: ATMine_Range_Mag { + displayName = "$STR_ACE_RealisticNames_APERSMine_Name"; + }; + // https://www.buymilsurp.com/us-m26-antipersonnel-bounding-mine-p-5419.html + class APERSBoundingMine_Range_Mag: ATMine_Range_Mag { + displayName = "$STR_ACE_RealisticNames_APERSBoundingMine_Name"; + }; + // http://en.wikipedia.org/wiki/PMR-3_mine + class APERSTripMine_Wire_Mag: ATMine_Range_Mag { + displayName = "$STR_ACE_RealisticNames_APERSTripwireMine_Name"; + }; + // the following ones can be found here: http://www.dtic.mil/dtic/tr/fulltext/u2/a567897.pdf + class SLAMDirectionalMine_Wire_Mag: ATMine_Range_Mag { + displayName = "$STR_ACE_RealisticNames_SLAM_Name"; + }; - // claymore - class ClaymoreDirectionalMine_Remote_Mag: CA_Magazine { - displayName = "$STR_ACE_RealisticNames_Claymore_Name"; - }; + // claymore + class ClaymoreDirectionalMine_Remote_Mag: CA_Magazine { + displayName = "$STR_ACE_RealisticNames_Claymore_Name"; + }; - // satchels - class SatchelCharge_Remote_Mag: CA_Magazine { - displayName = "$STR_ACE_RealisticNames_SatchelCharge_Name"; - }; - class DemoCharge_Remote_Mag: SatchelCharge_Remote_Mag { - displayName = "$STR_ACE_RealisticNames_DemoCharge_Name"; - }; + // satchels + class SatchelCharge_Remote_Mag: CA_Magazine { + displayName = "$STR_ACE_RealisticNames_SatchelCharge_Name"; + }; + class DemoCharge_Remote_Mag: SatchelCharge_Remote_Mag { + displayName = "$STR_ACE_RealisticNames_DemoCharge_Name"; + }; - // hand grenades - class HandGrenade: CA_Magazine { - displayName = "$STR_ACE_RealisticNames_HandGrenade_Name"; - }; - class SmokeShell: HandGrenade { - displayName = "$STR_ACE_RealisticNames_SmokeShell_Name"; - }; - class SmokeShellBlue: SmokeShell { - displayName = "$STR_ACE_RealisticNames_SmokeShellBlue_Name"; - }; - class SmokeShellGreen: SmokeShell { - displayName = "$STR_ACE_RealisticNames_SmokeShellGreen_Name"; - }; - class SmokeShellOrange: SmokeShell { - displayName = "$STR_ACE_RealisticNames_SmokeShellOrange_Name"; - }; - class SmokeShellPurple: SmokeShell { - displayName = "$STR_ACE_RealisticNames_SmokeShellPurple_Name"; - }; - class SmokeShellRed: SmokeShell { - displayName = "$STR_ACE_RealisticNames_SmokeShellRed_Name"; - }; - class SmokeShellYellow: SmokeShell { - displayName = "$STR_ACE_RealisticNames_SmokeShellYellow_Name"; - }; + // hand grenades + class HandGrenade: CA_Magazine { + displayName = "$STR_ACE_RealisticNames_HandGrenade_Name"; + }; + class SmokeShell: HandGrenade { + displayName = "$STR_ACE_RealisticNames_SmokeShell_Name"; + }; + class SmokeShellBlue: SmokeShell { + displayName = "$STR_ACE_RealisticNames_SmokeShellBlue_Name"; + }; + class SmokeShellGreen: SmokeShell { + displayName = "$STR_ACE_RealisticNames_SmokeShellGreen_Name"; + }; + class SmokeShellOrange: SmokeShell { + displayName = "$STR_ACE_RealisticNames_SmokeShellOrange_Name"; + }; + class SmokeShellPurple: SmokeShell { + displayName = "$STR_ACE_RealisticNames_SmokeShellPurple_Name"; + }; + class SmokeShellRed: SmokeShell { + displayName = "$STR_ACE_RealisticNames_SmokeShellRed_Name"; + }; + class SmokeShellYellow: SmokeShell { + displayName = "$STR_ACE_RealisticNames_SmokeShellYellow_Name"; + }; }; diff --git a/addons/realisticnames/script_component.hpp b/addons/realisticnames/script_component.hpp index 74a7dd413f..54b9cf4d7c 100644 --- a/addons/realisticnames/script_component.hpp +++ b/addons/realisticnames/script_component.hpp @@ -2,11 +2,11 @@ #include "\z\ace\Addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_REALISTICNAMES - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_ENABLED_REALISTICNAMES - #define DEBUG_SETTINGS DEBUG_ENABLED_REALISTICNAMES + #define DEBUG_SETTINGS DEBUG_ENABLED_REALISTICNAMES #endif #include "\z\ace\Addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index ed70a3a00d..8c1483ead2 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1,1218 +1,1218 @@  - - - XM312 - XM312 - XM312 - XM312 - XM312 - XM312 - XM312 - XM312 - XM312 - XM312A - - - XM312A - XM312A - XM312 - XM312A - XM312A - XM312A - XM312A - XM312A - XM312A - XM312A - - - XM312 (High) - XM312 (Hoch) - XM312 (Alto) - XM312 (Haut) - XM312 (Vysoký) - XM312 (Wysoki) - XM312 (Высокий) - XM312 (Alta) - XM312 (Magasított) - XM312 (Alta) - - - XM307 - XM307 - XM307 - XM307 - XM307 - XM307 - XM307 - XM307 - XM307 - XM307 - - - XM307A - XM307A - XM307A - XM307A - XM307A - XM307A - XM307A - XM307A - XM307A - XM307A - - - XM307 (High) - XM307 (Hoch) - XM307 (Alto) - XM307 (Haut) - XM307 (Vysoký) - XM307 (Wysoki) - XM307 (Высокий) - XM307 (Alta) - XM307 (Magasított) - XM307 (Alta) - - - Mini-Spike Launcher (AT) - Mini-Spike Lenkflugkörper (AT) - Lanzador Mini-Spike (AT) - Poste de tir Mini-Spike (AC) - Mini-Spike Odpalovač (AT) - Wyrzutnia Mini-Spike (AT) - Mini-Spike Пусковое устройство (ПТРК) - Lança-mísseis Mini-Spike (AC) - Mini-Spike rakétarendszer (páncéltörő) - Lanciatore Mini-Spike (AC) - - - Mini-Spike Launcher (AA) - Mini-Spike Lenkflugkörper (AA) - Lanzador Mini-Spike (AA) - Poste de tir Mini-Spike (AA) - Mini-Spike Odpalovač (AA) - Wyrzutnia Mini-Spike (AA) - Mini-Spike Пусковое устройство (ВВ) - Lança-mísseis Mini-Spike (AA) - Mini-Spike rakétarendszer (légvédelmi) - Lanciatore Mini-Spike (AA) - - - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - YABHON-R3 - - - YABHON-R3 (CAS) - YABHON-R3 (Luftnahunterstützung) - YABHON-R3 (CAS) - YABHON-R3 (CAS) - YABHON-R3 (CAS) - YABHON-R3 (штурмовик) - - - M-ATV - M-ATV - M-ATV - M-ATV - M-ATV - M-ATV - M-ATV - M-ATV - M-ATV - M-ATV - - - M-ATV (HMG) - M-ATV (SMG) - M-ATV (HMG) - M-ATV (CKM) - M-ATV (TK) - M-ATV (HMG) - M-ATV (Пулемет) - M-ATV (HMG) - M-ATV (HMG) - M-ATV (HMG) - - - M-ATV (GMG) - M-ATV (GMW) - M-ATV (GMG) - M-ATV (GMG) - M-ATV (Granátomet) - M-ATV (GMG) - M-ATV (Гранатомет) - M-ATV (GMG) - M-ATV (GMG) - M-ATV (GMG) - - - Merkava Mk IV M - Merkava Mk IV M - Merkava Mk IV M - Merkawa Mk IV M - Merkava Mk IV M - Merkava Mk IV M - Меркава Mk IV M - Merkava Mk IV M - Merkava Mk IV M - Merkava Mk IV M - - - Merkava Mk IV LIC - Merkava Mk IV LIC - Merkava Mk IV LIC - Merkawa Mk IV LIC - Merkava Mk IV LIC - Merkava Mk IV LIC - Меркава Mk IV LIC - Merkava Mk IV LIC - Merkava Mk IV LIC - Merkava Mk IV LIC - - - Sholef - Sholef - Sholef - Sholef - Sholef - Sholef - Шолеф - Sholef - Sholef - Sholef - - - Seara - Seara - Seara - Seara - Seara - Seara - Seara - Seara - Seara - Seara - - - Namer - Namer - Namer - Namer - Namer - Namer - Намер - Namer - Namer - Namer - - - Bardelas - Bardelas - Bardelas - Bardelas - Bardelas - Bardelas - Bardelas - Bardelas - Bardelas - Bardelas - - - Patria AMV - Patria AMV - Patria AMV - Patria AMV - Patria AMV - Patria AMV - Patria AMV - Patria AMV - Patria AMV - Patria AMV - - - Nemmera - Nemmera - Nemmera - Nemmera - Nemmera - Nemmera - Nemmera - Nemmera - Nemmera - Nemmera - - - HEMTT Transport - HEMTT Transport - HEMTT de transporte - HEMTT Transportowy - HEMTT Valník - HEMTT Transport - HEMTT Транспортный - HEMTT Transporte - HEMTT szállítójármű - HEMTT da trasporto - - - HEMTT Transport (covered) - HEMTT Transport (bedeckt) - HEMTT de transporte (cubierto) - HEMTT Transportowy (zakryty) - HEMTT Valník (krytý) - HEMTT Transport (bâché) - HEMTT Транспортный (крытый) - HEMTT Transporte (coberto) - HEMTT szállítójármű (ponyvás) - HEMTT da trasporto (coperto) - - - HEMTT - HEMTT - HEMTT - HEMTT - HEMTT - HEMTT Tracteur - HEMTT - HEMTT - HEMTT - HEMTT - - - HEMTT Container - HEMTT Container - HEMTT de contenedor - HEMTT Kontener - HEMTT Skříňový - HEMTT Conteneur - HEMTT Контейнер - HEMTT Contêiner - HEMTT Konténer - HEMTT portacontainer - - - HEMTT Medical - HEMTT Sanitäter - HEMTT médico - HEMTT Medyczny - HEMTT Zdravotnický - HEMTT Sanitaire - HEMTT Медицинский - HEMTT Médico - HEMTT (egészségügyi) - HEMTT Medico - - - HEMTT Ammo - HEMTT Munition - HEMTT de munición - HEMTT Amunicyjny - HEMTT Muniční - HEMTT Munitions - HEMTT Боеприпасы - HEMTT Munições - HEMTT (lőszerszállító) - HEMTT di rifornimento munizioni - - - HEMTT Fuel - HEMTT Treibstoff - HEMTT de combustible - HEMTT Cysterna - HEMTT Cisterna - HEMTT Citerne - HEMTT Заправщик - HEMTT Combustível - HEMTT (üzemanyag-szállító) - HEMTT di rifornimento carburante - - - HEMTT Repair - HEMTT Instandsetzung - HEMTT de reparación - HEMTT Naprawczy - HEMTT Opravárenský - HEMTT Réparation - HEMTT Ремонтный - HEMTT Reparador - HEMTT (szerelő-jármű) - HEMTT Riparatore - - - Fennek - Fennek - Fennek - Fennek - Fennek - Fennek - Феннек - Fennek - Fennek - Fennek - - - Fennek (HMG) - Fennek (SMG) - Fennek (HMG) - Fennek (CKM) - Fennek (TK) - Fennek (HMG) - Феннек (Пулемет) - Fennek (HMG) - Fennek (HMG) - Fennek (HMG) - - - Fennek (GMG) - Fennek (GMW) - Fennek (GMG) - Fennek (GMG) - Fennek (granátomet) - Fennek (GMG) - Феннек (Гранатомет) - Fennek (GMG) - Fennek (GMG) - Fennek (GMG) - - - Leopard 2SG - Leopard 2SG - Leopard 2SG - Leopard 2SG - Leopard 2SG - Leopard 2SG - Леопард 2SG - Leopard 2SG - Leopard 2SG - Leopard 2SG - - - FV510 Warrior - FV510 Warrior - FV510 Warrior - FV510 Warrior - FV510 Warrior - FV510 Warrior - FV510 Уорриор - FV510 Warrior - FV510 Warrior - FV510 Warrior - - - Pandur II - Pandur II - Pandur II - Pandur II - Pandur II - Pandur II - Pandur II - Pandur II - Pandur II - Pandur II - - - KamAZ Transport - KamAZ Transport - KamAZ de transporte - KamAZ transportowy - KAMAZ Valník - KamAZ Transport - КамАЗ Траспортный - KamAZ Transporte - KamAZ szállítójármű - KamAZ da trasporto - - - KamAZ Transport (covered) - KamAZ Transport (bedeckt) - KamAZ de transporte (cubierto) - KamAZ Transportowy (zakryty) - KAMAZ Valník (krytý) - KamAZ Transport (bâché) - КамАЗ Траспортный (Крытый) - KamAZ Transporte (coberto) - KamAZ szállítójármű (ponyvás) - KamAZ da trasporto (coperto) - - - KamAZ Ammo - KamAZ Munition - KamAZ de munición - KamAZ Amunicyjny - KAMAZ Muniční - KamAZ Munitions - КамАЗ Боеприпасы - KamAZ Munições - KamAZ (lőszerszállító) - KamAZ di rifornimento munizioni - - - KamAZ Fuel - KamAZ Treibstoff - KamAZ de combustible - KamAZ cysterna - KAMAZ Cisterna - KamAZ Citerne - КамАЗ Заправщик - KamAZ Combustível - KamAZ (üzemanyag-szállító) - KamAZ di rifornimento carburante - - - KamAZ Repair - KamAZ Instandsetzung - KamAZ de reparación - KamAZ Naprawczy - KAMAZ Opravárenský - KamAZ Réparation - КамАЗ Ремонтный - KamAZ Reparador - KamAZ (szerelő-jármű) - KamAZ riparatore - - - KamAZ Medical - KamAZ Sanitäter - KamAZ médico - KamAZ Medyczny - KAMAZ Zdravotnický - KamAZ Sanitaire - КамАЗ Медицинский - KamAZ Médico - KamAZ (egészségügyi) - KamAZ Medico - - - Punisher - Punisher - Punisher - Punisher - Punisher - Punisher - Kаратель - Punisher - Punisher - Punisher - - - Punisher (HMG) - Punisher (SMG) - Punisher (HMG) - Punisher (CKM) - Punisher (TK) - Punisher (HMG) - Kаратель (Пулемет) - Punisher (HMG) - Punisher (HMG) - Punisher (HMG) - - - Punisher (GMG) - Punisher (GMW) - Punisher (GMG) - Punisher (CKM) - Punisher (granátomet) - Punisher (GMG) - Kаратель (Гранатомет) - Punisher (GMG) - Punisher (GMG) - Punisher (GMG) - - - T100 Black Eagle - T100 Black Eagle - T100 Black Eagle - T100 Black Eagle - T100 Black Eagle - T100 Black Eagle - T100 Черный Орел - T100 Black Eagle - T100 Black Eagle - T100 Black Eagle - - - 2S9 Sochor - 2S9 Sochor - 2S9 Sochor - 259 Sochor - 2S9 Sochor - 2S9 Sochor - 2S9 Сокор - 2S9 Sochor - 2S9 Sochor - 2S9 Sochor - - - BM-2T Stalker - BM-2T Stalker - BM-2T Stalker - BM-2T Stalker - BM-2T Stalker - BM-2T Stalker - БМ-2Т Сталкер - BM-2T Stalker - BM-2T Stalker - BM-2T Stalker - - - ZSU-35 Tigris - ZSU-35 Tigris - ZSU-35 Tigris - ZSU-35 Tigris - ZSU-35 Tigris - ZSU-35 Tigris - ЗСУ-35 Tigris - ZSU-35 Tigris - ZSU-35 Tigris - ZSU-35 Tigris - - - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - Otokar ARMA - - - Typhoon Transport - Typhoon Transport - Typhoon de transporte - Typhoon Transportowy - Typhoon Valník - Typhoon Transport - Тайфун Транспортный - Typhoon Transporte - Typhoon szállítójármű - Typhoon da trasporto - - - Typhoon Transport (covered) - Typhoon Transport (bedeckt) - Typhoon de transporte (cubierto) - Typhoon Transportowy (przykryty) - Typhoon Valník (krytý) - Typhoon Transport (bâché) - Тайфун Транспортный (kрытый) - Typhoon Transporte (coberto) - Typhoon szállítójármű (ponyvás) - Typhoon da trasporto (coperto) - - - Typhoon Device - Typhoon Gerät - Typhoon de dispositivo - Typhoon Urządzenie - Typhoon Zařízení - Typhoon Dispositif - Тайфун Устройство - Typhoon Dispositivo - Typhoon (szerkezet) - Typhoon per dispositivo - - - Typhoon Ammo - Typhoon Munition - Typhoon de munición - Typhoon Amunicyjny - Typhoon Muniční - Typhoon Munitions - Тайфун Боеприпасы - Typhoon Munições - Typhoon (lőszerszállító) - Typhoon di rifornimento munizioni - - - Typhoon Fuel - Typhoon Treibstoff - Typhoon de combustible - Typhoon Cysterna - Typhoon Cisterna - Typhoon Citerne - Тайфун Заправщик - Typhoon Combustível - Typhoon (üzemanyag-szállító) - Typhoon di rifornimento carburante - - - Typhoon Repair - Typhoon Instandsetzung - Typhoon de reparación - Typhoon Naprawczy - Typhoon Opravárenský - Typhoon Réparation - Тайфун Ремонтный - Typhoon Reparador - Typhoon (szerelő-jármű) - Typhoon riparatore - - - Typhoon Medical - Typhoon Sanitäter - Typhoon médico - Typhoon Medyczny - Typhoon Zdravotnický - Typhoon Sanitaire - Тайфун Медицинский - Typhoon Médico - Typhoon (egészségügyi) - Typhoon medico - - - RAH-66 Comanche - RAH-66 Comanche - RAH-66 Comanche - RAH-66 Comanche - RAH-66 Comanche - RAH-66 Commanche - RAH-66 Команч - RAH-66 Comanche - RAH-66 Comanche - RAH-66 Comanche - - - MH-6 Little Bird - MH-6 Little Bird - MH-6 Litte Bird - MH-6 Little Bird - MH-6 Little Bird - MH-6 Little Bird - MH-6 Little Bird - MH-6 Little Bird - MH-6 Little Bird - MH-6 Little Bird - - - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - AH-6 Little Bird - - - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - CH-47I Chinook - - - CH-47I Chinook (unarmed) - CH-47I Chinook (unbewaffnet) - CH-47I Chinnok (Desarmado) - CH-47I Chinook (nieuzbrojony) - CH-47I Chinook (невооруженный) - CH-47I Chinook (Neozbrojený) - - - A-10D Thunderbolt II - A-10D Thunderbolt II - A-10D Thunderbolt II - A-10D Thunderbolt II - A-10D Thunderbolt II - A-10D Thunderbolt II - A-10D Тандерболт II - A-10D Thunderbolt II - A-10D Thunderbolt II - A-10D Thunderbolt II - - - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - AW159 Wildcat - - - AW159 Wildcat (unarmed) - AW159 Wildcat (unbewaffnet) - AW159 Wildcat (desarmado) - AW159 Wildcat (nieuzbrojony) - AW159 Wildcat (neozbrojený) - AW159 Wildcat (non-armé) - AW159 Wildcat (невооруженный) - AW159 Wildcat (desarmado) - AW159 Wildcat (fegyvertelen) - AW159 Wildcat (disarmato) - - - AW101 Merlin - AW101 Merlin - AW101 Merlin - AW101 Merlin - AW101 Merlin - AW101 Merlin - AW101 Мерлин - AW101 Merlin - AW101 Merlin - AW101 Merlin - - - L-159 ALCA (CAS) - L-159 ALCA (CAS) - L-159 ALCA (CAS) - L-159 ALCA (CAS) - L-159 ALCA (CAS) - L-159 ALCA (CAS) - L-159 Альбатрос (CAS) - L-159 ALCA (CAS) - L-159 ALCA (CAS) - L-159 ALCA (CAS) - - - L-159 ALCA (AA) - L-159 ALCA (AA) - L-159 ALCA (AA) - L-159 ALCA (AA) - L-159 ALCA (AA) - L-159 ALCA (AA) - L-159 Альбатрос (AA) - L-159 ALCA (ВВ) - L-159 ALCA (AA) - L-159 ALCA (AA) - - - Ka-60 Kasatka - Ka-60 Kasatka - Ka-60 Kasatka - Ka-60 Kasatka - Ka-60 Kasatka - Ka-60 Kasatka - Ka-60 Касатка - Ka-60 Kasatka - Ka-60 Kasatka - Ka-60 Kasatka - - - Ka-60 Kasatka (unarmed) - Ka-60 Kasatka (unbewaffnet) - Ka-60 Kasatka (desarmado) - Ka-60 Kasatka (nieuzbrojony) - Ka-60 Kasatka (neozbrojená) - Ka-60 Kasatka (non-armé) - Ka-60 Касатка (невооруженный) - Ka-60 Kasatka (desarmado) - Ka-60 Kasatka (fegyvertelen) - Ka-60 Kasatka (disarmato) - - - Yak-130 - Yak-130 - Yak-130 - Jak-130 - Jak-130 - Yak-130 - Як-130 - Yak-130 - Jak-130 - Yak-130 - - - MD 500 - MD 500 - MD 500 - MD 500 - MD 500 - MD 500 - MD 500 - MD 500 - MD 500 - MD 500 - - - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - M4A1 SLAM - - - M18A1 Claymore - M18A1 Claymore - M18A1 Claymore - Mina kierunkowa M18A1 Claymore - M18A1 Mina Claymore - M18A1 Claymore Mine antipersonnel à effet dirigé - M18A1 Клеймор - M18A1 Claymore - M18A1 Claymore akna - M18A1 Claymore Mina antiuomo - - - M183 Demolition Charge Assembly - M183 Geballte Sprengladung - Conjunto de carga de demolición M183 - Ładunek burzący M183 - M183 Demoliční nálož - M183 Charge de Démolition - M183 Комплектный подрывной заряд - M183 Sacola de Demolição - M183 romboló töltet - M183 Demolition Charge Assembly - - - M112 Demolition Block - M112 Sprengladung - Bloque de demolición M112 - Ładunek burzący M112 - M112 Výbušná nálož - Pétard M112 - M112 подрывной заряд - M112 Carga de Demolição - M112 romboló töltet - M112 Demolition Block - - - M67 Fragmentation Grenade - M67 Splittergranate - Granada de fragmentación M67 - Granat obronny M67 - M67 Granát - M67 Grenade à fragmentation - M67 ручная осколочная граната - M67 Granada de fragmentação - M67 repeszgránát - M67 Granata a frammentazione - - - M83 Smoke Grenade (White) - M83 Rauchgranate (Weiss) - Granada de humo M83 (Blanco) - Granat dymny M83 (Biały) - M83 Kouřový Granát (Bílý) - M83 Grenade fumigène (Blanche) - M83 дымовой гранаты (Белый) - M83 Granada de fumaça (Branca) - M83 füstgránát (Fehér) - M83 Granata fumogena (Bianco) - - - M18 Smoke Grenade (Blue) - M18 Rauchgranate (Blau) - Granada de humo M18 (Azul) - Granat dymny M18 (Niebieski) - M18 Kouřový Granát (Modrý) - M18 Grenade fumigène (Bleue) - M18 дымовой гранаты (Синий) - M18 Granada de fumaça (Azul) - M18 füstgránát (Kék) - M18 Granata fumogena (Blu) - - - M18 Smoke Grenade (Green) - M18 Rauchgranate (Grün) - Granada de humo M18 (Verde) - Granat dymny M18 (Zielony) - M18 Kouřový Granát (Zelený) - M18 Grenade fumigène (Verte) - M18 дымовой гранаты (Зелёный) - M18 Granada de fumaça (Verde) - M18 füstgránát (Zöld) - M18 Granata fumogena (Verde) - - - M18 Smoke Grenade (Orange) - M18 Rauchgranate (Orange) - Granada de humo M18 (Naranja) - Granat dymny M18 (Pomarańczowy) - M18 Kouřový Granát (Oranžový) - M18 Grenade fumigène (Orange) - M18 дымовой гранаты (Оранжевый) - M18 Granada de fumaça (Laranja) - M18 füstgránát (Narancssárga) - M18 Granata fumogena (Arancione) - - - M18 Smoke Grenade (Purple) - M18 Rauchgranate (Violett) - Granada de humo M18 (Púrpura) - Granat dymny M18 (Fioletowy) - M18 Kouřový Granát (Fialový) - M18 Grenade fumigène (Pourpre) - M18 дымовой гранаты (Пурпурный) - M18 Granada de fumaça (Roxa) - M18 füstgránát (Lila) - M18 Granata fumogena (Viola) - - - M18 Smoke Grenade (Red) - M18 Rauchgranate (Rot) - Granada de humo M18 (Rojo) - Granat dymny M18 (Czerwony) - M18 Kouřový Granát (Červený) - M18 Grenade fumigène (Rouge) - M18 дымовой гранаты (Красный) - M18 Granada de fumaça (Vermelha) - M18 füstgránát (Piros) - M18 Granata fumogena (Rosso) - - - M18 Smoke Grenade (Yellow) - M18 Rauchgranate (Gelb) - Granada de humo M18 (Amarillo) - Granat dymny M18 (Żółty) - M18 Kouřový Granát (Žlutý) - M18 Grenade fumigène (Jaune) - M183 дымовой гранаты (Жёлтые) - M18 Granada de fumaça (Amarela) - M18 füstgránát (Sárga) - M18 Granata fumogena (Giallo) - - - M15 Anti-Tank Mine - M15 Panzerabwehrmine - Mina antitanque M15 - Mina przeciwpancerna M15 - M15 Protitanková Mina - M15 Mine antichar - M15 противотанковая мина - M15 Mina anticarro - M15 harckocsiakna - M15 Mine anticarro - - - VS-50 Anti-Personnel Mine - VS-50 Antipersonenmine - Mina antipersona VS-50 - Mina przeciwpiechotna VS-50 - VS-50 Protipěchotní Mina - VS-50 Mine antipersonnel à pression - VS-50 Противопехотная мина - VS-50 Mina antipessoal - VS-50 gyalogsági taposóakna - VS-50 Mine antiuomo - - - M26 Anti-Personnel Bounding Mine - M26 Antipersonensprungmine - Mina antipersona M26 - Mina przeciwpiechotna M26 - M26 Šrapnelová Mina - M26 Mine antipersonnel bondissante - M26 Противопехотная мина - M26 Mina saltadora antipessoal - M26 gyalogsági ugróakna - M26 Mine saltanti antiuomo - - - PMR-3 Anti-Personnel Tripwire Mine - PMR-3 Antipersonenstolperdrahtmine - Mina antipersona de alambre PMR-3 - Mina przeciwpiechotna PMR-3 - PMR-3 Nástražná Mina - PMR-3 Mine antipersonnel à traction - PMR-3 Противопехотная мина - PMR-3 Mina antipessoal (armadilha) - PMR-3 botlódrótos gyalogsági akna - PMR-3 Mine antiuomo - - - P99 - P99 - - - MP-443 Grach - MP-443 Grach - - - ACP-C2 - ACP-C2 - - - FNX-45 Tactical - FNX-45 Tactical - - - Chiappa Rhino 60DS - Chiappa Rhino 60DS - - - Taurus Judge - Taurus Judge - - - NLAW - NLAW - - - RPG-32 - RPG-32 - - - Mini-Spike (AA) - Mini-Spike (AA) - - - Mini-Spike (AT) - Mini-Spike (AT) - - - MX - MX - - - MX (Black) - MX (Black) - - - MXC - MXC - - - MXC (Black) - MXC (Black) - - - MX 3GL - MX 3GL - - - MX 3GL (Black) - MX 3GL (Black) - - - MX LSW - MX LSW - - - MX LSW (Black) - MX LSW (Black) - - - MXM - MXM - - - MXM (Black) - MXM (Black) - - - KT2002 Katiba - KT2002 Katiba - - - KT2002C Katiba - KT2002C Katiba - - - KT2002 Katiba KGL - KT2002 Katiba KGL - - - F2000 (Camo) - F2000 (Camo) - - - F2000 - F2000 - - - F2000 Tactical (Camo) - F2000 Tactical (Camo) - - - F2000 Tactical - F2000 Tactical - - - F2000 EGLM (Camo) - F2000 EGLM (Camo) - - - F2000 EGLM - F2000 EGLM - - - TAR-21 - TAR-21 - - - CTAR-21 - CTAR-21 - - - TAR-21 EGLM - TAR-21 EGLM - - - Vector SMG - Vector SMG - - - Scorpion Evo 3 A1 - Scorpion Evo 3 A1 - - - CPW - CPW - - - RFB SDAR - RFB SDAR - - - Stoner 99 LMG - Stoner 99 LMG - - - Negev NG7 - Negev NG7 - - - Mk14 Mod 1 EBR - Mk14 Mod 1 EBR - - - GM6 Lynx - GM6 Lynx - - - GM6 Lynx (Camo) - GM6 Lynx (Camo) - - - M200 Intervention - M200 Intervention - - - M200 Intervention (Camo) - M200 Intervention (Camo) - - - VS-121 - VS-121 - - + + + XM312 + XM312 + XM312 + XM312 + XM312 + XM312 + XM312 + XM312 + XM312 + XM312A + + + XM312A + XM312A + XM312 + XM312A + XM312A + XM312A + XM312A + XM312A + XM312A + XM312A + + + XM312 (High) + XM312 (Hoch) + XM312 (Alto) + XM312 (Haut) + XM312 (Vysoký) + XM312 (Wysoki) + XM312 (Высокий) + XM312 (Alta) + XM312 (Magasított) + XM312 (Alta) + + + XM307 + XM307 + XM307 + XM307 + XM307 + XM307 + XM307 + XM307 + XM307 + XM307 + + + XM307A + XM307A + XM307A + XM307A + XM307A + XM307A + XM307A + XM307A + XM307A + XM307A + + + XM307 (High) + XM307 (Hoch) + XM307 (Alto) + XM307 (Haut) + XM307 (Vysoký) + XM307 (Wysoki) + XM307 (Высокий) + XM307 (Alta) + XM307 (Magasított) + XM307 (Alta) + + + Mini-Spike Launcher (AT) + Mini-Spike Lenkflugkörper (AT) + Lanzador Mini-Spike (AT) + Poste de tir Mini-Spike (AC) + Mini-Spike Odpalovač (AT) + Wyrzutnia Mini-Spike (AT) + Mini-Spike Пусковое устройство (ПТРК) + Lança-mísseis Mini-Spike (AC) + Mini-Spike rakétarendszer (páncéltörő) + Lanciatore Mini-Spike (AC) + + + Mini-Spike Launcher (AA) + Mini-Spike Lenkflugkörper (AA) + Lanzador Mini-Spike (AA) + Poste de tir Mini-Spike (AA) + Mini-Spike Odpalovač (AA) + Wyrzutnia Mini-Spike (AA) + Mini-Spike Пусковое устройство (ВВ) + Lança-mísseis Mini-Spike (AA) + Mini-Spike rakétarendszer (légvédelmi) + Lanciatore Mini-Spike (AA) + + + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + YABHON-R3 + + + YABHON-R3 (CAS) + YABHON-R3 (Luftnahunterstützung) + YABHON-R3 (CAS) + YABHON-R3 (CAS) + YABHON-R3 (CAS) + YABHON-R3 (штурмовик) + + + M-ATV + M-ATV + M-ATV + M-ATV + M-ATV + M-ATV + M-ATV + M-ATV + M-ATV + M-ATV + + + M-ATV (HMG) + M-ATV (SMG) + M-ATV (HMG) + M-ATV (CKM) + M-ATV (TK) + M-ATV (HMG) + M-ATV (Пулемет) + M-ATV (HMG) + M-ATV (HMG) + M-ATV (HMG) + + + M-ATV (GMG) + M-ATV (GMW) + M-ATV (GMG) + M-ATV (GMG) + M-ATV (Granátomet) + M-ATV (GMG) + M-ATV (Гранатомет) + M-ATV (GMG) + M-ATV (GMG) + M-ATV (GMG) + + + Merkava Mk IV M + Merkava Mk IV M + Merkava Mk IV M + Merkawa Mk IV M + Merkava Mk IV M + Merkava Mk IV M + Меркава Mk IV M + Merkava Mk IV M + Merkava Mk IV M + Merkava Mk IV M + + + Merkava Mk IV LIC + Merkava Mk IV LIC + Merkava Mk IV LIC + Merkawa Mk IV LIC + Merkava Mk IV LIC + Merkava Mk IV LIC + Меркава Mk IV LIC + Merkava Mk IV LIC + Merkava Mk IV LIC + Merkava Mk IV LIC + + + Sholef + Sholef + Sholef + Sholef + Sholef + Sholef + Шолеф + Sholef + Sholef + Sholef + + + Seara + Seara + Seara + Seara + Seara + Seara + Seara + Seara + Seara + Seara + + + Namer + Namer + Namer + Namer + Namer + Namer + Намер + Namer + Namer + Namer + + + Bardelas + Bardelas + Bardelas + Bardelas + Bardelas + Bardelas + Bardelas + Bardelas + Bardelas + Bardelas + + + Patria AMV + Patria AMV + Patria AMV + Patria AMV + Patria AMV + Patria AMV + Patria AMV + Patria AMV + Patria AMV + Patria AMV + + + Nemmera + Nemmera + Nemmera + Nemmera + Nemmera + Nemmera + Nemmera + Nemmera + Nemmera + Nemmera + + + HEMTT Transport + HEMTT Transport + HEMTT de transporte + HEMTT Transportowy + HEMTT Valník + HEMTT Transport + HEMTT Транспортный + HEMTT Transporte + HEMTT szállítójármű + HEMTT da trasporto + + + HEMTT Transport (covered) + HEMTT Transport (bedeckt) + HEMTT de transporte (cubierto) + HEMTT Transportowy (zakryty) + HEMTT Valník (krytý) + HEMTT Transport (bâché) + HEMTT Транспортный (крытый) + HEMTT Transporte (coberto) + HEMTT szállítójármű (ponyvás) + HEMTT da trasporto (coperto) + + + HEMTT + HEMTT + HEMTT + HEMTT + HEMTT + HEMTT Tracteur + HEMTT + HEMTT + HEMTT + HEMTT + + + HEMTT Container + HEMTT Container + HEMTT de contenedor + HEMTT Kontener + HEMTT Skříňový + HEMTT Conteneur + HEMTT Контейнер + HEMTT Contêiner + HEMTT Konténer + HEMTT portacontainer + + + HEMTT Medical + HEMTT Sanitäter + HEMTT médico + HEMTT Medyczny + HEMTT Zdravotnický + HEMTT Sanitaire + HEMTT Медицинский + HEMTT Médico + HEMTT (egészségügyi) + HEMTT Medico + + + HEMTT Ammo + HEMTT Munition + HEMTT de munición + HEMTT Amunicyjny + HEMTT Muniční + HEMTT Munitions + HEMTT Боеприпасы + HEMTT Munições + HEMTT (lőszerszállító) + HEMTT di rifornimento munizioni + + + HEMTT Fuel + HEMTT Treibstoff + HEMTT de combustible + HEMTT Cysterna + HEMTT Cisterna + HEMTT Citerne + HEMTT Заправщик + HEMTT Combustível + HEMTT (üzemanyag-szállító) + HEMTT di rifornimento carburante + + + HEMTT Repair + HEMTT Instandsetzung + HEMTT de reparación + HEMTT Naprawczy + HEMTT Opravárenský + HEMTT Réparation + HEMTT Ремонтный + HEMTT Reparador + HEMTT (szerelő-jármű) + HEMTT Riparatore + + + Fennek + Fennek + Fennek + Fennek + Fennek + Fennek + Феннек + Fennek + Fennek + Fennek + + + Fennek (HMG) + Fennek (SMG) + Fennek (HMG) + Fennek (CKM) + Fennek (TK) + Fennek (HMG) + Феннек (Пулемет) + Fennek (HMG) + Fennek (HMG) + Fennek (HMG) + + + Fennek (GMG) + Fennek (GMW) + Fennek (GMG) + Fennek (GMG) + Fennek (granátomet) + Fennek (GMG) + Феннек (Гранатомет) + Fennek (GMG) + Fennek (GMG) + Fennek (GMG) + + + Leopard 2SG + Leopard 2SG + Leopard 2SG + Leopard 2SG + Leopard 2SG + Leopard 2SG + Леопард 2SG + Leopard 2SG + Leopard 2SG + Leopard 2SG + + + FV510 Warrior + FV510 Warrior + FV510 Warrior + FV510 Warrior + FV510 Warrior + FV510 Warrior + FV510 Уорриор + FV510 Warrior + FV510 Warrior + FV510 Warrior + + + Pandur II + Pandur II + Pandur II + Pandur II + Pandur II + Pandur II + Pandur II + Pandur II + Pandur II + Pandur II + + + KamAZ Transport + KamAZ Transport + KamAZ de transporte + KamAZ transportowy + KAMAZ Valník + KamAZ Transport + КамАЗ Траспортный + KamAZ Transporte + KamAZ szállítójármű + KamAZ da trasporto + + + KamAZ Transport (covered) + KamAZ Transport (bedeckt) + KamAZ de transporte (cubierto) + KamAZ Transportowy (zakryty) + KAMAZ Valník (krytý) + KamAZ Transport (bâché) + КамАЗ Траспортный (Крытый) + KamAZ Transporte (coberto) + KamAZ szállítójármű (ponyvás) + KamAZ da trasporto (coperto) + + + KamAZ Ammo + KamAZ Munition + KamAZ de munición + KamAZ Amunicyjny + KAMAZ Muniční + KamAZ Munitions + КамАЗ Боеприпасы + KamAZ Munições + KamAZ (lőszerszállító) + KamAZ di rifornimento munizioni + + + KamAZ Fuel + KamAZ Treibstoff + KamAZ de combustible + KamAZ cysterna + KAMAZ Cisterna + KamAZ Citerne + КамАЗ Заправщик + KamAZ Combustível + KamAZ (üzemanyag-szállító) + KamAZ di rifornimento carburante + + + KamAZ Repair + KamAZ Instandsetzung + KamAZ de reparación + KamAZ Naprawczy + KAMAZ Opravárenský + KamAZ Réparation + КамАЗ Ремонтный + KamAZ Reparador + KamAZ (szerelő-jármű) + KamAZ riparatore + + + KamAZ Medical + KamAZ Sanitäter + KamAZ médico + KamAZ Medyczny + KAMAZ Zdravotnický + KamAZ Sanitaire + КамАЗ Медицинский + KamAZ Médico + KamAZ (egészségügyi) + KamAZ Medico + + + Punisher + Punisher + Punisher + Punisher + Punisher + Punisher + Kаратель + Punisher + Punisher + Punisher + + + Punisher (HMG) + Punisher (SMG) + Punisher (HMG) + Punisher (CKM) + Punisher (TK) + Punisher (HMG) + Kаратель (Пулемет) + Punisher (HMG) + Punisher (HMG) + Punisher (HMG) + + + Punisher (GMG) + Punisher (GMW) + Punisher (GMG) + Punisher (CKM) + Punisher (granátomet) + Punisher (GMG) + Kаратель (Гранатомет) + Punisher (GMG) + Punisher (GMG) + Punisher (GMG) + + + T100 Black Eagle + T100 Black Eagle + T100 Black Eagle + T100 Black Eagle + T100 Black Eagle + T100 Black Eagle + T100 Черный Орел + T100 Black Eagle + T100 Black Eagle + T100 Black Eagle + + + 2S9 Sochor + 2S9 Sochor + 2S9 Sochor + 259 Sochor + 2S9 Sochor + 2S9 Sochor + 2S9 Сокор + 2S9 Sochor + 2S9 Sochor + 2S9 Sochor + + + BM-2T Stalker + BM-2T Stalker + BM-2T Stalker + BM-2T Stalker + BM-2T Stalker + BM-2T Stalker + БМ-2Т Сталкер + BM-2T Stalker + BM-2T Stalker + BM-2T Stalker + + + ZSU-35 Tigris + ZSU-35 Tigris + ZSU-35 Tigris + ZSU-35 Tigris + ZSU-35 Tigris + ZSU-35 Tigris + ЗСУ-35 Tigris + ZSU-35 Tigris + ZSU-35 Tigris + ZSU-35 Tigris + + + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + Otokar ARMA + + + Typhoon Transport + Typhoon Transport + Typhoon de transporte + Typhoon Transportowy + Typhoon Valník + Typhoon Transport + Тайфун Транспортный + Typhoon Transporte + Typhoon szállítójármű + Typhoon da trasporto + + + Typhoon Transport (covered) + Typhoon Transport (bedeckt) + Typhoon de transporte (cubierto) + Typhoon Transportowy (przykryty) + Typhoon Valník (krytý) + Typhoon Transport (bâché) + Тайфун Транспортный (kрытый) + Typhoon Transporte (coberto) + Typhoon szállítójármű (ponyvás) + Typhoon da trasporto (coperto) + + + Typhoon Device + Typhoon Gerät + Typhoon de dispositivo + Typhoon Urządzenie + Typhoon Zařízení + Typhoon Dispositif + Тайфун Устройство + Typhoon Dispositivo + Typhoon (szerkezet) + Typhoon per dispositivo + + + Typhoon Ammo + Typhoon Munition + Typhoon de munición + Typhoon Amunicyjny + Typhoon Muniční + Typhoon Munitions + Тайфун Боеприпасы + Typhoon Munições + Typhoon (lőszerszállító) + Typhoon di rifornimento munizioni + + + Typhoon Fuel + Typhoon Treibstoff + Typhoon de combustible + Typhoon Cysterna + Typhoon Cisterna + Typhoon Citerne + Тайфун Заправщик + Typhoon Combustível + Typhoon (üzemanyag-szállító) + Typhoon di rifornimento carburante + + + Typhoon Repair + Typhoon Instandsetzung + Typhoon de reparación + Typhoon Naprawczy + Typhoon Opravárenský + Typhoon Réparation + Тайфун Ремонтный + Typhoon Reparador + Typhoon (szerelő-jármű) + Typhoon riparatore + + + Typhoon Medical + Typhoon Sanitäter + Typhoon médico + Typhoon Medyczny + Typhoon Zdravotnický + Typhoon Sanitaire + Тайфун Медицинский + Typhoon Médico + Typhoon (egészségügyi) + Typhoon medico + + + RAH-66 Comanche + RAH-66 Comanche + RAH-66 Comanche + RAH-66 Comanche + RAH-66 Comanche + RAH-66 Commanche + RAH-66 Команч + RAH-66 Comanche + RAH-66 Comanche + RAH-66 Comanche + + + MH-6 Little Bird + MH-6 Little Bird + MH-6 Litte Bird + MH-6 Little Bird + MH-6 Little Bird + MH-6 Little Bird + MH-6 Little Bird + MH-6 Little Bird + MH-6 Little Bird + MH-6 Little Bird + + + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + AH-6 Little Bird + + + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + CH-47I Chinook + + + CH-47I Chinook (unarmed) + CH-47I Chinook (unbewaffnet) + CH-47I Chinnok (Desarmado) + CH-47I Chinook (nieuzbrojony) + CH-47I Chinook (невооруженный) + CH-47I Chinook (Neozbrojený) + + + A-10D Thunderbolt II + A-10D Thunderbolt II + A-10D Thunderbolt II + A-10D Thunderbolt II + A-10D Thunderbolt II + A-10D Thunderbolt II + A-10D Тандерболт II + A-10D Thunderbolt II + A-10D Thunderbolt II + A-10D Thunderbolt II + + + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + AW159 Wildcat + + + AW159 Wildcat (unarmed) + AW159 Wildcat (unbewaffnet) + AW159 Wildcat (desarmado) + AW159 Wildcat (nieuzbrojony) + AW159 Wildcat (neozbrojený) + AW159 Wildcat (non-armé) + AW159 Wildcat (невооруженный) + AW159 Wildcat (desarmado) + AW159 Wildcat (fegyvertelen) + AW159 Wildcat (disarmato) + + + AW101 Merlin + AW101 Merlin + AW101 Merlin + AW101 Merlin + AW101 Merlin + AW101 Merlin + AW101 Мерлин + AW101 Merlin + AW101 Merlin + AW101 Merlin + + + L-159 ALCA (CAS) + L-159 ALCA (CAS) + L-159 ALCA (CAS) + L-159 ALCA (CAS) + L-159 ALCA (CAS) + L-159 ALCA (CAS) + L-159 Альбатрос (CAS) + L-159 ALCA (CAS) + L-159 ALCA (CAS) + L-159 ALCA (CAS) + + + L-159 ALCA (AA) + L-159 ALCA (AA) + L-159 ALCA (AA) + L-159 ALCA (AA) + L-159 ALCA (AA) + L-159 ALCA (AA) + L-159 Альбатрос (AA) + L-159 ALCA (ВВ) + L-159 ALCA (AA) + L-159 ALCA (AA) + + + Ka-60 Kasatka + Ka-60 Kasatka + Ka-60 Kasatka + Ka-60 Kasatka + Ka-60 Kasatka + Ka-60 Kasatka + Ka-60 Касатка + Ka-60 Kasatka + Ka-60 Kasatka + Ka-60 Kasatka + + + Ka-60 Kasatka (unarmed) + Ka-60 Kasatka (unbewaffnet) + Ka-60 Kasatka (desarmado) + Ka-60 Kasatka (nieuzbrojony) + Ka-60 Kasatka (neozbrojená) + Ka-60 Kasatka (non-armé) + Ka-60 Касатка (невооруженный) + Ka-60 Kasatka (desarmado) + Ka-60 Kasatka (fegyvertelen) + Ka-60 Kasatka (disarmato) + + + Yak-130 + Yak-130 + Yak-130 + Jak-130 + Jak-130 + Yak-130 + Як-130 + Yak-130 + Jak-130 + Yak-130 + + + MD 500 + MD 500 + MD 500 + MD 500 + MD 500 + MD 500 + MD 500 + MD 500 + MD 500 + MD 500 + + + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + M4A1 SLAM + + + M18A1 Claymore + M18A1 Claymore + M18A1 Claymore + Mina kierunkowa M18A1 Claymore + M18A1 Mina Claymore + M18A1 Claymore Mine antipersonnel à effet dirigé + M18A1 Клеймор + M18A1 Claymore + M18A1 Claymore akna + M18A1 Claymore Mina antiuomo + + + M183 Demolition Charge Assembly + M183 Geballte Sprengladung + Conjunto de carga de demolición M183 + Ładunek burzący M183 + M183 Demoliční nálož + M183 Charge de Démolition + M183 Комплектный подрывной заряд + M183 Sacola de Demolição + M183 romboló töltet + M183 Demolition Charge Assembly + + + M112 Demolition Block + M112 Sprengladung + Bloque de demolición M112 + Ładunek burzący M112 + M112 Výbušná nálož + Pétard M112 + M112 подрывной заряд + M112 Carga de Demolição + M112 romboló töltet + M112 Demolition Block + + + M67 Fragmentation Grenade + M67 Splittergranate + Granada de fragmentación M67 + Granat obronny M67 + M67 Granát + M67 Grenade à fragmentation + M67 ручная осколочная граната + M67 Granada de fragmentação + M67 repeszgránát + M67 Granata a frammentazione + + + M83 Smoke Grenade (White) + M83 Rauchgranate (Weiss) + Granada de humo M83 (Blanco) + Granat dymny M83 (Biały) + M83 Kouřový Granát (Bílý) + M83 Grenade fumigène (Blanche) + M83 дымовой гранаты (Белый) + M83 Granada de fumaça (Branca) + M83 füstgránát (Fehér) + M83 Granata fumogena (Bianco) + + + M18 Smoke Grenade (Blue) + M18 Rauchgranate (Blau) + Granada de humo M18 (Azul) + Granat dymny M18 (Niebieski) + M18 Kouřový Granát (Modrý) + M18 Grenade fumigène (Bleue) + M18 дымовой гранаты (Синий) + M18 Granada de fumaça (Azul) + M18 füstgránát (Kék) + M18 Granata fumogena (Blu) + + + M18 Smoke Grenade (Green) + M18 Rauchgranate (Grün) + Granada de humo M18 (Verde) + Granat dymny M18 (Zielony) + M18 Kouřový Granát (Zelený) + M18 Grenade fumigène (Verte) + M18 дымовой гранаты (Зелёный) + M18 Granada de fumaça (Verde) + M18 füstgránát (Zöld) + M18 Granata fumogena (Verde) + + + M18 Smoke Grenade (Orange) + M18 Rauchgranate (Orange) + Granada de humo M18 (Naranja) + Granat dymny M18 (Pomarańczowy) + M18 Kouřový Granát (Oranžový) + M18 Grenade fumigène (Orange) + M18 дымовой гранаты (Оранжевый) + M18 Granada de fumaça (Laranja) + M18 füstgránát (Narancssárga) + M18 Granata fumogena (Arancione) + + + M18 Smoke Grenade (Purple) + M18 Rauchgranate (Violett) + Granada de humo M18 (Púrpura) + Granat dymny M18 (Fioletowy) + M18 Kouřový Granát (Fialový) + M18 Grenade fumigène (Pourpre) + M18 дымовой гранаты (Пурпурный) + M18 Granada de fumaça (Roxa) + M18 füstgránát (Lila) + M18 Granata fumogena (Viola) + + + M18 Smoke Grenade (Red) + M18 Rauchgranate (Rot) + Granada de humo M18 (Rojo) + Granat dymny M18 (Czerwony) + M18 Kouřový Granát (Červený) + M18 Grenade fumigène (Rouge) + M18 дымовой гранаты (Красный) + M18 Granada de fumaça (Vermelha) + M18 füstgránát (Piros) + M18 Granata fumogena (Rosso) + + + M18 Smoke Grenade (Yellow) + M18 Rauchgranate (Gelb) + Granada de humo M18 (Amarillo) + Granat dymny M18 (Żółty) + M18 Kouřový Granát (Žlutý) + M18 Grenade fumigène (Jaune) + M183 дымовой гранаты (Жёлтые) + M18 Granada de fumaça (Amarela) + M18 füstgránát (Sárga) + M18 Granata fumogena (Giallo) + + + M15 Anti-Tank Mine + M15 Panzerabwehrmine + Mina antitanque M15 + Mina przeciwpancerna M15 + M15 Protitanková Mina + M15 Mine antichar + M15 противотанковая мина + M15 Mina anticarro + M15 harckocsiakna + M15 Mine anticarro + + + VS-50 Anti-Personnel Mine + VS-50 Antipersonenmine + Mina antipersona VS-50 + Mina przeciwpiechotna VS-50 + VS-50 Protipěchotní Mina + VS-50 Mine antipersonnel à pression + VS-50 Противопехотная мина + VS-50 Mina antipessoal + VS-50 gyalogsági taposóakna + VS-50 Mine antiuomo + + + M26 Anti-Personnel Bounding Mine + M26 Antipersonensprungmine + Mina antipersona M26 + Mina przeciwpiechotna M26 + M26 Šrapnelová Mina + M26 Mine antipersonnel bondissante + M26 Противопехотная мина + M26 Mina saltadora antipessoal + M26 gyalogsági ugróakna + M26 Mine saltanti antiuomo + + + PMR-3 Anti-Personnel Tripwire Mine + PMR-3 Antipersonenstolperdrahtmine + Mina antipersona de alambre PMR-3 + Mina przeciwpiechotna PMR-3 + PMR-3 Nástražná Mina + PMR-3 Mine antipersonnel à traction + PMR-3 Противопехотная мина + PMR-3 Mina antipessoal (armadilha) + PMR-3 botlódrótos gyalogsági akna + PMR-3 Mine antiuomo + + + P99 + P99 + + + MP-443 Grach + MP-443 Grach + + + ACP-C2 + ACP-C2 + + + FNX-45 Tactical + FNX-45 Tactical + + + Chiappa Rhino 60DS + Chiappa Rhino 60DS + + + Taurus Judge + Taurus Judge + + + NLAW + NLAW + + + RPG-32 + RPG-32 + + + Mini-Spike (AA) + Mini-Spike (AA) + + + Mini-Spike (AT) + Mini-Spike (AT) + + + MX + MX + + + MX (Black) + MX (Black) + + + MXC + MXC + + + MXC (Black) + MXC (Black) + + + MX 3GL + MX 3GL + + + MX 3GL (Black) + MX 3GL (Black) + + + MX LSW + MX LSW + + + MX LSW (Black) + MX LSW (Black) + + + MXM + MXM + + + MXM (Black) + MXM (Black) + + + KT2002 Katiba + KT2002 Katiba + + + KT2002C Katiba + KT2002C Katiba + + + KT2002 Katiba KGL + KT2002 Katiba KGL + + + F2000 (Camo) + F2000 (Camo) + + + F2000 + F2000 + + + F2000 Tactical (Camo) + F2000 Tactical (Camo) + + + F2000 Tactical + F2000 Tactical + + + F2000 EGLM (Camo) + F2000 EGLM (Camo) + + + F2000 EGLM + F2000 EGLM + + + TAR-21 + TAR-21 + + + CTAR-21 + CTAR-21 + + + TAR-21 EGLM + TAR-21 EGLM + + + Vector SMG + Vector SMG + + + Scorpion Evo 3 A1 + Scorpion Evo 3 A1 + + + CPW + CPW + + + RFB SDAR + RFB SDAR + + + Stoner 99 LMG + Stoner 99 LMG + + + Negev NG7 + Negev NG7 + + + Mk14 Mod 1 EBR + Mk14 Mod 1 EBR + + + GM6 Lynx + GM6 Lynx + + + GM6 Lynx (Camo) + GM6 Lynx (Camo) + + + M200 Intervention + M200 Intervention + + + M200 Intervention (Camo) + M200 Intervention (Camo) + + + VS-121 + VS-121 + + \ No newline at end of file diff --git a/addons/thermals/config.cpp b/addons/thermals/config.cpp index fdb00bb0f9..252a440535 100644 --- a/addons/thermals/config.cpp +++ b/addons/thermals/config.cpp @@ -1,42 +1,40 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = 0.60; - requiredAddons[] = {ace_core}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {"[TF]Nkey"}; - authorUrl = "https://github.com/michail-nikolaev/"; - }; + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {ace_common}; + author[] = {"[TF]Nkey"}; + authorUrl = "https://github.com/michail-nikolaev/"; + VERSION_CONFIG; + }; }; class CfgVehicles { - class Land; - class Man: Land { - mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)) - tBody = 32; // Metabolism temperature of the model (in celsius) - }; + class Land; + class Man: Land { + mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)) + tBody = 32; // Metabolism temperature of the model (in celsius) + }; - class All; - // Up to this point, the thermal properties apply to the entire model, - // so if a vehicle's engine starts, the entire model will begin to warm up at the rate of htMax up to a temperature of afMax, - // likewise if it begins driving, the entire model will heat up at the rate specified by htMax to a maximum temperature of mfMax. - class AllVehicles: All { - htMin=60; // Minimum half-cooling time (in seconds) - htMax=1800; // Maximum half-cooling time (in seconds) - afMax=70; // Maximum temperature in case the model is alive (in celsius) - mfMax=50; // Maximum temperature when the model is moving (in celsius) - mFact=0.0; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)) - tBody=0; // Metabolism temperature of the model (in celsius) - }; + class All; + // Up to this point, the thermal properties apply to the entire model, + // so if a vehicle's engine starts, the entire model will begin to warm up at the rate of htMax up to a temperature of afMax, + // likewise if it begins driving, the entire model will heat up at the rate specified by htMax to a maximum temperature of mfMax. + class AllVehicles: All { + htMin=60; // Minimum half-cooling time (in seconds) + htMax=1800; // Maximum half-cooling time (in seconds) + afMax=70; // Maximum temperature in case the model is alive (in celsius) + mfMax=50; // Maximum temperature when the model is moving (in celsius) + mFact=0.0; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)) + tBody=0; // Metabolism temperature of the model (in celsius) + }; - class Animal; - class Animal_Base_F: Animal { - mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)) - tBody = 32; // Metabolism temperature of the model (in celsius) - }; + class Animal; + class Animal_Base_F: Animal { + mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)) + tBody = 32; // Metabolism temperature of the model (in celsius) + }; }; diff --git a/addons/thermals/script_component.hpp b/addons/thermals/script_component.hpp index 5daf18e62d..eee052b91e 100644 --- a/addons/thermals/script_component.hpp +++ b/addons/thermals/script_component.hpp @@ -2,11 +2,11 @@ #include "\z\ace\Addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_THERMALS - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_ENABLED_THERMALS - #define DEBUG_SETTINGS DEBUG_ENABLED_THERMALS + #define DEBUG_SETTINGS DEBUG_ENABLED_THERMALS #endif #include "\z\ace\Addons\main\script_macros.hpp" \ No newline at end of file diff --git a/extras/blank_module/CfgEventHandlers.hpp b/extras/blank_module/CfgEventHandlers.hpp index 8af0265fe2..51c0e909d7 100644 --- a/extras/blank_module/CfgEventHandlers.hpp +++ b/extras/blank_module/CfgEventHandlers.hpp @@ -1,5 +1,5 @@ class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); - }; + class ADDON { + init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + }; }; \ No newline at end of file diff --git a/extras/blank_module/config.cpp b/extras/blank_module/config.cpp index 628865c703..6c8d8ca938 100644 --- a/extras/blank_module/config.cpp +++ b/extras/blank_module/config.cpp @@ -1,17 +1,17 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = 0.60; - requiredAddons[] = {"ace_core"}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {""}; - authorUrl = ""; - }; + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = 0.60; + requiredAddons[] = {"ace_core"}; + version = "0.95"; + versionStr = "0.95"; + versionAr[] = {0,95,0}; + author[] = {""}; + authorUrl = ""; + }; }; #include "CfgEventHandlers.hpp" \ No newline at end of file diff --git a/extras/blank_module/script_component.hpp b/extras/blank_module/script_component.hpp index 40058509c2..efce15f539 100644 --- a/extras/blank_module/script_component.hpp +++ b/extras/blank_module/script_component.hpp @@ -2,11 +2,11 @@ #include "\z\ace\addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_BLANK - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_SETTINGS_BLANK - #define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK + #define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK #endif #include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file From 35703f3920307c95faf72513f6d6d31cc6d76140 Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 21:35:18 +0100 Subject: [PATCH 15/18] inheritance --- addons/ai/config.cpp | 2 +- addons/interaction/config.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp index d2c9983349..c96dbe48b8 100644 --- a/addons/ai/config.cpp +++ b/addons/ai/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.60; - requiredAddons[] = {"ace_core"}; + requiredAddons[] = {"ace_main","ace_common"}; version = "0.95"; versionStr = "0.95"; versionAr[] = {0,95,0}; diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index ec1ea69fb2..f4e2f2c423 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -523,7 +523,7 @@ class CfgVehicles { displayName = "$STR_ACE_Interaction_Push"; distance = 4; condition = QUOTE( getMass _target < 1000 and alive _target ); - statement = QUOTE( [_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call FUNC(push); ); + //statement = QUOTE( [_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call FUNC(push); ); showDisabled = 0; priority = -1; }; From d8aa735c5a72ed292d6827ee3bbfe85f7e8155f9 Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 21:45:49 +0100 Subject: [PATCH 16/18] fix missileguidance base class issue --- addons/missileguidance/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/missileguidance/CfgWeapons.hpp b/addons/missileguidance/CfgWeapons.hpp index 33c2bfe8de..d2961604b6 100644 --- a/addons/missileguidance/CfgWeapons.hpp +++ b/addons/missileguidance/CfgWeapons.hpp @@ -1,7 +1,7 @@ +class Mode_SemiAuto; class CfgWeapons { class CannonCore; class LauncherCore; - class Mode_SemiAuto; class RocketPods: LauncherCore { canLock = 1; From bdf2351f14a1369973f50f9276bf2bfd561a8daf Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 21:56:33 +0100 Subject: [PATCH 17/18] done with ai --- addons/ai/CfgAISkill.hpp | 27 ++ addons/ai/CfgWeapons.hpp | 575 ++++++++++++++++++++++++++++++ addons/ai/config.cpp | 623 +-------------------------------- addons/ai/script_component.hpp | 4 +- 4 files changed, 615 insertions(+), 614 deletions(-) create mode 100644 addons/ai/CfgAISkill.hpp create mode 100644 addons/ai/CfgWeapons.hpp diff --git a/addons/ai/CfgAISkill.hpp b/addons/ai/CfgAISkill.hpp new file mode 100644 index 0000000000..dfa0299509 --- /dev/null +++ b/addons/ai/CfgAISkill.hpp @@ -0,0 +1,27 @@ + +/* + * Documentation: + * https://community.bistudio.com/wiki/AI_Sub-skills + * + * The idea here is to reduce the AI's godlike aiming + * capabilties while retaining it's high intelligence. + * The AI should be smart enough to move through a town, + * but also be 'human' in their reaction time and aim. + * + * Note: All these values can still be adjusted via + * scripts, these arrays just change what 0 & 1 + * are for setSkill. + */ + +class CfgAISkill { + aimingAccuracy[] = {0,0, 1,0.8}; // {0,0,1,1}; v1.26 defaults + aimingShake[] = {0,0, 1,0.6}; // {0,0,1,1}; + aimingSpeed[] = {0,0, 1,0.7}; // {0,0.5,1,1}; + commanding[] = {0,0, 1,0.8}; // {0,0,1,1}; + courage[] = {0,0, 1,0.7}; // {0,0,1,1}; + endurance[] = {0,0, 1,0.7}; // {0,0,1,1}; + general[] = {0,0, 1,0.9}; // {0,0,1,1}; + reloadSpeed[] = {0,0, 1,0.8}; // {0,0,1,1}; + spotDistance[] = {0,0, 1,0.9}; // {0,0.2,1,0.4}; + spotTime[] = {0,0, 1,0.7}; // {0,0,1,0.7}; +}; diff --git a/addons/ai/CfgWeapons.hpp b/addons/ai/CfgWeapons.hpp new file mode 100644 index 0000000000..ff25e53c22 --- /dev/null +++ b/addons/ai/CfgWeapons.hpp @@ -0,0 +1,575 @@ + +// weapon config changes, by commy2 + +/* documentation: +aiDispersionCoefX = 1.0 Dispersion multiplier for AI units (axis X - left to right). +aiDispersionCoefY = 1.0 Dispersion multiplier for AI units (axis Y - top-down). +aiRateOfFire = 5.0 Delay between shots at given aiRateOfFireDistance. +aiRateOfFireDistance = 500 At shorter distance delay (aiRateOfFire) goes linearly to zero. +*/ + +class Mode_SemiAuto; +class Mode_Burst; +class Mode_FullAuto; + +class CfgWeapons { + + // rifles + class RifleCore; + class Rifle: RifleCore { + aiDispersionCoefX = 6; + aiDispersionCoefY = 6; + }; + + class Rifle_Base_F: Rifle {}; + class Rifle_Long_Base_F: Rifle_Base_F {}; + + // MX + class arifle_MX_Base_F: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + modes[] += {"AGM_Burst_far"}; + + class Single: Mode_SemiAuto { + minRange = 120; // 2; + minRangeProbab = 0.7; // 0.5; + midRange = 300; // 200; + midRangeProbab = 0.5; // 0.7; + }; + + class FullAuto; + class fullauto_medium: FullAuto { + minRange = 20; // 2; + burst = "3 + round random 5"; //3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 500; + minRange = 400; + minRangeProbab = 0.1; + midRange = 500; + midRangeProbab = 0.2; + maxRange = 600; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: Single { + aiRateOfFireDistance = 700; // 600; + minRange = 120; // 2; + maxRange = 700; // 600; + }; + + class single_far_optics2: single_medium_optics1 { + aiRateOfFireDistance = 900; // 700; + minRange = 200; // 100; + maxRange = 900; // 700; + }; + }; + + // MX carbine + class arifle_MXC_F: arifle_MX_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Single { + minRange = 120; // 2; + minRangeProbab = 0.5; // 0.3; + midRange = 250; // 150; + midRangeProbab = 0.3; // 0.5; + }; + + class FullAuto; + class fullauto_medium: fullauto_medium { + minRange = 20; // 2; + burst = "3 + round random 5"; //3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 400; + minRange = 300; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.2; + maxRange = 500; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: single_medium_optics1 { + aiRateOfFireDistance = 600; // 500; + minRange = 120; // 2; + maxRange = 600; // 500; + }; + + class single_far_optics2: single_medium_optics1 { + aiRateOfFireDistance = 800; // 700; + minRange = 200; // 100; + maxRange = 800; // 700; + }; + }; + + //class arifle_MX_F: arifle_MX_Base_F {}; + //class arifle_MX_GL_F: arifle_MX_Base_F {}; + + // MX machine gun + class arifle_MXM_F: arifle_MX_Base_F { + class Single: Single { + minRange = 120; // 2; + minRangeProbab = 0.7; // 0.5; + midRange = 350; // 250; + midRangeProbab = 0.5; // 0.7; + }; + + class fullauto_medium: fullauto_medium { + minRange = 20; // 2; + burst = "3 + round random 5"; //3; + }; + + class single_medium_optics1: single_medium_optics1 { + aiRateOfFireDistance = 700; // 600; + minRange = 120; // 2; + maxRange = 750; // 650; + }; + + class single_far_optics2: single_far_optics2 { + aiRateOfFireDistance = 900; // 800; + minRange = 200; // 100; + maxRange = 900; // 800; + }; + }; + + // MX sniper rifle + class arifle_MX_SW_F: arifle_MX_Base_F { + aiDispersionCoefY = 24.0; + aiDispersionCoefX = 21.0; + modes[] += {"AGM_Burst_far"}; + + class Single: Mode_SemiAuto { + minRange = 120; // 2; + }; + + class close; + class medium; + class AGM_Burst_far: medium { + aiRateOfFire = 6.0; + aiRateOfFireDistance = 900; + minRange = 500; + minRangeProbab = 0.1; + midRange = 700; + midRangeProbab = 0.2; + maxRange = 900; + maxRangeProbab = 0.2; + burst = "3 + round random 5"; + }; + + class far_optic1: close { + aiRateOfFireDistance = 750; // 650; + maxRange = 750; // 650; + }; + + class far_optic2: far_optic1 { + maxRange = 1100; // 900; + aiRateOfFireDistance = 1100;// 900; + }; + }; + + // Katiba + class arifle_Katiba_Base_F: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + modes[] += {"AGM_Burst_far"}; + + class Single: Mode_SemiAuto { + minRange = 120; // 2; + minRangeProbab = 0.7; // 0.5; + midRange = 300; // 200; + midRangeProbab = 0.5; // 0.7; + }; + + class FullAuto; + class fullauto_medium: FullAuto { + minRange = 20; // 2; + burst = "3 + round random 5"; //3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 500; + minRange = 400; + minRangeProbab = 0.1; + midRange = 500; + midRangeProbab = 0.2; + maxRange = 600; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: Single { + aiRateOfFireDistance = 700; // 600; + minRange = 120; // 2; + maxRange = 700; // 600; + }; + + class single_far_optics2: single_medium_optics1 { + aiRateOfFireDistance = 900; // 800; + minRange = 200; // 100; + maxRange = 900; // 800; + }; + }; + + // Katiba carbine + class arifle_Katiba_C_F: arifle_Katiba_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Single { + minRange = 120; // 2; + minRangeProbab = 0.5; // 0.3; + midRange = 250; // 150; + midRangeProbab = 0.3; // 0.7; + }; + + //class FullAuto: FullAuto {}; + + class fullauto_medium: fullauto_medium { + minRange = 20; // 2; + maxRange = 150; //100; + burst = "3 + round random 5"; //3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 400; + minRange = 300; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.2; + maxRange = 500; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: single_medium_optics1 { + minRange = 120; // 2; + maxRange = 600; // 500; + }; + + class single_medium_optics2: single_medium_optics1 { + aiRateOfFireDistance = 800; // 700; + minRange = 200; // 100; + maxRange = 800; // 700; + }; + }; + + // F2002 + class mk20_base_F: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + modes[] += {"AGM_Burst_far"}; + + class Single: Mode_SemiAuto { + minRange = 120; // 2; + minRangeProbab = 0.7; // 0.5; + midRange = 250; // 150; + midRangeProbab = 0.5; // 0.7; + }; + + class FullAuto: Mode_FullAuto { + minRange = 0; //2; + }; + + class fullauto_medium: FullAuto { + minRange = 20; // 2; + maxRange = 150; // 100; + burst = "3 + round random 5"; // 3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 500; + minRange = 400; + minRangeProbab = 0.1; + midRange = 500; + midRangeProbab = 0.2; + maxRange = 600; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: Single { + aiRateOfFireDistance = 600; // 500; + minRange = 120; // 5; + maxRange = 600; // 500; + }; + + class single_far_optics2: single_medium_optics1 { + aiRateOfFireDistance = 800; // 700; + minRange = 200; // 100; + maxRange = 800; // 700; + }; + }; + + // F2002 carbine + class arifle_Mk20C_F: mk20_base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Single { + minRange = 120; // 2; + minRangeProbab = 0.7; // 0.5; + midRange = 250; // 150; + midRangeProbab = 0.5; // 0.7; + maxRange = 350; // 250; + }; + + class FullAuto: FullAuto { + minRange = 0; //2; + }; + + class single_medium_optics1: single_medium_optics1 { + aiRateOfFireDistance = 600; // 500; + minRange = 120; // 5; + maxRange = 550; // 450; + }; + + //class single_medium_optics2: single_medium_optics1 {}; + class fullauto_medium: fullauto_medium { + minRange = 20; //2; + burst = "3 + round random 5"; //3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 400; + minRange = 300; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.2; + maxRange = 500; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + }; + + // TAR-20 + class Tavor_base_F: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + modes[] += {"AGM_Burst_far"}; + + class Single: Mode_SemiAuto { + minRange = 120; //2; + minRangeProbab = 0.7; //0.5; + midRange = 250; //150; + midRangeProbab = 0.5; //0.7; + maxRange = 350; //250; + }; + + class FullAuto: Mode_FullAuto { + minRange = 0; //2; + }; + + class fullauto_medium: FullAuto { + minRange = 20; // 2; + maxRange = 150; // 100; + burst = "3 + round random 5"; // 3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 400; + minRange = 300; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.2; + maxRange = 500; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: Single { + aiRateOfFireDistance = 600; // 500; + minRange = 120; // 5; + maxRange = 550; // 450; + }; + + class single_medium_optics2: single_medium_optics1 { + aiRateOfFireDistance = 700; // 600; + minRange = 200; // 100; + maxRange = 700; // 600; + }; + }; + + // TAR-21 + class arifle_TRG21_F: Tavor_base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Single { + minRange = 120; // 2; + minRangeProbab = 0.7; // 0.3; + midRange = 300; // 200; + midRangeProbab = 0.5; // 0.7; + maxRange = 400; // 300; + }; + + class FullAuto: FullAuto { + minRange = 0; //2; + }; + + class fullauto_medium: fullauto_medium { + minRange = 20; // 2; + maxRange = 150; // 100; + burst = "3 + round random 5"; // 3; + }; + + class AGM_Burst_far: fullauto_medium { + aiRateOfFire = 2.0; + aiRateOfFireDistance = 400; + minRange = 300; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.2; + maxRange = 500; + maxRangeProbab = 0.2; + burst = "2 + round random 3"; + }; + + class single_medium_optics1: single_medium_optics1 { + aiRateOfFireDistance = 700; // 600; + minRange = 120; // 2; + maxRange = 600; // 500; + }; + + class single_medium_optics2: single_medium_optics1 { + aiRateOfFireDistance = 800; // 700; + minRange = 200; // 100; + maxRange = 800; // 700; + }; + }; + + // sub machine guns + + // SDAR + class SDAR_base_F: Rifle_Base_F { + aiDispersionCoefY = 28.0; + aiDispersionCoefX = 20.0; + + class Single: Mode_SemiAuto { + minRange = 10; //2; + }; + + class Burst: Mode_Burst { + minRange = 5; //1; + }; + }; + + // PD2000 + class pdw2000_base_F: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Mode_SemiAuto { + minRange = 100; //2; + }; + + class Burst: Mode_Burst { + minRange = 50; //1; + }; + }; + + // Vector + class SMG_01_Base: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Mode_SemiAuto { + minRange = 50; //2; + }; + + class Burst: Mode_Burst { + minRange = 25; //2; + }; + }; + + // Scorpion EVO + class SMG_02_base_F: Rifle_Base_F { + aiDispersionCoefY = 18.0; + aiDispersionCoefX = 12.0; + + class Single: Mode_SemiAuto { + minRange = 50; //2; + }; + + class Burst: Mode_Burst { + minRange = 25; //2; + }; + }; + + // machine guns + + // Stoner + class LMG_Mk200_F: Rifle_Long_Base_F { + aiDispersionCoefY = 24.0; + aiDispersionCoefX = 21.0; + modes[] += {"AGM_Burst_far"}; + + class medium; + class AGM_Burst_far: medium { + aiRateOfFire = 6.0; + aiRateOfFireDistance = 900; + minRange = 500; + minRangeProbab = 0.1; + midRange = 700; + midRangeProbab = 0.2; + maxRange = 900; + maxRangeProbab = 0.2; + burst = "3 + round random 5"; + }; + + class far_optic1: medium { + maxRange = 750; // 650; + }; + + class far_optic2: far_optic1 { + maxRange = 1100; // 900; + aiRateOfFireDistance = 1100;// 900; + }; + }; + + // Negev + class LMG_Zafir_F: Rifle_Long_Base_F { + aiDispersionCoefY = 23.0; + aiDispersionCoefX = 19.0; + modes[] += {"AGM_Burst_far"}; + + class Single: Mode_SemiAuto { + minRange = 120; // 2; + }; + + class close; + class medium; + class AGM_Burst_far: medium { + aiRateOfFire = 6.0; + aiRateOfFireDistance = 900; + minRange = 500; + minRangeProbab = 0.1; + midRange = 700; + midRangeProbab = 0.2; + maxRange = 900; + maxRangeProbab = 0.2; + burst = "3 + round random 5"; + }; + + class far_optic1: close { + maxRange = 800; //700; + }; + + class far_optic2: far_optic1 { + maxRange = 1200; //1000; + }; + }; +}; diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp index c96dbe48b8..fdcb6afe9d 100644 --- a/addons/ai/config.cpp +++ b/addons/ai/config.cpp @@ -1,617 +1,16 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = 0.60; - requiredAddons[] = {"ace_main","ace_common"}; - version = "0.95"; - versionStr = "0.95"; - versionAr[] = {0,95,0}; - author[] = {"KoffeinFlummi", "commy2"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - }; + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author[] = {"KoffeinFlummi","commy2"}; + authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; + }; }; -/* - * Documentation: - * https://community.bistudio.com/wiki/AI_Sub-skills - * - * The idea here is to reduce the AI's godlike aiming - * capabilties while retaining it's high intelligence. - * The AI should be smart enough to move through a town, - * but also be 'human' in their reaction time and aim. - * - * Note: All these values can still be adjusted via - * scripts, these arrays just change what 0 & 1 - * are for setSkill. - */ - -class CfgAISkill { - aimingAccuracy[] = {0,0, 1,0.8}; // {0,0,1,1}; v1.26 defaults - aimingShake[] = {0,0, 1,0.6}; // {0,0,1,1}; - aimingSpeed[] = {0,0, 1,0.7}; // {0,0.5,1,1}; - commanding[] = {0,0, 1,0.8}; // {0,0,1,1}; - courage[] = {0,0, 1,0.7}; // {0,0,1,1}; - endurance[] = {0,0, 1,0.7}; // {0,0,1,1}; - general[] = {0,0, 1,0.9}; // {0,0,1,1}; - reloadSpeed[] = {0,0, 1,0.8}; // {0,0,1,1}; - spotDistance[] = {0,0, 1,0.9}; // {0,0.2,1,0.4}; - spotTime[] = {0,0, 1,0.7}; // {0,0,1,0.7}; -}; - -// weapon config changes, by commy2 - -/* documentation: -aiDispersionCoefX = 1.0 Dispersion multiplier for AI units (axis X - left to right). -aiDispersionCoefY = 1.0 Dispersion multiplier for AI units (axis Y - top-down). -aiRateOfFire = 5.0 Delay between shots at given aiRateOfFireDistance. -aiRateOfFireDistance = 500 At shorter distance delay (aiRateOfFire) goes linearly to zero. -*/ - -class Mode_SemiAuto; -class Mode_Burst; -class Mode_FullAuto; - -class CfgWeapons { - - // rifles - class RifleCore; - class Rifle: RifleCore { - aiDispersionCoefX = 6; - aiDispersionCoefY = 6; - }; - - class Rifle_Base_F: Rifle {}; - class Rifle_Long_Base_F: Rifle_Base_F {}; - - // MX - class arifle_MX_Base_F: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - modes[] += {"AGM_Burst_far"}; - - class Single: Mode_SemiAuto { - minRange = 120; // 2; - minRangeProbab = 0.7; // 0.5; - midRange = 300; // 200; - midRangeProbab = 0.5; // 0.7; - }; - - class FullAuto; - class fullauto_medium: FullAuto { - minRange = 20; // 2; - burst = "3 + round random 5"; //3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 500; - minRange = 400; - minRangeProbab = 0.1; - midRange = 500; - midRangeProbab = 0.2; - maxRange = 600; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: Single { - aiRateOfFireDistance = 700; // 600; - minRange = 120; // 2; - maxRange = 700; // 600; - }; - - class single_far_optics2: single_medium_optics1 { - aiRateOfFireDistance = 900; // 700; - minRange = 200; // 100; - maxRange = 900; // 700; - }; - }; - - // MX carbine - class arifle_MXC_F: arifle_MX_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Single { - minRange = 120; // 2; - minRangeProbab = 0.5; // 0.3; - midRange = 250; // 150; - midRangeProbab = 0.3; // 0.5; - }; - - class FullAuto; - class fullauto_medium: fullauto_medium { - minRange = 20; // 2; - burst = "3 + round random 5"; //3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 400; - minRange = 300; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.2; - maxRange = 500; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: single_medium_optics1 { - aiRateOfFireDistance = 600; // 500; - minRange = 120; // 2; - maxRange = 600; // 500; - }; - - class single_far_optics2: single_medium_optics1 { - aiRateOfFireDistance = 800; // 700; - minRange = 200; // 100; - maxRange = 800; // 700; - }; - }; - - //class arifle_MX_F: arifle_MX_Base_F {}; - //class arifle_MX_GL_F: arifle_MX_Base_F {}; - - // MX machine gun - class arifle_MXM_F: arifle_MX_Base_F { - class Single: Single { - minRange = 120; // 2; - minRangeProbab = 0.7; // 0.5; - midRange = 350; // 250; - midRangeProbab = 0.5; // 0.7; - }; - - class fullauto_medium: fullauto_medium { - minRange = 20; // 2; - burst = "3 + round random 5"; //3; - }; - - class single_medium_optics1: single_medium_optics1 { - aiRateOfFireDistance = 700; // 600; - minRange = 120; // 2; - maxRange = 750; // 650; - }; - - class single_far_optics2: single_far_optics2 { - aiRateOfFireDistance = 900; // 800; - minRange = 200; // 100; - maxRange = 900; // 800; - }; - }; - - // MX sniper rifle - class arifle_MX_SW_F: arifle_MX_Base_F { - aiDispersionCoefY = 24.0; - aiDispersionCoefX = 21.0; - modes[] += {"AGM_Burst_far"}; - - class Single: Mode_SemiAuto { - minRange = 120; // 2; - }; - - class close; - class medium; - class AGM_Burst_far: medium { - aiRateOfFire = 6.0; - aiRateOfFireDistance = 900; - minRange = 500; - minRangeProbab = 0.1; - midRange = 700; - midRangeProbab = 0.2; - maxRange = 900; - maxRangeProbab = 0.2; - burst = "3 + round random 5"; - }; - - class far_optic1: close { - aiRateOfFireDistance = 750; // 650; - maxRange = 750; // 650; - }; - - class far_optic2: far_optic1 { - maxRange = 1100; // 900; - aiRateOfFireDistance = 1100;// 900; - }; - }; - - // Katiba - class arifle_Katiba_Base_F: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - modes[] += {"AGM_Burst_far"}; - - class Single: Mode_SemiAuto { - minRange = 120; // 2; - minRangeProbab = 0.7; // 0.5; - midRange = 300; // 200; - midRangeProbab = 0.5; // 0.7; - }; - - class FullAuto; - class fullauto_medium: FullAuto { - minRange = 20; // 2; - burst = "3 + round random 5"; //3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 500; - minRange = 400; - minRangeProbab = 0.1; - midRange = 500; - midRangeProbab = 0.2; - maxRange = 600; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: Single { - aiRateOfFireDistance = 700; // 600; - minRange = 120; // 2; - maxRange = 700; // 600; - }; - - class single_far_optics2: single_medium_optics1 { - aiRateOfFireDistance = 900; // 800; - minRange = 200; // 100; - maxRange = 900; // 800; - }; - }; - - // Katiba carbine - class arifle_Katiba_C_F: arifle_Katiba_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Single { - minRange = 120; // 2; - minRangeProbab = 0.5; // 0.3; - midRange = 250; // 150; - midRangeProbab = 0.3; // 0.7; - }; - - //class FullAuto: FullAuto {}; - - class fullauto_medium: fullauto_medium { - minRange = 20; // 2; - maxRange = 150; //100; - burst = "3 + round random 5"; //3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 400; - minRange = 300; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.2; - maxRange = 500; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: single_medium_optics1 { - minRange = 120; // 2; - maxRange = 600; // 500; - }; - - class single_medium_optics2: single_medium_optics1 { - aiRateOfFireDistance = 800; // 700; - minRange = 200; // 100; - maxRange = 800; // 700; - }; - }; - - // F2002 - class mk20_base_F: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - modes[] += {"AGM_Burst_far"}; - - class Single: Mode_SemiAuto { - minRange = 120; // 2; - minRangeProbab = 0.7; // 0.5; - midRange = 250; // 150; - midRangeProbab = 0.5; // 0.7; - }; - - class FullAuto: Mode_FullAuto { - minRange = 0; //2; - }; - - class fullauto_medium: FullAuto { - minRange = 20; // 2; - maxRange = 150; // 100; - burst = "3 + round random 5"; // 3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 500; - minRange = 400; - minRangeProbab = 0.1; - midRange = 500; - midRangeProbab = 0.2; - maxRange = 600; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: Single { - aiRateOfFireDistance = 600; // 500; - minRange = 120; // 5; - maxRange = 600; // 500; - }; - - class single_far_optics2: single_medium_optics1 { - aiRateOfFireDistance = 800; // 700; - minRange = 200; // 100; - maxRange = 800; // 700; - }; - }; - - // F2002 carbine - class arifle_Mk20C_F: mk20_base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Single { - minRange = 120; // 2; - minRangeProbab = 0.7; // 0.5; - midRange = 250; // 150; - midRangeProbab = 0.5; // 0.7; - maxRange = 350; // 250; - }; - - class FullAuto: FullAuto { - minRange = 0; //2; - }; - - class single_medium_optics1: single_medium_optics1 { - aiRateOfFireDistance = 600; // 500; - minRange = 120; // 5; - maxRange = 550; // 450; - }; - - //class single_medium_optics2: single_medium_optics1 {}; - class fullauto_medium: fullauto_medium { - minRange = 20; //2; - burst = "3 + round random 5"; //3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 400; - minRange = 300; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.2; - maxRange = 500; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - }; - - // TAR-20 - class Tavor_base_F: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - modes[] += {"AGM_Burst_far"}; - - class Single: Mode_SemiAuto { - minRange = 120; //2; - minRangeProbab = 0.7; //0.5; - midRange = 250; //150; - midRangeProbab = 0.5; //0.7; - maxRange = 350; //250; - }; - - class FullAuto: Mode_FullAuto { - minRange = 0; //2; - }; - - class fullauto_medium: FullAuto { - minRange = 20; // 2; - maxRange = 150; // 100; - burst = "3 + round random 5"; // 3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 400; - minRange = 300; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.2; - maxRange = 500; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: Single { - aiRateOfFireDistance = 600; // 500; - minRange = 120; // 5; - maxRange = 550; // 450; - }; - - class single_medium_optics2: single_medium_optics1 { - aiRateOfFireDistance = 700; // 600; - minRange = 200; // 100; - maxRange = 700; // 600; - }; - }; - - // TAR-21 - class arifle_TRG21_F: Tavor_base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Single { - minRange = 120; // 2; - minRangeProbab = 0.7; // 0.3; - midRange = 300; // 200; - midRangeProbab = 0.5; // 0.7; - maxRange = 400; // 300; - }; - - class FullAuto: FullAuto { - minRange = 0; //2; - }; - - class fullauto_medium: fullauto_medium { - minRange = 20; // 2; - maxRange = 150; // 100; - burst = "3 + round random 5"; // 3; - }; - - class AGM_Burst_far: fullauto_medium { - aiRateOfFire = 2.0; - aiRateOfFireDistance = 400; - minRange = 300; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.2; - maxRange = 500; - maxRangeProbab = 0.2; - burst = "2 + round random 3"; - }; - - class single_medium_optics1: single_medium_optics1 { - aiRateOfFireDistance = 700; // 600; - minRange = 120; // 2; - maxRange = 600; // 500; - }; - - class single_medium_optics2: single_medium_optics1 { - aiRateOfFireDistance = 800; // 700; - minRange = 200; // 100; - maxRange = 800; // 700; - }; - }; - - // sub machine guns - - // SDAR - class SDAR_base_F: Rifle_Base_F { - aiDispersionCoefY = 28.0; - aiDispersionCoefX = 20.0; - - class Single: Mode_SemiAuto { - minRange = 10; //2; - }; - - class Burst: Mode_Burst { - minRange = 5; //1; - }; - }; - - // PD2000 - class pdw2000_base_F: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Mode_SemiAuto { - minRange = 100; //2; - }; - - class Burst: Mode_Burst { - minRange = 50; //1; - }; - }; - - // Vector - class SMG_01_Base: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Mode_SemiAuto { - minRange = 50; //2; - }; - - class Burst: Mode_Burst { - minRange = 25; //2; - }; - }; - - // Scorpion EVO - class SMG_02_base_F: Rifle_Base_F { - aiDispersionCoefY = 18.0; - aiDispersionCoefX = 12.0; - - class Single: Mode_SemiAuto { - minRange = 50; //2; - }; - - class Burst: Mode_Burst { - minRange = 25; //2; - }; - }; - - // machine guns - - // Stoner - class LMG_Mk200_F: Rifle_Long_Base_F { - aiDispersionCoefY = 24.0; - aiDispersionCoefX = 21.0; - modes[] += {"AGM_Burst_far"}; - - class medium; - class AGM_Burst_far: medium { - aiRateOfFire = 6.0; - aiRateOfFireDistance = 900; - minRange = 500; - minRangeProbab = 0.1; - midRange = 700; - midRangeProbab = 0.2; - maxRange = 900; - maxRangeProbab = 0.2; - burst = "3 + round random 5"; - }; - - class far_optic1: medium { - maxRange = 750; // 650; - }; - - class far_optic2: far_optic1 { - maxRange = 1100; // 900; - aiRateOfFireDistance = 1100;// 900; - }; - }; - - // Negev - class LMG_Zafir_F: Rifle_Long_Base_F { - aiDispersionCoefY = 23.0; - aiDispersionCoefX = 19.0; - modes[] += {"AGM_Burst_far"}; - - class Single: Mode_SemiAuto { - minRange = 120; // 2; - }; - - class close; - class medium; - class AGM_Burst_far: medium { - aiRateOfFire = 6.0; - aiRateOfFireDistance = 900; - minRange = 500; - minRangeProbab = 0.1; - midRange = 700; - midRangeProbab = 0.2; - maxRange = 900; - maxRangeProbab = 0.2; - burst = "3 + round random 5"; - }; - - class far_optic1: close { - maxRange = 800; //700; - }; - - class far_optic2: far_optic1 { - maxRange = 1200; //1000; - }; - }; -}; +#include "CfgAISkill.hpp" +#include "CfgWeapons.hpp" diff --git a/addons/ai/script_component.hpp b/addons/ai/script_component.hpp index 46602db75c..7e95e38573 100644 --- a/addons/ai/script_component.hpp +++ b/addons/ai/script_component.hpp @@ -2,11 +2,11 @@ #include "\z\ace\Addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_AI - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_ENABLED_AI - #define DEBUG_SETTINGS DEBUG_ENABLED_AI + #define DEBUG_SETTINGS DEBUG_ENABLED_AI #endif #include "\z\ace\Addons\main\script_macros.hpp" \ No newline at end of file From cf8259882e3c9d7b20873799ec9efa76e25e499f Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 22:34:01 +0100 Subject: [PATCH 18/18] formating --- addons/common/CfgEventHandlers.hpp | 57 +- addons/common/CfgMagazines.hpp | 10 + addons/common/CfgSounds.hpp | 10 +- addons/common/CfgVehicles.hpp | 3 +- addons/common/CfgWeapons.hpp | 44 +- addons/common/DefaultItems.hpp | 1006 ++++++++-------- addons/common/FixAnimations.hpp | 54 +- addons/common/FixPickup.hpp | 20 +- addons/common/HintConfig.hpp | 134 +-- addons/common/MainMenu.hpp | 174 +-- addons/common/MenuConfig.hpp | 1808 ++++++++++++++-------------- addons/common/NoVoice.hpp | 435 +++---- addons/common/ProgressScreen.hpp | 166 +-- addons/common/RscInfoType.hpp | 36 +- addons/common/XEH_postInit.sqf | 38 +- addons/common/XEH_preInit.sqf | 16 +- addons/common/config.cpp | 89 +- addons/common/script_component.hpp | 4 +- addons/common/stringtable.xml | 926 +++++++------- 19 files changed, 2517 insertions(+), 2513 deletions(-) create mode 100644 addons/common/CfgMagazines.hpp diff --git a/addons/common/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp index 025d7d8f74..34119a3407 100644 --- a/addons/common/CfgEventHandlers.hpp +++ b/addons/common/CfgEventHandlers.hpp @@ -1,41 +1,42 @@ + class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit) ); - serverInit = QUOTE(call COMPILE_FILE(scripts\readParameters) ); - disableModuload = true; - }; + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_preInit) ); + serverInit = QUOTE(call COMPILE_FILE(scripts\readParameters) ); + disableModuload = true; + }; }; class Extended_PostInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit) ); - disableModuload = true; - }; + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_postInit) ); + disableModuload = true; + }; }; class Extended_InitPost_EventHandlers { - class All { - class GVAR(executePersistent) { - init = QUOTE([_this select 0] call FUNC(executePersistent) ); + class All { + class GVAR(executePersistent) { + init = QUOTE([_this select 0] call FUNC(executePersistent) ); + }; }; - }; - class CAManBase { - class GVAR(setName) { - init = QUOTE(if (local (_this select 0)) then { _this call FUNC(setName) }; ); + class CAManBase { + class GVAR(setName) { + init = QUOTE(if (local (_this select 0)) then { _this call FUNC(setName) }; ); + }; + class GVAR(forceWalk) { + init = QUOTE(if (local (_this select 0)) then { _this call FUNC(applyForceWalkStatus); }; ); + }; }; - class GVAR(forceWalk) { - init = QUOTE(if (local (_this select 0)) then { _this call FUNC(applyForceWalkStatus); }; ); - }; - }; }; class Extended_Respawn_EventHandlers { - class All { - class GVAR(restoreVariablesJIP) { - respawn = QUOTE(_this call FUNC(restoreVariablesJIP) ); + class All { + class GVAR(restoreVariablesJIP) { + respawn = QUOTE(_this call FUNC(restoreVariablesJIP) ); + }; + class GVAR(setName) { + respawn = QUOTE(_this call FUNC(setName) ); + }; }; - class GVAR(setName) { - respawn = QUOTE(_this call FUNC(setName) ); - }; - }; -}; \ No newline at end of file +}; diff --git a/addons/common/CfgMagazines.hpp b/addons/common/CfgMagazines.hpp new file mode 100644 index 0000000000..815ab6db9f --- /dev/null +++ b/addons/common/CfgMagazines.hpp @@ -0,0 +1,10 @@ + +class CfgMagazines { + class CA_Magazine; + class ACE_FakeMagazine: CA_Magazine { + descriptionShort = ""; + displayName = ""; + displayNameShort = ""; + count = 0; + }; +}; diff --git a/addons/common/CfgSounds.hpp b/addons/common/CfgSounds.hpp index b3784aee36..d564f6717d 100644 --- a/addons/common/CfgSounds.hpp +++ b/addons/common/CfgSounds.hpp @@ -1,7 +1,7 @@ class CfgSounds { - class ACE_Sound_Click { - sound[] = {PATHTOF(sounds\ACE_click.wav), 1, 1, 200}; - titles[] = {}; - }; -}; \ No newline at end of file + class ACE_Sound_Click { + sound[] = {PATHTOF(sounds\ACE_click.wav), 1, 1, 200}; + titles[] = {}; + }; +}; diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp index bd1ffa8c73..ee78ad3924 100644 --- a/addons/common/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -1,3 +1,4 @@ + class CfgVehicles { /*class Man; class CAManBase: Man { @@ -105,4 +106,4 @@ class CfgVehicles { class TransportItems {}; class TransportBackpacks {}; }; -}; \ No newline at end of file +}; diff --git a/addons/common/CfgWeapons.hpp b/addons/common/CfgWeapons.hpp index 0c2239a3ab..5df5d75da8 100644 --- a/addons/common/CfgWeapons.hpp +++ b/addons/common/CfgWeapons.hpp @@ -1,30 +1,20 @@ + class CfgWeapons { - class ItemCore; - class ACE_ItemCore: ItemCore { - type = 4096;//4; - detectRange = -1; - simulation = "ItemMineDetector"; - }; + class ItemCore; + class ACE_ItemCore: ItemCore { + type = 4096;//4; + detectRange = -1; + simulation = "ItemMineDetector"; + }; - class Rifle_Base_F; - class ACE_FakePrimaryWeapon: Rifle_Base_F { - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - displayName = ""; - picture = ""; - model = ""; - magazines[] = {"ACE_FakeMagazine"}; - scope = 2; - }; + class Rifle_Base_F; + class ACE_FakePrimaryWeapon: Rifle_Base_F { + discreteDistance[] = {}; + discreteDistanceInitIndex = 0; + displayName = ""; + picture = ""; + model = ""; + magazines[] = {"ACE_FakeMagazine"}; + scope = 2; + }; }; - -class CfgMagazines { - class CA_Magazine; - - class ACE_FakeMagazine: CA_Magazine { - descriptionShort = ""; - displayName = ""; - displayNameShort = ""; - count = 0; - }; -}; \ No newline at end of file diff --git a/addons/common/DefaultItems.hpp b/addons/common/DefaultItems.hpp index e228fca522..539eb3beff 100644 --- a/addons/common/DefaultItems.hpp +++ b/addons/common/DefaultItems.hpp @@ -18,16 +18,16 @@ D = []; {D set [_forEachIndex, getArray (_x >> "respawnItems")]} forEach A; diag_log text "====================="; { - diag_log text format ["class %1;", _x]; + diag_log text format ["class %1;", _x]; } forEach E; { - diag_log text format ["class %1: %2 {", _x, B select _forEachIndex]; - _s = str (C select _forEachIndex); _s = toString (toArray _s - [91,93]); - diag_log text format [" items[] = {%1};", _s]; - _s = str (D select _forEachIndex); _s = toString (toArray _s - [91,93]); - diag_log text format [" respawnItems[] = {%1};", _s]; - diag_log text "};"; + diag_log text format ["class %1: %2 {", _x, B select _forEachIndex]; + _s = str (C select _forEachIndex); _s = toString (toArray _s - [91,93]); + diag_log text format [" items[] = {%1};", _s]; + _s = str (D select _forEachIndex); _s = toString (toArray _s - [91,93]); + diag_log text format [" respawnItems[] = {%1};", _s]; + diag_log text "};"; } forEach A; */ @@ -37,994 +37,994 @@ class SoldierGB; class SoldierEB; class C_man_1; class B_Soldier_base_F: SoldierWB { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_02_f: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_03_f: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_04_f: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_05_f: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_RangeMaster_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_lite_F: B_Soldier_03_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_GL_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_AR_F: B_Soldier_02_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_SL_F: B_Soldier_03_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_TL_F: B_Soldier_03_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_M_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_LAT_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_medic_F: B_Soldier_02_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_repair_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_exp_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Helipilot_F: B_Soldier_04_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_A_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_AT_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_AA_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_engineer_F: B_Soldier_03_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_crew_F: B_Soldier_03_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_officer_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Competitor_F: B_RangeMaster_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Pilot_F: B_Soldier_05_f { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_helicrew_F: B_Helipilot_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_PG_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_UAV_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class b_soldier_unarmed_f: B_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_diver_base_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_diver_F: B_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_diver_TL_F: B_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_diver_exp_F: B_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_recon_base: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_LAT_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_exp_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_medic_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_TL_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_M_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_recon_JTAC_F: B_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_sniper_base_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_spotter_F: B_Soldier_sniper_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_sniper_F: B_Soldier_sniper_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Story_SF_Captain_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Story_Protagonist_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Story_Engineer_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Story_Colonel_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Story_Pilot_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Story_Tank_Commander_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class b_soldier_survival_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_CTRG_soldier_GL_LAT_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_CTRG_soldier_engineer_exp_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_CTRG_soldier_M_medic_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_CTRG_soldier_AR_A_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_support_base_F: B_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_AAR_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_AAT_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_soldier_AAA_F: B_soldier_AAT_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_support_MG_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_support_GMG_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_support_Mort_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_support_AMG_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_support_AMort_F: B_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_base_F: SoldierGB { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_lite_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_SL_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_TL_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_AR_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_medic_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_engineer_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_exp_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_GL_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_M_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_LAT_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Soldier_A_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_officer_F: I_G_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_F: I_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_F: I_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_lite_F: I_G_Soldier_lite_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_lite_F: I_G_Soldier_lite_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_SL_F: I_G_Soldier_SL_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_SL_F: I_G_Soldier_SL_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_TL_F: I_G_Soldier_TL_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_TL_F: I_G_Soldier_TL_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_AR_F: I_G_Soldier_AR_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_AR_F: I_G_Soldier_AR_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_medic_F: I_G_medic_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_medic_F: I_G_medic_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_engineer_F: I_G_engineer_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_engineer_F: I_G_engineer_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_exp_F: I_G_Soldier_exp_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_exp_F: I_G_Soldier_exp_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_GL_F: I_G_Soldier_GL_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_GL_F: I_G_Soldier_GL_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_M_F: I_G_Soldier_M_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_M_F: I_G_Soldier_M_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_LAT_F: I_G_Soldier_LAT_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_LAT_F: I_G_Soldier_LAT_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_Soldier_A_F: I_G_Soldier_A_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_Soldier_A_F: I_G_Soldier_A_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_G_officer_F: I_G_officer_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_G_officer_F: I_G_officer_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class i_g_soldier_unarmed_f: I_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class b_g_soldier_unarmed_f: B_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class o_g_soldier_unarmed_f: O_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class i_g_survivor_F: I_G_Soldier_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class b_g_survivor_F: B_G_Soldier_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class o_g_survivor_F: O_G_Soldier_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class I_G_Story_Protagonist_F: B_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_Story_SF_Captain_F: B_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_resistanceLeader_F: I_G_Story_Protagonist_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_G_resistanceCommander_F: I_G_Story_Protagonist_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_base_F: SoldierGB { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_02_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_03_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_04_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_soldier_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_lite_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_A_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_GL_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_AR_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_SL_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_TL_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_M_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_LAT_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_AT_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_AA_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_medic_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_repair_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_exp_F: I_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_engineer_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_crew_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_helipilot_F: I_Soldier_03_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_pilot_F: I_Soldier_04_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_helicrew_F: I_helipilot_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_officer_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Story_Colonel_F: I_officer_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_soldier_UAV_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class i_soldier_unarmed_f: I_soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_diver_base_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_diver_F: I_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_diver_exp_F: I_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_diver_TL_F: I_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_sniper_base_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Spotter_F: I_Soldier_sniper_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Sniper_F: I_Soldier_sniper_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_support_base_F: I_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_AAR_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_AAT_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_Soldier_AAA_F: I_Soldier_AAT_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_support_MG_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_support_GMG_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_support_Mort_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_support_AMG_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_support_AMort_F: I_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_base_F: SoldierEB { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_officer_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_02_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_lite_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_GL_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_AR_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_SL_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_TL_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldier_M_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_LAT_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_medic_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldier_repair_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldier_exp_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_helipilot_F: O_Soldier_02_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_A_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_AT_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_AA_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_engineer_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_crew_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Pilot_F: O_helipilot_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_helicrew_F: O_helipilot_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldier_PG_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Story_Colonel_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Story_CEO_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldier_UAV_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class o_soldier_unarmed_f: O_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_diver_base_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_diver_F: O_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_diver_TL_F: O_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_diver_exp_F: O_Soldier_diver_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_sniper_base_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_spotter_F: O_Soldier_sniper_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_sniper_F: O_Soldier_sniper_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_recon_base: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_M_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_LAT_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_medic_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_exp_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_JTAC_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_recon_TL_F: O_Soldier_recon_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_support_base_F: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_AAR_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_AAT_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_AAA_F: O_Soldier_AAT_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_support_MG_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_support_GMG_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_support_Mort_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_support_AMG_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_support_AMort_F: O_Soldier_support_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_Soldier_Urban_base: O_Soldier_base_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_AR_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_AAR_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_LAT_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_AT_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_AAT_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_AA_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_AAA_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_TL_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_SoldierU_SL_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_medic_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_repair_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_exp_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_engineer_U_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_M_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_soldierU_A_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_SoldierU_GL_F: O_Soldier_Urban_base { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class C_Marshal_F: B_RangeMaster_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class B_Soldier_VR_F: B_Soldier_base_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class O_Soldier_VR_F: O_Soldier_base_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class I_Soldier_VR_F: I_Soldier_base_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class C_Soldier_VR_F: C_man_1 { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class B_Protagonist_VR_F: B_Soldier_base_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class O_Protagonist_VR_F: O_Soldier_base_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class I_Protagonist_VR_F: I_Soldier_base_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class B_UAV_AI: B_Helipilot_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class O_UAV_AI: O_helipilot_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class I_UAV_AI: O_UAV_AI { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class Underwear_F: B_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class b_survivor_F: B_Soldier_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class o_survivor_F: O_Soldier_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class i_survivor_F: I_soldier_F { - items[] = {}; - respawnItems[] = {}; + items[] = {}; + respawnItems[] = {}; }; class b_soldier_universal_f: B_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class b_g_soldier_universal_f: B_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class o_soldier_universal_f: O_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class o_g_soldier_universal_f: O_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class i_soldier_universal_f: I_soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; class i_g_soldier_universal_f: I_G_Soldier_F { - items[] = {"FirstAidKit"}; - respawnItems[] = {"FirstAidKit"}; + items[] = {"FirstAidKit"}; + respawnItems[] = {"FirstAidKit"}; }; diff --git a/addons/common/FixAnimations.hpp b/addons/common/FixAnimations.hpp index f94a9fa00e..d389391ba1 100644 --- a/addons/common/FixAnimations.hpp +++ b/addons/common/FixAnimations.hpp @@ -1,35 +1,35 @@ class CfgMovesBasic; class CfgMovesMaleSdr: CfgMovesBasic { - class AgonyBase; - class AgonyBaseRfl; - class StandBase; + class AgonyBase; + class AgonyBaseRfl; + class StandBase; - class States { - class AinjPfalMstpSnonWnonDnon_carried_Down: AgonyBase { - canReload = 0; - }; - class AinjPfalMstpSnonWnonDnon_carried_Up: AgonyBase { - canReload = 0; - }; - class AinjPfalMstpSnonWrflDnon_carried_Down: AgonyBase { - canReload = 0; - }; - class AinjPfalMstpSnonWrflDnon_carried_Up: AgonyBaseRfl { - canReload = 0; - }; + class States { + class AinjPfalMstpSnonWnonDnon_carried_Down: AgonyBase { + canReload = 0; + }; + class AinjPfalMstpSnonWnonDnon_carried_Up: AgonyBase { + canReload = 0; + }; + class AinjPfalMstpSnonWrflDnon_carried_Down: AgonyBase { + canReload = 0; + }; + class AinjPfalMstpSnonWrflDnon_carried_Up: AgonyBaseRfl { + canReload = 0; + }; - class AmovPpneMstpSnonWnonDnon_injured; - class AinjPpneMstpSnonWnonDnon: AmovPpneMstpSnonWnonDnon_injured { - canReload = 0; - }; - class AmovPpneMstpSrasWrflDnon_injured; - class AinjPpneMstpSnonWrflDnon: AmovPpneMstpSrasWrflDnon_injured { - canReload = 0; - }; + class AmovPpneMstpSnonWnonDnon_injured; + class AinjPpneMstpSnonWnonDnon: AmovPpneMstpSnonWnonDnon_injured { + canReload = 0; + }; + class AmovPpneMstpSrasWrflDnon_injured; + class AinjPpneMstpSnonWrflDnon: AmovPpneMstpSrasWrflDnon_injured { + canReload = 0; + }; - class LadderCivilStatic: StandBase { - ACE_isLadder = 1; + class LadderCivilStatic: StandBase { + ACE_isLadder = 1; + }; }; - }; }; diff --git a/addons/common/FixPickup.hpp b/addons/common/FixPickup.hpp index 19ced78e96..79ddf77026 100644 --- a/addons/common/FixPickup.hpp +++ b/addons/common/FixPickup.hpp @@ -1,13 +1,13 @@ class CfgActions { - class None; - class TakeWeapon: None { - show = 0; - }; - class TakeItem: None { - show = 0; - }; - class TakeMagazine: None { - show = 0; - }; + class None; + class TakeWeapon: None { + show = 0; + }; + class TakeItem: None { + show = 0; + }; + class TakeMagazine: None { + show = 0; + }; }; diff --git a/addons/common/HintConfig.hpp b/addons/common/HintConfig.hpp index f4e8c0d2d4..3e3493a8ba 100644 --- a/addons/common/HintConfig.hpp +++ b/addons/common/HintConfig.hpp @@ -4,73 +4,73 @@ class RscStructuredText; class RscMapControl; class RscTitles { - class ACE_RscHint { - idd = -1; - onLoad = "uiNamespace setVariable ['ACE_ctrlHint', (_this select 0) displayCtrl 1];"; - movingEnable = false; - duration = 4; - fadeIn = 0.2; - fadeOut = 0.2; - name = "ACE_RscHint"; + class ACE_RscHint { + idd = -1; + onLoad = "uiNamespace setVariable ['ACE_ctrlHint', (_this select 0) displayCtrl 1];"; + movingEnable = false; + duration = 4; + fadeIn = 0.2; + fadeOut = 0.2; + name = "ACE_RscHint"; - class controls { - class HintBox: RscStructuredText { - idc = 1; - text = ""; - size = "1 / 40 / (getResolution select 5)"; - sizeEx = 1; - colorText[] = {1, 1, 1, 1}; - colorBackground[] = {0, 0, 0, 0.5}; - x = safeZoneW + safeZoneX - 0 * safezoneW; //safeZoneW + safeZoneX - 0.2 * safezoneW; - y = safeZoneY + 0.2 * safezoneH; - w = 0.2 * safeZoneW; - h = 0.1 * SafeZoneH; - }; - }; - }; - class ACE_RscErrorHint { - idd = -1; - onLoad = "uiNamespace setVariable ['ACE_ctrlErrorHint', (_this select 0) displayCtrl 1];"; - movingEnable = false; - duration = 999999; - fadeIn = 0.2; - fadeOut = 0.2; - name = "ACE_RscErrorHint"; + class controls { + class HintBox: RscStructuredText { + idc = 1; + text = ""; + size = "1 / 40 / (getResolution select 5)"; + sizeEx = 1; + colorText[] = {1, 1, 1, 1}; + colorBackground[] = {0, 0, 0, 0.5}; + x = safeZoneW + safeZoneX - 0 * safezoneW; //safeZoneW + safeZoneX - 0.2 * safezoneW; + y = safeZoneY + 0.2 * safezoneH; + w = 0.2 * safeZoneW; + h = 0.1 * SafeZoneH; + }; + }; + }; + class ACE_RscErrorHint { + idd = -1; + onLoad = "uiNamespace setVariable ['ACE_ctrlErrorHint', (_this select 0) displayCtrl 1];"; + movingEnable = false; + duration = 999999; + fadeIn = 0.2; + fadeOut = 0.2; + name = "ACE_RscErrorHint"; - class controls { - class HintBox: RscStructuredText { - idc = 1; - text = ""; - size = "1 / 40 / (getResolution select 5)"; - sizeEx = 1; - colorText[] = {1, 1, 1, 1}; - colorBackground[] = {0.8, 0, 0, 0.5}; - x = 0.3 * safeZoneW + safeZoneX; - y = 0.4 * safezoneH + safeZoneY; - w = 0.4 * safeZoneW; - h = 0.2 * SafeZoneH; - }; - }; - }; - class ACE_EventHandlerHelper: ACE_Rsc_Display_Base { - idd = -1; - class controls { - class CameraView: RscMapControl { - onDraw = "if (cameraView != uiNamespace getVariable 'ACE_EventHandler_CameraMode') then {uiNamespace setVariable ['ACE_EventHandler_CameraMode', cameraView]; {[uiNamespace getVariable 'ACE_EventHandler_CameraMode'] call _x; nil} count ((missionNamespace getVariable 'ACE_EventHandler_CameraMode') select 2);};"; - idc = -1; - w = 0; - h = 0; - }; - }; - }; - class ACE_EventHandlerHelper2: ACE_Rsc_Display_Base { - class controls { - class MapMarkerCreated: RscMapControl { - onDraw = "if (count allMapMarkers != uiNamespace getVariable 'ACE_EventHandler_MapMarker') then {if (count allMapMarkers > uiNamespace getVariable 'ACE_EventHandler_MapMarker') then {{[allMapMarkers select count allMapMarkers - 1] call _x; nil} count ((missionNamespace getVariable 'ACE_EventHandler_MapMarker') select 2);}; uiNamespace setVariable ['ACE_EventHandler_MapMarker', count allMapMarkers];};"; - idc = -1; - w = 0; - h = 0; - }; - }; - }; + class controls { + class HintBox: RscStructuredText { + idc = 1; + text = ""; + size = "1 / 40 / (getResolution select 5)"; + sizeEx = 1; + colorText[] = {1, 1, 1, 1}; + colorBackground[] = {0.8, 0, 0, 0.5}; + x = 0.3 * safeZoneW + safeZoneX; + y = 0.4 * safezoneH + safeZoneY; + w = 0.4 * safeZoneW; + h = 0.2 * SafeZoneH; + }; + }; + }; + class ACE_EventHandlerHelper: ACE_Rsc_Display_Base { + idd = -1; + class controls { + class CameraView: RscMapControl { + onDraw = "if (cameraView != uiNamespace getVariable 'ACE_EventHandler_CameraMode') then {uiNamespace setVariable ['ACE_EventHandler_CameraMode', cameraView]; {[uiNamespace getVariable 'ACE_EventHandler_CameraMode'] call _x; nil} count ((missionNamespace getVariable 'ACE_EventHandler_CameraMode') select 2);};"; + idc = -1; + w = 0; + h = 0; + }; + }; + }; + class ACE_EventHandlerHelper2: ACE_Rsc_Display_Base { + class controls { + class MapMarkerCreated: RscMapControl { + onDraw = "if (count allMapMarkers != uiNamespace getVariable 'ACE_EventHandler_MapMarker') then {if (count allMapMarkers > uiNamespace getVariable 'ACE_EventHandler_MapMarker') then {{[allMapMarkers select count allMapMarkers - 1] call _x; nil} count ((missionNamespace getVariable 'ACE_EventHandler_MapMarker') select 2);}; uiNamespace setVariable ['ACE_EventHandler_MapMarker', count allMapMarkers];};"; + idc = -1; + w = 0; + h = 0; + }; + }; + }; }; diff --git a/addons/common/MainMenu.hpp b/addons/common/MainMenu.hpp index 12ecb33c2b..d10ff5deda 100644 --- a/addons/common/MainMenu.hpp +++ b/addons/common/MainMenu.hpp @@ -1,103 +1,103 @@ class ACE_Tile_Base { - class Attributes { - font = "PuristaMedium"; - color = "#E5E5E5"; - align = "left"; - shadow = "true"; - }; - class AttributesImage { - font = "PuristaMedium"; - color = "#E5E5E5"; - align = "left"; - }; - class HitZone { - left = 0.0; - top = 0.0; - right = 0.0; - bottom = 0.0; - }; - class ShortcutPos { - left = 0; - top = 0; - w = 0; - h = 0; - }; - class TextPos { - left = 0.01; - top = 0; - right = 0; - bottom = 0; - }; - action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Common_openMenu;"; - animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)"; - animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)"; - animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)"; - animTextureNormal = "#(argb,8,8,3)color(1,1,1,1)"; - animTextureOver = "#(argb,8,8,3)color(1,1,1,1)"; - animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)"; - color2[] = {0,0,0,1}; - color[] = {1,1,1,1}; - //colorBackground2[] = {0.75,0.75,0.75,1}; - //colorBackground[] = {0,0,0,0.8}; - colorBackground[] = {1, 0.647, 0, 0.5}; - colorBackground2[] = {1, 0.647, 0, 0.5}; - colorBackgroundFocused[] = {1, 1, 1, 0}; - colorDisabled[] = {1,1,1,0.25}; - colorFocused[] = {0,0,0,1}; - colorText[] = {1,1,1,1}; - default = 0; - font = "PuristaMedium"; - idc = -1; - period = 1.2; - periodFocus = 1.2; - periodOver = 1.2; - shadow = 0; - shortcuts[] = {}; - size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; - sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; - soundClick[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundClick",0.09,1}; - soundEnter[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEnter",0.09,1}; - soundEscape[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEscape",0.09,1}; - soundPush[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundPush",0.09,1}; - style = "0x02 + 0xC0"; - text = "$STR_ACE_Common_Options"; - textureNoShortcut = "#(argb,8,8,3)color(0,0,0,0)"; - tooltip = ""; - tooltipColorBox[] = {1,1,1,1}; - tooltipColorShade[] = {0,0,0,0.65}; - tooltipColorText[] = {1,1,1,1}; - type = 16; - x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "(0.1 * safezoneH + safezoneY) + 1.2 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + class Attributes { + font = "PuristaMedium"; + color = "#E5E5E5"; + align = "left"; + shadow = "true"; + }; + class AttributesImage { + font = "PuristaMedium"; + color = "#E5E5E5"; + align = "left"; + }; + class HitZone { + left = 0.0; + top = 0.0; + right = 0.0; + bottom = 0.0; + }; + class ShortcutPos { + left = 0; + top = 0; + w = 0; + h = 0; + }; + class TextPos { + left = 0.01; + top = 0; + right = 0; + bottom = 0; + }; + action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Common_openMenu;"; + animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)"; + animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)"; + animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)"; + animTextureNormal = "#(argb,8,8,3)color(1,1,1,1)"; + animTextureOver = "#(argb,8,8,3)color(1,1,1,1)"; + animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)"; + color2[] = {0,0,0,1}; + color[] = {1,1,1,1}; + //colorBackground2[] = {0.75,0.75,0.75,1}; + //colorBackground[] = {0,0,0,0.8}; + colorBackground[] = {1, 0.647, 0, 0.5}; + colorBackground2[] = {1, 0.647, 0, 0.5}; + colorBackgroundFocused[] = {1, 1, 1, 0}; + colorDisabled[] = {1,1,1,0.25}; + colorFocused[] = {0,0,0,1}; + colorText[] = {1,1,1,1}; + default = 0; + font = "PuristaMedium"; + idc = -1; + period = 1.2; + periodFocus = 1.2; + periodOver = 1.2; + shadow = 0; + shortcuts[] = {}; + size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; + sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; + soundClick[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundClick",0.09,1}; + soundEnter[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEnter",0.09,1}; + soundEscape[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEscape",0.09,1}; + soundPush[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundPush",0.09,1}; + style = "0x02 + 0xC0"; + text = "$STR_ACE_Common_Options"; + textureNoShortcut = "#(argb,8,8,3)color(0,0,0,0)"; + tooltip = ""; + tooltipColorBox[] = {1,1,1,1}; + tooltipColorShade[] = {0,0,0,0.65}; + tooltipColorText[] = {1,1,1,1}; + type = 16; + x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; + y = "(0.1 * safezoneH + safezoneY) + 1.2 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)"; + h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; }; class RscStandardDisplay; /*class RscDisplayMain: RscStandardDisplay { - class controls { - class ACE_Tile : ACE_Tile_Base {}; - }; + class controls { + class ACE_Tile : ACE_Tile_Base {}; + }; };*/ class RscDisplayMPInterrupt: RscStandardDisplay { - class controls { - class ACE_Tile : ACE_Tile_Base {}; - }; + class controls { + class ACE_Tile : ACE_Tile_Base {}; + }; }; class RscDisplayInterrupt: RscStandardDisplay { - class controls { - class ACE_Tile : ACE_Tile_Base {}; - }; + class controls { + class ACE_Tile : ACE_Tile_Base {}; + }; }; class RscDisplayInterruptEditor3D: RscStandardDisplay { - class controls { - class ACE_Tile : ACE_Tile_Base {}; - }; + class controls { + class ACE_Tile : ACE_Tile_Base {}; + }; }; class RscDisplayInterruptEditorPreview: RscStandardDisplay { - class controls { - class ACE_Tile : ACE_Tile_Base {}; - }; + class controls { + class ACE_Tile : ACE_Tile_Base {}; + }; }; diff --git a/addons/common/MenuConfig.hpp b/addons/common/MenuConfig.hpp index 0acc081e65..418a7cb849 100644 --- a/addons/common/MenuConfig.hpp +++ b/addons/common/MenuConfig.hpp @@ -4,42 +4,42 @@ #define BORDER 0.1 class ACE_Common_Interactive_Button_Base { - tooltip = ""; - action = ""; + tooltip = ""; + action = ""; - idc = -1; - access = 0; - style = 0; - type = 1; - text = ""; - font = "PuristaMedium"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - shadow = 2; + idc = -1; + access = 0; + style = 0; + type = 1; + text = ""; + font = "PuristaMedium"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + shadow = 2; - x = 0; - y = 0; - w = 0; - h = 0; + x = 0; + y = 0; + w = 0; + h = 0; - offsetX = 0.003; - offsetY = 0.003; - offsetPressedX = 0.002; - offsetPressedY = 0.002; - borderSize = 0; + offsetX = 0.003; + offsetY = 0.003; + offsetPressedX = 0.002; + offsetPressedY = 0.002; + borderSize = 0; - colorText[] = {1,1,1,1}; - colorDisabled[] = {0.5,0.5,0.5,1}; - colorBackground[] = {0,0,0,0.8}; - colorBackgroundDisabled[] = {0,0,0,0.8}; - colorBackgroundActive[] = {1,1,1,0.8}; - colorFocused[] = {0,0,0,0}; - colorShadow[] = {0,0,0,0}; - colorBorder[] = {1,1,1,0.8}; + colorText[] = {1,1,1,1}; + colorDisabled[] = {0.5,0.5,0.5,1}; + colorBackground[] = {0,0,0,0.8}; + colorBackgroundDisabled[] = {0,0,0,0.8}; + colorBackgroundActive[] = {1,1,1,0.8}; + colorFocused[] = {0,0,0,0}; + colorShadow[] = {0,0,0,0}; + colorBorder[] = {1,1,1,0.8}; - soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.09,1}; - soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.09,1}; - soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1}; - soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1}; + soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.09,1}; + soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.09,1}; + soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1}; + soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1}; }; #define HSPACE2 0.05 @@ -47,881 +47,881 @@ class ACE_Common_Interactive_Button_Base { #define BORDER 0.1 class ACE_Common_Text_Button_Base { - idc = 2; - moving = 0; - text = ""; - font = "PuristaMedium"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - lineSpacing = 0; - access = 0; - type = 0; - style = 2 + 0x800; - size = 1; - colorBackground[] = {0,0,0,0.8}; - colorText[] = {1,1,1,1}; - x = 0; - y = 0; - w = 0; - h = 0; + idc = 2; + moving = 0; + text = ""; + font = "PuristaMedium"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + lineSpacing = 0; + access = 0; + type = 0; + style = 2 + 0x800; + size = 1; + colorBackground[] = {0,0,0,0.8}; + colorText[] = {1,1,1,1}; + x = 0; + y = 0; + w = 0; + h = 0; }; class ACE_Common_OptionsMenu_Dialog { - idd = -1; - movingEnable = true; - onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Common_MenuDialog', _dlgMenuDialog];"; - objects[] = {}; - - class controlsBackground { - class Background { - idc = 1; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0 + 0x800; - size = 1; - //colorBackground[] = {0, 0.265, 0, 0.5}; - colorBackground[] = {0, 0, 0, 0.5}; - colorText[] = {0, 0, 0, 0}; - x = HSPACE2 / 2 * safezoneW + safezoneX; - y = VSPACE2 / 2 * safezoneH + safezoneY; - w = (1 - 2 * HSPACE2 / 2) * safezoneW; - h = (1 - 2 * VSPACE2 / 2) * safezoneH; + idd = -1; + movingEnable = true; + onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Common_MenuDialog', _dlgMenuDialog];"; + objects[] = {}; + + class controlsBackground { + class Background { + idc = 1; + moving = 0; + font = "TahomaB"; + text = ""; + sizeEx = 0; + lineSpacing = 0; + access = 0; + type = 0; + style = 0 + 0x800; + size = 1; + //colorBackground[] = {0, 0.265, 0, 0.5}; + colorBackground[] = {0, 0, 0, 0.5}; + colorText[] = {0, 0, 0, 0}; + x = HSPACE2 / 2 * safezoneW + safezoneX; + y = VSPACE2 / 2 * safezoneH + safezoneY; + w = (1 - 2 * HSPACE2 / 2) * safezoneW; + h = (1 - 2 * VSPACE2 / 2) * safezoneH; + }; + + class Header { + idc = 2; + moving = 0; + text = "$STR_ACE_Common_Options"; + font = "PuristaMedium"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + lineSpacing = 0; + access = 0; + type = 0; + style = 1 + 0x800; + size = 1; + //colorBackground[] = {0,0,0,0}; + colorBackground[] = {1, 0.647, 0, 0.5}; + colorText[] = {1,1,1,1}; + x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 0.5 * 0.04) * safezoneH + safezoneY; + w = 4.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class ACE_Logo : ACE_Common_Interactive_Button_Base { + action = "closeDialog 0;"; + type = 0; + style = 48; + onMouseEnter = "hint ('_' + str(_this))"; + tooltip = ""; + text = "";//"\ACE_common\rsc\bwlogo.paa"; + idc = 2; + x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 0.5 * 0.1)) * safezoneW + safezoneX; + y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; + w = 1.0 / 16 * safezoneW; + h = 1.0 / 9 * safezoneH; + }; + }; + + class controls { + class Text_Button0 : ACE_Common_Text_Button_Base { + idc = 100; + style = 0 + 0x800; + x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; + w = 4.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Text_Button1 : Text_Button0 { + idc = 101; + y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button2 : Text_Button0 { + idc = 102; + y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button3 : Text_Button0 { + idc = 103; + y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button4 : Text_Button0 { + idc = 104; + y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button5 : Text_Button0 { + idc = 105; + y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button6 : Text_Button0 { + idc = 106; + y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button7 : Text_Button0 { + idc = 107; + y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button8 : Text_Button0 { + idc = 108; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button9 : Text_Button0 { + idc = 109; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button10 : Text_Button0 { + idc = 110; + y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button11 : Text_Button0 { + idc = 111; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button12 : Text_Button0 { + idc = 112; + y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button13 : Text_Button0 { + idc = 113; + y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button14 : Text_Button0 { + idc = 114; + y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button15 : Text_Button0 { + idc = 115; + y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button16 : Text_Button0 { + idc = 116; + y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button17 : Text_Button0 { + idc = 117; + y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button18 : Text_Button0 { + idc = 118; + y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Button19 : Text_Button0 { + idc = 119; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + }; + + ////////////////////////////////////////////////// + + class Interactive_Button0 : ACE_Common_Interactive_Button_Base { + action = "ACE_Common_keySet = -1; [0] spawn ACE_Common_editKey"; + sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + idc = 200; + style = 2 + 0x800; + x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; + w = 3.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_Button1 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [1] spawn ACE_Common_editKey"; + idc = 201; + y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button2 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [2] spawn ACE_Common_editKey"; + idc = 202; + y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button3 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [3] spawn ACE_Common_editKey"; + idc = 203; + y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button4 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [4] spawn ACE_Common_editKey"; + idc = 204; + y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button5 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [5] spawn ACE_Common_editKey"; + idc = 205; + y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button6 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [6] spawn ACE_Common_editKey"; + idc = 206; + y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button7 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [7] spawn ACE_Common_editKey"; + idc = 207; + y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button8 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [8] spawn ACE_Common_editKey"; + idc = 208; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button9 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [9] spawn ACE_Common_editKey"; + idc = 209; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button10 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [10] spawn ACE_Common_editKey"; + idc = 210; + y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button11 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [11] spawn ACE_Common_editKey"; + idc = 211; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button12 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [12] spawn ACE_Common_editKey"; + idc = 212; + y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button13 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [13] spawn ACE_Common_editKey"; + idc = 213; + y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button14 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [14] spawn ACE_Common_editKey"; + idc = 214; + y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button15 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [15] spawn ACE_Common_editKey"; + idc = 215; + y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button16 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [16] spawn ACE_Common_editKey"; + idc = 216; + y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button17 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [17] spawn ACE_Common_editKey"; + idc = 217; + y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button18 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [18] spawn ACE_Common_editKey"; + idc = 218; + y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Button19 : Interactive_Button0 { + action = "ACE_Common_keySet = -1; [19] spawn ACE_Common_editKey"; + idc = 219; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + }; + + ////////////////////////////////////////////////// + + class Interactive_Checkbox0 : Text_Button0 { + action = "hint '0'"; + idc = 300; + //type = 0; + style = 48; + text = PATHTOF(UI\box_unchecked_ca.paa); + colorBackground[] = {0, 0, 0, 0}; + colorText[] = {1, 1, 1, 1}; + x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; + w = 0.3 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_Checkbox1 : Interactive_Checkbox0 { + action = ""; + idc = 301; + y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox2 : Interactive_Checkbox0 { + action = ""; + idc = 302; + y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox3 : Interactive_Checkbox0 { + action = ""; + idc = 303; + y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox4 : Interactive_Checkbox0 { + action = ""; + idc = 304; + y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox5 : Interactive_Checkbox0 { + action = ""; + idc = 305; + y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox6 : Interactive_Checkbox0 { + action = ""; + idc = 306; + y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox7 : Interactive_Checkbox0 { + action = ""; + idc = 307; + y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox8 : Interactive_Checkbox0 { + action = ""; + idc = 308; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox9 : Interactive_Checkbox0 { + action = ""; + idc = 309; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox10 : Interactive_Checkbox0 { + action = ""; + idc = 310; + y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox11 : Interactive_Checkbox0 { + action = ""; + idc = 311; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox12 : Interactive_Checkbox0 { + action = ""; + idc = 312; + y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox13 : Interactive_Checkbox0 { + action = ""; + idc = 313; + y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox14 : Interactive_Checkbox0 { + action = ""; + idc = 314; + y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox15 : Interactive_Checkbox0 { + action = ""; + idc = 315; + y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox16 : Interactive_Checkbox0 { + action = ""; + idc = 316; + y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox17 : Interactive_Checkbox0 { + action = ""; + idc = 317; + y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox18 : Interactive_Checkbox0 { + action = ""; + idc = 318; + y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_Checkbox19 : Interactive_Checkbox0 { + action = ""; + idc = 319; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + }; + + ////////////////////////////////////////////////// + + class Text_Checkbox0 : Text_Button0 { + idc = 400; + x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; + w = 4.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Text_Checkbox1 : Text_Checkbox0 { + idc = 401; + y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox2 : Text_Checkbox0 { + idc = 402; + y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox3 : Text_Checkbox0 { + idc = 403; + y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox4 : Text_Checkbox0 { + idc = 404; + y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox5 : Text_Checkbox0 { + idc = 405; + y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox6 : Text_Checkbox0 { + idc = 406; + y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox7 : Text_Checkbox0 { + idc = 407; + y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox8 : Text_Checkbox0 { + idc = 408; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox9 : Text_Checkbox0 { + idc = 409; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox10 : Text_Checkbox0 { + idc = 410; + y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox11 : Text_Checkbox0 { + idc = 411; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox12 : Text_Checkbox0 { + idc = 412; + y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox13 : Text_Checkbox0 { + idc = 413; + y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox14 : Text_Checkbox0 { + idc = 414; + y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox15 : Text_Checkbox0 { + idc = 415; + y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox16 : Text_Checkbox0 { + idc = 416; + y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox17 : Text_Checkbox0 { + idc = 417; + y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox18 : Text_Checkbox0 { + idc = 418; + y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; + }; + + class Text_Checkbox19 : Text_Checkbox0 { + idc = 419; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + }; + + ////////////////////////////////////////////////// + + class Interactive_CheckboxButton0 : ACE_Common_Interactive_Button_Base { + action = "[0] call ACE_Common_toggleState"; + idc = 500; + colorBackground[] = {0, 0, 0, 0}; + colorBackgroundActive[] = {0, 0, 0, 0}; + colorText[] = {1, 1, 1, 1}; + x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; + w = 0.3 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_CheckboxButton1 : Interactive_CheckboxButton0 { + action = "[1] call ACE_Common_toggleState"; + idc = 501; + y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton2 : Interactive_CheckboxButton0 { + action = "[2] call ACE_Common_toggleState"; + idc = 502; + y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton3 : Interactive_CheckboxButton0 { + action = "[3] call ACE_Common_toggleState"; + idc = 503; + y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton4 : Interactive_CheckboxButton0 { + action = "[4] call ACE_Common_toggleState"; + idc = 504; + y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton5 : Interactive_CheckboxButton0 { + action = "[5] call ACE_Common_toggleState"; + idc = 505; + y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton6 : Interactive_CheckboxButton0 { + action = "[6] call ACE_Common_toggleState"; + idc = 506; + y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton7 : Interactive_CheckboxButton0 { + action = "[7] call ACE_Common_toggleState"; + idc = 507; + y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton8 : Interactive_CheckboxButton0 { + action = "[8] call ACE_Common_toggleState"; + idc = 508; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton9 : Interactive_CheckboxButton0 { + action = "[9] call ACE_Common_toggleState"; + idc = 509; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton10 : Interactive_CheckboxButton0 { + action = "[10] call ACE_Common_toggleState"; + idc = 510; + y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton11 : Interactive_CheckboxButton0 { + action = "[11] call ACE_Common_toggleState"; + idc = 511; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton12 : Interactive_CheckboxButton0 { + action = "[12] call ACE_Common_toggleState"; + idc = 512; + y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton13 : Interactive_CheckboxButton0 { + action = "[13] call ACE_Common_toggleState"; + idc = 513; + y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton14 : Interactive_CheckboxButton0 { + action = "[14] call ACE_Common_toggleState"; + idc = 514; + y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton15 : Interactive_CheckboxButton0 { + action = "[15] call ACE_Common_toggleState"; + idc = 515; + y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton16 : Interactive_CheckboxButton0 { + action = "[16] call ACE_Common_toggleState"; + idc = 516; + y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton17 : Interactive_CheckboxButton0 { + action = "[17] call ACE_Common_toggleState"; + idc = 517; + y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton18 : Interactive_CheckboxButton0 { + action = "[18] call ACE_Common_toggleState"; + idc = 518; + y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; + }; + + class Interactive_CheckboxButton19 : Interactive_CheckboxButton0 { + action = "[19] call ACE_Common_toggleState"; + idc = 519; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + }; + + ////////////////////////////////////////////////// + + class TextBox_KeyChange : Text_Button0 { + text = ""; + idc = 20; + style = 2 + 0x800; + x = (6 * 0.1) * safezoneW + safezoneX; + y = (8 * 0.04) * safezoneH + safezoneY; + w = (6.0 / 16 - HSPACE2 / 2) * safezoneW; + h = (3.0 / 9 - VSPACE2 / 2) * safezoneH; + }; + + /*class TextBox_Key_Shift : TextBox_KeyChange { + text = "$STR_ACE_Common_Shift"; + idc = 21; + colorText[] = {0.25,0.25,0.25,1}; + colorBackground[] = {0,0,0,0}; + x = (3 / 4 * HSPACE2 + 5.75 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + w = 2.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class TextBox_Key_Control : TextBox_Key_Shift { + text = "$STR_ACE_Common_Ctrl"; + idc = 22; + x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key_Alt : TextBox_Key_Shift { + text = "$STR_ACE_Common_Alt"; + idc = 23; + x = (3 / 4 * HSPACE2 + 7.75 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + };*/ + + class TextBox_Key_Shift : Interactive_Button0 { + action = "ACE_Common_keyNewTemp = [42, [false, false, false], 42];"; + text = "$STR_ACE_Common_Shift"; + sizeEx = "0.7 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + idc = 21; + colorText[] = {1,1,1,1}; + colorBackground[] = {0,0,0,0}; + x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + w = 1.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class TextBox_Key_Control : TextBox_Key_Shift { + action = "ACE_Common_keyNewTemp = [29, [false, false, false], 29];"; + text = "$STR_ACE_Common_Ctrl"; + idc = 22; + x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key_Alt : TextBox_Key_Shift { + action = "ACE_Common_keyNewTemp = [56, [false, false, false], 56];"; + text = "$STR_ACE_Common_Alt"; + idc = 23; + x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key_Shift_Right : TextBox_Key_Shift { + action = "ACE_Common_keyNewTemp = [54, [false, false, false], 54];"; + text = "$STR_ACE_Common_Shift_Right"; + idc = 27; + x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key_Control_Right : TextBox_Key_Shift { + action = "ACE_Common_keyNewTemp = [157, [false, false, false], 157];"; + text = "$STR_ACE_Common_Ctrl_Right"; + idc = 28; + x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key_Alt_Right : TextBox_Key_Shift { + action = "ACE_Common_keyNewTemp = [184, [false, false, false], 184];"; + text = "$STR_ACE_Common_Alt_Right"; + idc = 29; + x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Action : TextBox_KeyChange { + text = ""; + idc = 30; + colorText[] = {1,1,1,1}; + colorBackground[] = {0,0,0,0}; + sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; + w = 2.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class TextBox_Key_Default : TextBox_Key_Shift { + action = "call ACE_Common_keysetDefault"; + text = "$STR_ACE_Common_KeyDefault"; + idc = 31; + x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key_None : TextBox_Key_Shift { + action = "ACE_Common_keyNewTemp = [0, [false, false, false], 0];"; + text = "$STR_ACE_Common_KeyNone"; + idc = 32; + x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; + }; + + class TextBox_Key : TextBox_KeyChange { + text = ""; + idc = 24; + colorText[] = {1,1,1,1}; + colorBackground[] = {0,0,0,0}; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + x = (3 / 4 * HSPACE2 + 6.75 * 0.1 - 2.0 / 16) * safezoneW + safezoneX; + y = (VSPACE2 + 8.5 * 0.04) * safezoneH + safezoneY; + w = 6.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_ButtonV : Interactive_Button0 { + action = "ACE_Common_keySet = 1"; + text = "$STR_ACE_Common_Save"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + idc = 25; + colorBackground[] = {0,0,0,0}; + x = (HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + w = 2.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_ButtonW : Interactive_ButtonV { + action = "ACE_Common_keySet = -1"; + text = "$STR_ACE_Common_Cancel"; + idc = 26; + x = (HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; + w = 2.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_ButtonX : Interactive_Button0 { + action = "ACE_Common_keySave = 1; closeDialog 0"; + text = "$STR_ACE_Common_Save"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + idc = 10; + x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 2.5 * 0.1)) * safezoneW + safezoneX; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + w = 2.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_ButtonY : Interactive_Button0 { + action = "ACE_Common_keySave = -1; closeDialog 0"; + text = "$STR_ACE_Common_Cancel"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + idc = 11; + x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 1 * 0.1)) * safezoneW + safezoneX; + y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; + w = 2.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_ButtonA : ACE_Common_Interactive_Button_Base { + action = "false call ACE_Common_nextKeys"; + text = "$STR_ACE_Common_Prev"; + idc = 12; + style = 2 + 0x800; + x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; + y = (VSPACE2 + 0.5 * 0.04) * safezoneH + safezoneY; + w = 1.0 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; + + class Interactive_ButtonB : Interactive_ButtonA { + action = "true call ACE_Common_nextKeys"; + text = "$STR_ACE_Common_Next"; + idc = 13; + x = (HSPACE2 + 3 * 0.1 + 2.0 / 16) * safezoneW + safezoneX; + }; + + class Interactive_ButtonC : ACE_Common_Text_Button_Base { + text = ""; + idc = 14; + style = 2 + 0x800; + x = (HSPACE2 + 3 * 0.1 + 1.25 / 16) * safezoneW + safezoneX; + y = (VSPACE2 + 0.5 * 0.04) * safezoneH + safezoneY; + w = 0.5 / 16 * safezoneW; + h = 0.3 / 9 * safezoneH; + }; }; - - class Header { - idc = 2; - moving = 0; - text = "$STR_ACE_Common_Options"; - font = "PuristaMedium"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - lineSpacing = 0; - access = 0; - type = 0; - style = 1 + 0x800; - size = 1; - //colorBackground[] = {0,0,0,0}; - colorBackground[] = {1, 0.647, 0, 0.5}; - colorText[] = {1,1,1,1}; - x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 0.5 * 0.04) * safezoneH + safezoneY; - w = 4.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class ACE_Logo : ACE_Common_Interactive_Button_Base { - action = "closeDialog 0;"; - type = 0; - style = 48; - onMouseEnter = "hint ('_' + str(_this))"; - tooltip = ""; - text = "";//"\ACE_common\rsc\bwlogo.paa"; - idc = 2; - x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 0.5 * 0.1)) * safezoneW + safezoneX; - y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; - w = 1.0 / 16 * safezoneW; - h = 1.0 / 9 * safezoneH; - }; - }; - - class controls { - class Text_Button0 : ACE_Common_Text_Button_Base { - idc = 100; - style = 0 + 0x800; - x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; - w = 4.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Text_Button1 : Text_Button0 { - idc = 101; - y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button2 : Text_Button0 { - idc = 102; - y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button3 : Text_Button0 { - idc = 103; - y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button4 : Text_Button0 { - idc = 104; - y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button5 : Text_Button0 { - idc = 105; - y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button6 : Text_Button0 { - idc = 106; - y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button7 : Text_Button0 { - idc = 107; - y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button8 : Text_Button0 { - idc = 108; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button9 : Text_Button0 { - idc = 109; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button10 : Text_Button0 { - idc = 110; - y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button11 : Text_Button0 { - idc = 111; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button12 : Text_Button0 { - idc = 112; - y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button13 : Text_Button0 { - idc = 113; - y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button14 : Text_Button0 { - idc = 114; - y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button15 : Text_Button0 { - idc = 115; - y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button16 : Text_Button0 { - idc = 116; - y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button17 : Text_Button0 { - idc = 117; - y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button18 : Text_Button0 { - idc = 118; - y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Button19 : Text_Button0 { - idc = 119; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - }; - - ////////////////////////////////////////////////// - - class Interactive_Button0 : ACE_Common_Interactive_Button_Base { - action = "ACE_Common_keySet = -1; [0] spawn ACE_Common_editKey"; - sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - idc = 200; - style = 2 + 0x800; - x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; - w = 3.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_Button1 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [1] spawn ACE_Common_editKey"; - idc = 201; - y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button2 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [2] spawn ACE_Common_editKey"; - idc = 202; - y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button3 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [3] spawn ACE_Common_editKey"; - idc = 203; - y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button4 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [4] spawn ACE_Common_editKey"; - idc = 204; - y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button5 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [5] spawn ACE_Common_editKey"; - idc = 205; - y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button6 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [6] spawn ACE_Common_editKey"; - idc = 206; - y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button7 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [7] spawn ACE_Common_editKey"; - idc = 207; - y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button8 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [8] spawn ACE_Common_editKey"; - idc = 208; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button9 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [9] spawn ACE_Common_editKey"; - idc = 209; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button10 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [10] spawn ACE_Common_editKey"; - idc = 210; - y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button11 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [11] spawn ACE_Common_editKey"; - idc = 211; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button12 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [12] spawn ACE_Common_editKey"; - idc = 212; - y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button13 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [13] spawn ACE_Common_editKey"; - idc = 213; - y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button14 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [14] spawn ACE_Common_editKey"; - idc = 214; - y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button15 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [15] spawn ACE_Common_editKey"; - idc = 215; - y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button16 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [16] spawn ACE_Common_editKey"; - idc = 216; - y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button17 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [17] spawn ACE_Common_editKey"; - idc = 217; - y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button18 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [18] spawn ACE_Common_editKey"; - idc = 218; - y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Button19 : Interactive_Button0 { - action = "ACE_Common_keySet = -1; [19] spawn ACE_Common_editKey"; - idc = 219; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - }; - - ////////////////////////////////////////////////// - - class Interactive_Checkbox0 : Text_Button0 { - action = "hint '0'"; - idc = 300; - //type = 0; - style = 48; - text = PATHTOF(UI\box_unchecked_ca.paa); - colorBackground[] = {0, 0, 0, 0}; - colorText[] = {1, 1, 1, 1}; - x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; - w = 0.3 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_Checkbox1 : Interactive_Checkbox0 { - action = ""; - idc = 301; - y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox2 : Interactive_Checkbox0 { - action = ""; - idc = 302; - y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox3 : Interactive_Checkbox0 { - action = ""; - idc = 303; - y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox4 : Interactive_Checkbox0 { - action = ""; - idc = 304; - y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox5 : Interactive_Checkbox0 { - action = ""; - idc = 305; - y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox6 : Interactive_Checkbox0 { - action = ""; - idc = 306; - y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox7 : Interactive_Checkbox0 { - action = ""; - idc = 307; - y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox8 : Interactive_Checkbox0 { - action = ""; - idc = 308; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox9 : Interactive_Checkbox0 { - action = ""; - idc = 309; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox10 : Interactive_Checkbox0 { - action = ""; - idc = 310; - y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox11 : Interactive_Checkbox0 { - action = ""; - idc = 311; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox12 : Interactive_Checkbox0 { - action = ""; - idc = 312; - y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox13 : Interactive_Checkbox0 { - action = ""; - idc = 313; - y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox14 : Interactive_Checkbox0 { - action = ""; - idc = 314; - y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox15 : Interactive_Checkbox0 { - action = ""; - idc = 315; - y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox16 : Interactive_Checkbox0 { - action = ""; - idc = 316; - y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox17 : Interactive_Checkbox0 { - action = ""; - idc = 317; - y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox18 : Interactive_Checkbox0 { - action = ""; - idc = 318; - y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_Checkbox19 : Interactive_Checkbox0 { - action = ""; - idc = 319; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - }; - - ////////////////////////////////////////////////// - - class Text_Checkbox0 : Text_Button0 { - idc = 400; - x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; - w = 4.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Text_Checkbox1 : Text_Checkbox0 { - idc = 401; - y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox2 : Text_Checkbox0 { - idc = 402; - y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox3 : Text_Checkbox0 { - idc = 403; - y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox4 : Text_Checkbox0 { - idc = 404; - y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox5 : Text_Checkbox0 { - idc = 405; - y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox6 : Text_Checkbox0 { - idc = 406; - y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox7 : Text_Checkbox0 { - idc = 407; - y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox8 : Text_Checkbox0 { - idc = 408; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox9 : Text_Checkbox0 { - idc = 409; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox10 : Text_Checkbox0 { - idc = 410; - y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox11 : Text_Checkbox0 { - idc = 411; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox12 : Text_Checkbox0 { - idc = 412; - y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox13 : Text_Checkbox0 { - idc = 413; - y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox14 : Text_Checkbox0 { - idc = 414; - y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox15 : Text_Checkbox0 { - idc = 415; - y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox16 : Text_Checkbox0 { - idc = 416; - y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox17 : Text_Checkbox0 { - idc = 417; - y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox18 : Text_Checkbox0 { - idc = 418; - y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; - }; - - class Text_Checkbox19 : Text_Checkbox0 { - idc = 419; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - }; - - ////////////////////////////////////////////////// - - class Interactive_CheckboxButton0 : ACE_Common_Interactive_Button_Base { - action = "[0] call ACE_Common_toggleState"; - idc = 500; - colorBackground[] = {0, 0, 0, 0}; - colorBackgroundActive[] = {0, 0, 0, 0}; - colorText[] = {1, 1, 1, 1}; - x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY; - w = 0.3 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_CheckboxButton1 : Interactive_CheckboxButton0 { - action = "[1] call ACE_Common_toggleState"; - idc = 501; - y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton2 : Interactive_CheckboxButton0 { - action = "[2] call ACE_Common_toggleState"; - idc = 502; - y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton3 : Interactive_CheckboxButton0 { - action = "[3] call ACE_Common_toggleState"; - idc = 503; - y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton4 : Interactive_CheckboxButton0 { - action = "[4] call ACE_Common_toggleState"; - idc = 504; - y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton5 : Interactive_CheckboxButton0 { - action = "[5] call ACE_Common_toggleState"; - idc = 505; - y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton6 : Interactive_CheckboxButton0 { - action = "[6] call ACE_Common_toggleState"; - idc = 506; - y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton7 : Interactive_CheckboxButton0 { - action = "[7] call ACE_Common_toggleState"; - idc = 507; - y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton8 : Interactive_CheckboxButton0 { - action = "[8] call ACE_Common_toggleState"; - idc = 508; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton9 : Interactive_CheckboxButton0 { - action = "[9] call ACE_Common_toggleState"; - idc = 509; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton10 : Interactive_CheckboxButton0 { - action = "[10] call ACE_Common_toggleState"; - idc = 510; - y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton11 : Interactive_CheckboxButton0 { - action = "[11] call ACE_Common_toggleState"; - idc = 511; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton12 : Interactive_CheckboxButton0 { - action = "[12] call ACE_Common_toggleState"; - idc = 512; - y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton13 : Interactive_CheckboxButton0 { - action = "[13] call ACE_Common_toggleState"; - idc = 513; - y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton14 : Interactive_CheckboxButton0 { - action = "[14] call ACE_Common_toggleState"; - idc = 514; - y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton15 : Interactive_CheckboxButton0 { - action = "[15] call ACE_Common_toggleState"; - idc = 515; - y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton16 : Interactive_CheckboxButton0 { - action = "[16] call ACE_Common_toggleState"; - idc = 516; - y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton17 : Interactive_CheckboxButton0 { - action = "[17] call ACE_Common_toggleState"; - idc = 517; - y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton18 : Interactive_CheckboxButton0 { - action = "[18] call ACE_Common_toggleState"; - idc = 518; - y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; - }; - - class Interactive_CheckboxButton19 : Interactive_CheckboxButton0 { - action = "[19] call ACE_Common_toggleState"; - idc = 519; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - }; - - ////////////////////////////////////////////////// - - class TextBox_KeyChange : Text_Button0 { - text = ""; - idc = 20; - style = 2 + 0x800; - x = (6 * 0.1) * safezoneW + safezoneX; - y = (8 * 0.04) * safezoneH + safezoneY; - w = (6.0 / 16 - HSPACE2 / 2) * safezoneW; - h = (3.0 / 9 - VSPACE2 / 2) * safezoneH; - }; - - /*class TextBox_Key_Shift : TextBox_KeyChange { - text = "$STR_ACE_Common_Shift"; - idc = 21; - colorText[] = {0.25,0.25,0.25,1}; - colorBackground[] = {0,0,0,0}; - x = (3 / 4 * HSPACE2 + 5.75 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class TextBox_Key_Control : TextBox_Key_Shift { - text = "$STR_ACE_Common_Ctrl"; - idc = 22; - x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key_Alt : TextBox_Key_Shift { - text = "$STR_ACE_Common_Alt"; - idc = 23; - x = (3 / 4 * HSPACE2 + 7.75 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - };*/ - - class TextBox_Key_Shift : Interactive_Button0 { - action = "ACE_Common_keyNewTemp = [42, [false, false, false], 42];"; - text = "$STR_ACE_Common_Shift"; - sizeEx = "0.7 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - idc = 21; - colorText[] = {1,1,1,1}; - colorBackground[] = {0,0,0,0}; - x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - w = 1.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class TextBox_Key_Control : TextBox_Key_Shift { - action = "ACE_Common_keyNewTemp = [29, [false, false, false], 29];"; - text = "$STR_ACE_Common_Ctrl"; - idc = 22; - x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key_Alt : TextBox_Key_Shift { - action = "ACE_Common_keyNewTemp = [56, [false, false, false], 56];"; - text = "$STR_ACE_Common_Alt"; - idc = 23; - x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key_Shift_Right : TextBox_Key_Shift { - action = "ACE_Common_keyNewTemp = [54, [false, false, false], 54];"; - text = "$STR_ACE_Common_Shift_Right"; - idc = 27; - x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key_Control_Right : TextBox_Key_Shift { - action = "ACE_Common_keyNewTemp = [157, [false, false, false], 157];"; - text = "$STR_ACE_Common_Ctrl_Right"; - idc = 28; - x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key_Alt_Right : TextBox_Key_Shift { - action = "ACE_Common_keyNewTemp = [184, [false, false, false], 184];"; - text = "$STR_ACE_Common_Alt_Right"; - idc = 29; - x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Action : TextBox_KeyChange { - text = ""; - idc = 30; - colorText[] = {1,1,1,1}; - colorBackground[] = {0,0,0,0}; - sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class TextBox_Key_Default : TextBox_Key_Shift { - action = "call ACE_Common_keysetDefault"; - text = "$STR_ACE_Common_KeyDefault"; - idc = 31; - x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key_None : TextBox_Key_Shift { - action = "ACE_Common_keyNewTemp = [0, [false, false, false], 0];"; - text = "$STR_ACE_Common_KeyNone"; - idc = 32; - x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; - }; - - class TextBox_Key : TextBox_KeyChange { - text = ""; - idc = 24; - colorText[] = {1,1,1,1}; - colorBackground[] = {0,0,0,0}; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - x = (3 / 4 * HSPACE2 + 6.75 * 0.1 - 2.0 / 16) * safezoneW + safezoneX; - y = (VSPACE2 + 8.5 * 0.04) * safezoneH + safezoneY; - w = 6.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_ButtonV : Interactive_Button0 { - action = "ACE_Common_keySet = 1"; - text = "$STR_ACE_Common_Save"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - idc = 25; - colorBackground[] = {0,0,0,0}; - x = (HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_ButtonW : Interactive_ButtonV { - action = "ACE_Common_keySet = -1"; - text = "$STR_ACE_Common_Cancel"; - idc = 26; - x = (HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_ButtonX : Interactive_Button0 { - action = "ACE_Common_keySave = 1; closeDialog 0"; - text = "$STR_ACE_Common_Save"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - idc = 10; - x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 2.5 * 0.1)) * safezoneW + safezoneX; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_ButtonY : Interactive_Button0 { - action = "ACE_Common_keySave = -1; closeDialog 0"; - text = "$STR_ACE_Common_Cancel"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - idc = 11; - x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 1 * 0.1)) * safezoneW + safezoneX; - y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_ButtonA : ACE_Common_Interactive_Button_Base { - action = "false call ACE_Common_nextKeys"; - text = "$STR_ACE_Common_Prev"; - idc = 12; - style = 2 + 0x800; - x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; - y = (VSPACE2 + 0.5 * 0.04) * safezoneH + safezoneY; - w = 1.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - - class Interactive_ButtonB : Interactive_ButtonA { - action = "true call ACE_Common_nextKeys"; - text = "$STR_ACE_Common_Next"; - idc = 13; - x = (HSPACE2 + 3 * 0.1 + 2.0 / 16) * safezoneW + safezoneX; - }; - - class Interactive_ButtonC : ACE_Common_Text_Button_Base { - text = ""; - idc = 14; - style = 2 + 0x800; - x = (HSPACE2 + 3 * 0.1 + 1.25 / 16) * safezoneW + safezoneX; - y = (VSPACE2 + 0.5 * 0.04) * safezoneH + safezoneY; - w = 0.5 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; - }; - }; }; diff --git a/addons/common/NoVoice.hpp b/addons/common/NoVoice.hpp index adfc674707..a34e30c08e 100644 --- a/addons/common/NoVoice.hpp +++ b/addons/common/NoVoice.hpp @@ -1,227 +1,228 @@ class RadioProtocolBase { - class Words; + class Words; }; + class ACE_RadioProtocolNoRadio: RadioProtocolBase { - class CuratorWaypointPlaced; - class CuratorWaypointPlacedAttack; - class CuratorObjectPlaced; - class curatorObjectDestroyed; - class curatorModuleCAS; - class SentFireNoTarget_1; - class SentSupportRequestRGCASBombing; - class SentNoTargetDefault; - class SentEngageNoTargetDefault; - class SentFireNoTargetDefault; - class SentAttackNoTargetDefault; - class SentEnemyDetectedMedium; - class SentEnemyDetectedLong; - class SentEnemyDetectedDangerClose; - class SentEnemyDetectedClose; - class SentEnemyDetectedVeryLong; - class SentIsLeaderDefault; - class SentCommandCompletedDefault; - class SentFireReadyDefault; - class SentCommandFailedDefault; - class SentDestinationUnreacheableDefault; - class SentObjectDestroyedDefault; - class SentObjectDestroyedUnknownDefault; - class SentClearDefault; - class SentRepeatCommandDefault; - class SentWhereAreYouDefault; - class SentReportStatusDefault; - class SentNotifyAttackDefault; - class SentNotifyAttackSubgroupDefault; - class SentConfirmMoveDefault; - class SentConfirmAttackDefault; - class SentConfirmOtherDefault; - class SentUnitKilledDefault; - class SentHealthCriticalDefault; - class SentHealthNormalDefault; - class SentReturnToFormationDefault; - class SentLooseFormationDefault; - class SentCmdFollowMeDefault; - class SelectCmdMoveSentenceClose; - class SelectCmdMoveSentenceVeryClose; - class SelectCmdMoveSentenceFar; - class SentEnemyDetectedMediumStealth; - class SentSupportConfirmDefault; - class SelectCmdMoveSentenceClose_1; - class SelectCmdMoveSentenceVeryClose_1; - class SelectCmdMoveSentenceFar_1; - class SentSupportRequestRGCASHelicopter; - class SentSupportRequestRGSupplyDrop; - class SentSupportRequestRGUAV; - class SentSupportRequestRGArty; - class SentSupportRequestRGTransport; - class SentRequestAcknowledgedSGCASBombing; - class SentRequestAcknowledgedSGCASHelicopter; - class SentRequestAcknowledgedSGSupplyDrop; - class SentRequestAcknowledgedSGUAV; - class SentRequestAcknowledgedSGArty; - class SentRequestAcknowledgedTransport; - class SentUnitDestroyedHQCASBombing; - class SentUnitDestroyedHQCASHelicopter; - class SentUnitDestroyedHQSupplyDrop; - class SentUnitDestroyedHQUAV; - class SentUnitDestroyedHQArty; - class SentUnitDestroyedHQTransport; - class SentRequestAccomplishedSGCASBombing; - class SentRequestAccomplishedSGCASHelicopter; - class SentRequestAccomplishedSGSupplyDrop; - class SentRequestAccomplishedSGUAV; - class SentRequestAccomplishedSGArty; - class SentRequestAccomplishedSGTransport; - class SentSupportAddedDuringMission; - class SentArtySGSupportRoundsComplete; - class SentTransportSGWelcomeAboard; - class SentTransportSGLZCoordinatesSelected; - class SelectCmdMoveSentenceLocation; - class SelectCmdMoveSentenceMedium; - class SentEnemyDetectedLongStealth; - class SentEnemyDetectedDangerCloseStealth; - class SentEnemyDetectedCloseStealth; - class SentEnemyDetectedVeryLongStealth; - class SentEngageDefault; - class SelectCmdMoveSentenceLocation_1; - class SelectCmdMoveSentenceMedium_1; - class SentBehaviourSafeDefault; - class SentBehaviourAwareDefault; - class SentBehaviourCombatDefault; - class SentOpenFireDefault; - class SentCeaseFireInsideGroupDefault; - class SentCeaseFireDefault; - class SentEngageStealth; - class SentFireNoTargetStealth; - class SentAttackNoTargetStealth; - class SentNoTargetStealth; - class SentEngageNoTargetStealth; - class SelectCmdMoveSentenceCloseStealth; - class SelectCmdMoveSentenceVeryCloseStealth; - class SelectCmdMoveSentenceFarStealth; - class SelectCmdMoveSentenceLocationStealth; - class SelectCmdMoveSentenceMediumStealth; - class SentReturnToFormationStealth; - class SentLooseFormationStealth; - class SentCmdFollowMeStealth; - class SentOpenFireStealth; - class SentCeaseFireInsideGroupStealth; - class SentBehaviourSafeStealth; - class SentBehaviourAwareStealth; - class SentBehaviourCombatStealth; - class SentSupportConfirmStealth; - class SentCommandFailedStealth; - class SentObjectDestroyedStealth; - class SentObjectDestroyedUnknownStealth; - class SentCommandCompletedStealth; - class SentFireReadyStealth; - class SentIsLeaderStealth; - class SentDestinationUnreacheableStealth; - class SentClearStealth; - class SentRepeatCommandStealth; - class SentWhereAreYouStealth; - class SentReportStatusStealth; - class SentNotifyAttackStealth; - class SentNotifyAttackSubgroupStealth; - class SentConfirmMoveStealth; - class SentConfirmAttackStealth; - class SentConfirmOtherStealth; - class SentUnitKilledStealth; - class SentHealthCriticalStealth; - class SentHealthNormalStealth; - class SentGenReinforcementsConfirmed; - class SentGenReinforcementsRejected; - class SentGenReinforcementsArrived; - class SentGenLeavingAO; - class SentGenTime; - class SentGenLosing; - class SentGenLost; - class SentGenComplete; - class SentGenCmdSeize; - class SentGenCmdDefend; - class SentGenCmdRTB; - class SentGenCmdTargetNeutralize; - class SentGenCmdTargetProtect; - class SentGenCmdTargetEscort; - class SentGenCmdTargetFind; - class SentGenIncoming; - class SentGenBaseUnlockRespawn; - class SentGenBaseUnlockVehicle; - class SentGenBaseSideFriendlyWEST; - class SentFXBreathingSlow; - class SentFXBreathingFast; - class SentFXHit; - class SentFXDeath; - class SentFXHurt; - class SentFXEffort; - class SentFXDrowning; - class SentCeaseFireDefault_1; - class SentGenBaseSideFriendlyEAST; - class SentGenBaseSideFriendlyGUER; - class SentGenBaseSideEnemyWEST; - class SentGenBaseSideEnemyEAST; - class SentGenBaseSideEnemyGUER; - class SentTargetDefault; - class SentTargetStealth; - class Dummy; - class Words: Words { - grid_zero[] = {}; - grid_one[] = {}; - grid_two[] = {}; - grid_three[] = {}; - grid_four[] = {}; - grid_five[] = {}; - grid_six[] = {}; - grid_seven[] = {}; - grid_eight[] = {}; - grid_nine[] = {}; - grid_zero_2[] = {}; - grid_one_2[] = {}; - grid_two_2[] = {}; - grid_three_2[] = {}; - grid_four_2[] = {}; - grid_five_2[] = {}; - grid_six_2[] = {}; - grid_seven_2[] = {}; - grid_eight_2[] = {}; - grid_nine_2[] = {}; - grid_zero_3[] = {}; - grid_one_3[] = {}; - grid_two_3[] = {}; - grid_three_3[] = {}; - grid_four_3[] = {}; - grid_five_3[] = {}; - grid_six_3[] = {}; - grid_seven_3[] = {}; - grid_eight_3[] = {}; - grid_nine_3[] = {}; - Ready[] = {}; - Waiting[] = {}; - StandingBy[] = {}; - /*IAmReady[] = {}; - ReadyForOrders[] = {}; - AwaitingOrders[] = {};*/ - }; + class CuratorWaypointPlaced; + class CuratorWaypointPlacedAttack; + class CuratorObjectPlaced; + class curatorObjectDestroyed; + class curatorModuleCAS; + class SentFireNoTarget_1; + class SentSupportRequestRGCASBombing; + class SentNoTargetDefault; + class SentEngageNoTargetDefault; + class SentFireNoTargetDefault; + class SentAttackNoTargetDefault; + class SentEnemyDetectedMedium; + class SentEnemyDetectedLong; + class SentEnemyDetectedDangerClose; + class SentEnemyDetectedClose; + class SentEnemyDetectedVeryLong; + class SentIsLeaderDefault; + class SentCommandCompletedDefault; + class SentFireReadyDefault; + class SentCommandFailedDefault; + class SentDestinationUnreacheableDefault; + class SentObjectDestroyedDefault; + class SentObjectDestroyedUnknownDefault; + class SentClearDefault; + class SentRepeatCommandDefault; + class SentWhereAreYouDefault; + class SentReportStatusDefault; + class SentNotifyAttackDefault; + class SentNotifyAttackSubgroupDefault; + class SentConfirmMoveDefault; + class SentConfirmAttackDefault; + class SentConfirmOtherDefault; + class SentUnitKilledDefault; + class SentHealthCriticalDefault; + class SentHealthNormalDefault; + class SentReturnToFormationDefault; + class SentLooseFormationDefault; + class SentCmdFollowMeDefault; + class SelectCmdMoveSentenceClose; + class SelectCmdMoveSentenceVeryClose; + class SelectCmdMoveSentenceFar; + class SentEnemyDetectedMediumStealth; + class SentSupportConfirmDefault; + class SelectCmdMoveSentenceClose_1; + class SelectCmdMoveSentenceVeryClose_1; + class SelectCmdMoveSentenceFar_1; + class SentSupportRequestRGCASHelicopter; + class SentSupportRequestRGSupplyDrop; + class SentSupportRequestRGUAV; + class SentSupportRequestRGArty; + class SentSupportRequestRGTransport; + class SentRequestAcknowledgedSGCASBombing; + class SentRequestAcknowledgedSGCASHelicopter; + class SentRequestAcknowledgedSGSupplyDrop; + class SentRequestAcknowledgedSGUAV; + class SentRequestAcknowledgedSGArty; + class SentRequestAcknowledgedTransport; + class SentUnitDestroyedHQCASBombing; + class SentUnitDestroyedHQCASHelicopter; + class SentUnitDestroyedHQSupplyDrop; + class SentUnitDestroyedHQUAV; + class SentUnitDestroyedHQArty; + class SentUnitDestroyedHQTransport; + class SentRequestAccomplishedSGCASBombing; + class SentRequestAccomplishedSGCASHelicopter; + class SentRequestAccomplishedSGSupplyDrop; + class SentRequestAccomplishedSGUAV; + class SentRequestAccomplishedSGArty; + class SentRequestAccomplishedSGTransport; + class SentSupportAddedDuringMission; + class SentArtySGSupportRoundsComplete; + class SentTransportSGWelcomeAboard; + class SentTransportSGLZCoordinatesSelected; + class SelectCmdMoveSentenceLocation; + class SelectCmdMoveSentenceMedium; + class SentEnemyDetectedLongStealth; + class SentEnemyDetectedDangerCloseStealth; + class SentEnemyDetectedCloseStealth; + class SentEnemyDetectedVeryLongStealth; + class SentEngageDefault; + class SelectCmdMoveSentenceLocation_1; + class SelectCmdMoveSentenceMedium_1; + class SentBehaviourSafeDefault; + class SentBehaviourAwareDefault; + class SentBehaviourCombatDefault; + class SentOpenFireDefault; + class SentCeaseFireInsideGroupDefault; + class SentCeaseFireDefault; + class SentEngageStealth; + class SentFireNoTargetStealth; + class SentAttackNoTargetStealth; + class SentNoTargetStealth; + class SentEngageNoTargetStealth; + class SelectCmdMoveSentenceCloseStealth; + class SelectCmdMoveSentenceVeryCloseStealth; + class SelectCmdMoveSentenceFarStealth; + class SelectCmdMoveSentenceLocationStealth; + class SelectCmdMoveSentenceMediumStealth; + class SentReturnToFormationStealth; + class SentLooseFormationStealth; + class SentCmdFollowMeStealth; + class SentOpenFireStealth; + class SentCeaseFireInsideGroupStealth; + class SentBehaviourSafeStealth; + class SentBehaviourAwareStealth; + class SentBehaviourCombatStealth; + class SentSupportConfirmStealth; + class SentCommandFailedStealth; + class SentObjectDestroyedStealth; + class SentObjectDestroyedUnknownStealth; + class SentCommandCompletedStealth; + class SentFireReadyStealth; + class SentIsLeaderStealth; + class SentDestinationUnreacheableStealth; + class SentClearStealth; + class SentRepeatCommandStealth; + class SentWhereAreYouStealth; + class SentReportStatusStealth; + class SentNotifyAttackStealth; + class SentNotifyAttackSubgroupStealth; + class SentConfirmMoveStealth; + class SentConfirmAttackStealth; + class SentConfirmOtherStealth; + class SentUnitKilledStealth; + class SentHealthCriticalStealth; + class SentHealthNormalStealth; + class SentGenReinforcementsConfirmed; + class SentGenReinforcementsRejected; + class SentGenReinforcementsArrived; + class SentGenLeavingAO; + class SentGenTime; + class SentGenLosing; + class SentGenLost; + class SentGenComplete; + class SentGenCmdSeize; + class SentGenCmdDefend; + class SentGenCmdRTB; + class SentGenCmdTargetNeutralize; + class SentGenCmdTargetProtect; + class SentGenCmdTargetEscort; + class SentGenCmdTargetFind; + class SentGenIncoming; + class SentGenBaseUnlockRespawn; + class SentGenBaseUnlockVehicle; + class SentGenBaseSideFriendlyWEST; + class SentFXBreathingSlow; + class SentFXBreathingFast; + class SentFXHit; + class SentFXDeath; + class SentFXHurt; + class SentFXEffort; + class SentFXDrowning; + class SentCeaseFireDefault_1; + class SentGenBaseSideFriendlyEAST; + class SentGenBaseSideFriendlyGUER; + class SentGenBaseSideEnemyWEST; + class SentGenBaseSideEnemyEAST; + class SentGenBaseSideEnemyGUER; + class SentTargetDefault; + class SentTargetStealth; + class Dummy; + class Words: Words { + grid_zero[] = {}; + grid_one[] = {}; + grid_two[] = {}; + grid_three[] = {}; + grid_four[] = {}; + grid_five[] = {}; + grid_six[] = {}; + grid_seven[] = {}; + grid_eight[] = {}; + grid_nine[] = {}; + grid_zero_2[] = {}; + grid_one_2[] = {}; + grid_two_2[] = {}; + grid_three_2[] = {}; + grid_four_2[] = {}; + grid_five_2[] = {}; + grid_six_2[] = {}; + grid_seven_2[] = {}; + grid_eight_2[] = {}; + grid_nine_2[] = {}; + grid_zero_3[] = {}; + grid_one_3[] = {}; + grid_two_3[] = {}; + grid_three_3[] = {}; + grid_four_3[] = {}; + grid_five_3[] = {}; + grid_six_3[] = {}; + grid_seven_3[] = {}; + grid_eight_3[] = {}; + grid_nine_3[] = {}; + Ready[] = {}; + Waiting[] = {}; + StandingBy[] = {}; + /*IAmReady[] = {}; + ReadyForOrders[] = {}; + AwaitingOrders[] = {};*/ + }; }; class CfgVoice { - class ACE_NoVoice { - author = "$STR_ACE_Common_ACETeam"; - protocol = "ACE_RadioProtocolNoRadio"; - variants[] = {1}; - directories[] = {"",""}; - identityTypes[] = {"Default"}; - scope = 2; - voiceType = ""; - icon = "\a3\Ui_f\data\Map\Markers\Flags\nato_ca.paa"; - displayName = "$STR_ACE_Common_NoVoice"; - }; + class ACE_NoVoice { + author = "$STR_ACE_Common_ACETeam"; + protocol = "ACE_RadioProtocolNoRadio"; + variants[] = {1}; + directories[] = {"",""}; + identityTypes[] = {"Default"}; + scope = 2; + voiceType = ""; + icon = "\a3\Ui_f\data\Map\Markers\Flags\nato_ca.paa"; + displayName = "$STR_ACE_Common_NoVoice"; + }; }; class CfgVoiceTypes { - class ACE_NoVoice { - name = "$STR_ACE_Common_NoVoice"; - voices[] = {"ACE_NoVoice","ACE_NoVoice","ACE_NoVoice"}; - preview = "ACE_NoVoice"; - alternative = ""; - }; + class ACE_NoVoice { + name = "$STR_ACE_Common_NoVoice"; + voices[] = {"ACE_NoVoice","ACE_NoVoice","ACE_NoVoice"}; + preview = "ACE_NoVoice"; + alternative = ""; + }; }; diff --git a/addons/common/ProgressScreen.hpp b/addons/common/ProgressScreen.hpp index 3c2858c07f..873aeac73c 100644 --- a/addons/common/ProgressScreen.hpp +++ b/addons/common/ProgressScreen.hpp @@ -1,94 +1,94 @@ class ACE_Common_ProgressBar_Dialog { - idd = -1; - movingEnable = false; - onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; - objects[] = {}; + idd = -1; + movingEnable = false; + onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; + objects[] = {}; - class controlsBackground { - class Background { - idc = -1; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0; - size = 1; - colorBackground[] = {0, 0, 0, 0.1}; - colorText[] = {0, 0, 0, 0}; - x = "safezoneX"; - y = "safezoneY"; - w = "safezoneW"; - h = "safezoneH"; - }; + class controlsBackground { + class Background { + idc = -1; + moving = 0; + font = "TahomaB"; + text = ""; + sizeEx = 0; + lineSpacing = 0; + access = 0; + type = 0; + style = 0; + size = 1; + colorBackground[] = {0, 0, 0, 0.1}; + colorText[] = {0, 0, 0, 0}; + x = "safezoneX"; + y = "safezoneY"; + w = "safezoneW"; + h = "safezoneH"; + }; - class Progress_Bar { - idc = 1; - moving = 0; - text = ""; - font = "PuristaMedium"; - sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; - lineSpacing = 0; - access = 0; - type = 0; - style = 2; - size = 1; - colorBackground[] = {1, 0.647, 0, 0.5}; - colorText[] = {1,1,1,1}; - x = "safezoneX + 0.1 * safezoneW"; - y = "safezoneY + 0.2 * safezoneH"; - w = "0.0 * safezoneW"; - h = "0.01 * safezoneH"; - }; + class Progress_Bar { + idc = 1; + moving = 0; + text = ""; + font = "PuristaMedium"; + sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; + lineSpacing = 0; + access = 0; + type = 0; + style = 2; + size = 1; + colorBackground[] = {1, 0.647, 0, 0.5}; + colorText[] = {1,1,1,1}; + x = "safezoneX + 0.1 * safezoneW"; + y = "safezoneY + 0.2 * safezoneH"; + w = "0.0 * safezoneW"; + h = "0.01 * safezoneH"; + }; - class Title_Bar : Progress_Bar { - idc = 2; - //type = 13; - //size = 1; - colorBackground[] = {0, 0, 0, 0}; - x = "safezoneX + 0.1 * safezoneW"; - y = "safezoneY + 0.1 * safezoneH"; - w = "0.8 * safezoneW"; - h = "0.05 * safezoneH"; - /*class Attributes { - font = "TahomaB"; - color = "#000000"; - align = "center"; - valign = "middle"; - shadow = false; - shadowColor = "#ff0000"; - size = "1"; - };*/ + class Title_Bar : Progress_Bar { + idc = 2; + //type = 13; + //size = 1; + colorBackground[] = {0, 0, 0, 0}; + x = "safezoneX + 0.1 * safezoneW"; + y = "safezoneY + 0.1 * safezoneH"; + w = "0.8 * safezoneW"; + h = "0.05 * safezoneH"; + /*class Attributes { + font = "TahomaB"; + color = "#000000"; + align = "center"; + valign = "middle"; + shadow = false; + shadowColor = "#ff0000"; + size = "1"; + };*/ + }; }; - }; }; class ACE_Common_DisableMouse_Dialog { - idd = -1; - movingEnable = false; - onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];"; - objects[] = {}; - class controlsBackground { - class Background { - idc = -1; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0; - size = 1; - colorBackground[] = {0, 0, 0, 0};//0.5 - colorText[] = {0, 0, 0, 0}; - x = "safezoneX"; - y = "safezoneY"; - w = "safezoneW"; - h = "safezoneH"; + idd = -1; + movingEnable = false; + onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];"; + objects[] = {}; + class controlsBackground { + class Background { + idc = -1; + moving = 0; + font = "TahomaB"; + text = ""; + sizeEx = 0; + lineSpacing = 0; + access = 0; + type = 0; + style = 0; + size = 1; + colorBackground[] = {0, 0, 0, 0};//0.5 + colorText[] = {0, 0, 0, 0}; + x = "safezoneX"; + y = "safezoneY"; + w = "safezoneW"; + h = "safezoneH"; + }; }; - }; }; diff --git a/addons/common/RscInfoType.hpp b/addons/common/RscInfoType.hpp index ead66065e3..1a4950b022 100644 --- a/addons/common/RscInfoType.hpp +++ b/addons/common/RscInfoType.hpp @@ -1,27 +1,27 @@ class RscInGameUI { - class RscUnitInfo; - class RscUnitInfoSoldier: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgSoldier', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoSoldier', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoTank: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgVehicle', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoVehicle', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoAir: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgAircraft', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAircraft', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoShip: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgShip', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoShip', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; - class RscUnitInfoParachute: RscUnitInfo { - onLoad = "uiNamespace setVariable ['ACE_dlgParachute', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoParachute', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; - }; + class RscUnitInfo; + class RscUnitInfoSoldier: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgSoldier', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoSoldier', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoTank: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgVehicle', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoVehicle', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoAir: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgAircraft', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAircraft', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoShip: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgShip', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoShip', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; + class RscUnitInfoParachute: RscUnitInfo { + onLoad = "uiNamespace setVariable ['ACE_dlgParachute', _this select 0]; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoParachute', [-1, [], []]]) select 2); {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInfoAny', [-1, [], []]]) select 2); [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; + }; }; class RscDisplayInventory { - onLoad = "[""onLoad"",_this,""RscDisplayInventory"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInventory', [-1, [], []]]) select 2);"; + onLoad = "[""onLoad"",_this,""RscDisplayInventory"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; {_this call _x} forEach ((missionNamespace getVariable ['ACE_onLoadInventory', [-1, [], []]]) select 2);"; }; class RscDisplayChannel { - onLoad = QUOTE(_this call GVAR(onLoadRscDisplayChannel)); + onLoad = QUOTE(_this call GVAR(onLoadRscDisplayChannel)); }; diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 4367367f74..1476f775c0 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -2,7 +2,7 @@ #include "script_component.hpp" QGVAR(remoteFnc) addPublicVariableEventHandler { - (_this select 1) call FUNC(execRemoteFnc); + (_this select 1) call FUNC(execRemoteFnc); }; [missionNamespace] call FUNC(executePersistent); @@ -12,9 +12,9 @@ _currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Common" >> "versio _previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""]; if (_currentVersion != _previousVersion) then { - // do something + // do something - profileNamespace setVariable ["ACE_VersionNumberString", _currentVersion]; + profileNamespace setVariable ["ACE_VersionNumberString", _currentVersion]; }; 0 spawn COMPILE_FILE(scripts\Version\checkVersionNumber); @@ -37,8 +37,8 @@ GVAR(toggleState) = COMPILE_FILE(scripts\toggleState); GVAR(keyStates) = []; GVAR(keyTimes) = []; for "_index" from 0 to 300 do { - GVAR(keyStates) set [_index, 0]; - GVAR(keyTimes) set [_index, -1]; + GVAR(keyStates) set [_index, 0]; + GVAR(keyTimes) set [_index, -1]; }; call COMPILE_FILE(scripts\KeyInput\initCanInteractFunction); @@ -46,24 +46,24 @@ call COMPILE_FILE(scripts\KeyInput\initKeys); call COMPILE_FILE(scripts\KeyInput\initScrollWheel); 0 spawn { - while {true} do { - waitUntil {!isNull (findDisplay 46)}; sleep 0.1; - findDisplay 46 displayAddEventHandler ["KeyDown", QUOTE( _this call GVAR(onKeyDown) )]; - findDisplay 46 displayAddEventHandler ["KeyUp", QUOTE( _this call GVAR(onKeyUp) )]; - findDisplay 46 displayAddEventHandler ["MouseZChanged", QUOTE( _this call GVAR(onScrollWheel) )]; - [false] call FUNC(disableUserInput); - waitUntil {isNull (findDisplay 46)}; - }; + while {true} do { + waitUntil {!isNull (findDisplay 46)}; sleep 0.1; + findDisplay 46 displayAddEventHandler ["KeyDown", QUOTE( _this call GVAR(onKeyDown) )]; + findDisplay 46 displayAddEventHandler ["KeyUp", QUOTE( _this call GVAR(onKeyUp) )]; + findDisplay 46 displayAddEventHandler ["MouseZChanged", QUOTE( _this call GVAR(onScrollWheel) )]; + [false] call FUNC(disableUserInput); + waitUntil {isNull (findDisplay 46)}; + }; }; enableCamShake true; // Set the name for the current player [missionNamespace, "playerChanged", { - if (alive (_this select 0)) then { - [_this select 0] call FUNC(setName) - }; - if (alive (_this select 1)) then { - [_this select 1] call FUNC(setName) - }; + if (alive (_this select 0)) then { + [_this select 0] call FUNC(setName) + }; + if (alive (_this select 1)) then { + [_this select 1] call FUNC(setName) + }; }] call FUNC(addCustomEventhandler); diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 63421aa0cb..e59894c370 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -140,14 +140,14 @@ PREP(fixCrateContent); // Loop to update the ACE_player variable ACE_player = player; if (hasInterface) then { - ["ACE_CheckForPlayerChange", "onEachFrame", { - if !(ACE_player isEqualTo (missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player])) then { - _this = ACE_player; + ["ACE_CheckForPlayerChange", "onEachFrame", { + if !(ACE_player isEqualTo (missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player])) then { + _this = ACE_player; - ACE_player = missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player]; - uiNamespace setVariable ["ACE_player", ACE_player]; + ACE_player = missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player]; + uiNamespace setVariable ["ACE_player", ACE_player]; - [missionNamespace, "playerChanged", [ACE_player, _this]] call FUNC(callCustomEventHandlers); - }; - }] call BIS_fnc_addStackedEventHandler; + [missionNamespace, "playerChanged", [ACE_player, _this]] call FUNC(callCustomEventHandlers); + }; + }] call BIS_fnc_addStackedEventHandler; }; diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 8c234e4c85..771511ac04 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -1,66 +1,67 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {"ACE_Box_Misc"}; - weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon"}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_main"}; - author[] = {"KoffeinFlummi"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - VERSION_CONFIG; - }; + class ADDON { + units[] = {"ACE_Box_Misc"}; + weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_main"}; + author[] = {"KoffeinFlummi"}; + authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; + }; }; #include "CfgEventHandlers.hpp" #include "CfgSounds.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" +#include "CfgMagazines.hpp" class ACE_Rsc_Display_Base { - idd = -1; - type = 0; - style = 48; - name = ""; - duration = 999999; - fadeIn = 0; - fadeOut = 0; - font = "TahomaB"; - size = 1; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; + idd = -1; + type = 0; + style = 48; + name = ""; + duration = 999999; + fadeIn = 0; + fadeOut = 0; + font = "TahomaB"; + size = 1; + colorBackground[] = {1, 1, 1, 0}; + colorText[] = {1, 1, 1, 1}; }; class ACE_Rsc_Control_Base { - idc = 1; - type = 0; - style = 48; - access = 0; - lineSpacing = 0; - moving = 1; - text = ""; - size = 1; - sizeEx = 0; - font = "TahomaB"; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; - x = 0; - y = 0; - w = 0; - h = 0; + idc = 1; + type = 0; + style = 48; + access = 0; + lineSpacing = 0; + moving = 1; + text = ""; + size = 1; + sizeEx = 0; + font = "TahomaB"; + colorBackground[] = {1, 1, 1, 0}; + colorText[] = {1, 1, 1, 1}; + x = 0; + y = 0; + w = 0; + h = 0; }; class GVAR(canInteractConditions) { - class GVAR(notOnMap) { - condition = "!visibleMap"; - }; + class GVAR(notOnMap) { + condition = "!visibleMap"; + }; }; class GVAR(Options) { - class enableNumberHotkeys { - displayName = "$STR_ACE_Common_EnableNumberHotkeys"; - default = 1; - }; + class enableNumberHotkeys { + displayName = "$STR_ACE_Common_EnableNumberHotkeys"; + default = 1; + }; }; #include @@ -71,7 +72,7 @@ class GVAR(Options) { /* class RscControlsGroupNoScrollbars; class RscAttributeInventory: RscControlsGroupNoScrollbars { - onSetFocus = "[_this,""RscAttributeInventory"",'CuratorCommon'] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call ACE_CuratorFix_fnc_addUnloadEventhandler;"; + onSetFocus = "[_this,""RscAttributeInventory"",'CuratorCommon'] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call ACE_CuratorFix_fnc_addUnloadEventhandler;"; }; */ diff --git a/addons/common/script_component.hpp b/addons/common/script_component.hpp index cbb8741c94..1dcd2b379c 100644 --- a/addons/common/script_component.hpp +++ b/addons/common/script_component.hpp @@ -4,11 +4,11 @@ // #define DEBUG_MODE_FULL #ifdef DEBUG_ENABLED_COMMON - #define DEBUG_MODE_FULL + #define DEBUG_MODE_FULL #endif #ifdef DEBUG_ENABLED_COMMON - #define DEBUG_SETTINGS DEBUG_ENABLED_COMMON + #define DEBUG_SETTINGS DEBUG_ENABLED_COMMON #endif #include "\z\ace\addons\main\script_macros.hpp" diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index f3606f77a1..cf4638c569 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1,467 +1,467 @@  - - - ACE-Team - ACE-Team - ACE-Team - ACE-Team - ACE-Team - ACE-Team - Команда ACE - ACE-Team - ACE-Team - ACE-Team - - - Save - Speichern - Guardar - Zapisz - Uložit - Sauvegarder - Сохранить - Salvar - Mentés - Salva - - - Cancel - Abbrechen - Cancelar - Anuluj - Zrušit - Annuler - Отмена - Cancelar - Mégse - Annulla - - - ACE Options - ACE Optionen - Opciones ACE - Opcje ACE - ACE Nastavení - ACE Options - ACE Настройки - Opções do ACE - ACE Opciók - Opzioni ACE - - - Shift - Umschalt - Shift - Shift - Shift - Shift - Shift - Shift - Shift - Shift - - - Ctrl - Strg - Ctrl - Ctrl - Ctrl - Ctrl - Ctrl - Ctrl - Ctrl - Ctrl - - - Alt - Alt - Alt - Alt - Alt - Alt - Alt - Alt - Alt - Alt - - - Shift right - Umschalt rechts - Shift derecho - Prawy Shift - Pravý Shift - Shift Droite - Правый Shift - Shift da Direita - Jobb Shift - Shift destro - - - Ctrl right - Strg rechts - Ctrl derecho - Prawy Ctrl - Pravý Ctrl - Ctrl Droite - Правый Ctrl - Ctrl da Direita - Jobb Ctrl - Ctrl destro - - - Alt right - Alt Gr - Alt derecho - Prawy Alt - Pravý Alt - Alt Droite - Правый Alt - Alt da Direita - Alt Gr - Alt Gr - - - Default - Standard - Por defecto - Domyślne - Výchozí - Défaut - По умолчанию - Padrão - Alapértelmezett - Standard - - - None - Keiner - Ninguna - Brak - Žádný - Aucun - Не назначено - Nenhuma - Semmi - Non assegnato - - - 2x %1 - 2x %1 - 2x %1 - 2x %1 - 2x %1 - 2x %1 - 2x %1 - 2x %1 - 2x %1 - 2x %1 - - - Hold %1 - %1 halten - Mantener %1 - Przytrzymać %1 - Držet %1 - Tenir %1 - Удерживая %1 - Segurar %1 - %1 Nyomvatartása - Tieni premuto %1 - - - Profile saved - Profil gespeichert - Perfil guardado - Profil zapisany - Profil uložen - Profil sauvegardé - Профиль сохранен - Perfil salvo - Profil elmentve - Profilo salvato - - - Profile not saved - Profil nicht gespeichert - Perfil no guardado - Profil niezapisany - Profil neuložen - Profil non sauvegardé - Профиль не сохранен - Perfil não salvo - A profil nincs elmentve - Profilo non salvato - - - - N - N - N - N - S - N - С - N - É - N - - - NNE - NNO - NNE - NNE - SSV - NNE - ССВ - NNE - ÉÉK - NNE - - - NE - NO - NE - NE - SV - NE - СВ - NE - ÉK - NE - - - ENE - ONO - ENE - ENE - VSV - ENE - ВСВ - LNE - KÉK - ENE - - - E - O - E - E - V - E - В - L - K - E - - - ESE - OSO - ESE - ESE - VJV - ESE - ВЮВ - LSE - KDK - ESE - - - SE - SO - SE - SE - JV - SE - ЮВ - SE - DK - SE - - - SSE - SSO - SSE - SSE - JJV - SSE - ЮЮВ - SSE - DDK - SSE - - - S - S - S - S - J - S - Ю - S - D - S - - - SSW - SSW - SSO - SSW - JJZ - SSO - ЮЮЗ - SSO - DDNy - SSO - - - SW - SW - SO - SW - JZ - SO - ЮЗ - SO - DNy - SO - - - WSW - WSW - OSO - WSW - ZJZ - OSO - ЗЮЗ - OSO - NyDNy - OSO - - - W - W - O - W - Z - O - З - O - Ny - O - - - WNW - WNW - ONO - WNW - ZSZ - ONO - ЗСЗ - ONO - NyÉNy - ONO - - - NW - NW - NO - NW - SZ - NO - СЗ - NO - ÉNy - NO - - - NNW - NNW - NNO - NNW - SSZ - NNO - ССЗ - NNO - ÉÉNy - NNO - - - Action cancelled. - Aktion abgebrochen. - Acción cancelada. - Przerwano czynność - Akce přerušena - Action annulée. - Действие отменено. - Ação cancelada. - Művelet megszakítva. - Azione cancellata. - - - < Prev - < Zurück - < Anterior. - < Poprzedni - < Předchozí - < Préc - < Пред. - < Anterior - < Előző - < Prec - - - Next > - Weiter > - Siguiente > - Następny > - Další > - Suivant > - След. > - Próximo > - Következő > - Prossimo > - - - [ACE] Miscellaneous Items - [ACE] Verschiedenes - [ACE] Objetos varios - [ACE] Różne przedmioty - [ACE] Ostatní předměty - [ACE] Objets divers - [ACE] Различные предметы - [ACE] Itens diversos - [ACE] Egyéb tárgyak - [ACE] Oggetti vari - - - Disable Command Menu - Befehlsmenü ausschalten - Desactivar menú de mando - Wyłącz menu dowodzenia - Vypnout velící menu - Désactiver Menu Commande - Выключить командное меню - Parancsnoki menü kikapcsolása - - - Unknown - Unbekannt - Desconocido - Nieznany - Neznámý - Неизвестно - Ismeretlen - - - No Voice - Keine Stimme - Sin voz - Brak głosu - Žádný hlas - Без голоса - Nincs hang - - + + + ACE-Team + ACE-Team + ACE-Team + ACE-Team + ACE-Team + ACE-Team + Команда ACE + ACE-Team + ACE-Team + ACE-Team + + + Save + Speichern + Guardar + Zapisz + Uložit + Sauvegarder + Сохранить + Salvar + Mentés + Salva + + + Cancel + Abbrechen + Cancelar + Anuluj + Zrušit + Annuler + Отмена + Cancelar + Mégse + Annulla + + + ACE Options + ACE Optionen + Opciones ACE + Opcje ACE + ACE Nastavení + ACE Options + ACE Настройки + Opções do ACE + ACE Opciók + Opzioni ACE + + + Shift + Umschalt + Shift + Shift + Shift + Shift + Shift + Shift + Shift + Shift + + + Ctrl + Strg + Ctrl + Ctrl + Ctrl + Ctrl + Ctrl + Ctrl + Ctrl + Ctrl + + + Alt + Alt + Alt + Alt + Alt + Alt + Alt + Alt + Alt + Alt + + + Shift right + Umschalt rechts + Shift derecho + Prawy Shift + Pravý Shift + Shift Droite + Правый Shift + Shift da Direita + Jobb Shift + Shift destro + + + Ctrl right + Strg rechts + Ctrl derecho + Prawy Ctrl + Pravý Ctrl + Ctrl Droite + Правый Ctrl + Ctrl da Direita + Jobb Ctrl + Ctrl destro + + + Alt right + Alt Gr + Alt derecho + Prawy Alt + Pravý Alt + Alt Droite + Правый Alt + Alt da Direita + Alt Gr + Alt Gr + + + Default + Standard + Por defecto + Domyślne + Výchozí + Défaut + По умолчанию + Padrão + Alapértelmezett + Standard + + + None + Keiner + Ninguna + Brak + Žádný + Aucun + Не назначено + Nenhuma + Semmi + Non assegnato + + + 2x %1 + 2x %1 + 2x %1 + 2x %1 + 2x %1 + 2x %1 + 2x %1 + 2x %1 + 2x %1 + 2x %1 + + + Hold %1 + %1 halten + Mantener %1 + Przytrzymać %1 + Držet %1 + Tenir %1 + Удерживая %1 + Segurar %1 + %1 Nyomvatartása + Tieni premuto %1 + + + Profile saved + Profil gespeichert + Perfil guardado + Profil zapisany + Profil uložen + Profil sauvegardé + Профиль сохранен + Perfil salvo + Profil elmentve + Profilo salvato + + + Profile not saved + Profil nicht gespeichert + Perfil no guardado + Profil niezapisany + Profil neuložen + Profil non sauvegardé + Профиль не сохранен + Perfil não salvo + A profil nincs elmentve + Profilo non salvato + + + + N + N + N + N + S + N + С + N + É + N + + + NNE + NNO + NNE + NNE + SSV + NNE + ССВ + NNE + ÉÉK + NNE + + + NE + NO + NE + NE + SV + NE + СВ + NE + ÉK + NE + + + ENE + ONO + ENE + ENE + VSV + ENE + ВСВ + LNE + KÉK + ENE + + + E + O + E + E + V + E + В + L + K + E + + + ESE + OSO + ESE + ESE + VJV + ESE + ВЮВ + LSE + KDK + ESE + + + SE + SO + SE + SE + JV + SE + ЮВ + SE + DK + SE + + + SSE + SSO + SSE + SSE + JJV + SSE + ЮЮВ + SSE + DDK + SSE + + + S + S + S + S + J + S + Ю + S + D + S + + + SSW + SSW + SSO + SSW + JJZ + SSO + ЮЮЗ + SSO + DDNy + SSO + + + SW + SW + SO + SW + JZ + SO + ЮЗ + SO + DNy + SO + + + WSW + WSW + OSO + WSW + ZJZ + OSO + ЗЮЗ + OSO + NyDNy + OSO + + + W + W + O + W + Z + O + З + O + Ny + O + + + WNW + WNW + ONO + WNW + ZSZ + ONO + ЗСЗ + ONO + NyÉNy + ONO + + + NW + NW + NO + NW + SZ + NO + СЗ + NO + ÉNy + NO + + + NNW + NNW + NNO + NNW + SSZ + NNO + ССЗ + NNO + ÉÉNy + NNO + + + Action cancelled. + Aktion abgebrochen. + Acción cancelada. + Przerwano czynność + Akce přerušena + Action annulée. + Действие отменено. + Ação cancelada. + Művelet megszakítva. + Azione cancellata. + + + < Prev + < Zurück + < Anterior. + < Poprzedni + < Předchozí + < Préc + < Пред. + < Anterior + < Előző + < Prec + + + Next > + Weiter > + Siguiente > + Następny > + Další > + Suivant > + След. > + Próximo > + Következő > + Prossimo > + + + [ACE] Miscellaneous Items + [ACE] Verschiedenes + [ACE] Objetos varios + [ACE] Różne przedmioty + [ACE] Ostatní předměty + [ACE] Objets divers + [ACE] Различные предметы + [ACE] Itens diversos + [ACE] Egyéb tárgyak + [ACE] Oggetti vari + + + Disable Command Menu + Befehlsmenü ausschalten + Desactivar menú de mando + Wyłącz menu dowodzenia + Vypnout velící menu + Désactiver Menu Commande + Выключить командное меню + Parancsnoki menü kikapcsolása + + + Unknown + Unbekannt + Desconocido + Nieznany + Neznámý + Неизвестно + Ismeretlen + + + No Voice + Keine Stimme + Sin voz + Brak głosu + Žádný hlas + Без голоса + Nincs hang + + \ No newline at end of file