Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/selfInteractionMenu' into explosiveInteraction

Browse Source
This commit is contained in:
Garth L-H de Wet 2015-02-20 00:46:56 +02:00
commit 477d8c9dec
25 changed files with 709 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
addons/attach/CfgVehicles.hpp
View File

@ -1,25 +1,30 @@
#define MACRO_ATTACHTOVEHICLE \ #define MACRO_ATTACHTOVEHICLE \
class ACE_Actions { \ class ACE_Actions { \
class GVAR(AttachVehicle) { \ class ACE_MainActions { \
displayName = "$STR_ACE_Attach_AttachDetach"; \ selection = ""; \
condition = QUOTE(([ARR_3(_player, _target, '')] call FUNC(canAttach))); \ distance = 5; \
statement = QUOTE( [ARR_2(_player, _target)] call FUNC(openAttachUI);); \ condition = "true"; \
exceptions[] = {"ACE_Drag_isNotDragging"}; \ class GVAR(AttachVehicle) { \
showDisabled = 0; \ displayName = "$STR_ACE_Attach_AttachDetach"; \
priority = 0; \ condition = QUOTE(([ARR_3(_player, _target, '')] call FUNC(canAttach))); \
icon = PATHTOF(UI\attach_ca.paa); \ statement = QUOTE( [ARR_2(_player, _target)] call FUNC(openAttachUI);); \
distance = 4; \ exceptions[] = {"ACE_Drag_isNotDragging"}; \
}; \ showDisabled = 0; \
class GVAR(DetachVehicle) { \ priority = 0; \
displayName = "$STR_ACE_Attach_Detach"; \ icon = PATHTOF(UI\attach_ca.paa); \
condition = QUOTE(([ARR_2(_player, _target)] call FUNC(canDetach))); \ distance = 4; \
statement = QUOTE( [ARR_2(_player, _target)] call FUNC(detach) ); \ }; \
exceptions[] = {"ACE_Drag_isNotDragging"}; \ class GVAR(DetachVehicle) { \
showDisabled = 0; \ displayName = "$STR_ACE_Attach_Detach"; \
priority = 0; \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(canDetach))); \
icon = PATHTOF(UI\detach_ca.paa); \ statement = QUOTE( [ARR_2(_player, _target)] call FUNC(detach) ); \
distance = 4; \ exceptions[] = {"ACE_Drag_isNotDragging"}; \
showDisabled = 0; \
priority = 0; \
icon = PATHTOF(UI\detach_ca.paa); \
distance = 4; \
}; \
}; \ }; \
}; };

173
addons/captives/CfgVehicles.hpp
View File

@ -2,70 +2,78 @@ class CfgVehicles {
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {
class ACE_Actions { class ACE_Actions {
class ACE_ApplyHandcuffs { class ACE_RightHandActions {
displayName = "$STR_ACE_Captives_SetCaptive"; selection = "righthand";
distance = 4; displayName = "Right hand";
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canApplyHandcuffs)); distance = 5;
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doApplyHandcuffs)); condition = QUOTE(([ARR_2(_player, _target)] call FUNC(canApplyHandcuffs)) || ([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs)));
exceptions[] = {}; class ACE_ApplyHandcuffs {
showDisabled = 0; displayName = "$STR_ACE_Captives_SetCaptive";
priority = 2.4; distance = 4;
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa)); condition = QUOTE([ARR_2(_player, _target)] call FUNC(canApplyHandcuffs));
hotkey = "C"; statement = QUOTE([ARR_2(_player, _target)] call FUNC(doApplyHandcuffs));
exceptions[] = {};
showDisabled = 0;
priority = 2.4;
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
hotkey = "C";
};
class ACE_RemoveHandcuffs {
displayName = "$STR_ACE_Captives_ReleaseCaptive";
distance = 4;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doRemoveHandcuffs));
exceptions[] = {};
showDisabled = 0;
priority = 2.4;
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
hotkey = "R";
};
}; };
class ACE_RemoveHandcuffs { class ACE_MainActions {
displayName = "$STR_ACE_Captives_ReleaseCaptive"; class ACE_EscortCaptive {
distance = 4; displayName = "$STR_ACE_Captives_EscortCaptive";
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs)); distance = 4;
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doRemoveHandcuffs)); condition = QUOTE([ARR_2(_player, _target)] call FUNC(canEscortCaptive));
exceptions[] = {}; statement = QUOTE([ARR_3(_player, _target, true)] call FUNC(doEscortCaptive));
showDisabled = 0; exceptions[] = {};
priority = 2.4; showDisabled = 0;
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa)); icon = QUOTE(PATHTOF(UI\captive_ca.paa));
hotkey = "R"; priority = 2.3;
}; hotkey = "E";
class ACE_EscortCaptive { };
displayName = "$STR_ACE_Captives_EscortCaptive"; class ACE_StopEscorting {
distance = 4; displayName = "$STR_ACE_Captives_StopEscorting";
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canEscortCaptive)); distance = 4;
statement = QUOTE([ARR_3(_player, _target, true)] call FUNC(doEscortCaptive)); condition = QUOTE([ARR_2(_player, _target)] call FUNC(canStopEscorting));
exceptions[] = {}; statement = QUOTE([ARR_3(_player,_target, false)] call FUNC(doEscortCaptive));
showDisabled = 0; exceptions[] = {QGVAR(isNotEscorting)};
icon = QUOTE(PATHTOF(UI\captive_ca.paa)); showDisabled = 0;
priority = 2.3; icon = QUOTE(PATHTOF(UI\captive_ca.paa));
hotkey = "E"; priority = 2.3;
}; hotkey = "E";
class ACE_StopEscorting { };
displayName = "$STR_ACE_Captives_StopEscorting"; class ACE_LoadCaptive {
distance = 4; displayName = "$STR_ACE_Captives_LoadCaptive";
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canStopEscorting)); distance = 4;
statement = QUOTE([ARR_3(_player,_target, false)] call FUNC(doEscortCaptive)); condition = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(canLoadCaptive));
exceptions[] = {QGVAR(isNotEscorting)}; statement = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(doLoadCaptive));
showDisabled = 0; exceptions[] = {QGVAR(isNotEscorting)};
icon = QUOTE(PATHTOF(UI\captive_ca.paa)); showDisabled = 0;
priority = 2.3; icon = QUOTE(PATHTOF(UI\captive_ca.paa));
hotkey = "E"; priority = 2.2;
}; hotkey = "L";
class ACE_LoadCaptive { };
displayName = "$STR_ACE_Captives_LoadCaptive"; class ACE_FriskPerson {
distance = 4; displayName = "$STR_ACE_Captives_FriskPerson";
condition = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(canLoadCaptive)); distance = 2;
statement = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(doLoadCaptive)); condition = QUOTE([ARR_2(_player, _target)] call FUNC(canFriskPerson));
exceptions[] = {QGVAR(isNotEscorting)}; statement = QUOTE([ARR_2(_player, _target)] call FUNC(doFriskPerson));
showDisabled = 0; showDisabled = 0;
icon = QUOTE(PATHTOF(UI\captive_ca.paa)); //icon = ""; //@todo
priority = 2.2; priority = 3;
hotkey = "L"; hotkey = "F";
}; };
class ACE_FriskPerson {
displayName = "$STR_ACE_Captives_FriskPerson";
distance = 2;
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canFriskPerson));
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doFriskPerson));
showDisabled = 0;
//icon = ""; //@todo
priority = 3;
hotkey = "F";
}; };
}; };
@ -100,24 +108,27 @@ class CfgVehicles {
#define MACRO_LOADUNLOADCAPTIVE \ #define MACRO_LOADUNLOADCAPTIVE \
class ACE_Actions { \ class ACE_Actions { \
class ACE_LoadCaptive { \ class ACE_MainActions { \
displayName = "$STR_ACE_Captives_LoadCaptive"; \ selection = ""; \
distance = 4; \ class ACE_LoadCaptive { \
condition = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(canLoadCaptive)); \ displayName = "$STR_ACE_Captives_LoadCaptive"; \
statement = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(doLoadCaptive)); \ distance = 4; \
exceptions[] = {QGVAR(isNotEscorting)}; \ condition = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(canLoadCaptive)); \
showDisabled = 0; \ statement = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(doLoadCaptive)); \
priority = 1.2; \ exceptions[] = {QGVAR(isNotEscorting)}; \
hotkey = "L"; \ showDisabled = 0; \
}; \ priority = 1.2; \
class ACE_UnloadCaptive { \ hotkey = "L"; \
displayName = "$STR_ACE_Captives_UnloadCaptive"; \ }; \
distance = 4; \ class ACE_UnloadCaptive { \
condition = QUOTE([ARR_2(_player, _target)] call FUNC(canUnloadCaptive)); \ displayName = "$STR_ACE_Captives_UnloadCaptive"; \
statement = QUOTE([ARR_2(_player, _target)] call FUNC(doUnloadCaptive)); \ distance = 4; \
showDisabled = 0; \ condition = QUOTE([ARR_2(_player, _target)] call FUNC(canUnloadCaptive)); \
priority = 1.2; \ statement = QUOTE([ARR_2(_player, _target)] call FUNC(doUnloadCaptive)); \
hotkey = "C"; \ showDisabled = 0; \
priority = 1.2; \
hotkey = "C"; \
}; \
}; \ }; \
}; };

