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

manual merge

Browse Source
This commit is contained in:
commy2
2016-02-10 10:11:33 +01:00
parent ae1f35c042 e2b8998d4b
commit 82086efca0
1026 changed files with 10413 additions and 6333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
addons/interaction/CfgVehicles.hpp
View File

@ -69,7 +69,6 @@ class CfgVehicles {
showDisabled = 0;
priority = 3.2;
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "M";
class ACE_AssignTeamRed {
displayName = CSTRING(AssignTeamRed);
@ -78,7 +77,6 @@ class CfgVehicles {
showDisabled = 1;
icon = PATHTOF(UI\team\team_red_ca.paa);
priority = 2.4;
hotkey = "R";
};
class ACE_AssignTeamGreen {
displayName = CSTRING(AssignTeamGreen);
@ -87,7 +85,6 @@ class CfgVehicles {
showDisabled = 1;
icon = PATHTOF(UI\team\team_green_ca.paa);
priority = 2.3;
hotkey = "G";
};
class ACE_AssignTeamBlue {
displayName = CSTRING(AssignTeamBlue);
@ -96,7 +93,6 @@ class CfgVehicles {
showDisabled = 1;
icon = PATHTOF(UI\team\team_blue_ca.paa);
priority = 2.2;
hotkey = "B";
};
class ACE_AssignTeamYellow {
displayName = CSTRING(AssignTeamYellow);
@ -105,7 +101,6 @@ class CfgVehicles {
showDisabled = 1;
icon = PATHTOF(UI\team\team_yellow_ca.paa);
priority = 2.1;
hotkey = "Y";
};
class ACE_UnassignTeam {
displayName = CSTRING(LeaveTeam);
@ -114,7 +109,6 @@ class CfgVehicles {
showDisabled = 1;
icon = PATHTOF(UI\team\team_white_ca.paa);
priority = 2.5;
hotkey = "N";
};
};
@ -125,7 +119,6 @@ class CfgVehicles {
showDisabled = 0;
priority = 2.6;
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "J";
};
class ACE_GetDown {
displayName = CSTRING(GetDown);
@ -148,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 {
@ -224,7 +224,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 3.2;
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "M";
class ACE_JoinTeamRed {
displayName = CSTRING(JoinTeamRed);
@ -234,7 +233,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 2.4;
icon = PATHTOF(UI\team\team_red_ca.paa);
hotkey = "R";
};
class ACE_JoinTeamGreen {
displayName = CSTRING(JoinTeamGreen);
@ -244,7 +242,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 2.3;
icon = PATHTOF(UI\team\team_green_ca.paa);
hotkey = "G";
};
class ACE_JoinTeamBlue {
displayName = CSTRING(JoinTeamBlue);
@ -254,7 +251,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 2.2;
icon = PATHTOF(UI\team\team_blue_ca.paa);
hotkey = "B";
};
class ACE_JoinTeamYellow {
displayName = CSTRING(JoinTeamYellow);
@ -264,7 +260,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 2.1;
icon = PATHTOF(UI\team\team_yellow_ca.paa);
hotkey = "Y";
};
class ACE_LeaveTeam {
displayName = CSTRING(LeaveTeam);
@ -274,7 +269,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 2.5;
icon = PATHTOF(UI\team\team_white_ca.paa);
hotkey = "N";
};
class ACE_BecomeLeader {
displayName = CSTRING(BecomeLeader);
@ -284,7 +278,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 1.0;
icon = PATHTOF(UI\team\team_white_ca.paa);
hotkey = "L";
};
class ACE_LeaveGroup {
displayName = CSTRING(LeaveGroup);
@ -294,7 +287,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 1.2;
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "M";
};
};
@ -306,7 +298,6 @@ class CfgVehicles {
showDisabled = 1;
priority = 4.5;
icon = ""; // @todo
hotkey = "E";
};
};
};
@ -486,7 +477,7 @@ class CfgVehicles {
};
};
};
class StaticMGWeapon: StaticWeapon {};
class HMG_01_base_F: StaticMGWeapon {};
@ -514,8 +505,8 @@ class CfgVehicles {
};
};
class thingX;
class ReammoBox_F: thingX {
class ThingX;
class ReammoBox_F: ThingX {
class ACE_Actions {
class ACE_MainActions {
displayName = CSTRING(MainAction);
@ -536,7 +527,7 @@ class CfgVehicles {
class ACE_SelfActions {};
};
class ACE_RepairItem_Base: thingX {
class ACE_RepairItem_Base: ThingX {
class ACE_Actions {
class ACE_MainActions {
displayName = CSTRING(MainAction);
@ -549,7 +540,7 @@ class CfgVehicles {
class ACE_SelfActions {};
};
class RoadCone_F: thingX {
class RoadCone_F: ThingX {
class ACE_Actions {
class ACE_MainActions {
displayName = CSTRING(MainAction);

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

2
addons/interaction/functions/fnc_joinTeam.sqf
View File

@ -22,7 +22,7 @@ params ["_unit", "_team"];
// display message
if (_unit == ACE_player) then {
private "_message";
private "_message";
if (_team == "MAIN") then {
_message = localize LSTRING(LeftTeam);

5
addons/interaction/script_component.hpp
View File

@ -1,6 +1,11 @@
#define COMPONENT interaction
#include "\z\ace\addons\main\script_mod.hpp"
// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
// #define CBA_DEBUG_SYNCHRONOUS
// #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_INTERACTION
#define DEBUG_MODE_FULL
#endif

30
addons/interaction/stringtable.xml
View File

@ -222,7 +222,7 @@
<German>TANZEN!</German>
<Spanish>BAILAR!</Spanish>
<Polish>TAŃCZ!</Polish>
<Czech>TANČIT!</Czech>
<Czech>TANCUJ!</Czech>
<French>Danse!</French>
<Russian>ТАНЦЕВАТЬ!</Russian>
<Hungarian>TÁNC!</Hungarian>
@ -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>
@ -511,7 +514,7 @@
<Spanish>Te has unido al equipo %1</Spanish>
<French>Tu as rejoint l'équipe %1</French>
<Polish>Dołączyłeś do %1</Polish>
<Czech>Připojil ses do %1 týmu</Czech>
<Czech>Připojili jste se do %1 týmu</Czech>
<Russian>Вы присоединились к группе %1</Russian>
<Portuguese>Você uniu-se à Equipe %1</Portuguese>
<Italian>Sei entrato nel team %1</Italian>
@ -535,7 +538,7 @@
<Spanish>Has dejado el equipo</Spanish>
<French>Tu as quitté l'équipe</French>
<Polish>Opuściłeś drużynę</Polish>
<Czech>Opustil jsi tým</Czech>
<Czech>Opustili jste tým</Czech>
<Russian>Вы покинули группу</Russian>
<Portuguese>Você deixou a Equipe</Portuguese>
<Italian>Hai lasciato il team</Italian>
@ -563,7 +566,7 @@
<Portuguese>Rolar</Portuguese>
<Italian>Scorri</Italian>
<Hungarian>Görgetés</Hungarian>
<Czech>Otáčení</Czech>
<Czech>Posunout</Czech>
</Key>
<Key ID="STR_ACE_Interaction_ModifierKey">
<English>Modifier Key</English>
@ -607,7 +610,7 @@
<Spanish>Empujar</Spanish>
<French>Pousser</French>
<Polish>Pchnij</Polish>
<Czech>Odstrčit</Czech>
<Czech>Tlačit</Czech>
<Hungarian>Tolás</Hungarian>
<Russian>Толкать</Russian>
<Portuguese>Empurrar</Portuguese>
@ -695,26 +698,41 @@
<English>Pass magazine</English>
<German>Magazin geben</German>
<Polish>Podaj magazynek</Polish>
<Russian>Передать магазин</Russian>
<Portuguese>Passar carregador</Portuguese>
<Czech>Podat zásobník</Czech>
</Key>
<Key ID="STR_ACE_Interaction_PassMagazinePrimary">
<English>Primary magazine</English>
<German>Gewehrmagazin</German>
<Polish>Magazynek karabinowy</Polish>
<Russian>Основной магазин</Russian>
<Portuguese>Carregador primário</Portuguese>
<Czech>Zásobník do primární zbraně</Czech>
</Key>
<Key ID="STR_ACE_Interaction_PassMagazineHandgun">
<English>Pistol magazine</English>
<German>Pistolenmagazin</German>
<Polish>Magazynek pistoletowy</Polish>
<Russian>Магазин к пистолету</Russian>
<Portuguese>Carregador da pistola</Portuguese>
<Czech>Zásobník do pistole</Czech>
</Key>
<Key ID="STR_ACE_Interaction_PassMagazineHint">
<English>%1 passed you a %2 magazine.</English>
<German>%1 hat dir ein %2 Magazin gegeben.</German>
<Polish>%1 podał Ci magazynek %2.</Polish>
<Russian>%1 передал вам магазин %2.</Russian>
<Portuguese>%1 passou a você um carregador %2.</Portuguese>
<Czech>%1 ti podal %2 zásobník.</Czech>
</Key>
<Key ID="STR_ACE_Interaction_PassMagazineSetting">
<English>Show "pass magazine" interaction</English>
<German>Zeige "Magazine geben" Interaktion</German>
<Polish>Pokaż interakcję "podaj magazynek"</Polish>
<Russian>Показывать действие "передать магазин"</Russian>
<Portuguese>Mostrar a interação "Passar carregador"</Portuguese>
<Czech>Zobrazit "interakci "podat zásobník"</Czech>
</Key>
</Package>
</Project>
</Project>