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 'refs/remotes/origin/master' into vehicleInteractionDistance

Browse Source
This commit is contained in:
PabstMirror
2016-06-14 19:36:45 -05:00
parent ff04ca8981 11dc3bd71a
commit d46c596cc4
2181 changed files with 103293 additions and 92389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
addons/interaction/CfgVehicles.hpp
View File

@ -1,4 +1,6 @@
class CBA_Extended_EventHandlers;
class CfgVehicles {
class ACE_Module;
class ACE_ModuleInteraction: ACE_Module {
@ -9,8 +11,7 @@ class CfgVehicles {
scope = 2;
isGlobal = 1;
isSingular = 1;
icon = PATHTOF(UI\Icon_Module_Interaction_ca.paa);
icon = QPATHTOF(UI\Icon_Module_Interaction_ca.paa);
class Arguments {
class EnableTeamManagement {
displayName = CSTRING(EnableTeamManagement_DisplayName);
@ -19,7 +20,6 @@ class CfgVehicles {
defaultValue = 1;
};
};
class ModuleDescription {
description = CSTRING(Module_Description);
};
@ -68,14 +68,14 @@ class CfgVehicles {
statement = "";
showDisabled = 0;
priority = 3.2;
icon = PATHTOF(UI\team\team_management_ca.paa);
icon = QPATHTOF(UI\team\team_management_ca.paa);
class ACE_AssignTeamRed {
displayName = CSTRING(AssignTeamRed);
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_red_ca.paa);
icon = QPATHTOF(UI\team\team_red_ca.paa);
priority = 2.4;
};
class ACE_AssignTeamGreen {
@ -83,7 +83,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_green_ca.paa);
icon = QPATHTOF(UI\team\team_green_ca.paa);
priority = 2.3;
};
class ACE_AssignTeamBlue {
@ -91,7 +91,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_blue_ca.paa);
icon = QPATHTOF(UI\team\team_blue_ca.paa);
priority = 2.2;
};
class ACE_AssignTeamYellow {
@ -99,7 +99,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_yellow_ca.paa);
icon = QPATHTOF(UI\team\team_yellow_ca.paa);
priority = 2.1;
};
class ACE_UnassignTeam {
@ -107,7 +107,7 @@ class CfgVehicles {
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam) && {assignedTeam _target != 'MAIN'});
statement = QUOTE([ARR_2(_target,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_white_ca.paa);
icon = QPATHTOF(UI\team\team_white_ca.paa);
priority = 2.5;
};
};
@ -118,7 +118,7 @@ class CfgVehicles {
statement = QUOTE([_player] joinSilent group _target);
showDisabled = 0;
priority = 2.6;
icon = PATHTOF(UI\team\team_management_ca.paa);
icon = QPATHTOF(UI\team\team_management_ca.paa);
};
class ACE_GetDown {
displayName = CSTRING(GetDown);
@ -223,7 +223,7 @@ class CfgVehicles {
statement = "";
showDisabled = 1;
priority = 3.2;
icon = PATHTOF(UI\team\team_management_ca.paa);
icon = QPATHTOF(UI\team\team_management_ca.paa);
class ACE_JoinTeamRed {
displayName = CSTRING(JoinTeamRed);
@ -232,7 +232,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.4;
icon = PATHTOF(UI\team\team_red_ca.paa);
icon = QPATHTOF(UI\team\team_red_ca.paa);
};
class ACE_JoinTeamGreen {
displayName = CSTRING(JoinTeamGreen);
@ -241,7 +241,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.3;
icon = PATHTOF(UI\team\team_green_ca.paa);
icon = QPATHTOF(UI\team\team_green_ca.paa);
};
class ACE_JoinTeamBlue {
displayName = CSTRING(JoinTeamBlue);
@ -250,7 +250,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.2;
icon = PATHTOF(UI\team\team_blue_ca.paa);
icon = QPATHTOF(UI\team\team_blue_ca.paa);
};
class ACE_JoinTeamYellow {
displayName = CSTRING(JoinTeamYellow);
@ -259,7 +259,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.1;
icon = PATHTOF(UI\team\team_yellow_ca.paa);
icon = QPATHTOF(UI\team\team_yellow_ca.paa);
};
class ACE_LeaveTeam {
displayName = CSTRING(LeaveTeam);
@ -268,7 +268,7 @@ class CfgVehicles {
statement = QUOTE([ARR_2(_player,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
priority = 2.5;
icon = PATHTOF(UI\team\team_white_ca.paa);
icon = QPATHTOF(UI\team\team_white_ca.paa);
};
class ACE_BecomeLeader {
displayName = CSTRING(BecomeLeader);
@ -277,7 +277,7 @@ class CfgVehicles {
statement = QUOTE(_this call DFUNC(doBecomeLeader));
showDisabled = 1;
priority = 1.0;
icon = PATHTOF(UI\team\team_white_ca.paa);
icon = QPATHTOF(UI\team\team_white_ca.paa);
};
class ACE_LeaveGroup {
displayName = CSTRING(LeaveGroup);
@ -286,7 +286,7 @@ class CfgVehicles {
statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;);
showDisabled = 1;
priority = 1.2;
icon = PATHTOF(UI\team\team_management_ca.paa);
icon = QPATHTOF(UI\team\team_management_ca.paa);
};
};
@ -357,6 +357,32 @@ class CfgVehicles {
};
};
class Motorcycle: LandVehicle {
class ACE_Actions {
class ACE_MainActions {
displayName = CSTRING(MainAction);
selection = "";
distance = 10;
condition = "true";
class ACE_Passengers {
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
};
};
};
class ACE_SelfActions {
class ACE_Passengers {
displayName = CSTRING(Passengers);
condition = "true";
statement = "";
insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
};
};
};
class Air;
class Helicopter: Air {
class ACE_Actions {
@ -424,7 +450,7 @@ class CfgVehicles {
class ACE_Push {
displayName = CSTRING(Push);
distance = 6;
condition = QUOTE(getMass _target <= 2600 && {alive _target} && {vectorMagnitude velocity _target < 3});
condition = QUOTE(_target call FUNC(canPush));
statement = QUOTE(_this call FUNC(push));
showDisabled = 0;
priority = -1;
@ -474,14 +500,6 @@ class CfgVehicles {
};
};
class Pod_Heli_Transport_04_base_F: StaticWeapon {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
distance = 5;
};
};
};
class StaticMGWeapon: StaticWeapon {};
class HMG_01_base_F: StaticMGWeapon {};
@ -530,6 +548,14 @@ class CfgVehicles {
class ACE_SelfActions {};
};
class Slingload_base_F: ReammoBox_F {};
class Pod_Heli_Transport_04_base_F: Slingload_base_F {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
distance = 5;
};
};
};
class ACE_RepairItem_Base: ThingX {
class ACE_Actions {
@ -544,6 +570,44 @@ class CfgVehicles {
class ACE_SelfActions {};
};
class Lamps_base_F;
class Land_PortableLight_single_F: Lamps_base_F {
class EventHandlers {
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
};
scope = 2;
class ACE_Actions {
class ACE_MainActions {
displayName = CSTRING(MainAction);
selection = "";
distance = 2;
condition = "true";
class ACE_LampTurnOn {
displayName = CSTRING(TurnOn);
condition = QUOTE(alive _target && !(_target getVariable [ARR_2('ACE_lampOn',true)]));
statement = QUOTE(_target call DFUNC(switchLamp));
selection = "";
distance = 2;
};
class ACE_LampTurnOff {
displayName = CSTRING(TurnOff);
condition = QUOTE(alive _target && _target getVariable [ARR_2('ACE_lampOn',true)]);
statement = QUOTE(_target call DFUNC(switchLamp));
selection = "";
distance = 2;
};
};
};
};
class Land_PortableLight_single_off_F: Land_PortableLight_single_F {
scope = 1;
};
class Land_PortableLight_double_F: Land_PortableLight_single_F {};
class Land_PortableLight_double_off_F: Land_PortableLight_double_F {
scope = 1;
};
class RoadCone_F: ThingX {
class ACE_Actions {
class ACE_MainActions {