2
addons/interact_menu/CfgEventHandlers.hpp
View File

@ -13,7 +13,7 @@ class Extended_PostInit_EventHandlers {
class Extended_InitPost_EventHandlers { class Extended_InitPost_EventHandlers {
class All { class All {
class GVAR(compileMenu) { class GVAR(compileMenu) {
init = QUOTE(_this call FUNC(compileMenu)); init = QUOTE(_this call FUNC(compileMenu);_this call FUNC(compileMenuSelfAction));
}; };
}; };
}; };

18
addons/interact_menu/XEH_clientInit.sqf
View File

@ -15,13 +15,27 @@ _fnc = {
["ACE3", ["ACE3",
"Interact Key", "Interact Key",
{_this call FUNC(keyDown)}, {_this call FUNC(keyDown)},
[15, [false, false, false]], [219, [false, false, false]],
false, false,
"keydown"] call cba_fnc_registerKeybind; "keydown"] call cba_fnc_registerKeybind;
["ACE3", ["ACE3",
"Interact Key", "Interact Key",
{_this call FUNC(keyUp)}, {_this call FUNC(keyUp)},
[15, [false, false, false]], [219, [false, false, false]],
false,
"keyUp"] call cba_fnc_registerKeybind;
["ACE3",
"Self Actions Key",
{_this call FUNC(keyDownSelfAction)},
[219, [false, true, false]],
false,
"keydown"] call cba_fnc_registerKeybind;
["ACE3",
"Self Actions Key",
{_this call FUNC(keyUpSelfAction)},
[219, [false, true, false]],
false, false,
"keyUp"] call cba_fnc_registerKeybind; "keyUp"] call cba_fnc_registerKeybind;

19
addons/interact_menu/XEH_preInit.sqf
View File

@ -2,22 +2,25 @@
ADDON = false; ADDON = false;
PREP(setToRender); PREP(addAction);
PREP(compileMenu);
PREP(compileMenuSelfAction);
PREP(keyDown);
PREP(keyDownSelfAction);
PREP(keyUp);
PREP(keyUpSelfAction);
PREP(probe);
PREP(removeAction);
PREP(render); PREP(render);
PREP(renderIcon); PREP(renderIcon);
PREP(renderMenu); PREP(renderMenu);
PREP(probe);
PREP(rotateVectLineGetMap);
PREP(rotateVectLine); PREP(rotateVectLine);
PREP(keyDown); PREP(rotateVectLineGetMap);
PREP(keyUp);
PREP(compileMenu);
PREP(addAction);
PREP(removeAction);
GVAR(toRender) = []; GVAR(toRender) = [];
GVAR(keyDown) = false; GVAR(keyDown) = false;
GVAR(keyDownSelfAction) = false;
GVAR(keyDownTime) = 0; GVAR(keyDownTime) = 0;
GVAR(lastTime) = diag_tickTime; GVAR(lastTime) = diag_tickTime;

2
addons/interact_menu/config.cpp
View File

@ -6,7 +6,7 @@ class CfgPatches {
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {"ace_common"};
author[] = {""}; author[] = {"NouberNou", "CAA-Picard"};
authorUrl = ""; authorUrl = "";
VERSION_CONFIG; VERSION_CONFIG;
}; };

19
addons/interact_menu/functions/fnc_addAction.sqf
View File

@ -1,19 +1,20 @@
/* /*
* Author: commy2 * Author: commy2
*
* Add an ACE action to an object. Note: This function is NOT global. * Add an ACE action to an object. Note: This function is NOT global.
* *
* Argument: * Argument:
* 0: Object the action should be assigned to (Object) * 0: Object the action should be assigned to <OBJECT>
* 1: Name of the action shown in the menu (String) * 1: Name of the action shown in the menu <STRING>
* 2: Icon (String) * 2: Icon <STRING>
* 3: Position (Position or Selection Name) * 3: Position (Position or Selection Name) <POSITION> or <STRING>
* 4: Statement (Code) * 4: Statement <CODE>
* 5: Condition (Code) * 5: Condition <CODE>
* 6: Distance (Number) * 6: Distance <NUMBER>
* *
* Return value: * Return value:
* The entry array, which can be used to remove the entry, or add children entries. * The entry array, which can be used to remove the entry, or add children entries <ARRAY>.
*
* Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"

40
addons/interact_menu/functions/fnc_compileMenu.sqf
View File

@ -37,7 +37,7 @@ _actionsCfg = configFile >> "CfgVehicles" >> _objectType >> "ACE_Actions";
_recurseFnc = { _recurseFnc = {
private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_condition", "_showDisabled", private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled",
"_enableInside", "_children", "_entry", "_actionsCfg"]; "_enableInside", "_children", "_entry", "_actionsCfg"];
_actions = []; _actions = [];
_actionsCfg = _this select 0; _actionsCfg = _this select 0;
@ -48,7 +48,10 @@ _recurseFnc = {
_distance = getNumber (_entryCfg >> "distance"); _distance = getNumber (_entryCfg >> "distance");
_icon = getText (_entryCfg >> "icon"); _icon = getText (_entryCfg >> "icon");
_statement = compile (getText (_entryCfg >> "statement")); _statement = compile (getText (_entryCfg >> "statement"));
_selection = getText (_entryCfg >> "selection");
if (_selection == "") then {
_selection = [0,0,0];
};
_condition = getText (_entryCfg >> "condition"); _condition = getText (_entryCfg >> "condition");
if (_condition == "") then {_condition = "true"}; if (_condition == "") then {_condition = "true"};
@ -59,25 +62,19 @@ _recurseFnc = {
_enableInside = getNumber (_entryCfg >> "enableInside"); _enableInside = getNumber (_entryCfg >> "enableInside");
_condition = compile _condition; _condition = compile _condition;
// diag_log text format["_condition: %1", _condition]; _children = [_entryCfg] call _recurseFnc;
_children = [];
if(isArray (_entryCfg >> "subMenu")) then {
_subMenuDef = getArray (_entryCfg >> "subMenu");
_childMenuName = _subMenuDef select 0;
_childMenuCfg = configFile >> "CfgVehicles" >> _objectType >> "ACE_Actions" >> _childMenuName;
_children = [_childMenuCfg] call _recurseFnc;
};
_entry = [ _entry = [
_displayName, _displayName,
_icon, _icon,
[0,0,0], _selection,
_statement, _statement,
_condition, _condition,
_distance, _distance,
_children, _children,
GVAR(uidCounter) GVAR(uidCounter)
]; ];
GVAR(uidCounter) = GVAR(uidCounter) + 1; diag_log _entry;
GVAR(uidCounter) = GVAR(uidCounter) + 1;
_actions pushBack _entry; _actions pushBack _entry;
}; };
}; };
@ -85,9 +82,20 @@ _recurseFnc = {
}; };
_actions = [_actionsCfg] call _recurseFnc; _actions = [_actionsCfg] call _recurseFnc;
//diag_log _actions;
// Backward-compat, filter only base actions that have a selection
private ["_newActions","_oldActions","_selection"];
_filteredActions = [];
{
_selection = _x select 2;
if (typeName _selection == "STRING") then {
_filteredActions pushBack _x;
};
} forEach _actions;
/*
_actions = [[ _actions = [[
"TEST!", "Interactions",
"\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa", "\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa",
"Spine3", "Spine3",
{ true }, { true },
@ -97,6 +105,6 @@ _actions = [[
GVAR(uidCounter) GVAR(uidCounter)
] ]
]; ];
GVAR(uidCounter) = GVAR(uidCounter) + 1; GVAR(uidCounter) = GVAR(uidCounter) + 1;
*/
_object setVariable [QUOTE(GVAR(actionData)), _actions]; _object setVariable [QUOTE(GVAR(actionData)), _filteredActions];

99
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf Normal file
View File

@ -0,0 +1,99 @@
//fnc_compileMenuSelfAction.sqf
#include "script_component.hpp";
// diag_log text format["COMPILE ACTIONS: %1", _this];
_object = _this select 0;
_objectType = typeOf _object;
/*
displayName = "$STR_ACE_Hearing_Earbuds_On";
condition = QUOTE( !([_player] call FUNC(hasEarPlugsIn)) && {'ACE_EarBuds' in items _player} );
statement = QUOTE( [_player] call FUNC(putInEarPlugs) );
showDisabled = 0;
priority = 2.5;
icon = PATHTOF(UI\ACE_earplugs_x_ca.paa);
hotkey = "E";
enableInside = 1;
*/
/*
[
[
"Launch",
"\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa",
[0,0,0],
{ (_this select 0) setVelocity [0,0,10]; },
{ true },
1,
[]
]
]
*/
_actionsCfg = configFile >> "CfgVehicles" >> _objectType >> "ACE_SelfActions";
_recurseFnc = {
private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_condition", "_showDisabled",
"_enableInside", "_children", "_entry", "_actionsCfg"];
_actions = [];
_actionsCfg = _this select 0;
for "_i" from 0 to (count _actionsCfg)-1 do {
_entryCfg = _actionsCfg select _i;
if(isClass _entryCfg) then {
_displayName = getText (_entryCfg >> "displayName");
_icon = getText (_entryCfg >> "icon");
_statement = compile (getText (_entryCfg >> "statement"));
_condition = getText (_entryCfg >> "condition");
if (_condition == "") then {_condition = "true"};
// Add canInteract (including exceptions) and canInteractWith to condition
_condition = _condition + format [QUOTE( && {%1 call EGVAR(common,canInteract)} && {[ARR_2(ACE_player, _target)] call EFUNC(common,canInteractWith)} ), getArray (_entryCfg >> "exceptions")];
_showDisabled = getNumber (_entryCfg >> "showDisabled");
_enableInside = getNumber (_entryCfg >> "enableInside");
_condition = compile _condition;
// diag_log text format["_condition: %1", _condition];
_children = [];
if(isArray (_entryCfg >> "subMenu")) then {
_subMenuDef = getArray (_entryCfg >> "subMenu");
_childMenuName = _subMenuDef select 0;
_childMenuCfg = configFile >> "CfgVehicles" >> _objectType >> "ACE_SelfActions" >> _childMenuName;
_children = [_childMenuCfg] call _recurseFnc;
};
_entry = [
_displayName,
_icon,
[0,0,0],
_statement,
_condition,
10, //distace
_children,
GVAR(uidCounter)
];
GVAR(uidCounter) = GVAR(uidCounter) + 1;
_actions pushBack _entry;
};
};
_actions
};
_actions = [_actionsCfg] call _recurseFnc;
_actions = [[
"Self Actions",
"\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa",
"Spine3",
{ true },
{ true },
10,
_actions,
GVAR(uidCounter)
]
];
GVAR(uidCounter) = GVAR(uidCounter) + 1;
_object setVariable [QUOTE(GVAR(selfActionData)), _actions];

