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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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