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 branch 'master' of github.com:acemod/ACE3

Browse Source
This commit is contained in:
jaynus 2015-04-15 09:55:48 -07:00
commit 2e3545f3d0
7 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -67,6 +67,7 @@ rakowozz
Raspu86
Riccardo Petricca <petriccarcc@gmail.com>
Robert Boklahánics <bokirobi@gmail.com>
ramius86 <pasini86@hotmail.com>
simon84
Sniperwolf572 <tenga6@gmail.com>
Tonic

17
addons/captives/functions/fnc_setHandcuffed.sqf
View File

@ -29,11 +29,11 @@ if ((_unit getVariable [QGVAR(isHandcuffed), false]) isEqualTo _state) exitWith
if (_state) then {
_unit setVariable [QGVAR(isHandcuffed), true, true];
[_unit, QGVAR(Handcuffed), true] call EFUNC(common,setCaptivityStatus);
if (_unit getVariable [QGVAR(isSurrendering), false]) then { //If surrendering, stop
[_unit, false] call FUNC(setSurrendered);
};
//Set unit cargoIndex (will be -1 if dismounted)
_unit setVariable [QGVAR(CargoIndex), ((vehicle _unit) getCargoIndex _unit), true];
@ -47,30 +47,29 @@ if (_state) then {
if (_unit getVariable [QGVAR(isHandcuffed), false] && {vehicle _unit == _unit}) then {
[_unit] call EFUNC(common,fixLoweredRifleAnimation);
[_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
//Adds an animation changed eh
//If we get a change in animation then redo the animation (handles people vaulting to break the animation chain)
_animChangedEHID = _unit addEventHandler ["AnimChanged", {
PARAMS_2(_unit,_newAnimation);
if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
ERROR("Handcuff animation interrupted");
// systemChat format ["debug %2: new %1", _newAnimation, time];
TRACE_1("Handcuff animation interrupted",_newAnimation);
[_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
};
}];
_unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
};
}, [_unit], 0.01, 0] call EFUNC(common,waitAndExecute);
} else {
_unit setVariable [QGVAR(isHandcuffed), false, true];
[_unit, QGVAR(Handcuffed), false] call EFUNC(common,setCaptivityStatus);
//remove AnimChanged EH
//remove AnimChanged EH
_animChangedEHID = _unit getVariable [QGVAR(handcuffAnimEHID), -1];
_unit removeEventHandler ["AnimChanged", _animChangedEHID];
_unit setVariable [QGVAR(handcuffAnimEHID), -1];
if (((vehicle _unit) == _unit) && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
//Break out of hands up animation loop
[_unit, "ACE_AmovPercMstpScapWnonDnon_AmovPercMstpSnonWnonDnon", 2] call EFUNC(common,doAnimation);

3
addons/captives/functions/fnc_setSurrendered.sqf
View File

@ -51,8 +51,7 @@ if (_state) then {
_animChangedEHID = _unit addEventHandler ["AnimChanged", {
PARAMS_2(_unit,_newAnimation);
if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
ERROR("Surrender animation interrupted");
// systemChat format ["debug %2: new %1", _newAnimation, time];
TRACE_1("Surrender animation interrupted",_newAnimation);
[_unit, "ACE_AmovPercMstpSsurWnonDnon", 1] call EFUNC(common,doAnimation);
};
}];

1
addons/interact_menu/stringtable.xml
View File

@ -14,6 +14,7 @@
<Key ID="STR_ACE_Interact_Menu_UseListMenu">
<English>Display interaction menus as lists</English>
<Spanish>Mostrar los menus de interacción como listas</Spanish>
<Russian>Показывать меню взаимодействия в виде списка</Russian>
</Key>
<Key ID="STR_ACE_Interact_Menu_InteractKey">
<English>Interact Key</English>

6
addons/kestrel4500/stringtable.xml
View File

@ -17,27 +17,33 @@
<Key ID="STR_ACE_Kestrel_Description">
<English>Kestrel 4500 Pocket Weather Tracker</English>
<Polish>Anemomentr skrzydełkowy Kestrel 4500</Polish>
<Russian>Карманная метеостанция Kestrel 4500NV</Russian>
</Key>
<Key ID="STR_ACE_Kestrel4500_OpenKestrel">
<English>Open Kestrel 4500</English>
<Polish>Otwórz Kestrel 4500</Polish>
<Hungarian>Kestrel 4500 elővétele</Hungarian>
<Russian>Открыть Kestrel 4500NV</Russian>
</Key>
<Key ID="STR_ACE_Kestrel4500_ShowKestrel">
<English>Show Kestrel 4500</English>
<Polish>Pokaż Kestrel 4500</Polish>
<Russian>Показать Kestrel 4500NV</Russian>
</Key>
<Key ID="STR_ACE_Kestrel4500_HideKestrel">
<English>Hide Kestrel 4500</English>
<Polish>Ukryj Kestrel 4500</Polish>
<Russian>Убрать Kestrel 4500NV</Russian>
</Key>
<Key ID="STR_ACE_Kestrel4500_KestrelDialogKey">
<English>Open Kestrel 4500</English>
<Polish>Otwórz Kestrel 4500</Polish>
<Russian>Открыть Kestrel 4500NV</Russian>
</Key>
<Key ID="STR_ACE_Kestrel4500_DisplayKestrelKey">
<English>Show Kestrel 4500</English>
<Polish>Pokaż Kestrel 4500</Polish>
<Russian>Показать Kestrel 4500NV</Russian>
</Key>
</Package>
</Project>

37
addons/medical/stringtable.xml
View File

@ -74,6 +74,7 @@
<Czech>Aplikovat škrtidlo</Czech>
<Polish>Załóż stazę</Polish>
<French>Appliquer un garrot</French>
<Russian>Наложить жгут</Russian>
</Key>
<Key ID="STR_ACE_Medical_Bandage">
<English>Bandage</English>
@ -165,7 +166,7 @@
<Spanish>Inyectando Morfina ...</Spanish>
<Polish>Wstrzykiwanie morfiny ...</Polish>
<Czech>Aplikuji morfin ...</Czech>
<Russian>Введение морфина...</Russian>
<Russian>Введение морфина ...</Russian>
<French>Injection de Morphine...</French>
<Hungarian>Morfium beadása ...</Hungarian>
<Portuguese>Injetando Morfina ...</Portuguese>
@ -177,7 +178,7 @@
<Spanish>Inyectando Epinefrina ...</Spanish>
<Polish>Wstrzykiwanie adrenaliny ...</Polish>
<Czech>Aplikuji adrenalin ...</Czech>
<Russian>Введение адреналина...</Russian>
<Russian>Введение адреналина ...</Russian>
<French>Injection d'Adrénaline ...</French>
<Hungarian>Epinefrin beadása ...</Hungarian>
<Portuguese>Injetando Epinefrina ...</Portuguese>
@ -190,7 +191,7 @@
<Czech>Aplikuji atropin ...</Czech>
<Polish>Wstrzykiwanie atropiny ...</Polish>
<French>Injection d'Atropine ...</French>
<Russian>Введение атропина...</Russian>
<Russian>Введение атропина ...</Russian>
<Hungarian>Atropin beadása ...</Hungarian>
</Key>
<Key ID="STR_ACE_Medical_Transfusing_Blood">
@ -199,7 +200,7 @@
<Spanish>Transfusión de sangre ...</Spanish>
<Polish>Przetaczanie krwi ...</Polish>
<Czech>Probíhá transfúze krve ...</Czech>
<Russian>Переливание крови...</Russian>
<Russian>Переливание крови ...</Russian>
<French>Transfusion Sanguine ...</French>
<Hungarian>Infúzió vérrel ...</Hungarian>
<Portuguese>Transfundindo Sangue ...</Portuguese>
@ -212,7 +213,7 @@
<Czech>Probíha transfúze fyziologický roztoku ...</Czech>
<Polish>Przetaczanie solanki ...</Polish>
<French>Transfusion de saline ...</French>
<Russian>Переливание физраствора...</Russian>
<Russian>Переливание физраствора ...</Russian>
<Hungarian>Infúzió sós vizzel ...</Hungarian>
</Key>
<Key ID="STR_ACE_Medical_Transfusing_Plasma">
@ -222,7 +223,7 @@
<Czech>Probíha transfúze plazmy ...</Czech>
<Polish>Przetaczanie osocza ...</Polish>
<French>Transfusion de Plasma ...</French>
<Russian>Переливание плазмы...</Russian>
<Russian>Переливание плазмы ...</Russian>
<Hungarian>Infúzió vérplazmával ...</Hungarian>
</Key>
<Key ID="STR_ACE_Medical_Bandaging">
@ -235,7 +236,7 @@
<Italian>Sto applicando la benda ...</Italian>
<Hungarian>Bekötözés ...</Hungarian>
<Portuguese>Atando ...</Portuguese>
<Russian>Перевязывание...</Russian>
<Russian>Перевязывание ...</Russian>
</Key>
<Key ID="STR_ACE_Medical_Applying_Tourniquet">
<English>Applying Tourniquet ...</English>
@ -244,7 +245,7 @@
<Czech>Aplikuji škrtidlo</Czech>
<Polish>Zakładanie stazy ...</Polish>
<French>Mise en place du Garrot ...</French>
<Russian>Наложение жгута...</Russian>
<Russian>Наложение жгута ...</Russian>
<Hungarian>Érszorító felhelyezése ...</Hungarian>
</Key>
<Key ID="STR_ACE_MEDICAL_ACTIONS_Medical">
@ -1014,7 +1015,7 @@
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CONTENT">
<English>Checking Blood Pressure..</English>
<French>Mesure de la tension ...</French>
<Russian>Проверка артериального давления...</Russian>
<Russian>Проверка артериального давления ...</Russian>
<Spanish>Comprobando presión arterial...</Spanish>
<Polish>Sprawdzanie ciśnienia krwi...</Polish>
<German>Blutdruck kontrollieren...</German>
@ -1093,7 +1094,7 @@
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_CONTENT">
<English>Checking Heart Rate..</English>
<French>Vérification du rythme cardiaque ...</French>
<Russian>Проверка пульса...</Russian>
<Russian>Проверка пульса ...</Russian>
<Spanish>Comprobando ritmo cardíaco...</Spanish>
<Polish>Sprawdzanie tętna...</Polish>
<German>Kontrolliere Herzfrequenz</German>
@ -1182,7 +1183,7 @@
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_REPONSE_UNRESPONSIVE">
<English>%1 is not responsive</English>
<Russian>%1 не реагирует</Russian>
<Russian>%1 не реагирует на раздражители</Russian>
<French>%1 est inconscient</French>
<Spanish>%1 no reacciona</Spanish>
<Polish>%1 jest nieprzytomny</Polish>
@ -1350,7 +1351,7 @@
<Key ID="STR_ACE_MEDICAL_PlacingInBodyBag">
<English>Placing body in bodybag</English>
<Spanish>Colocando cuerpo en bolsa para cadáveres</Spanish>
<Russian>Упаковка тела</Russian>
<Russian>Упаковка тела ...</Russian>
<Polish>Pakowanie ciała do worka na zwłoki</Polish>
<French>Placement du corps dans la housse</French>
<Hungarian>Test hullazsákba helyezése ...</Hungarian>
@ -1391,61 +1392,73 @@
<English>Heavily wounded</English>
<German>Schwer verwundet:</German>
<Polish>Ciężko ranny</Polish>
<Russian>Сильно ранен</Russian>
</Key>
<Key ID="STR_ACE_Medical_LightlyWounded">
<English>Lightly wounded</English>
<German>Leicht verwundet:</German>
<Polish>Lekko ranny</Polish>
<Russian>Легко ранен</Russian>
</Key>
<Key ID="STR_ACE_Medical_VeryLightlyWounded">
<English>Very lightly wounded</English>
<German>Sehr leicht verwundet:</German>
<Polish>B. lekko ranny</Polish>
<Russian>Очень легко ранен</Russian>
</Key>
<Key ID="STR_ACE_Medical_Head">
<English>Head</English>
<German>Kopf</German>
<Polish>Głowa</Polish>
<Russian>Голова</Russian>
</Key>
<Key ID="STR_ACE_Medical_Torso">
<English>Torso</English>
<German>Torso</German>
<Polish>Tors</Polish>
<Russian>Торс</Russian>
</Key>
<Key ID="STR_ACE_Medical_LeftArm">
<English>Left Arm</English>
<German>Linker Arm</German>
<Polish>Lewe ramię</Polish>
<Russian>Левая рука</Russian>
</Key>
<Key ID="STR_ACE_Medical_RightArm">
<English>Right Arm</English>
<German>Rechter Arm</German>
<Polish>Prawe ramię</Polish>
<Russian>Правая рука</Russian>
</Key>
<Key ID="STR_ACE_Medical_LeftLeg">
<English>Left Leg</English>
<German>Linkes Bein</German>
<Polish>Lewa noga</Polish>
<Russian>Левая нога</Russian>
</Key>
<Key ID="STR_ACE_Medical_RightLeg">
<English>Right Leg</English>
<German>Rechtes Bein</German>
<Polish>Prawa noga</Polish>
<Russian>Правая нога</Russian>
</Key>
<Key ID="STR_ACE_Medical_painEffectType">
<English>Pain Effect Type</English>
<German>Schmerzeffekt-Typ</German>
<Polish>Rodzaj efektu bólu</Polish>
<Russian>Вид боли</Russian>
</Key>
<Key ID="STR_ACE_Medical_painEffect_Flash">
<English>Colour Flashing</English>
<German>Farbblinken</German>
<Polish>Pulsujące kolory</Polish>
<Russian>Разноцветные вспышки</Russian>
</Key>
<Key ID="STR_ACE_Medical_painEffect_Chroma">
<English>Chromatic Aberration</English>
<German>Chromatische Aberration</German>
<Polish>Aberracja chromatyczna</Polish>
<Russian>Хроматическая аберрация</Russian>
</Key>
</Package>
</Project>

3
addons/weather/stringtable.xml
View File

@ -5,6 +5,7 @@
<Key ID="STR_ACE_Weather_WindInfoKey">
<English>Show Wind Info</English>
<Polish>Pokaż inf. o wietrze</Polish>
<Russian>Показать информацию о погоде</Russian>
</Key>
</Package>
</Project>
</Project>