4
addons/interact_menu/functions/fnc_keyDown.sqf
View File

@ -2,7 +2,7 @@
#include "script_component.hpp" #include "script_component.hpp"
if(!GVAR(keyDown)) then { if(!GVAR(keyDown)) then {
GVAR(keyDown) = true; GVAR(keyDown) = true;
GVAR(keyDownTime) = diag_tickTime; GVAR(keyDownTime) = diag_tickTime;
}; };
true true

11
addons/interact_menu/functions/fnc_keyDownSelfAction.sqf Normal file
View File

@ -0,0 +1,11 @@
//fnc_keyDownSelfAction.sqf
#include "script_component.hpp"
if(!GVAR(keyDownSelfAction)) then {
GVAR(keyDownSelfAction) = true;
GVAR(keyDown) = false;
GVAR(keyDownTime) = diag_tickTime;
GVAR(selfMenuOffset) = [sin getDir ACE_player, cos getDir ACE_player, 0] vectorMultiply 2;
};
true

6
addons/interact_menu/functions/fnc_keyUp.sqf
View File

@ -1,12 +1,12 @@
//fnc_keyUp.sqf //fnc_keyUpSelfAction.sqf
#include "script_component.hpp" #include "script_component.hpp"
GVAR(keyDown) = false; GVAR(keyDown) = false;
if(GVAR(actionSelected)) then { if(GVAR(actionSelected)) then {
this = GVAR(selectedTarget); this = GVAR(selectedTarget);
_player = ACE_Player; _player = ACE_Player;
_target = GVAR(selectedTarget); _target = GVAR(selectedTarget);
[GVAR(selectedTarget), player] call GVAR(selectedAction); [GVAR(selectedTarget), player] call GVAR(selectedAction);
}; };
GVAR(expanded) = false; GVAR(expanded) = false;
GVAR(lastPath) = []; GVAR(lastPath) = [];

15
addons/interact_menu/functions/fnc_keyUpSelfAction.sqf Normal file
View File

@ -0,0 +1,15 @@
//fnc_keyUp.sqf
#include "script_component.hpp"
GVAR(keyDownSelfAction) = false;
if(GVAR(actionSelected)) then {
this = GVAR(selectedTarget);
_player = ACE_Player;
_target = GVAR(selectedTarget);
[GVAR(selectedTarget), player] call GVAR(selectedAction);
};
GVAR(expanded) = false;
GVAR(lastPath) = [];
GVAR(menuDepthPath) = [];
GVAR(vecLineMap) = [];
true

3
addons/interact_menu/functions/fnc_probe.sqf
View File

