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 pull request #3070 from dixon13/newCivInteraction

Browse Source 
Changes to civilian interaction
This commit is contained in:
Thomas Kooi 2016-02-05 09:14:45 +01:00
commit f47b51c0cb
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -53,6 +53,7 @@ Coren <coren4@gmail.com>
Crusty
Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
Dimaslg <dimaslg@telecable.es>
dixon13 <dixonbegay@gmail.com>
Drill <drill87@gmail.com>
Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
Dslyecxi <dslyecxi@gmail.com>

7
addons/interaction/CfgVehicles.hpp
View File

@ -141,6 +141,13 @@ class CfgVehicles {
showDisabled = 0;
priority = 2.5;
};
class ACE_GetOut {
displayName = CSTRING(GetOut);
condition = QUOTE(!(isNull objectParent _target) && [ARR_2(_player,_target)] call DFUNC(canInteractWithCivilian));
statement = QUOTE([_target] call EFUNC(common,unloadPerson));
showDisabled = 0;
priority = 2.6;
};
};
class ACE_Torso {

2
addons/interaction/config.cpp
View File

@ -6,7 +6,7 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interact_menu"};
author[] = {"commy2", "KoffeinFlummi", "esteldunedain", "bux578"};
author[] = {"commy2", "KoffeinFlummi", "esteldunedain", "bux578", "dixon13"};
authorUrl = "https://github.com/commy2/";
VERSION_CONFIG;
};

1
addons/interaction/functions/fnc_canInteractWithCivilian.sqf
View File

@ -18,5 +18,4 @@
#include "script_component.hpp"
params ["_unit", "_target", ["_isCivilian", true]];
alive _target && [side _target != side _unit, side group _target == civilian] select _isCivilian // return

5
addons/interaction/stringtable.xml
View File

@ -349,6 +349,9 @@
<Portuguese>Abaixe-se!</Portuguese>
<Italian>A terra!</Italian>
</Key>
<key ID="STR_ACE_Interaction_GetOut">
<English>Get Out</English>
</key>
<Key ID="STR_ACE_Interaction_TeamManagement">
<English>Team Management</English>
<German>Gruppenverwaltung</German>
@ -732,4 +735,4 @@
<Czech>Zobrazit "interakci "podat zásobník"</Czech>
</Key>
</Package>
</Project>
</Project>