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