@ -9,7 +9,7 @@ if(!GVAR(keyDown)) then {
{ {
_actionObject = _x; _actionObject = _x;
_actionData = _actionObject getVariable [QUOTE(GVAR(actionData)), []]; _actionData = _actionObject getVariable [QUOTE(GVAR(actionData)), []];
if((count _actionData) > 0) then { if((count _actionData) > 0) then {
_renderData = []; _renderData = [];
{ {
@ -18,6 +18,7 @@ if(!GVAR(keyDown)) then {
_target = _actionObject; _target = _actionObject;
_player = ACE_player; _player = ACE_player;
_active = [_target, ACE_player] call (_actionItem select 4); _active = [_target, ACE_player] call (_actionItem select 4);
systemChat format ["%1 %2 is active %3", _actionObject, _actionItem select 0, _active];
// player sideChat format["_active: %1 %2", _actionItem select 0, _active]; // player sideChat format["_active: %1 %2", _actionItem select 0, _active];
if(_active) then { if(_active) then {
_renderItem = +_actionItem; _renderItem = +_actionItem;

183
addons/interact_menu/functions/fnc_render.sqf
View File

@ -6,99 +6,108 @@ _foundTarget = false;
_cursorPos1 = positionCameraToWorld [0, 0, 0]; _cursorPos1 = positionCameraToWorld [0, 0, 0];
_cursorPos2 = positionCameraToWorld [0, 0, 2]; _cursorPos2 = positionCameraToWorld [0, 0, 2];
GVAR(currentOptions) = []; GVAR(currentOptions) = [];
if((count GVAR(toRender)) > 0 && GVAR(keyDown)) then { if((count GVAR(toRender)) > 0 && (GVAR(keyDown) || GVAR(keyDownSelfAction))) then {
if((count GVAR(vecLineMap)) == 0 || ((count GVAR(menuDepthPath)) > 0 && (getPosASL player) distance GVAR(lastPos) > 0.01)) then { if((count GVAR(vecLineMap)) == 0 || ((count GVAR(menuDepthPath)) > 0 && (getPosASL player) distance GVAR(lastPos) > 0.01)) then {
GVAR(lastPos) = getPosASL player; GVAR(lastPos) = getPosASL player;
_cursorVec = [_cursorPos2, _cursorPos1] call BIS_fnc_vectorFromXtoY; _cursorVec = [_cursorPos2, _cursorPos1] call BIS_fnc_vectorFromXtoY;
_p1 = [0,0,0]; _p1 = [0,0,0];
_p2 = +_cursorVec; _p2 = +_cursorVec;
_p = (_cursorVec call CBA_fnc_vect2polar); _p = (_cursorVec call CBA_fnc_vect2polar);
_v = [(_p select 0), (_p select 1), (_p select 2)+90] call CBA_fnc_polar2vect; _v = [(_p select 0), (_p select 1), (_p select 2)+90] call CBA_fnc_polar2vect;
_cp = [_cursorVec, _v] call BIS_fnc_crossProduct; _cp = [_cursorVec, _v] call BIS_fnc_crossProduct;
GVAR(vecLineMap) = [_cp, _p1, _p2] call FUNC(rotateVectLineGetMap); GVAR(vecLineMap) = [_cp, _p1, _p2] call FUNC(rotateVectLineGetMap);
}; };
{ if (GVAR(keyDown)) then {
if(!(_forEachIndex in GVAR(filter))) then { // Render all nearby interaction menus
GVAR(renderDepth) = 0; {
_renderTargets = _x; if(!(_forEachIndex in GVAR(filter))) then {
{ GVAR(renderDepth) = 0;
[_renderTargets select 0, _x, 0] call FUNC(renderMenu); _renderTargets = _x;
} forEach (_renderTargets select 1); {
}; [_renderTargets select 0, _x, 0, [180, 360]] call FUNC(renderMenu);
} forEach GVAR(toRender); } forEach (_renderTargets select 1);
// player sideChat format["c: %1", count GVAR(toRender)]; };
} forEach GVAR(toRender);
} else {
// Render only the self action menu
_actions = (ACE_player getVariable QGVAR(selfActionData)) select 0;
_pos = (ACE_player modelToWorld (ACE_player selectionPosition "spine3")) vectorAdd GVAR(selfMenuOffset) vectorAdd [0,0,0.25];
[ACE_player, _actions, 0, [180, 360], _pos] call FUNC(renderMenu);
};
// player sideChat format["c: %1", count GVAR(toRender)];
}; };
if(GVAR(keyDown)) then { if(GVAR(keyDown) || GVAR(keyDownSelfAction)) then {
_cursorScreenPos = worldToScreen _cursorPos2; _cursorScreenPos = worldToScreen _cursorPos2;
_closestDistance = 1000000; _closestDistance = 1000000;
_closestSelection = -1; _closestSelection = -1;
{ {
_pos = _x select 1; _pos = _x select 1;
_sPos = worldToScreen _pos; _sPos = worldToScreen _pos;
if(count _sPos > 0) then { if(count _sPos > 0) then {
_disSq = (((_cursorScreenPos select 0) - (_sPos select 0))^2 + ((_cursorScreenPos select 1) - (_sPos select 1))^2); _disSq = (((_cursorScreenPos select 0) - (_sPos select 0))^2 + ((_cursorScreenPos select 1) - (_sPos select 1))^2);
if(_disSq < 0.0125 && _disSq < _closestDistance) then { if(_disSq < 0.0125 && _disSq < _closestDistance) then {
_closestDistance = _disSq; _closestDistance = _disSq;
_closestSelection = _forEachIndex; _closestSelection = _forEachIndex;
}; };
}; };
} forEach GVAR(currentOptions); } forEach GVAR(currentOptions);
if(_closestSelection != -1) then { if(_closestSelection != -1) then {
_closest = GVAR(currentOptions) select _closestSelection; _closest = GVAR(currentOptions) select _closestSelection;
_pos = _closest select 1; _pos = _closest select 1;
_cTime = diag_tickTime; _cTime = diag_tickTime;
_delta = _cTime - GVAR(lastTime); _delta = _cTime - GVAR(lastTime);
GVAR(lastTime) = _cTime; GVAR(lastTime) = _cTime;
GVAR(rotationAngle) = GVAR(rotationAngle) + (180*_delta); GVAR(rotationAngle) = GVAR(rotationAngle) + (180*_delta);
if(GVAR(rotationAngle) > 360) then { if(GVAR(rotationAngle) > 360) then {
GVAR(rotationAngle) = GVAR(rotationAngle) - 360; GVAR(rotationAngle) = GVAR(rotationAngle) - 360;
}; };
drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selectover_ca.paa", [1,0,0,.75], _pos, 0.6*SafeZoneW, 0.6*SafeZoneW, GVAR(rotationAngle), "", 0.5, 0.025, "TahomaB"]; drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selectover_ca.paa", [1,0,0,.75], _pos, 0.6*SafeZoneW, 0.6*SafeZoneW, GVAR(rotationAngle), "", 0.5, 0.025, "TahomaB"];
_foundTarget = true; _foundTarget = true;
GVAR(actionSelected) = true; GVAR(actionSelected) = true;
GVAR(selectedTarget) = (_closest select 0) select 0; GVAR(selectedTarget) = (_closest select 0) select 0;
GVAR(selectedAction) = ((_closest select 0) select 1) select 3; GVAR(selectedAction) = ((_closest select 0) select 1) select 3;
_misMatch = false; _misMatch = false;
_hoverPath = (_closest select 2); _hoverPath = (_closest select 2);
if((count GVAR(lastPath)) != (count _hoverPath)) then { if((count GVAR(lastPath)) != (count _hoverPath)) then {
_misMatch = true; _misMatch = true;
} else { } else {
{ {
if(_x != (_hoverPath select _forEachIndex)) exitWith { if(_x != (_hoverPath select _forEachIndex)) exitWith {
_misMatch = true; _misMatch = true;
}; };
} forEach GVAR(lastPath); } forEach GVAR(lastPath);
}; };
if(_misMatch) then { if(_misMatch) then {
GVAR(lastPath) = _hoverPath; GVAR(lastPath) = _hoverPath;
GVAR(startHoverTime) = diag_tickTime; GVAR(startHoverTime) = diag_tickTime;
GVAR(expanded) = false; GVAR(expanded) = false;
} else { } else {
if(!GVAR(expanded) && diag_tickTime-GVAR(startHoverTime) > 0.25) then { if(!GVAR(expanded) && diag_tickTime-GVAR(startHoverTime) > 0.25) then {
GVAR(expanded) = true; GVAR(expanded) = true;
GVAR(menuDepthPath) = +GVAR(lastPath); GVAR(menuDepthPath) = +GVAR(lastPath);
}; };
}; };
}; };
drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selected_ca.paa", [1,0,0,1], _cursorPos2, 1, 1, 0, "", 0.5, 0.025, "TahomaB"]; drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selected_ca.paa", [1,0,0,1], _cursorPos2, 1, 1, 0, "", 0.5, 0.025, "TahomaB"];
}; };
if(!_foundTarget && GVAR(actionSelected)) then { if(!_foundTarget && GVAR(actionSelected)) then {
GVAR(actionSelected) = false; GVAR(actionSelected) = false;
GVAR(expanded) = false; GVAR(expanded) = false;
GVAR(lastPath) = []; GVAR(lastPath) = [];
if(!GVAR(keyDown)) then { if(!GVAR(keyDown)) then {
GVAR(vecLineMap) = []; GVAR(vecLineMap) = [];
}; };
}; };
for "_i" from GVAR(iconCount) to (count GVAR(iconCtrls))-1 do { for "_i" from GVAR(iconCount) to (count GVAR(iconCtrls))-1 do {
ctrlDelete (GVAR(iconCtrls) select _i); ctrlDelete (GVAR(iconCtrls) select _i);
}; };
GVAR(iconCtrls) resize GVAR(iconCount); GVAR(iconCtrls) resize GVAR(iconCount);
GVAR(iconCount) = 0; GVAR(iconCount) = 0;

27
addons/interact_menu/functions/fnc_renderIcon.sqf
View File

@ -6,24 +6,23 @@ _text = _this select 0;
_color = _this select 1; _color = _this select 1;
_pos = _this select 2; _pos = _this select 2;
_icon = _this select 6; _icon = _this select 6;
//systemChat format ["Drawing icon %1", _text];
_sPos = worldToScreen _pos; _sPos = worldToScreen _pos;
// _sPos = _pos; // _sPos = _pos;
if(count _sPos > 0) then { if(count _sPos > 0) then {
// player sideChat format["render!"]; // player sideChat format["render!"];
if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then {
GVAR(iconCtrls) pushBack ((findDisplay 46) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); GVAR(iconCtrls) pushBack ((findDisplay 46) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]);
}; };
_ctrl = GVAR(iconCtrls) select GVAR(iconCount); _ctrl = GVAR(iconCtrls) select GVAR(iconCount);
GVAR(iconCount) = GVAR(iconCount) + 1; GVAR(iconCount) = GVAR(iconCount) + 1;
if(_icon == "") then { if(_icon == "") then {
_icon = DEFAULT_ICON; _icon = DEFAULT_ICON;
}; };
_text = "<img image='" + _icon + "' />" + _text; _text = format ["<img image='%1' color='%2' align='center'/><br/><t color ='%3' size='0.75' align='center'>%4</t>", _icon, _color, _color, _text];
_ctrl ctrlSetStructuredText (parseText _text); _ctrl ctrlSetStructuredText (parseText _text);
_ctrl ctrlSetPosition [(_sPos select 0)-(0.011*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.4*SafeZoneW, 0.025*SafeZoneW]; _ctrl ctrlSetPosition [(_sPos select 0)-(0.2*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.4*SafeZoneW, 0.035*SafeZoneW];
_ctrl ctrlSetForegroundColor _color; //_ctrl ctrlSetBackgroundColor [1, 0, 0, 0.1];
_opacity = _color select 3; // _ctrl ctrlSetBackgroundColor [1,0,0,1];
_control ctrlSetTextColor _color; _ctrl ctrlCommit 0;
// _ctrl ctrlSetBackgroundColor [1,0,0,1];
_ctrl ctrlCommit 0;
}; };

125
addons/interact_menu/functions/fnc_renderMenu.sqf
View File

@ -1,64 +1,89 @@
//fnc_renderMenu.sqf //fnc_renderMenu.sqf
#include "script_component.hpp" #include "script_component.hpp"
private ["_object", "_actionData", "_distance", "_index", "_pos", "_cursorScreenPos", "_path", "_menuDepth", "_opacity", "_currentRenderDepth", "_radialOffset", "_active", "_x", "_offset", "_newPos", "_forEachIndex"]; private ["_object", "_actionData", "_distance", "_uid", "_pos", "_cursorScreenPos", "_path", "_menuDepth", "_opacity", "_currentRenderDepth", "_radialOffset", "_active", "_x", "_offset", "_newPos", "_forEachIndex"];
_object = _this select 0; _object = _this select 0;
_actionData = _this select 1; _actionData = _this select 1;
_distance = _actionData select 5; _uid = _actionData select 7;//_this select 2;
_index = _this select 2; _angles = _this select 3;
if((count _this) > 3) then { _distance = _actionData select 5;
_pos = _this select 3; EXPLODE_2_PVT(_angles,_centerAngle,_maxAngleSpan);
if((count _this) > 4) then {
_pos = _this select 4;
} else { } else {
if(typeName (_actionData select 2) == "ARRAY") then { if(typeName (_actionData select 2) == "ARRAY") then {
_pos = _object modelToWorld (_actionData select 2); _pos = _object modelToWorld (_actionData select 2);
} else { } else {
_pos = _object modelToWorld (_object selectionPosition (_actionData select 2)); _pos = _object modelToWorld (_object selectionPosition (_actionData select 2));
}; };
}; };
_cursorScreenPos = (positionCameraToWorld [0, 0, 0]); _cursorScreenPos = (positionCameraToWorld [0, 0, 0]);
if(_cursorScreenPos distance _pos <= _distance) then { if(_cursorScreenPos distance _pos <= _distance) then {
_path = []; _path = [];
if((count _this) > 4) then { if((count _this) > 5) then {
_path = +(_this select 4); _path = +(_this select 5);
}; };
_menuDepth = (count GVAR(menuDepthPath)); _menuDepth = (count GVAR(menuDepthPath));
_opacity = 1; // ARGB Color (First Hex Pair is transparancy)
if(_menuDepth > 0 && _index != (GVAR(menuDepthPath) select (GVAR(renderDepth)))) then { _color = "#FFFFFFFF";
_opacity = ((GVAR(renderDepth)/_menuDepth)) max 0.25; if(_menuDepth > 0 && _uid != (GVAR(menuDepthPath) select (GVAR(renderDepth)))) then {
}; _color = format ["#%1FFFFFF", [255 * (((GVAR(renderDepth)/_menuDepth)) max 0.25)] call EFUNC(common,toHex)];
_path set[(count _path), _index]; };
// player sideChat format["r: %1", _actionData select 2]; _path set[(count _path), _uid];
[_actionData select 0, [1,1,1,_opacity], _pos, 1, 1, 0, _actionData select 1, 0.5, 0.025, "TahomaB"] call FUNC(renderIcon); [_actionData select 0, _color, _pos, 1, 1, 0, _actionData select 1, 0.5, 0.025, "TahomaB"] call FUNC(renderIcon);
GVAR(currentOptions) set[(count GVAR(currentOptions)), [_this, _pos, _path]]; GVAR(currentOptions) set[(count GVAR(currentOptions)), [_this, _pos, _path]];
_currentRenderDepth = -1; _currentRenderDepth = -1;
_currentRenderDepth = GVAR(renderDepth); _currentRenderDepth = GVAR(renderDepth);
GVAR(renderDepth) = GVAR(renderDepth) + 1; GVAR(renderDepth) = GVAR(renderDepth) + 1;
if(_index == (GVAR(menuDepthPath) select (GVAR(renderDepth)-1))) then { if(_uid == (GVAR(menuDepthPath) select (GVAR(renderDepth)-1))) then {
_radialOffset = 0; // Count how many actions are active
{ private "_numActions";
// if(_index != (GVAR(menuDepthPath) select (GVAR(renderDepth)))) then { _numActions = 0;
this = _object; {
_target = _object; this = _object;
_player = ACE_player; _target = _object;
_active = [_object, ACE_player] call (_x select 4); _player = ACE_player;
// diag_log text format["_active: %1: %2", (_x select 0), _active]; _active = [_object, ACE_player] call (_x select 4);
if(_active) then { if(_active) then {
_offset = [GVAR(vecLineMap), (270*(GVAR(renderDepth)%2))-(_radialOffset*45)] call FUNC(rotateVectLine); _numActions = _numActions + 1;
_mod = 0.1*_distance; };
_newPos = [ } forEach (_actionData select 6);
(_pos select 0) + ((_offset select 0)*_mod), systemChat format ["Menu %1, _numActions: %2", _actionData select 0, _numActions];
(_pos select 1) + ((_offset select 1)*_mod),
(_pos select 2) + ((_offset select 2)*_mod) private "_angleSpan";
]; _angleSpan = _maxAngleSpan min (55 * (_numActions - 1));
// drawLine3D [_pos, _newPos, [1,0,0,1]];
[_object, _x, _forEachIndex, _newPos, _path] call FUNC(renderMenu); private "_angle";
_radialOffset = _radialOffset + 1; _angle = _centerAngle - _angleSpan / 2;
{
this = _object;
_target = _object;
_player = ACE_player;
_active = [_object, ACE_player] call (_x select 4);
// diag_log text format["_active: %1: %2", (_x select 0), _active];
if(_active) then {
//systemChat format ["_angle: %1", _angle];
_offset = [GVAR(vecLineMap), _angle] call FUNC(rotateVectLine);
_mod = 0.15 max (0.15 * (_cursorScreenPos distance _pos)); //0.5;//0.1*_distance;
_newPos = [
(_pos select 0) + ((_offset select 0)*_mod),
(_pos select 1) + ((_offset select 1)*_mod),
(_pos select 2) + ((_offset select 2)*_mod)
];
// drawLine3D [_pos, _newPos, [1,0,0,0.5]];
[_object, _x, _forEachIndex, [_angle, 150], _newPos, _path] call FUNC(renderMenu);
if (_angle == 360) then {
_angle = _angle + _angleSpan / _numActions;
} else {
_angle = _angle + _angleSpan / ((_numActions-1) max 1);
}; };
// }; };
} forEach (_actionData select 6); } forEach (_actionData select 6);
}; };
GVAR(renderDepth) = GVAR(renderDepth) - 1; GVAR(renderDepth) = GVAR(renderDepth) - 1;
}; };

6
addons/interact_menu/functions/fnc_setToRender.sqf
View File

@ -1,6 +0,0 @@
//fnc_setToRender.sqf
#include "script_component.hpp"
// No idea what this function was for, it was autogenerated out of my WIP file...
private ["_options"];
_object = _this select 0;
_options = _this select 1;

192
addons/interaction/CfgVehicles.hpp
View File

@ -30,123 +30,133 @@ class CfgVehicles {
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {
class ACE_Actions { class ACE_Actions {
class ACE_TeamManagement { class ACE_MainActions {
displayName = "$STR_ACE_Interaction_TeamManagement"; displayName = "$STR_ACE_Interaction_MainAction";
distance = 4; distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player} && {GVAR(EnableTeamManagement)}); condition = QUOTE(true);
statement = ""; statement = "";
showDisabled = 0; icon = "\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa";
priority = 3.2; selection = "spine3";
icon = PATHTOF(UI\team\team_management_ca.paa);
subMenu[] = {"ACE_TeamManagement", 0};
hotkey = "M";
enableInside = 1;
class ACE_JoinTeamRed { class ACE_TeamManagement {
displayName = "$STR_ACE_Interaction_JoinTeamRed"; displayName = "$STR_ACE_Interaction_TeamManagement";
distance = 4; distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player} && {GVAR(EnableTeamManagement)});
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam)); statement = "";
showDisabled = 1; showDisabled = 0;
icon = PATHTOF(UI\team\team_red_ca.paa); priority = 3.2;
priority = 2.4; icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "R"; hotkey = "M";
enableInside = 1;
class ACE_JoinTeamRed {
displayName = "$STR_ACE_Interaction_JoinTeamRed";
distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_red_ca.paa);
priority = 2.4;
hotkey = "R";
enableInside = 1;
};
class ACE_JoinTeamGreen {
displayName = "$STR_ACE_Interaction_JoinTeamGreen";
distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_green_ca.paa);
priority = 2.3;
hotkey = "G";
enableInside = 1;
};
class ACE_JoinTeamBlue {
displayName = "$STR_ACE_Interaction_JoinTeamBlue";
distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_blue_ca.paa);
priority = 2.2;
hotkey = "B";
enableInside = 1;
};
class ACE_JoinTeamYellow {
displayName = "$STR_ACE_Interaction_JoinTeamYellow";
distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_yellow_ca.paa);
priority = 2.1;
hotkey = "Y";
enableInside = 1;
};
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([ARR_2(_target,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_white_ca.paa);
priority = 2.5;
hotkey = "N";
enableInside = 1;
};
};
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;);
showDisabled = 0;
priority = 2.6;
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "J";
enableInside = 1; enableInside = 1;
}; };
class ACE_JoinTeamGreen {
displayName = "$STR_ACE_Interaction_JoinTeamGreen"; class ACE_GetDown {
displayName = "$STR_ACE_Interaction_GetDown";
distance = 4; distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); condition = QUOTE([_target] call DFUNC(canInteractWith));
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam)); statement = QUOTE([_target] call DFUNC(getDown));
showDisabled = 1; showDisabled = 0;
icon = PATHTOF(UI\team\team_green_ca.paa);
priority = 2.3;
hotkey = "G";
enableInside = 1;
};
class ACE_JoinTeamBlue {
displayName = "$STR_ACE_Interaction_JoinTeamBlue";
distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_blue_ca.paa);
priority = 2.2; priority = 2.2;
hotkey = "B";
enableInside = 1;
}; };
class ACE_JoinTeamYellow { class ACE_SendAway {
displayName = "$STR_ACE_Interaction_JoinTeamYellow"; displayName = "$STR_ACE_Interaction_SendAway";
distance = 4; distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player}); condition = QUOTE([_target] call DFUNC(canInteractWith));
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam)); statement = QUOTE([_target] call DFUNC(sendAway));
showDisabled = 1; showDisabled = 0;
icon = PATHTOF(UI\team\team_yellow_ca.paa); priority = 2.0;
priority = 2.1;
hotkey = "Y";
enableInside = 1;
}; };
class ACE_Pardon {
class ACE_LeaveTeam { displayName = "$STR_ACE_Interaction_Pardon";
displayName = "$STR_ACE_Interaction_LeaveTeam";
distance = 4; distance = 4;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player} && {assignedTeam _player != 'MAIN'}); condition = QUOTE(rating _target < -2000 && {alive _target} && {side group _player == side group _target});
statement = QUOTE([ARR_2(_target,'MAIN')] call DFUNC(joinTeam)); statement = QUOTE([ARR_3(_target,'{_this addRating -rating _this}',_target)] call DEFUNC(common,execRemoteFnc));
showDisabled = 1; showDisabled = 0;
icon = PATHTOF(UI\team\team_white_ca.paa);
priority = 2.5; priority = 2.5;
hotkey = "N";
enableInside = 1; enableInside = 1;
}; };
}; };
class ACE_TapShoulder { class ACE_TapShoulder {
displayName = "$STR_ACE_Interaction_TapShoulder"; displayName = "$STR_ACE_Interaction_TapShoulder";
selection = "rightshoulder";
distance = 4; distance = 4;
condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder)); condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder));
statement = QUOTE([ARR_2(_player, _target)] call DFUNC(tapShoulder)); statement = QUOTE([ARR_2(_player, _target)] call DFUNC(tapShoulder));
showDisabled = 1; showDisabled = 0;
priority = 2.8; priority = 2.8;
hotkey = "Q"; hotkey = "Q";
enableInside = 1; enableInside = 1;
}; };
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;);
showDisabled = 0;
priority = 2.6;
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "J";
enableInside = 1;
};
class ACE_GetDown {
displayName = "$STR_ACE_Interaction_GetDown";
distance = 4;
condition = QUOTE([_target] call DFUNC(canInteractWith));
statement = QUOTE([_target] call DFUNC(getDown));
showDisabled = 0;
priority = 2.2;
};
class ACE_SendAway {
displayName = "$STR_ACE_Interaction_SendAway";
distance = 4;
condition = QUOTE([_target] call DFUNC(canInteractWith));
statement = QUOTE([_target] call DFUNC(sendAway));
showDisabled = 0;
priority = 2.0;
};
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([ARR_3(_target,'{_this addRating -rating _this}',_target)] call DEFUNC(common,execRemoteFnc));
showDisabled = 0;
priority = 2.5;
enableInside = 1;
};
}; };
class ACE_SelfActions { class ACE_SelfActions {

72
addons/interaction/XEH_clientInit.sqf
View File

@ -16,78 +16,6 @@ GVAR(isOpeningDoor) = false;
// Add keybinds // Add keybinds
["ACE3",
localize "STR_ACE_Interaction_InteractionMenu",
{
// Conditions: canInteract
_exceptions = ["ACE_Drag_isNotDragging", "ACE_Medical_canTreat", QEGVAR(captives,isNotEscorting), "ACE_Interaction_isNotSwimming"];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific
if !(isNull (findDisplay 1713999)) exitWith {false};
// Statement
call FUNC(onButtonDown);
true
},
[219, [false, false, false]],
false,
"keydown"
] call cba_fnc_registerKeybind;
["ACE3",
localize "STR_ACE_Interaction_InteractionMenu",
{
// Conditions: canInteract
_exceptions = ["ACE_Drag_isNotDragging", "ACE_Medical_canTreat", QEGVAR(captives,isNotEscorting), "ACE_Interaction_isNotSwimming"];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific
if !(!isNull (findDisplay 1713999) && {QGVAR(AutoCloseMenu)}) exitWith {false};
// Statement
if (GVAR(MenuType) mod 2 == 0) then {call FUNC(onButtonUp)};
true
},
[219, [false, false, false]],
false,
"keyup"
] call cba_fnc_registerKeybind;
["ACE3",
localize "STR_ACE_Interaction_InteractionMenuSelf",
{
// Conditions: canInteract
_exceptions = ["ACE_Drag_isNotDragging", "ACE_Medical_canTreat", QEGVAR(captives,isNotEscorting), QEGVAR(captives,isNotSurrendering), "ACE_Interaction_isNotSwimming", "ACE_Common_notOnMap"];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific
if !(isNull (findDisplay 1713999)) exitWith {false};
// Statement
call FUNC(onButtonDownSelf);
true
},
[219, [false, true, false]],
false,
"keydown"
] call cba_fnc_registerKeybind;
["ACE3",
localize "STR_ACE_Interaction_InteractionMenuSelf",
{
// Conditions: canInteract
_exceptions = ["ACE_Drag_isNotDragging", "ACE_Medical_canTreat", QEGVAR(captives,isNotEscorting), QEGVAR(captives,isNotSurrendering), "ACE_Interaction_isNotSwimming"];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific
if !(!isNull (findDisplay 1713999) && {QGVAR(AutoCloseMenu)}) exitWith {false};
// Statement
if (GVAR(MenuType) mod 2 == 1) then {call FUNC(onButtonUp)};
true
},
[219, [false, true, false]],
false,
"keyup"
] call cba_fnc_registerKeybind;
["ACE3", ["ACE3",
localize "STR_ACE_Interaction_OpenDoor", localize "STR_ACE_Interaction_OpenDoor",
{ {

3
addons/interaction/stringtable.xml
View File

@ -2,6 +2,9 @@
<!-- Edited with tabler - 2014-12-20 --> <!-- Edited with tabler - 2014-12-20 -->
<Project name="ACE"> <Project name="ACE">
<Package name="Interaction"> <Package name="Interaction">
<Key ID="STR_ACE_Interaction_MainAction">
<English>Interactions &gt;&gt;</English>
</Key>
<Key ID="STR_ACE_Interaction_InteractionMenu"> <Key ID="STR_ACE_Interaction_InteractionMenu">
<English>Interaction Menu</English> <English>Interaction Menu</English>
<German>Interaktionsmenü</German> <German>Interaktionsmenü</German>

4
addons/logistics_uavbattery/CfgVehicles.hpp
View File

@ -2,6 +2,7 @@ class CfgVehicles {
class Helicopter_Base_F; class Helicopter_Base_F;
class UAV_01_base_F: Helicopter_Base_F { class UAV_01_base_F: Helicopter_Base_F {
class ACE_Actions { class ACE_Actions {
class ACE_MainActions {
class GVAR(RefuelUAV) { class GVAR(RefuelUAV) {
displayName = "$STR_ACE_logistics_uavbattery_Recharge"; displayName = "$STR_ACE_logistics_uavbattery_Recharge";
distance = 4; distance = 4;
@ -11,9 +12,10 @@ class CfgVehicles {
priority = 1.245; \ priority = 1.245; \
icon = QUOTE(PATHTOF(ui\UAV_battery.paa)); icon = QUOTE(PATHTOF(ui\UAV_battery.paa));
}; };
};
}; };
}; };
// Misc box content // Misc box content
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {

14
addons/map/CfgVehicles.hpp
View File

@ -85,12 +85,14 @@ class CfgVehicles {
}; };
class ACE_Actions { class ACE_Actions {
class ACE_CopyMap { class ACE_MainActions {
displayName = "$STR_ACE_Map_CopyMap"; class ACE_CopyMap {
condition = QUOTE(([_target] call EFUNC(common,isPlayer) && {'ItemMap' in assigneditems _player} && {'ACE_MapTools' in items _player} && {'ItemMap' in assignedItems _target})); displayName = "$STR_ACE_Map_CopyMap";
statement = QUOTE([ARR_2(_player,_target)] call FUNC(copyMapStart)); condition = QUOTE(([_target] call EFUNC(common,isPlayer) && {'ItemMap' in assigneditems _player} && {'ACE_MapTools' in items _player} && {'ItemMap' in assignedItems _target}));
showDisabled = 0; statement = QUOTE([ARR_2(_player,_target)] call FUNC(copyMapStart));
priority = -1; showDisabled = 0;
priority = -1;
};
}; };
}; };
}; };

111
addons/respawn/CfgVehicles.hpp
View File

@ -78,13 +78,18 @@ class CfgVehicles {
init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint));
}; };
class ACE_Actions : ACE_Actions { class ACE_Actions : ACE_Actions {
class ACE_Teleport { class ACE_MainActions {
displayName = "Teleport to Rallypoint"; distance = 5;
distance = 4; condition = "true";
condition = QUOTE(side group _player == west); selection = "";
statement = QUOTE([ARR_3(_player, side group _player, false)] call FUNC(teleportToRallypoint)); class ACE_Teleport {
showDisabled = 1; displayName = "Teleport to Rallypoint";
priority = 1; distance = 4;
condition = QUOTE(side group _player == west);
statement = QUOTE([ARR_3(_player, side group _player, false)] call FUNC(teleportToRallypoint));
showDisabled = 1;
priority = 1;
};
}; };
}; };
}; };
@ -98,13 +103,18 @@ class CfgVehicles {
init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint));
}; };
class ACE_Actions : ACE_Actions { class ACE_Actions : ACE_Actions {
class ACE_Teleport { class ACE_MainActions {
displayName = "Teleport to Rallypoint"; distance = 5;
distance = 4; condition = "true";
condition = QUOTE(side group _player == east); selection = "";
statement = QUOTE([ARR_3(_player, side group _player, false)] call FUNC(teleportToRallypoint)); class ACE_Teleport {
showDisabled = 1; displayName = "Teleport to Rallypoint";
priority = 1; distance = 4;
condition = QUOTE(side group _player == east);
statement = QUOTE([ARR_3(_player, side group _player, false)] call FUNC(teleportToRallypoint));
showDisabled = 1;
priority = 1;
};
}; };
}; };
}; };
@ -118,13 +128,18 @@ class CfgVehicles {
init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint));
}; };
class ACE_Actions : ACE_Actions { class ACE_Actions : ACE_Actions {
class ACE_Teleport { class ACE_MainActions {
displayName = "Teleport to Rallypoint"; distance = 5;
distance = 4; condition = "true";
condition = QUOTE(side group _player == independent); selection = "";
statement = QUOTE([ARR_3(_player, side group _player, false)] call FUNC(teleportToRallypoint)); class ACE_Teleport {
showDisabled = 1; displayName = "Teleport to Rallypoint";
priority = 1; distance = 4;
condition = QUOTE(side group _player == independent);
statement = QUOTE([ARR_3(_player, side group _player, false)] call FUNC(teleportToRallypoint));
showDisabled = 1;
priority = 1;
};
}; };
}; };
}; };
@ -139,13 +154,17 @@ class CfgVehicles {
init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint)); init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_nato_CO.paa'; _this call FUNC(initRallypoint));
}; };
class ACE_Actions : ACE_Actions { class ACE_Actions : ACE_Actions {
class ACE_Teleport { class ACE_MainActions {
displayName = "Teleport to Base"; distance = 5;
distance = 4; condition = "true";
condition = QUOTE(side group _player == west); class ACE_Teleport {
statement = QUOTE([ARR_3(_player, side group _player, true)] call FUNC(teleportToRallypoint)); displayName = "Teleport to Base";
showDisabled = 1; distance = 4;
priority = 1; condition = QUOTE(side group _player == west);
statement = QUOTE([ARR_3(_player, side group _player, true)] call FUNC(teleportToRallypoint));
showDisabled = 1;
priority = 1;
};
}; };
}; };
}; };
@ -159,13 +178,17 @@ class CfgVehicles {
init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint)); init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_CSAT_CO.paa'; _this call FUNC(initRallypoint));
}; };
class ACE_Actions : ACE_Actions { class ACE_Actions : ACE_Actions {
class ACE_Teleport { class ACE_MainActions {
displayName = "Teleport to Base"; distance = 5;
distance = 4; condition = "true";
condition = QUOTE(side group _player == east); class ACE_Teleport {
statement = QUOTE([ARR_3(_player, side group _player, true)] call FUNC(teleportToRallypoint)); displayName = "Teleport to Base";
showDisabled = 1; distance = 4;
priority = 1; condition = QUOTE(side group _player == east);
statement = QUOTE([ARR_3(_player, side group _player, true)] call FUNC(teleportToRallypoint));
showDisabled = 1;
priority = 1;
};
}; };
}; };
}; };
@ -179,13 +202,17 @@ class CfgVehicles {
init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint)); init = QUOTE((_this select 0) setFlagTexture '\A3\Data_F\Flags\Flag_AAF_CO.paa'; _this call FUNC(initRallypoint));
}; };
class ACE_Actions : ACE_Actions { class ACE_Actions : ACE_Actions {
class ACE_Teleport { class ACE_MainActions {
displayName = "Teleport to Base"; distance = 5;
distance = 4; condition = "true";
condition = QUOTE(side group _player == independent); class ACE_Teleport {
statement = QUOTE([ARR_3(_player, side group _player, true)] call FUNC(teleportToRallypoint)); displayName = "Teleport to Base";
showDisabled = 1; distance = 4;
priority = 1; condition = QUOTE(side group _player == independent);
statement = QUOTE([ARR_3(_player, side group _player, true)] call FUNC(teleportToRallypoint));
showDisabled = 1;
priority = 1;
};
}; };
}; };
}; };

