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

allow actions to be defined for different selections

Browse Source
This commit is contained in:
Nicolás Badano 2015-02-19 15:36:27 -03:00
parent 30943cbfd4
commit f7d5d615ee
12 changed files with 356 additions and 283 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"; \
}; \
}; \ }; \
}; };

36
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,24 +62,18 @@ _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)
]; ];
diag_log _entry;
GVAR(uidCounter) = GVAR(uidCounter) + 1; 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 },
@ -98,5 +106,5 @@ _actions = [[
] ]
]; ];
GVAR(uidCounter) = GVAR(uidCounter) + 1; GVAR(uidCounter) = GVAR(uidCounter) + 1;
*/
_object setVariable [QUOTE(GVAR(actionData)), _actions]; _object setVariable [QUOTE(GVAR(actionData)), _filteredActions];

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

@ -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;

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

@ -6,7 +6,7 @@ _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 {

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

@ -34,7 +34,6 @@ if(_cursorScreenPos distance _pos <= _distance) then {
_color = format ["#%1FFFFFF", [255 * (((GVAR(renderDepth)/_menuDepth)) max 0.25)] call EFUNC(common,toHex)]; _color = format ["#%1FFFFFF", [255 * (((GVAR(renderDepth)/_menuDepth)) max 0.25)] call EFUNC(common,toHex)];
}; };
_path set[(count _path), _index]; _path set[(count _path), _index];
// player sideChat format["r: %1", _actionData select 2];
[_actionData select 0, _color, _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;
@ -53,7 +52,7 @@ if(_cursorScreenPos distance _pos <= _distance) then {
_numActions = _numActions + 1; _numActions = _numActions + 1;
}; };
} forEach (_actionData select 6); } forEach (_actionData select 6);
systemChat format ["_numActions: %1", _numActions]; systemChat format ["Menu %1, _numActions: %2", _actionData select 0, _numActions];
private "_angleSpan"; private "_angleSpan";
_angleSpan = _maxAngleSpan min (35 * (_numActions - 1)); _angleSpan = _maxAngleSpan min (35 * (_numActions - 1));
@ -67,7 +66,7 @@ if(_cursorScreenPos distance _pos <= _distance) then {
_active = [_object, ACE_player] call (_x select 4); _active = [_object, ACE_player] call (_x select 4);
// diag_log text format["_active: %1: %2", (_x select 0), _active]; // diag_log text format["_active: %1: %2", (_x select 0), _active];
if(_active) then { if(_active) then {
systemChat format ["_angle: %1", _angle]; //systemChat format ["_angle: %1", _angle];
_offset = [GVAR(vecLineMap), _angle] call FUNC(rotateVectLine); _offset = [GVAR(vecLineMap), _angle] call FUNC(rotateVectLine);
_mod = 0.4 max (0.15 * (_cursorScreenPos distance _pos)); //0.5;//0.1*_distance; _mod = 0.4 max (0.15 * (_cursorScreenPos distance _pos)); //0.5;//0.1*_distance;
_newPos = [ _newPos = [

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 {

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 {