55
addons/vehiclelock/CfgVehicles.hpp
View File

@ -1,29 +1,34 @@
#define MACRO_LOCK_ACTIONS \ #define MACRO_LOCK_ACTIONS \
class ACE_unlockVehicle { \ class ACE_MainActions { \
displayName = "$STR_ACE_Vehicle_Action_UnLock"; \ selection = ""; \
distance = 4; \ distance = 5; \
condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \ condition = "true"; \
statement = QUOTE([ARR_3('SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \ class ACE_unlockVehicle { \
showDisabled = 0; \ displayName = "$STR_ACE_Vehicle_Action_UnLock"; \
priority = 0.3; \ distance = 4; \
icon = QUOTE(PATHTOF(ui\key_menuIcon_ca.paa)); \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \
}; \ statement = QUOTE([ARR_3('SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \
class ACE_lockVehicle { \ showDisabled = 0; \
displayName = "$STR_ACE_Vehicle_Action_Lock"; \ priority = 0.3; \
distance = 4; \ icon = QUOTE(PATHTOF(ui\key_menuIcon_ca.paa)); \
condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \ }; \
statement = QUOTE([ARR_3('SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \ class ACE_lockVehicle { \
showDisabled = 0; \ displayName = "$STR_ACE_Vehicle_Action_Lock"; \
priority = 0.2; \ distance = 4; \
icon = QUOTE(PATHTOF(ui\key_menuIcon_ca.paa)); \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \
}; \ statement = QUOTE([ARR_3('SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \
class ACE_lockpickVehicle { \ showDisabled = 0; \
displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \ priority = 0.2; \
distance = 4; \ icon = QUOTE(PATHTOF(ui\key_menuIcon_ca.paa)); \
condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \ }; \
statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \ class ACE_lockpickVehicle { \
showDisabled = 0; \ displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \
priority = 0.1; \ distance = 4; \
condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \
statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \
showDisabled = 0; \
priority = 0.1; \
}; \
}; };
class CfgVehicles { class CfgVehicles {