From f6eeb5e3ba29821b099bf5c53739ee8f9f2b0256 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 22:29:31 +0200 Subject: [PATCH 01/42] Add pain coefficient --- addons/medical/ACE_Settings.hpp | 4 ++++ addons/medical/CfgVehicles.hpp | 6 ++++++ addons/medical/XEH_postInit.sqf | 2 +- addons/medical/functions/fnc_moduleMedicalSettings.sqf | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index e7f60a14e8..0b600996d0 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -22,6 +22,10 @@ class ACE_Settings { typeName = "SCALAR"; value = 1; }; + class GVAR(painCoefficient) { + typeName = "SCALAR"; + value = 1; + }; class GVAR(enableAirway) { typeName = "BOOL"; value = false; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 2b1f7c9468..9f355cbc55 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -128,6 +128,12 @@ class CfgVehicles { typeName = "NUMBER"; defaultValue = 1; }; + class painCoefficient { + displayName = "Pain coefficient"; + description = "Coefficient to modify the pain intensity"; + typeName = "NUMBER"; + defaultValue = 1; + }; class keepLocalSettingsSynced { displayName = "Sync status"; description = "Keep unit status synced. Recommended on."; diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 526990709b..b8152f08b8 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -166,7 +166,7 @@ GVAR(lastHeartBeatSound) = time; // Pain effect _strength = ACE_player getVariable [QGVAR(pain), 0]; - // _strength = _strength * (ACE_player getVariable [QGVAR(coefPain), GVAR(coefPain)]); @todo + _strength = _strength * (ACE_player getVariable [QGVAR(painCoefficient), GVAR(painCoefficient)]); if (GVAR(painEffectType) == 1) then { GVAR(effectPainCC) ppEffectEnable false; if ((ACE_player getVariable [QGVAR(pain), 0]) > 0 && {alive ACE_player}) then { diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 34dd063a4d..9771a07db6 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -34,4 +34,5 @@ if !(_activated) exitWith {}; [_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); From 74ca85cbd99d1c1eb525762d5430db5f201a0bfb Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 22:36:41 +0200 Subject: [PATCH 02/42] Change getBloodLoss to expect an array --- addons/medical/XEH_postInit.sqf | 4 ++-- addons/medical/functions/fnc_getBloodLoss.sqf | 16 +++++++++------- .../functions/fnc_getBloodVolumeChange.sqf | 2 +- .../medical/functions/fnc_getHeartRateChange.sqf | 4 ++-- .../medical/functions/fnc_handleUnitVitals.sqf | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index b8152f08b8..15aa362409 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -131,7 +131,7 @@ GVAR(effectTimeBlood) = time; }; }; - _bleeding = ACE_player call FUNC(getBloodLoss); + _bleeding = [ACE_player] call FUNC(getBloodLoss); // Bleeding Indicator if (_bleeding > 0 and GVAR(effectTimeBlood) + 3.5 < time) then { GVAR(effectTimeBlood) = time; @@ -250,7 +250,7 @@ if (USE_WOUND_EVENT_SYNC) then { [ {(((_this select 0) getvariable [QGVAR(bloodVolume), 100]) < 65)}, {(((_this select 0) getvariable [QGVAR(pain), 0]) > 0.9)}, - {(((_this select 0) call FUNC(getBloodLoss)) > 0.25)}, + {(([_this select 0] call FUNC(getBloodLoss)) > 0.25)}, {((_this select 0) getvariable [QGVAR(inReviveState), false])}, {((_this select 0) getvariable [QGVAR(inCardiacArrest), false])}, {((_this select 0) getvariable ["ACE_isDead", false])}, diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index f6b26f7686..aa94d7dc33 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -15,15 +15,17 @@ #define BLOODLOSSRATE_BASIC 0.2 -private ["_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"]; -// TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical). +private ["_unit", "_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"]; + +_unit = _this select 0; + _totalBloodLoss = 0; // Advanced medical bloodloss handling if (GVAR(level) >= 2) then { - _tourniquets = _this getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]; - _openWounds = _this getvariable [QGVAR(openWounds), []]; - //_cardiacOutput = [_this] call FUNC(getCardiacOutput); + _tourniquets = _unit getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]; + _openWounds = _unit getvariable [QGVAR(openWounds), []]; + //_cardiacOutput = [_unit] call FUNC(getCardiacOutput); { if ((_tourniquets select (_x select 2)) == 0) then { @@ -34,7 +36,7 @@ if (GVAR(level) >= 2) then { }; }foreach _openWounds; - _internalWounds = _this getvariable [QGVAR(internalWounds), []]; + _internalWounds = _unit getvariable [QGVAR(internalWounds), []]; { _totalBloodLoss = _totalBloodLoss + ((_x select 4) * (_x select 3)); }foreach _internalWounds; @@ -42,6 +44,6 @@ if (GVAR(level) >= 2) then { // cap the blood loss to be no greater as the current cardiac output //(_totalBloodLoss min _cardiacOutput); } else { - _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _this); + _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _unit); }; _totalBloodLoss * (GVAR(bleedingCoefficient) max 0); diff --git a/addons/medical/functions/fnc_getBloodVolumeChange.sqf b/addons/medical/functions/fnc_getBloodVolumeChange.sqf index f94c5d5b7b..23eba4a0c7 100644 --- a/addons/medical/functions/fnc_getBloodVolumeChange.sqf +++ b/addons/medical/functions/fnc_getBloodVolumeChange.sqf @@ -34,7 +34,7 @@ private ["_unit","_bloodVolume","_bloodVolumeChange", "_ivVolume"]; _unit = _this select 0; _bloodVolume = _unit getvariable [QGVAR(bloodVolume), 100]; -_bloodVolumeChange = -(_unit call FUNC(getBloodLoss)); +_bloodVolumeChange = -([_unit] call FUNC(getBloodLoss)); if (_bloodVolume < 100.0) then { { diff --git a/addons/medical/functions/fnc_getHeartRateChange.sqf b/addons/medical/functions/fnc_getHeartRateChange.sqf index e7bc9407d2..f3fec64053 100644 --- a/addons/medical/functions/fnc_getHeartRateChange.sqf +++ b/addons/medical/functions/fnc_getHeartRateChange.sqf @@ -20,7 +20,7 @@ _unit = _this select 0; _hrIncrease = 0; if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then { _heartRate = _unit getvariable [QGVAR(heartRate), 80]; - _bloodLoss = _unit call FUNC(getBloodLoss); + _bloodLoss = [_unit] call FUNC(getBloodLoss); _adjustment = _unit getvariable [QGVAR(heartRateAdjustments), []]; { @@ -83,4 +83,4 @@ if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then { _hrIncrease = _hrIncrease - HEART_RATE_MODIFIER; }; }; -_hrIncrease \ No newline at end of file +_hrIncrease diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index 411f64b49e..f986a095de 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -43,7 +43,7 @@ if (_bloodVolume < 90) then { }; }; -if ((_unit call FUNC(getBloodLoss)) > 0) then { +if (([_unit] call FUNC(getBloodLoss)) > 0) then { if !(_unit getvariable [QGVAR(isBleeding), false]) then { _unit setvariable [QGVAR(isBleeding), true, true]; }; From d10f4d543d3a2c4cbaff379447a4002f3e20ea77 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 22:38:48 +0200 Subject: [PATCH 03/42] Enable unit specific bleeding coefficient --- addons/medical/functions/fnc_getBloodLoss.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index aa94d7dc33..7fe108670f 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -46,4 +46,4 @@ if (GVAR(level) >= 2) then { } else { _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _unit); }; -_totalBloodLoss * (GVAR(bleedingCoefficient) max 0); +_totalBloodLoss * ((_unit getVariable [QGVAR(bleedingCoefficient), GVAR(bleedingCoefficient)]) max 0); From 84e19375152b963bfcad3c5dc19e48cf714a9c36 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 23:50:37 +0200 Subject: [PATCH 04/42] Add damage threshold to basic --- .../functions/fnc_handleDamage_basic.sqf | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index aa9c2f61df..3c94aba248 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -24,13 +24,20 @@ #define ARMDAMAGETRESHOLD2 1.7 #define UNCONSCIOUSNESSTRESHOLD 0.7 -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage"]; +private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_threshold"]; -_unit = _this select 0; -_selectionName = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; +_unit = _this select 0; +_selectionName = _this select 1; +_damage = _this select 2; +_shooter = _this select 3; +_projectile = _this select 4; + +// Apply damage treshold / coefficient +_threshold = [ + _unit getVariable [QGVAR(damageThreshold), GVAR(AIDamageThreshold)], + _unit getVariable [QGVAR(damageThreshold), GVAR(playerDamageThreshold)] +] select ([_unit] call EFUNC(common,isPlayer)); +_damage = _damage * (1 / _threshold); // This is a new hit, reset variables. // Note: sometimes handleDamage spans over 2 or even 3 frames. From d1c95ba8a19fbe6d3cae1a3c7d68c76dd97b6ed5 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 23 Apr 2015 11:31:27 +0200 Subject: [PATCH 05/42] Add maximum unconsciousness time option --- addons/medical/ACE_Settings.hpp | 4 ++++ addons/medical/CfgVehicles.hpp | 6 ++++++ addons/medical/XEH_respawn.sqf | 8 +++++++- .../functions/fnc_moduleMedicalSettings.sqf | 1 + .../medical/functions/fnc_setUnconscious.sqf | 19 +++++++++++++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 0b600996d0..40a28fb4d9 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -63,6 +63,10 @@ class ACE_Settings { typeName = "BOOL"; value = 0; }; + class GVAR(maxUnconsciousTime) { + typeName = "SCALAR"; + value = -1; + }; class GVAR(maxReviveTime) { typeName = "SCALAR"; value = 120; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 9f355cbc55..6aa3f82d60 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -122,6 +122,12 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 0; }; + class maxUnconsciousTime { + displayName = "Max. Uncon. Time"; + description = "Maximum time a unit can be unconscious before dying. Negative Values disable this."; + typeName = "NUMBER"; + defaultValue = -1; + }; class bleedingCoefficient { displayName = "Bleeding coefficient"; description = "Coefficient to modify the bleeding speed"; diff --git a/addons/medical/XEH_respawn.sqf b/addons/medical/XEH_respawn.sqf index ac6cc2d6ef..0a95e064fd 100644 --- a/addons/medical/XEH_respawn.sqf +++ b/addons/medical/XEH_respawn.sqf @@ -8,7 +8,13 @@ if !(local _unit) exitWith {}; [_unit] call FUNC(init); -//Reset captive status for respawning unit +// Reset captive status for respawning unit if (!(_unit getVariable ["ACE_isUnconscious", false])) then { [_unit, QGVAR(unconscious), false] call EFUNC(common,setCaptivityStatus); }; + +// Remove maximum unconsciousness time handler +_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1]; +if (_maxUnconHandle > 0) then { + [_maxUnconHandle] call CBA_fnc_removePerFrameHandler; +}; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 9771a07db6..dd7422c40e 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -33,6 +33,7 @@ if !(_activated) exitWith {}; [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(maxUnconsciousTime), "maxUnconsciousTime"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index c5809f8c8e..84c5618168 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -22,6 +22,15 @@ _unit = _this select 0; _set = if (count _this > 1) then {_this select 1} else {true}; _minWaitingTime = if (count _this > 2) then {_this select 2} else {DEFAULT_DELAY}; +// No change, fuck off. (why is there no xor?) +if (_set isEqualTo (_unit getVariable ["ACE_isUnconscious", false])) exitWith {}; + +// Remove maximum unconsciousness time handler +_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1]; +if (_maxUnconHandle > 0) then { + [_maxUnconHandle] call CBA_fnc_removePerFrameHandler; +}; + if !(_set) exitwith { _unit setvariable ["ACE_isUnconscious", false, true]; }; @@ -86,4 +95,14 @@ _startingTime = time; [DFUNC(unconsciousPFH), 0.1, [_unit,_animState, _originalPos, _startingTime, _minWaitingTime, false, vehicle _unit isKindOf "ParachuteBase"] ] call CBA_fnc_addPerFrameHandler; +// Maximum unconsciousness time +_maxUnconTime = _unit getVariable [QGVAR(maxUnconsciousTime), GVAR(maxUnconsciousTime)]; +if (_maxUnconTime >= 0) then { + _handle = [{ + _unit = _this select 0; + [_unit] call FUNC(setDead); + }, [_unit], _maxUnconTime, 0.5] call EFUNC(common,waitAndExecute); + _unit setVariable [QGVAR(maxUnconTimeHandle), _handle]; +}; + ["medical_onUnconscious", [_unit, true]] call EFUNC(common,globalEvent); From d7b961043b9580724daaedcedc049d8daf3b6945 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 24 Apr 2015 22:20:16 +0200 Subject: [PATCH 06/42] Remove animation reset before falling unconscious This caused the unit to briefly move to the default animation, which looked shite. --- addons/medical/functions/fnc_setUnconscious.sqf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 84c5618168..633718f163 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -71,8 +71,6 @@ if (vehicle _unit == _unit) then { _unit addWeapon "ACE_FakePrimaryWeapon"; }; _unit selectWeapon (primaryWeapon _unit); - _unit switchMove ""; - _unit playmoveNow ""; }; // We are storing the current animation, so we can use it later on when waking the unit up inside a vehicle @@ -89,7 +87,15 @@ if (GVAR(moveUnitsFromGroupOnUnconscious)) then { }; [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); -[_unit, [_unit] call EFUNC(common,getDeathAnim), 1, true] call EFUNC(common,doAnimation); +_anim = [_unit] call EFUNC(common,getDeathAnim) +[_unit, _anim, 1, true] call EFUNC(common,doAnimation); +[{ + _unit = _this select 0; + _anim = _this select 1; + if (_unit getVariable "ACE_isUnconscious") then { + [_unit, _anim, 2, true] call EFUNC(common,doAnimation); + }; +}, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute); _startingTime = time; From 274663e1b9fb833e27ab3ab4c3f936c0d5695726 Mon Sep 17 00:00:00 2001 From: Dimaslg Date: Sat, 25 Apr 2015 18:53:45 +0200 Subject: [PATCH 07/42] Spanish Translation Minor fixes and spelling mistakes. --- addons/ballistics/stringtable.xml | 16 +++++++++------- addons/disposable/stringtable.xml | 4 ++-- addons/dragging/stringtable.xml | 4 ++-- addons/explosives/stringtable.xml | 6 +++--- addons/fcs/stringtable.xml | 4 ++-- addons/flashsuppressors/stringtable.xml | 14 +++++++------- addons/grenades/stringtable.xml | 4 ++-- addons/interact_menu/stringtable.xml | 4 ++++ addons/interaction/stringtable.xml | 4 ++-- addons/kestrel4500/stringtable.xml | 4 ++-- addons/laser_selfdesignate/stringtable.xml | 4 ++-- addons/laserpointer/stringtable.xml | 8 ++++---- addons/magazinerepack/stringtable.xml | 8 ++++---- addons/medical/stringtable.xml | 11 +++++------ addons/microdagr/stringtable.xml | 4 ++-- addons/missileguidance/stringtable.xml | 16 ++++++++-------- addons/nametags/stringtable.xml | 6 +++--- addons/nightvision/stringtable.xml | 16 ++++++++-------- addons/optionsmenu/stringtable.xml | 8 ++++---- addons/overheating/stringtable.xml | 2 +- addons/realisticnames/stringtable.xml | 6 +++--- addons/reload/stringtable.xml | 8 ++++---- addons/vehiclelock/stringtable.xml | 18 +++++++++--------- addons/weaponselect/stringtable.xml | 14 +++++++------- 24 files changed, 99 insertions(+), 94 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 49b39c0af6..e65b91f926 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -273,7 +273,7 @@ 7.62mm Tracer 7,62 mm Nyomjelző 7,62mm Leuchtspur - 7,62mm trazadora + 7,62mm Trazadora 7,62mm Traçantes 7,62mm Smugacz 7.62mm Svítící @@ -380,7 +380,7 @@ .338 NM Tracer .338 NM Svítící .338 NM Traçante - .338 NM trazadora + .338 NM Trazadora .338 NM трассирующие @@ -456,7 +456,7 @@ 9,3mm Smugacz 9.3mm Svítící 9.3mm Traçante - 9.3mm trazadora + 9.3mm Trazadora 9,3 мм трассирующие @@ -507,7 +507,7 @@ 9,3mm Smugacz 9.3mm Svítící 9.3mm Traçante - 9.3mm trazadora + 9.3mm Trazadora 9,3 мм трассирующие @@ -903,7 +903,7 @@ Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20 Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20 - + 7.62mm 20Rnd Mag (Mk248 Mod 0) Magazynek 7,62mm 20rd (Mk248 Mod 0) @@ -984,12 +984,13 @@ Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM Calibre: 6.5x47mm (HPBT Scenar)<br />Cartouches: 30 - Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30 + Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30<br />Se usa en: MXM Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30 Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30 6.5mm Creedmor 30Rnd Mag + Cargador de 30 balas de 6.5mm Creedmor 6.5mm CM @@ -1000,6 +1001,7 @@ Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM + Calibre: 6.5mm Creedmor<br />Balas: 30<br />Se usa en: MXM .338 10Rnd Mag (300gr Sierra MatchKing HPBT) @@ -1104,4 +1106,4 @@ Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5 - + \ No newline at end of file diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 7f57998157..b97efca5f4 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -29,10 +29,10 @@ Missile préchargé Dummy Přednabitá dummy střela Wstępnie załadowana atrapa pocisku - Preloaded Missile Dummy + Precargado misil inerte Előtöltött műrakéta Предзаряженная ракетная болванка Missile stupido precaricato - + \ No newline at end of file diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index 521ab87006..990f91144e 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -28,7 +28,7 @@ Item too heavy Gegenstand ist zu schwer - Articulo demasiado pesado + Objeto demasiado pesado Przedmiot jest zbyt ciężki Objet trop lourd Não é possível carregar o item devido a seu peso @@ -50,4 +50,4 @@ Нести - + \ No newline at end of file diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 8e941b1f2a..7071de32a5 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -208,7 +208,7 @@ Add to Speed Dial Zur Schnellauswahl hinzufügen - Agregar a marcado rápido + Añadir a marcado rápido Dodaj do szybkiego wybierania Ajouter à la composition rapide Přidat jako rychlou volbu @@ -364,7 +364,7 @@ Select a Trigger Wähle einen Zünder - Seleccionar un disparador + Seleccionar un detonador Wybierz zapalnik Sélectionner une mise à feu Zvolit Detonátor @@ -502,4 +502,4 @@ Raccogli - + \ No newline at end of file diff --git a/addons/fcs/stringtable.xml b/addons/fcs/stringtable.xml index 857f511fca..6c785ae47b 100644 --- a/addons/fcs/stringtable.xml +++ b/addons/fcs/stringtable.xml @@ -14,7 +14,7 @@ Zeroed To Haltepunkt - Fijado a + Ajustado a Wyzerowany na Nastaveno na Zéroté à @@ -72,4 +72,4 @@ СУО обнулен. - + \ No newline at end of file diff --git a/addons/flashsuppressors/stringtable.xml b/addons/flashsuppressors/stringtable.xml index d3185fc2b0..a806ba8fa6 100644 --- a/addons/flashsuppressors/stringtable.xml +++ b/addons/flashsuppressors/stringtable.xml @@ -12,7 +12,7 @@ Tlumič plamene (6,5 mm) Cache-flamme (6,5 mm) Пламегаситель (6,5 мм) - Supresor (6,5 mm) + Bocacha (6,5 mm) Flash Suppressor (7.62 mm) @@ -24,7 +24,7 @@ Tlumič plamene (7,62 mm) Cache-flamme (7,62 mm) Пламегаситель (7,62 мм) - Supresor (7,62 mm) + Bocacha (7,62 mm) Flash Suppressor (5.56 mm) @@ -36,7 +36,7 @@ Tlumič plamene (5,56 mm) Cache-flamme (5,56 mm) Пламегаситель (5,56 мм) - Supresor (5,56 mm) + Bocacha (5,56 mm) Flash Suppressor (.45 ACP) @@ -48,7 +48,7 @@ Tlumič plamene (.45 ACP) Cache-flamme (.45 ACP) Пламегаситель (.45 ACP) - Supresor (.45 ACP) + Bocacha (.45 ACP) Flash Suppressor (9 mm) @@ -60,7 +60,7 @@ Tlumič plamene (9 mm) Cache-flamme (9 mm) Пламегаситель (9 мм) - Supresor (9 mm) + Bocacha (9 mm) Flash Suppressor (.338) @@ -72,7 +72,7 @@ Tlumič záblesku (.338) Cache-flamme (.338) Пламегаситель (.338) - Supresor (.338) + Bocacha (.338) Flash Suppressor (9.3 mm) @@ -84,7 +84,7 @@ Tlumič záblesku (9,3 mm) Cache-flamme (9,3 mm) Пламегаситель (9,3 мм) - Supresor (9,3 mm) + Bocacha (9,3 mm) \ No newline at end of file diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml index 7f8321d6c6..b5c3a6a35b 100644 --- a/addons/grenades/stringtable.xml +++ b/addons/grenades/stringtable.xml @@ -53,7 +53,7 @@ Roll Grenade Granate rollen - Rodar granada + Lanzamiento raso Po ziemi Po zemi Lancer roulé @@ -89,7 +89,7 @@ Also known as flashbang. Causes immediate flash blindness, deafness, tinnitus, and inner ear disturbance. Verursacht temporäre Blind- und Taubheit. - Produce de manera inmediata ceguera, sordera, tinitus y afecta el oído interior. + Tambien conocida como granada cegadora. Produce de manera inmediata ceguera, sordera, tinitus y afecta el oído interior. Les grenades incapacitantes servent à désorienter ou distraire une menace pendant quelques secondes. Znany też jako flashbang. Powoduje natychmiastową tymczasową ślepotę, głuchotę, dzwonienie w uszach i inne zaburzenia ucha wewnętrznego. Omračující granát je taktická nesmrtící zbraň používaná při záchraně rukojmí a zvládání davu. diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 55d67788f4..264bc6c645 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -73,15 +73,19 @@ Interaction - Text Max + Interacción - Ampliar texto Interaction - Text Min + Interacción - Reducir texto Interaction - Shadow Max + Interacción - Ampliar sombra Interaction - Shadow Min + Interacción - Reducir sombra \ No newline at end of file diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 38902f80cf..50bcac8fb3 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -104,7 +104,7 @@ Interaction Menu (Self) Interaktionsmenü (Selbst) - Menú de interacción (Propia) + Menú de interacción (Propio) Menu interakcji (własne) Menu interakce (vlastní) Menu d'interaction (Perso) @@ -734,4 +734,4 @@ Passeggeri - + \ No newline at end of file diff --git a/addons/kestrel4500/stringtable.xml b/addons/kestrel4500/stringtable.xml index 2703e34e9f..a71c2dc094 100644 --- a/addons/kestrel4500/stringtable.xml +++ b/addons/kestrel4500/stringtable.xml @@ -18,7 +18,7 @@ Anemomentr skrzydełkowy Kestrel 4500 Карманная метеостанция Kestrel 4500NV Station météo portable Kestrel 4500 - Kestrel 4500 Pocket Weather Tracker + Estación meteorológica Kestrel 4500 Kestrel 4500 Taschenwettermessgerät @@ -46,7 +46,7 @@ Убрать Kestrel 4500NV Cacher Kestrel 4500 Nascondi Kestrel 4500 - Esconder Kestrel 4500 + Ocultar Kestrel 4500 Kestrel 4500 wegstecken diff --git a/addons/laser_selfdesignate/stringtable.xml b/addons/laser_selfdesignate/stringtable.xml index f587763bce..bf870355dd 100644 --- a/addons/laser_selfdesignate/stringtable.xml +++ b/addons/laser_selfdesignate/stringtable.xml @@ -4,7 +4,7 @@ Laser Designator On Lasermarkierer an - Laser Designador encendido + Designador láser encendido ЛЦУ ВКЛ Laserový značkovač zapnut Desygnator laserowy wł. @@ -15,7 +15,7 @@ Laser Designator Off Lasermarkierer aus - Laser Designador apagado + Designador láser apagado ЛЦУ ВЫКЛ Laserový značkovat vypnut Desygnator laserowy wył. diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index 8fa38e24dd..d63767d982 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -43,7 +43,7 @@ <t color='#9cf953'>Użyj: </t>wł./wył. laser <t color='#9cf953'>Uso: </t>Ativar/Desativar laser <t color='#9cf953'>Использовать: </t>ВКЛ/ВЫКЛ лазер - <t color='#9cf953'>Usar: </t>encender/apagar láser + <t color='#9cf953'>Usar: </t>Encender/Apagar Láser <t color='#9cf953'>Használat: </t>Lézer BE/KI kapcsolása @@ -52,7 +52,7 @@ Laser Лазер Laser - Laser + Láser IR Laser @@ -60,7 +60,7 @@ Laser IR ИК-лазер Laser IR - Laser IR + Láser IR Switch Laser / IR Laser @@ -69,7 +69,7 @@ Изменить режим Лазер / ИК-лазер Changer Laser / Laser IR Alterna Laser / IR Laser - Cambiar Laser / Laser IR + Cambiar láser / Láser IR \ No newline at end of file diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml index 9ea10924ac..c78f71ef89 100644 --- a/addons/magazinerepack/stringtable.xml +++ b/addons/magazinerepack/stringtable.xml @@ -78,7 +78,7 @@ Repacking Finished Réorganisation terminée Wiederverpacken Fertig - Reembalaje finalizado + Reorganización finalizada Перепаковка завершена Páskování dokončeno Przepakowywanie zakończone @@ -89,7 +89,7 @@ Repacking Interrupted Réorganisation interrompue Umpacken Unterbrochen - Reembalaje interrumpido + Reorganización interrumpida Перепаковка прервана Páskování přerušeno Przepakowywanie przerwane @@ -100,7 +100,7 @@ %1 Full and %2 Partial %1 plein(s) et %2 partiel(s) %1 Vollständigen und %2 Teilweisen - %1 Total y %2 Parcial + %1 Llenos y %2 Incompletos %1 полных и %2 неполных %1 plný a %2 částečně Pełnych: %1.<br/>Częściowo pełnych: %2. @@ -108,4 +108,4 @@ %1 pieno e %2 parziale - + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 9220eb6671..cbd6c98ed8 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1343,7 +1343,6 @@ He is not in pain - Bandaged Bandé @@ -1456,7 +1455,7 @@ Load Patient Into Patient Einladen - Cargar el paciente en + Cargar al paciente en Załaduj pacjenta Naložit pacianta do Погрузить пациента в @@ -1468,7 +1467,7 @@ Unload Patient Patient Ausladen - Descargar el paciente + Descargar al paciente Wyładuj pacjenta Vyložit pacienta Выгрузить пациента @@ -1479,7 +1478,7 @@ Unload patient - Descargar el paciente + Descargar al paciente Выгрузить пациента Wyładuj pacjenta Débarquer le patient @@ -1488,7 +1487,7 @@ Load patient - Cargar el paciente en + Cargar al paciente en Погрузить пациента Załaduj pacjenta Embarquer le patient @@ -1533,7 +1532,7 @@ %1 has given an IV - %1 has puesto una IV + %1 ha puesto una IV %1 провел переливание %1 podał IV %1 a administré une IV diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index 91d83646b4..53c47314d8 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -237,7 +237,7 @@ Toggle MicroDAGR Display Mode MicoDAGR Anzeigemodus Wechseln - Conmutar modo de pantalla del MicroDAGR + Cambiar modo de pantalla del MicroDAGR Сменить режим показа MicroDAGR Przełącz GUI MicroDAGR Basculer le mode d'affichage MicroDAGR @@ -279,4 +279,4 @@ Chiudi MicroDAGR - + \ No newline at end of file diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 59a80df0dc..e6dc35a964 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -4,7 +4,7 @@ Advanced Missile Guidance - Avanzada Misiles Orientación + Guía de Misiles Avanzada Guidage avancé de missile Zaawansowane naprowadzanie rakiet Erweitertes Raketenlenksystem @@ -17,11 +17,11 @@ Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types. Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych. - Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un framework requerido para armas de tipo misil. + Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un sistema requerido para armas de tipo misil. Hydra-70 DAGR Missile - + Misil Hydra-70 DAGR Hydra-70 DAGR Hydra-70 DAGR Hydra-70 DAGR Rackete @@ -33,7 +33,7 @@ DAGR - + DAGR DAGR DAGR DAGR @@ -45,7 +45,7 @@ Hydra-70 DAGR Laser Guided Missile - + Misil guiado por láser Hydra-70 DAGR Missile à guidage Hydra-70 DAGR Laserowo naprowadzana rakieta Hydra-70 DAGR Hydra-70 DAGR lasergelenkte Rakete @@ -57,7 +57,7 @@ Hellfire II AGM-114K Missile - + Misil Hellfire II AGM-114K Hellfire II AGM-114K Hellfire II AGM-114K Hellfire II AGM-114K @@ -69,7 +69,7 @@ AGM-114K - + AGM-114K AGM-114K AGM-114K AGM-114K @@ -81,7 +81,7 @@ Hellfire II AGM-114K Laser Guided Missile - + Misil guiado por láser Hellfire II AGM-114K Missile à guidage laser Hellfire II AGM-114K Laserowo naprowadzana rakieta Hellfire II AGM-114K Hellfire II AGM-114K Lasergelenkte Rakete diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index e224ce61e4..db6c44256f 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -27,7 +27,7 @@ Show player name only on cursor (requires player names) Pokaż imiona graczy tylko pod kursorem (wymagana opcja Pokaż imiona graczy) - Mostrar nombres solo en el cursor (requiere Mostrar nombres de jugadores) + Mostrar nombres de jugadores solo al apuntarles (requiere Mostrar nombres de jugadores) Zeige Spielernamen nur an, wenn die Maus auf sie gerrichtet ist (benötigt Spielernamen) Noms uniquement sous le curseur (si noms affichés) Zobrazit jméno hráče jenom na kurzor (vyžaduje jména hráčů) @@ -39,7 +39,7 @@ Show player name only on keypress (requires player names) Spielernamen nur auf Tastendruck anzeigen (benötigt Spielernamen) - Mostrar nombres solo al pulsar (requiere Mostrar nombres de jugadores) + Mostrar nombres solo al pulsar la tecla(requiere Mostrar nombres de jugadores) Noms uniquement sur pression de la touche (si noms affichés) Zobrazit jména hráčů jen na klávesu (vyžaduje jména hráčů) Pokaż imiona graczy tylko po przytrzymaniu klawisza (wymagana opcja Pokaż imiona graczy) @@ -104,4 +104,4 @@ Colore nametag di default (membri non del gruppo) - + \ No newline at end of file diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index a2e24d79df..4ba86aa4d2 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -10,7 +10,7 @@ Gogle noktowizyjne (Gen1) Óculos de visão noturna (Gen1) ПНВ (Gen1) - Sistema de visión nocturna (Gen1) + Gafas de visión nocturna (Gen1) Éjjellátó szemüveg (1. Gen.) @@ -22,7 +22,7 @@ Gogle noktowizyjne (Gen2) Óculos de visão noturna (Gen2) ПНВ (Gen2) - Sistema de visión nocturna (Gen2) + Gafas de visión nocturna (Gen2) Éjjellátó szemüveg (2. Gen.) @@ -34,7 +34,7 @@ Gogle noktowizyjne (Gen3) Óculos de visão noturna (Gen3) ПНВ (Gen3) - Sistema de visión nocturna (Gen3) + Gafas de visión nocturna (Gen3) Éjjellátó szemüveg (3. Gen.) @@ -46,7 +46,7 @@ Gogle noktowizyjne (Gen3, brązowe) Óculos de visão noturna (Gen3, marrons) ПНВ (Gen3, коричневый) - Sistema de visión nocturna (Gen3, marrón) + Gafas de visión nocturna (Gen3, marrón) Éjjellátó szemüveg (3. Gen., barna) @@ -58,7 +58,7 @@ Gogle noktowizyjne (Gen3, zielone) Óculos de visão noturna (Gen3, verdes) ПНВ (Gen3, зеленый) - Sistema de visión nocturna (Gen3, verde) + Gafas de visión nocturna (Gen3, verde) Éjjellátó szemüveg (3. Gen., zöld) @@ -70,7 +70,7 @@ Gogle noktowizyjne (Gen3, czarne) Óculos de visão noturna (Gen3, pretos) ПНВ (Gen3, черный) - Sistema de visión nocturna (Gen3, negro) + Gafas de visión nocturna (Gen3, negro) Éjjellátó szemüveg (3. Gen., fekete) @@ -82,13 +82,13 @@ Gogle noktowizyjne (Gen4) Óculos de visão noturna (Gen4) ПНВ (Gen4) - Sistema de visión nocturna (Gen4) + Gafas de visión nocturna (Gen4) Éjjellátó szemüveg (4. Gen.) NV Goggles (Wide) NS-Brille (Weitwinkel) - Sistema de visión nocturna (Panorámicas) + Gafas de visión nocturna (Panorámicas) Gogle noktowizyjne (panoramiczne) Noktovizor (Širokoúhlý) ПНВ (Широкоугольный) diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index bc8d6dcdec..2ef75b9bf2 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -119,7 +119,7 @@ Open Export Menu Öffne Exportmenü - Abrir menu d'exportación + Abrir menu de exportación Открыть меню экспорта Otevřít exportovací menu Otwórz menu eksportowania @@ -130,7 +130,7 @@ String input. String input. - Introducir frase + Introducir cadena de texto. Строчный ввод. Wpisywanie tekstu. Entrée @@ -151,7 +151,7 @@ Number Nummer - Numero + Número Число Číslo Cyfra @@ -218,7 +218,7 @@ Option Menu UI Scaling Menu option: taille de l'UI Skalowanie UI menu ustawień - Opción de escalado del menú UI + Menú de opciónes de escalado de la interfaz de usuario \ No newline at end of file diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 89993dee62..9fec8818c8 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -4,7 +4,7 @@ Display text on jam Zeige Text bei Ladehemmung - Mostrar texto al encasquillar + Mostrar texto al encasquillarse Показывать текст, когда клинит оружие Zobrazit upozornění při zaseknutí Wyświetl tekst przy zacięciu broni diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 69b568dbca..4165ee1e94 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -290,7 +290,7 @@ HEMTT Container HEMTT Container - HEMTT de contenedor + HEMTT con contenedor HEMTT Kontener HEMTT Skříňový HEMTT Conteneur @@ -614,7 +614,7 @@ Typhoon Device Typhoon Gerät - Typhoon de dispositivo + Typhoon con dispositivo Typhoon Urządzenie Typhoon zařízení Typhoon Dispositif @@ -1678,4 +1678,4 @@ LWMMG .338 (Песочный) - + \ No newline at end of file diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml index ceaf32c2d8..417bc83b3c 100644 --- a/addons/reload/stringtable.xml +++ b/addons/reload/stringtable.xml @@ -4,7 +4,7 @@ Check ammo on weapon reload Prüfe Munition beim Nachladen - Comprovar munición al recargar el arma + Comprobar munición al recargar el arma Проверять боезапас при перезарядке Zkontrolovat munici při nabití Sprawdź stan amunicji przy przeładowaniu broni @@ -15,7 +15,7 @@ Check the ammo in your new magazine on magazine reload. Prüfe nachgeladenes Magazin - Comprueva la munición del nuevo cargador al recargar. + Comprueba la munición del nuevo cargador al recargar. Проверяет количество патронов в новом магазине при перезарядке. Kontroluje munice při nabití nového zásobníku. Pokaż stan amunicji w nowym magazynku przy przeładowaniu broni @@ -26,7 +26,7 @@ Check Ammo Munition prüfen - Verificar munición + Comprobar munición Sprawdź amunicję Vérifier Munitions Lőszerellenőrzés @@ -70,4 +70,4 @@ Attacco la tracolla... - + \ No newline at end of file diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index e62f9fdc5f..b89003a324 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -4,7 +4,7 @@ Unlock Vehicle Fahrzeug aufschließen - Vehículo abierto + Abrir vehículo Déverrouiller le véhicule Odblokuj pojazd Odemknout vozidlo @@ -15,7 +15,7 @@ Lock Vehicle Fahrzeug abschließen - Vehículo cerrado + Cerrar vehículo Verrouiller le véhicule Zablokuj pojazd Zamknout vozidlo @@ -37,7 +37,7 @@ Picking Lock.... Schloss knacken... - Forzando cierre... + Forzando cerradura... Crochetage... Otwieranie zamka... Páčim vozidlo... @@ -70,7 +70,7 @@ A lockpick set that can pick the locks of most vehicles. Ein Dietrich der die meisten Fahrzeugschlösser knacken kann... - Un set de ganzúas puede abrir la mayoría de cerraduras de vehículos. + Un set de ganzúas que puede abrir las cerraduras de la mayoría vehículos. Un crochet qui ouvrira la plupart des véhicules. Zestaw wytrychów, dzięki któremu można otworzyć zamki w większości pojazdów. Sada paklíčů, která dokáže odemknout zámky u většiny vozidel. @@ -81,7 +81,7 @@ A key that should open most WEST vehicles. Ein Schlüssel der die meisten westlichen Fahrzeuge öffnen sollte... - Una llave que puede abrir la mayoría de vehículos occidentales. + Una llave que abrirá la mayoría de vehículos occidentales. Une clé qui ouvrira la plupart des véhicules OUEST. Klucz, który powinien otworzyć większość pojazdów ZACHODU. Klíč který by měl otevřít většinou Západních vozidel. @@ -92,7 +92,7 @@ A key that should open most EAST vehicle. Ein Schlüssel der die meisten östlichen Fahrzeuge öffnen sollte... - Una llave que puede abrir la mayoría de vehículos orientales. + Una llave que abrirá la mayoría de vehículos orientales. Une clé qui ouvrira la plupart des véhicules EST. Klucz, który powinien otworzyć większość pojazdów WSCHODU. Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni. @@ -103,7 +103,7 @@ A key that should open most INDEP vehicle. Ein Schlüssel der die meisten Fahrzeuge der Aufständischen öffnen sollte... - Una llave que puede abrir la mayoría de vehículos independientes. + Una llave que abrirá la mayoría de vehículos independientes. Une clé qui ouvrira la plupart des véhicules INDEP. Klucz, który powinien otworzyć większość pojazdów INDFOR. Egy kulcs, ami a FÜGGETLEN egységek legtöbb járművét ki tudja nyitni. @@ -114,7 +114,7 @@ A key that should open most CIV vehicle. Ein Schlüssel der die meisten zivilen Fahrzeuge öffnen sollte... - Una llave que puede abrir la mayoría de vehículos civiles. + Una llave que abrirá la mayoría de vehículos civiles. Une clé qui ouvrira la plupart des véhicules CIV. Klucz, który powinien otworzyć większość pojazdów CYWILNYCH. Klíč který by měl otevřít většinu Civilních vozidel. @@ -123,4 +123,4 @@ Una chaive che apr ela maggior parte dei veicoli CIV - + \ No newline at end of file diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml index 6e06025620..c076a3a2e7 100644 --- a/addons/weaponselect/stringtable.xml +++ b/addons/weaponselect/stringtable.xml @@ -4,7 +4,7 @@ Display text on grenade throw Zeige Text beim Granatwurf - Mostrar texto al lanzar granada + Mostrar texto al lanzar una granada Показывать текст при броске Zobrazí text při hodu granátem Wyświetl tekst przy rzucie granatem @@ -15,7 +15,7 @@ Display a hint or text on grenade throw. Zeige Hinweis oder Text beim Granatwurf - Muestra una notificación o texto al lanzar granada + Muestra una notificación o texto al lanzar una granada Показывать текст или подсказку при броске гранаты. Zobrazí upozornění nebo text při hodu granátem. Wyświetla powiadomienie lub tekst przy rzucie granatem. @@ -62,7 +62,7 @@ Select Grenade Launcher Granatwerfer auswählen - Seleccionar lanzador de granadas + Seleccionar lanzagranadas Wybierz granatnik Zvolit Granátomet Выбрать подствольный гранатомет @@ -204,7 +204,7 @@ Throw Selected Grenade Gewählte Granate werfen - Arrojar granada seleccionada + Lanzar granada seleccionada Rzuć wybrany granat Lancer la grenade sélectionnée Kiválasztott Gránát Eldobása @@ -227,7 +227,7 @@ No frags left Keine explosiven Granaten übrig - Sin granadas de fragmentación + No quedan granadas de fragmentación Brak granatów odłamkowych Plus de grenades à fragmentation Nincs több repeszgránát @@ -239,7 +239,7 @@ No misc. grenades left Keine nichtexplosiven Granaten übrig - Sin granadas de varias + Sin granadas misc. Brak granatów nieodłamkowych Plus de grenades non-léthales Nincs több egyéb gránát @@ -272,4 +272,4 @@ Lancia fumogeno - + \ No newline at end of file From 4b7daaa8407e3a70ab51a7fecb5c587654a7473e Mon Sep 17 00:00:00 2001 From: Dimaslg Date: Sat, 25 Apr 2015 19:18:04 +0200 Subject: [PATCH 08/42] Spanish translation Minor fixes and spelling mistakes. --- addons/missileguidance/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index e6dc35a964..78387c65c6 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -4,7 +4,7 @@ Advanced Missile Guidance - Guía de Misiles Avanzada + Guiado Avanzado de Misiles Guidage avancé de missile Zaawansowane naprowadzanie rakiet Erweitertes Raketenlenksystem @@ -17,7 +17,7 @@ Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types. Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych. - Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un sistema requerido para armas de tipo misil. + Guiado Avanzado de Misiles, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un sistema requerido para armas de tipo misil. Hydra-70 DAGR Missile From 8a55c69cd7ceb877e1908909483aee8db6f93f1c Mon Sep 17 00:00:00 2001 From: Ivan Navarro Cabello Date: Tue, 28 Apr 2015 17:03:49 +0200 Subject: [PATCH 09/42] added spanish translation added spanish translation --- addons/ballistics/stringtable.xml | 6 ++- addons/interact_menu/stringtable.xml | 4 ++ addons/medical/stringtable.xml | 65 ++++++++++++++++++++++++++-- addons/mk6mortar/stringtable.xml | 32 ++++++++------ 4 files changed, 88 insertions(+), 19 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 4dc27fd2fc..b91b462985 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -903,7 +903,7 @@ Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20 Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20 - + 7.62mm 20Rnd Mag (Mk248 Mod 0) Magazynek 7,62mm 20rd (Mk248 Mod 0) @@ -991,6 +991,7 @@ 6.5mm Creedmor 30Rnd Mag Magazynek 6,5mm Creedmor 30rd + Cargador de 30 balas Creedmor de 6.5mm 6.5mm CM @@ -1002,6 +1003,7 @@ Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM + Calibre: 6.5mm Creedmor<br />Balas: 30<br />Se usa en: MXM .338 10Rnd Mag (300gr Sierra MatchKing HPBT) @@ -1106,4 +1108,4 @@ Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5 - + \ No newline at end of file diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 48ee00f475..2de2075221 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -76,21 +76,25 @@ Interaction - Text Max Interakcja - Tekst max Interaction -Texte Max + Interacción - Texto al max. Interaction - Text Min Interakcja - Tekst min Interaction - Texte Min + Interacción - Texto al min. Interaction - Shadow Max Interakcja - Cień max Interaction - Ombre Max + Interacción - Sombras al max. Interaction - Shadow Min Interakcja - Cień min Interaction - Ombre Min + Interacción - Sombras al min. \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index ec6b3aa374..312effe8b0 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -5,11 +5,13 @@ INJURIES VERLETZUNGEN ТРАВМЫ + HERIDAS No injuries on this bodypart ... Körperteil nicht verletzt ... Данная часть тела не повреждена ... + Sin heridas en esta parte del cuerpo ... Litter Simulation Detail @@ -358,7 +360,7 @@ Triage Card Triagekarte - Tarjeta de triaje + Tarjeta de clasificación Медкарта Karta segregacyjna Karta Triage @@ -370,6 +372,7 @@ No entries on this triage card. Keine Einträge auf der Triagekarte Нет записей. + Sin entradas en esta tarjeta de clasificación. Tourniquet @@ -397,21 +400,25 @@ Diagnose Diagnose Диагностика + Diagnosticar Diagnosing ... Diagnostizieren ... Диагностика ... + Diagnosticando ... CPR HLW Сердечно-легочная реанимация + RCP Performing CPR ... HLW durchführen ... Сердечно-легочная реанимация ... + Realizando RCP ... Give Blood IV (1000ml) @@ -1063,7 +1070,7 @@ Personal Aid Kit Аптечка - Botiquín de primeros auxilios + Equipo de primeros auxilios Équipement de support vital Apteczka osobista Persönliches Verbandpäckchen @@ -1084,11 +1091,13 @@ Personal Aid Kit for in field stitching or advanced treatment W znacznym stopniu poprawia stan pacjenta Полевая аптчека для продвинутого лечения и зашивания ран + Equipo de primeros auxilios para costura de campaña o tratamiento avanzados Use Personal Aid Kit Verbandpäckchen benutzen Использовать аптечку + Usar equipo de primeros auxilios Surgical Kit @@ -1124,6 +1133,7 @@ Use Surgical Kit Operationsset benutzen Использовать хирургический набор + Usar equipo quirúrgico Bodybag @@ -1179,6 +1189,7 @@ %1 checked Blood Pressure: %2 %1 kontrollierte Blutdruck: %2 %1 проверил артериальное давление: %2 + %1 verificada la presión arterial: %2 You checked %1 @@ -1254,21 +1265,25 @@ Low Niedrig Низкое + Baja Normal Normal Нормальное + Normal High Hoch Высокое + Alta No Blood Pressure Kein Blutdruck Артериальное давление отсутствует + Sin presión arterial Pulse @@ -1304,21 +1319,25 @@ %1 checked Heart Rate: %2 %1 kontrollierte Herzfrequenz: %2 %1 проверил пульс: %2 + %1 verificado el ritmo cardíaco: %2 Weak Schwach Слабый + Débil Normal Normal Нормальный + Normal Strong Stark Сильный + Fuerte You find a Heart Rate of %2 @@ -1423,30 +1442,37 @@ Patient %1<br/>is %2.<br/>%3.<br/>%4 Пациент %1<br/>%2.<br/>%3.<br/>%4 + Paciente %1<br/>is %2.<br/>%3.<br/>%4 alive жив + Vivo dead мертв + Muerto He's lost some blood Есть кровопотеря + Ha perdido un poco de sangre He hasn't lost blood Нет кровопотери + No ha perdido la sangre He is in pain Испытывает боль + Siente dolor He is not in pain Не испытывает боли + No siente dolor Bandaged @@ -1780,166 +1806,199 @@ Scrape Kratzer Ссадина + Arañazo Minor Scrape Kleiner Kratzer Малая ссадина + Arañazo menor Medium Scrape Mittlerer Kratzer Средняя ссадина + Arañazo medio Large Scrape Großer Kratzer Большая ссадина + Arañazo severo Avulsion Avulsion Рваная рана + Avulsión Minor Avulsion Kleine Avulsion Малая рваная рана + Avulsión menor Medium Avulsion Mittlere Avulsion Средняя рваная рана + Avulsión media Large Avulsion Große Avulsion Большая рваная рана + Avulsión severa Bruise Prellung Ушиб + Contusión Minor Bruise Kleine Prellung Малый ушиб + Contusión menor Medium Bruise Mittlere Prellung Средний ушиб + Contusión media Large Bruise Große Prellung Большой ушиб + Contusión severa Crushed tissue Quetschverletzung Компресионная травма + Tejido triturado Minor crushed tissue Kleine Quetschverletzung Малая компрессионная травма + Tejido triturado menor Medium crushed tissue Mittlere Quetschverletzung Средняя компрессионная травма + Tejido triturado medio Large crushed tissue Große Quetschverletzung Большая компрессионная травма + Tejido triturado severo Cut Schnittwunde Резаная рана + Corte Small Cut Kleine Schnittwunde Малая резаная рана + Corte menor Medium Cut Mittlere Schnittwunde Средняя резаная рана + Corte mediano Large Cut Große Schnittwunde Большая резаная рана + Corte severo Tear Riss Рваная рана + Desgarro Small Tear Kleiner Riss Малая рваная рана + Desgarro menor Medium Tear Mittlerer Riss Средняя рваная рана + Desgarro medio Large Tear Großer Riss Большая рваная рана + Desgarro severo Velocity Wound Ballistisches Trauma Огнестрельная рана + Herida de bala Smal Velocity Wound Kleines Ballistisches Trauma Малая огнестрельная рана + Herida de bala menor Medium Velocity Wound Mittleres Ballistisches Trauma Средняя огнестрельная рана + Herida de bala media Large Velocity Wound Großes Ballistisches Trauma Большая огнестрельная рана + Herida de bala severa Puncture Wound Stichwunde Колотая рана + Herida punzante Minor Puncture Wound Kleine Stichwunde Малая колотая рана + Herida punzante menor Medium Puncture Wound Mittlere Stichwunde Средняя колотая рана + Herida punzante media Large Puncture Wound Große Stichwunde Большая колотая рана + Herida punzante severa Broken Femur Gebrochener Oberschenkelknochen Перелом + Femur roto - + \ No newline at end of file diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index 19d68d8eb1..e0ed44578d 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -1,17 +1,21 @@  - - - 82mm Rangetable - - - Range Table for the MK6 82mm Mortar - - - Open 82mm Rangetable - - - Charge - - + + + 82mm Rangetable + Tabla de distancias de 82mm + + + Range Table for the MK6 82mm Mortar + Tabla de distancias para el mortero MK6 de 82mm + + + Open 82mm Rangetable + Abrir tabla de distancias de 82mm + + + Charge + Carga + + \ No newline at end of file From 956b5e355898039e3365796c83b8ff0a8037dd4f Mon Sep 17 00:00:00 2001 From: Dimaslg Date: Tue, 28 Apr 2015 21:01:48 +0200 Subject: [PATCH 10/42] Spanish Translation Minor fixes and some things at the Medical system translated. --- addons/laserpointer/stringtable.xml | 2 +- addons/medical/stringtable.xml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index d63767d982..6ef8be6a57 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -43,7 +43,7 @@ <t color='#9cf953'>Użyj: </t>wł./wył. laser <t color='#9cf953'>Uso: </t>Ativar/Desativar laser <t color='#9cf953'>Использовать: </t>ВКЛ/ВЫКЛ лазер - <t color='#9cf953'>Usar: </t>Encender/Apagar Láser + <t color='#9cf953'>Usar: </t>Encender/Apagar láser <t color='#9cf953'>Használat: </t>Lézer BE/KI kapcsolása diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index cbd6c98ed8..a96f2bb887 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1324,24 +1324,31 @@ Patient %1<br/>is %2.<br/>%3.<br/>%4 + El paciente %1<br/>está %2.<br/>%3.<br/>%4 alive + vivo dead + muerto He's lost some blood + Ha perdido algo de sangre He hasn't lost blood + No ha perdido sangre He is in pain + Tiene dolor He is not in pain + No tiene dolor Bandaged From 1c8137a7e5b874963c06f644cf73fc9153f57e0c Mon Sep 17 00:00:00 2001 From: Legolasindar Date: Wed, 29 Apr 2015 12:46:32 +0200 Subject: [PATCH 11/42] fixed spanish translate for opened pull #893 fixed spanish translate for opened pull #893 --- addons/medical/stringtable.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 312effe8b0..99adc0cb3a 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1091,7 +1091,7 @@ Personal Aid Kit for in field stitching or advanced treatment W znacznym stopniu poprawia stan pacjenta Полевая аптчека для продвинутого лечения и зашивания ран - Equipo de primeros auxilios para costura de campaña o tratamiento avanzados + Equipo de primeros auxilios para sutura de campaña o tratamientos avanzados Use Personal Aid Kit @@ -1447,12 +1447,12 @@ alive жив - Vivo + vivo dead мертв - Muerto + muerto He's lost some blood @@ -1462,7 +1462,7 @@ He hasn't lost blood Нет кровопотери - No ha perdido la sangre + No ha perdido sangre He is in pain @@ -2001,4 +2001,4 @@ Femur roto - \ No newline at end of file + From 283e34779feb9544753ee5dc345f7fd249c69df9 Mon Sep 17 00:00:00 2001 From: jaynus Date: Wed, 29 Apr 2015 07:05:48 -0700 Subject: [PATCH 12/42] Don't inherit --- addons/missileguidance/functions/fnc_onFired.sqf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf index 7ada1d4442..6c6c2717bf 100644 --- a/addons/missileguidance/functions/fnc_onFired.sqf +++ b/addons/missileguidance/functions/fnc_onFired.sqf @@ -7,7 +7,7 @@ if(GVAR(enabled) < 1 || {!local _projectile} ) exitWith { false }; if( !isPlayer _shooter && { GVAR(enabled) < 2 } ) exitWith { false }; -private["_config", "_enabled", "_target", "_seekerType", "_attackProfile"]; +private["_config", "_configs", "_enabled", "_target", "_seekerType", "_attackProfile"]; private["_args", "_canUseLock", "_guidingUnit", "_launchPos", "_lockMode", "_targetPos", "_vanillaTarget"]; PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); @@ -15,7 +15,9 @@ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); // Bail on not missile if(! (_ammo isKindOf "MissileBase") ) exitWith { false }; -_config = configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON); +_configs = configProperties [configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON), "true", false]; +if( (count _configs) < 1) exitWith {}; +_config = _configs select 1; _enabled = getNumber ( _config >> "enabled"); // Bail if guidance is not enabled From 864c3ea03ba0b08a86078f21bd32b839f5c06f0e Mon Sep 17 00:00:00 2001 From: Dimaslg Date: Wed, 29 Apr 2015 21:23:32 +0200 Subject: [PATCH 13/42] Conflicts resolve again Conflicts resolve again --- addons/missileguidance/stringtable.xml | 1 - addons/optionsmenu/stringtable.xml | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 5516e1e5db..839a4a3937 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -46,7 +46,6 @@ Hydra-70 DAGR Laser Guided Missile - Missile à guidage Hydra-70 DAGR Misil guiado por láser Hydra-70 DAGR Missile à guidage laser Hydra-70 DAGR Laserowo naprowadzana rakieta Hydra-70 DAGR diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index df71dceb57..64e95133ba 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -149,13 +149,8 @@ Number -<<<<<<< HEAD - Nummer - Número -======= Zahl - Numero ->>>>>>> acemod/master + Número Число Číslo Cyfra @@ -222,12 +217,8 @@ Option Menu UI Scaling Menu option: taille de l'UI Skalowanie UI menu ustawień -<<<<<<< HEAD - Menú de opciónes de escalado de la interfaz de usuario -======= - Opción de escalado del menú UI + Opción de escalado del menú IU UI Skalierung ->>>>>>> acemod/master \ No newline at end of file From 4e165e25724b03425a91ecf50cc23f0d754c9a8b Mon Sep 17 00:00:00 2001 From: Harakhti Date: Thu, 30 Apr 2015 13:25:25 +0200 Subject: [PATCH 14/42] Update Hungarian translations Let us match the current revision. At the time of making, the Ballistics XML was broken. --- addons/advanced_ballistics/stringtable.xml | 2 + addons/atragmx/stringtable.xml | 3 + addons/disarming/stringtable.xml | 1 + addons/interact_menu/stringtable.xml | 10 ++- addons/kestrel4500/stringtable.xml | 7 +- addons/laserpointer/stringtable.xml | 5 +- addons/medical/stringtable.xml | 80 +++++++++++++++++++++- addons/microdagr/stringtable.xml | 3 +- addons/missileguidance/stringtable.xml | 7 +- addons/mk6mortar/stringtable.xml | 6 +- addons/optionsmenu/stringtable.xml | 3 +- addons/realisticnames/stringtable.xml | 30 +++++++- addons/respawn/stringtable.xml | 8 ++- addons/scopes/stringtable.xml | 11 ++- addons/weather/stringtable.xml | 3 +- 15 files changed, 165 insertions(+), 14 deletions(-) diff --git a/addons/advanced_ballistics/stringtable.xml b/addons/advanced_ballistics/stringtable.xml index dbf2784f21..b88e569fdf 100644 --- a/addons/advanced_ballistics/stringtable.xml +++ b/addons/advanced_ballistics/stringtable.xml @@ -9,6 +9,7 @@ Afficher les info sur le vent Mostrar información del viento Windinformationen anzeigen + Széladatok mutatása Show Protractor @@ -18,6 +19,7 @@ Afficher le rapporteur Mostrar transportador Winkelmesser anzeigen + Szögmérő mutatása \ No newline at end of file diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml index f6bafa7762..e2fc54f9ab 100644 --- a/addons/atragmx/stringtable.xml +++ b/addons/atragmx/stringtable.xml @@ -20,6 +20,7 @@ Abrir ATragMX Ouvrir ATragMX ATragMX öffnen + ATragMX elővétele Rugged PDA with ATragMX @@ -28,6 +29,7 @@ PDA rugerizada con ATragMX Robuster PDA mit ATragMX PDA robuste avec ATragMX + Megerősített PDA, ATragMX-el Open ATragMX @@ -36,6 +38,7 @@ Abrir ATragMX Ouvrir ATragMX ATragMX öffnen + ATragMX elővétele \ No newline at end of file diff --git a/addons/disarming/stringtable.xml b/addons/disarming/stringtable.xml index 583080ff08..8f02cb7769 100644 --- a/addons/disarming/stringtable.xml +++ b/addons/disarming/stringtable.xml @@ -10,6 +10,7 @@ Открыть инвентарь Apri l'inventario Ouvrir l'inventaire + Felszerelés megtekintése \ No newline at end of file diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index b8913ce1c9..6fe1208e35 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -21,6 +21,7 @@ Zawsze wyświetlaj kursor dla interakcji Показывать курсор (взаимодействие) Immer den Cursor für Fremd-Interaktionen anzeigen + Mindig legyen a cselekvés kurzorja látható Display interaction menus as lists @@ -30,6 +31,7 @@ Mostra il menù di interazione come lista Wyświetlaj menu interakcji jako listę Interaktionsmenü in Listen anzeigen + Cselekvő menük listaként való megjelenítése Interact Key @@ -85,6 +87,7 @@ Interaction - Texte Max Interaktionstextfarbe Max Interazioni - Testo Massimo + Cselekvés - Szöveg max. Interaction - Text Min @@ -92,6 +95,7 @@ Interaction - Texte Min Interaktionstextfarbe Min Interazioni - Testo Minimo + Cselekvés - Szöveg min. Interaction - Shadow Max @@ -99,6 +103,7 @@ Interaction - Ombre Max Interaktionstextschatten Max Interazioni - Ombra Massima + Cselekvés - Árnyék max. Interaction - Shadow Min @@ -106,14 +111,17 @@ Interaction - Ombre Min Interaktionstextschatten Min Interazioni - Ombra Minima + Cselekvés - Árnyék min. Keep cursor centered Garder le curseur au centre + Kurzor középen tartása Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. + Középen tartja a kurzort, és a menüelemeket mozgatja. Hasznos lehetőség korlátozott képméretnél. - + \ No newline at end of file diff --git a/addons/kestrel4500/stringtable.xml b/addons/kestrel4500/stringtable.xml index 15808311d9..9d069acf6a 100644 --- a/addons/kestrel4500/stringtable.xml +++ b/addons/kestrel4500/stringtable.xml @@ -22,6 +22,7 @@ Kestrel 4500 Taschenwettermessgerät Kestrel 4500 Indicatore Meteorologico Tascabile Kestrel 4500 Medidor Balístico Ativo + Kestrel 4500 kézi szél-és időjárásmérő Open Kestrel 4500 @@ -42,6 +43,7 @@ Mostra Kestrel 4500 Mostrar Kestrel 4500 Kestrel 4500 anzeigen + Kestrel 4500 mutatása Hide Kestrel 4500 @@ -51,6 +53,7 @@ Nascondi Kestrel 4500 Esconder Kestrel 4500 Kestrel 4500 wegstecken + Kestrel 4500 elrejtése Open Kestrel 4500 @@ -60,6 +63,7 @@ Accendi Kestrel 4500 Abrir Kestrel 4500 Kestrel 4500 öffnen + Kestrel 4500 elővétele Show Kestrel 4500 @@ -69,6 +73,7 @@ Mostra Kestrel 4500 Mostrar Kestrel 4500 Kestrel 4500 anzeigen + Kestrel 4500 mutatása - + \ No newline at end of file diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index c3c227d8e3..e7a80dc1bd 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -57,6 +57,7 @@ Laser Laser Laser + Lézer IR Laser @@ -66,6 +67,7 @@ Laser IR Laser IR Laser IR + Infravörös Lézer Switch Laser / IR Laser @@ -75,6 +77,7 @@ Changer Laser / Laser IR Alterna Laser / IR Laser Cambiar Laser / Laser IR + Lézer / Infravörös Lézer váltása - + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 2cb2d5715d..0655f2e0c4 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -8,6 +8,7 @@ ТРАВМЫ BLESSURES OBRAŻENIA + SÉRÜLÉSEK No injuries on this bodypart ... @@ -16,6 +17,7 @@ Данная часть тела не повреждена ... Aucune blessures sur cette partie du corps Brak obrażeń na tej części ciała ... + Ezen a testrészen nincs sérülés ... Litter Simulation Detail @@ -24,6 +26,7 @@ Количество мусора от медицины Dettagli Simulazione Rifiuti Niveau de simulation des détritus + Hulladékszimuláció részletessége Litter simulation detail level sets the number of litter items which will be locally spawned in the client. Excessive amounts in local areas could cause FPS lag, so this is a client only setting. @@ -32,6 +35,7 @@ Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента. Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client. Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement. + A hulladékszimuláció részletessége megszabja a kliens által megjelenített hulladékobjektumok mennyiségét. Súlyos mennyiségek izolált területeken alacsony FPS-t okozhatnak, így ez egy kliensoldali beállítás. Inject Atropine @@ -115,6 +119,7 @@ Наложить жгут Applica laccio emostatico Aplicar Torniquete + Érszorító alkalmazása Bandage @@ -398,6 +403,7 @@ Нет записей. Aucune entrée sur cette carte de triage Brak wpisów w tej karcie segregacyjnej. + Ez az orvosi lap nem tartalmaz bejegyzést. Tourniquet @@ -430,6 +436,7 @@ Диагностика Diagnostiquer Diagnoza + Diagnosztizálás Diagnosing ... @@ -438,6 +445,7 @@ Диагностика ... Diagnostic en cours Diagnozowanie ... + Diagnózis folyamatban... CPR @@ -446,6 +454,7 @@ Сердечно-легочная реанимация RPC RKO + Újraélesztés Performing CPR ... @@ -454,6 +463,7 @@ Сердечно-легочная реанимация ... RPC en cours Przeprowadzanie RKO ... + Újraélesztés folyamatban... Give Blood IV (1000ml) @@ -966,6 +976,7 @@ Una sostanza che permette di dilatare i bronchi, aumentare il battito cardiaco e combattere effetti di reazioni allergiche. Usato anche in casi di arresto cardiaco. Ein Medikament, dass die Bronchien erweitert, die Herzfrequenz erhöht und Symptome von allergischen Reaktionen(Anaphylaxie) bekämpft. Wird bei plötzlichem Herzstillstand verabreicht. Uma droga trabalha dilatando os bronquios, aumentando a frequência cardíaca e combate efeitos de reações alérgicas(anáfilaticas). Usado em casos de parada cardiaca com poucas changes de recuperação. + Egy hormon, mely a szimpatikus idegrendszer által kitágítja a hörgőket, valamint megnöveli a szívverést, ezzel ellensúlyozva ilyen jellegű allergiás reakciókat (anafilaxiás sokk). Hirtelen szívmegállás esetén is használt, idő alatt csökkenő hatásfokkal. Plasma IV (1000ml) @@ -1053,6 +1064,7 @@ Cullot sanguin O- utilisé dans de rares et stricts cas pour compléter une perte de sang importante. Administré normalement lors d'un MEDEVAC O Negative Blutinfusion wird nur in seltenen Fällen verwendet, um den Bluthaushalt des Patienten zu ergänzen. Wird in der Regel wärend der Transportphase durchgeführt. Sangue O- , utilizado em casos raros para rapidamente repor o sangue. Uso habitual ocorre durante o transporte ou em estações de tratamento. + Nullás vércsoportú, Rh-negatív vér-infúzió, melyet kritikus és ritka helyzetekben vérutánpótlásra használnak, jellemzően az orvosi ellátás szállítási fázisa közben. Blood IV (500ml) @@ -1192,6 +1204,7 @@ Полевая аптчека для продвинутого лечения и зашивания ран Persönliches Verbandspäckchen zum ambulanten Nähen und fortgeschrittener Behandlung. Trousse de premiers soins pour coudre sur le terrain et traitements avancés. + Elsősegélycsomag, terepen való sebvarráshoz és haladó ellátáshoz Use Personal Aid Kit @@ -1199,6 +1212,7 @@ Использовать аптечку Utiliser la Trousse de premier soins Użyj apteczki osobistej + Elsősegélycsomag használata Surgical Kit @@ -1239,6 +1253,7 @@ Использовать хирургический набор Utiliser la trousse chirugicale Zszyj rany + Sebészeti készlet használata Bodybag @@ -1301,6 +1316,7 @@ %1 проверил артериальное давление: %2 %1 à vérifié la tension: %2 %1 sprawdził ciśnienie krwi: %2 + %1 ellenőrizte a vérnyomást: %2 You checked %1 @@ -1385,6 +1401,7 @@ Низкое Faible Niskie + Alacsony Normal @@ -1392,6 +1409,7 @@ Нормальное Normale Normalne + Normális High @@ -1399,6 +1417,7 @@ Высокое Haute Wysokie + Magas No Blood Pressure @@ -1406,6 +1425,7 @@ Артериальное давление отсутствует Aucune tension Brak ciśnienia krwi + Nincs vérnyomás Pulse @@ -1446,6 +1466,7 @@ %1 проверил пульс: %2 %1 à vérifié le rythme cardiaque: %2 %1 sprawdził tętno: %2 + %1 ellenőrizte a szívverés-számot: %2 Weak @@ -1453,6 +1474,7 @@ Слабый Faible Słabe + Gyenge Normal @@ -1460,6 +1482,7 @@ Нормальный Normal Normalne + Normális Strong @@ -1467,6 +1490,7 @@ Сильный Fort Silne + Erős You find a Heart Rate of %2 @@ -1584,6 +1608,7 @@ Patient %1<br/>ist %2.<br/>%3.<br/>%4 Patient %1<br/>est %2.<br/>%3.<br/> Pacjent %1<br/>jest %2.<br/>%3.<br/>%4 + A páciens, %1,<br/>%2.<br/>%3.<br/>%4 alive @@ -1591,6 +1616,7 @@ lebendig vivant żywy + élő dead @@ -1598,6 +1624,7 @@ tot mort martwy + halott He's lost some blood @@ -1605,9 +1632,11 @@ Er hat etwas Blut verloren Il à perdu du sang Stracił trochę krwi + Valamennyi vért vesztett He's lost a lot of blood + Sok vért vesztett He hasn't lost blood @@ -1615,6 +1644,7 @@ Er hat kein Blut verloren il n'a pas perdu de sang Nie stracił krwi + Nem vesztett vért He is in pain @@ -1622,6 +1652,7 @@ Er hat Schmerzen il souffre Odczuwa ból + Fájdalmai vannak He is not in pain @@ -1629,6 +1660,7 @@ Er hat keine Schmerzen Il ne souffre pas Nie odczuwa bólu + Nincsenek fájdalmai Bandaged @@ -1874,6 +1906,7 @@ Gravemente ferito Gravemente herido Lourdement blessé + Erősen sérült Lightly wounded @@ -1883,6 +1916,7 @@ Leggermente ferito Levemente herido Légèrement blessé + Enyhén sérült Very lightly wounded @@ -1892,6 +1926,7 @@ Ferito lievemente Muy levemente herido Très légèrement blessé + Nagyon enyhén sérült Head @@ -1901,6 +1936,7 @@ Testa Cabeza Tête + Fej Torso @@ -1910,6 +1946,7 @@ Torso Torso Torse + Testtörzs Left Arm @@ -1919,6 +1956,7 @@ Braccio sinistro Brazo izquierdo Bras gouche + Bal kar Right Arm @@ -1928,6 +1966,7 @@ Braccio destro Brazo derecho Bras droit + Jobb kar Left Leg @@ -1937,6 +1976,7 @@ Gamba sinistra Pierna izquierda Jambe gauche + Bal láb Right Leg @@ -1946,6 +1986,7 @@ Gamba destra Pierna derecha Jambe droite + Jobb láb Pain Effect Type @@ -1955,6 +1996,7 @@ Pain Effect Type Tipo de efecto de dolor Type d'effet de douleur + Fájdalom-effekt típusa Colour Flashing @@ -1964,6 +2006,7 @@ Colore lampeggiante Parpadeo de color Flash de couleur + Színvillódzás Chromatic Aberration @@ -1973,6 +2016,7 @@ Aberrazione cromatica Aberración cromática Aberration chromatique + Kromatikus aberráció Scrape @@ -1980,6 +2024,7 @@ Ссадина Eraflure Draśnięcie + Horzsolás Minor Scrape @@ -1987,6 +2032,7 @@ Малая ссадина Eraflure Mineure Pomniejsze draśnięcie + Kis horzsolás Medium Scrape @@ -1994,6 +2040,7 @@ Средняя ссадина Moyenne Eraflure Średnie draśnięcie + Közepes horzsolás Large Scrape @@ -2001,6 +2048,7 @@ Большая ссадина Large Eraflure Duże draśnięcie + Nagy horzsolás Avulsion @@ -2008,6 +2056,7 @@ Рваная рана Avulsion Rana płatowa + Leszakadás Minor Avulsion @@ -2015,6 +2064,7 @@ Малая рваная рана Avulsion Mineure Pomniejsza rana płatowa + Kis leszakadás Medium Avulsion @@ -2022,6 +2072,7 @@ Средняя рваная рана Avulsion Moyenne Średnia rana płatowa + Közepes leszakadás Large Avulsion @@ -2029,6 +2080,7 @@ Большая рваная рана Large Avulsion Duża rana płatowa + Nagy leszakadás Bruise @@ -2036,6 +2088,7 @@ Ушиб Hématome Stłuczenie + Zúzódás Minor Bruise @@ -2043,6 +2096,7 @@ Малый ушиб Hématome Mineur Pomniejsze stłuczenie + Kis zúzódás Medium Bruise @@ -2050,6 +2104,7 @@ Средний ушиб Hématome Moyen Średnie stłuczenie + Közepes zúzódás Large Bruise @@ -2057,6 +2112,7 @@ Большой ушиб Large Hématome Duże stłuczenie + Nagy zúzódás Crushed tissue @@ -2064,6 +2120,7 @@ Компресионная травма Tissu écrasé Zgniecienie tkanek miękkich + Zúzott szövet Minor crushed tissue @@ -2071,6 +2128,7 @@ Малая компрессионная травма Tissu écrasé Mineur Pomniejsze zgniecienie tkanek miękkich + Kis zúzott szövet Medium crushed tissue @@ -2078,6 +2136,7 @@ Средняя компрессионная травма Tissu écrasé Moyen Średnie zgniecienie tkanek miękkich + Közepes zúzott szövet Large crushed tissue @@ -2085,6 +2144,7 @@ Большая компрессионная травма Tissu écrasé Large Duże zgniecienie tkanek miękkich + Nagy zúzött szövet Cut @@ -2092,6 +2152,7 @@ Резаная рана Coupure Rana cięta + Vágás Small Cut @@ -2099,6 +2160,7 @@ Малая резаная рана Pomniejsza rana cięta Petite Coupure + Kis vágás Medium Cut @@ -2106,6 +2168,7 @@ Средняя резаная рана Średnia rana cięta Moyenne Coupure + Közepes vágás Large Cut @@ -2113,6 +2176,7 @@ Большая резаная рана Duża rana cięta Large Coupure + Nagy vágás Tear @@ -2120,6 +2184,7 @@ Рваная рана Rozerwanie skóry Déchirure + Szakadás Small Tear @@ -2127,6 +2192,7 @@ Малая рваная рана Pomniejsze rozerwanie skóry Petite Déchirure + Kis szakadás Medium Tear @@ -2134,6 +2200,7 @@ Средняя рваная рана Średnie rozerwanie skóry Moyenne Déchirure + Közepes szakadás Large Tear @@ -2141,6 +2208,7 @@ Большая рваная рана Duże rozerwanie skóry Large Déchirure + Nagy szakadás Velocity Wound @@ -2148,6 +2216,7 @@ Огнестрельная рана Rana postrzałowa Blessure de vélocité + Lőtt seb Smal Velocity Wound @@ -2155,6 +2224,7 @@ Малая огнестрельная рана Pomniejsza rana postrzałowa Petite Bessure de vélocité + Kis lőtt seb Medium Velocity Wound @@ -2162,6 +2232,7 @@ Средняя огнестрельная рана Średnia rana postrzałowa Moyenne Blessure de vélocité + Közepes lőtt seb Large Velocity Wound @@ -2169,6 +2240,7 @@ Большая огнестрельная рана Duża rana postrzałowa Large Blessure de vélocité + Nagy lőtt seb Puncture Wound @@ -2176,6 +2248,7 @@ Колотая рана Rana kłuta Blessure de perforation + Szúrt seb Minor Puncture Wound @@ -2183,6 +2256,7 @@ Малая колотая рана Pomniejsza rana kłuta Blessure de perforation Mineure + Kis szúrt seb Medium Puncture Wound @@ -2190,6 +2264,7 @@ Средняя колотая рана Średnia rana kłuta Blessure de perforation Moyenne + Közepes szúrt seb Large Puncture Wound @@ -2197,6 +2272,7 @@ Большая колотая рана Duża rana kłuta Large Blessure de perforation + Nagy szúrt seb Broken Femur @@ -2204,9 +2280,11 @@ Перелом Zkłamana kość udowa Femur Cassé + Törött combcsont Treating... + Ellátás... - + \ No newline at end of file diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index f9ca634fd2..32fad199de 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -251,6 +251,7 @@ Excluir Удалить Borrar + Törlés Toggle MicroDAGR Display Mode @@ -301,4 +302,4 @@ Fechar MicroDAGR - + \ No newline at end of file diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 15a87c31ba..cacec33b33 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -20,6 +20,7 @@ Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия. Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen. Le guidage avancé de missile, ou AMG en anglais, apporte de multiple améliorations au verouillage et au tir de missiles. C'est aussi un framework requis pour tout arme de type missile. + A fejlett rakétairányító (vagy AMG) többféle módosítást tartalmaz a rakéták célkövetéséhez és tüzeléséhez. Ez egy szükséges keresztrendszer a rakéta-alapú fegyverekhez. Hydra-70 DAGR Missile @@ -54,7 +55,7 @@ Hydra-70 DAGR laserem naváděná střela Hydra-70 DAGR missile guida laser - Hydra-70 DAGR lézer-irányított rakéta + Hydra-70 DAGR lézer-irányított rakéta Управляемая ракета лазерного наведения Hydra-70 DAGR @@ -66,7 +67,7 @@ Hellfire II AGM-114K Missile Hellfire II AGM-114K - Hellfire II AGM-114K rakéta + Hellfire II AGM-114K rakéta Hellfire II AGM-114K @@ -90,7 +91,7 @@ Hellfire II AGM-114K laserem naváděná střela Missile guida laser Hellfire II AGM-114K - Hellfire II AGM-114K lézer-irányított rakéta + Hellfire II AGM-114K lézer-irányított rakéta Управляемая ракета лазерного наведения Hellfire II AGM-114K diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index fe08d320e5..da01ebc149 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -7,6 +7,7 @@ Tabela strzelnicza 82mm table de tir 82mm 82 мм Таблица дальностей и прицелов + 82mm hatótáv-tábla Range Table for the MK6 82mm Mortar @@ -14,6 +15,7 @@ Tabela strzelnicza dla moździerza 82mm MK6 Table de tir pour le mortier MK6 82mm Таблица дальностей и прицелов для MK6 82 мм мортиры + Hatótáv-tábla a MK6 82mm-es mozsárhoz Open 82mm Rangetable @@ -21,6 +23,7 @@ Otwórz tabelę strzelniczą 82mm ouvrir la table de tir 82mm Открыть 82 мм Таблицу дальностей и прицелов + 82mm hatótáv-tábla megnyitása Charge @@ -28,6 +31,7 @@ Charge Ładunek Зарядить + Töltés - + \ No newline at end of file diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index ccb39c93c8..3823562905 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -235,6 +235,7 @@ Opción de escalado del menú UI Размер интерфейса меню настройки UI Skalierung + Beállításmenü kezelőfelületének skálázása - + \ No newline at end of file diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 49ffbf1773..fcd54a5610 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1533,6 +1533,7 @@ Noreen "Bad News" ULR Noreen "Bad News" ULR Noreen "Bad News" ULR + Noreen "Bad News"ULR Noreen "Bad News" ULR (Black) @@ -1542,6 +1543,7 @@ Noreen "Bad News" ULR (Чёрный) Noreen "Bad News" ULR (Schwarz) Noreen "Bad News" ULR (czarny) + Noreen "Bad News"ULR (Fekete) Noreen "Bad News" ULR (Camo) @@ -1551,6 +1553,7 @@ Noreen "Bad News" ULR (Камо) Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (kamuflaż) + Noreen "Bad News"ULR (Terepmintás) Noreen "Bad News" ULR (Sand) @@ -1560,6 +1563,7 @@ Noreen "Bad News" ULR (Песочный) Noreen "Bad News" ULR (Sand) Noreen "Bad News" ULR (piaskowy) + Noreen "Bad News"ULR (Homok) SIG 556 @@ -1569,6 +1573,7 @@ SIG 556 SIG 556 SIG 556 + SIG 556 SIG 556 (Black) @@ -1578,6 +1583,7 @@ SIG 556 (Чёрный) SIG 556 (czarny) SIG 556 (Schwarz) + SIG 556 (Fekete) SIG 556 (Khaki) @@ -1587,6 +1593,7 @@ SIG 556 (Хаки) SIG 556 (khaki) SIG 556 (Khaki) + SIG 556 (Khaki) SIG 556 (Sand) @@ -1596,6 +1603,7 @@ SIG 556 (Песочный) SIG 556 (piaskowy) SIG 556 (Sand) + SIG 556 (Homok) SIG 556 (Camo) @@ -1605,6 +1613,7 @@ SIG 556 (Камо) SIG 556 (kamuflaż) SIG 556 (Camo) + SIG 556 (Terepmintás) SIG 556 (Woodland) @@ -1614,6 +1623,7 @@ SIG 556 (Лесной) SIG 556 (leśny) SIG 556 (Woodland) + SIG 556 (Erdőmintás) SIG 556 (provisional) spotter @@ -1623,6 +1633,7 @@ SIG 556 (provisional) корректировщик SIG 556 (prowizoryczny) obserwator SIG 556 (provisorisch) Beobachter + SIG 556 (Ellátmányi) Megfigyelő ASP-1 Kir @@ -1632,6 +1643,7 @@ ASP-1 Kir ASP-1 Kir ASP-1 Kir + ASP-1 Kir ASP-1 Kir (Black) @@ -1641,6 +1653,7 @@ ASP-1 Kir (Чёрный) ASP-1 Kir (Schwarz) ASP-1 Kir (czarny) + ASP-1 Kir (Fekete) ASP-1 Kir (Tan) @@ -1650,6 +1663,7 @@ ASP-1 Kir (Бронзовый) ASP-1 Kir (Hellbraun) ASP-1 Kir (Tan) + ASP-1 Kir (Cserszín) Cyrus @@ -1659,6 +1673,7 @@ Cyrus Cyrus Cyrus + Cyrus Cyrus (Black) @@ -1668,6 +1683,7 @@ Cyrus (Чёрный) Cyrus (Schwarz) Cyrus (czarny) + Cyrus (Fekete) Cyrus (Hex) @@ -1677,6 +1693,7 @@ Cyrus (Гекс) Cyrus (Hex) Cyrus (hex) + Cyrus (Hex) Cyrus (Tan) @@ -1686,6 +1703,7 @@ Cyrus (Бронза) Cyrus (Hellbraun) Cyrus (podpalany) + Cyrus (Cserszín) M14 @@ -1695,6 +1713,7 @@ M14 M14 M14 + M14 M14 (Camo) @@ -1704,6 +1723,7 @@ M14 (Камо) M14 (kamuflaż) M14 (Camo) + M14 (Terepmintás) M14 (Olive) @@ -1713,6 +1733,7 @@ M14 (Олива) M14 (oliwkowy) M14 (Olive) + M14 (Olíva) HK121 @@ -1722,6 +1743,7 @@ HK121 HK121 HK121 + HK121 HK121 (Hex) @@ -1731,6 +1753,7 @@ HK121 (Гекс) HK121 (Hex) HK121 (hex) + HK121 (Hex) HK121 (Tan) @@ -1740,6 +1763,7 @@ HK121 (Бронза) HK121 (Hellbraun) HK121 (podpalany) + HK121 (Cserszín) LWMMG @@ -1749,6 +1773,7 @@ LWMMG LWMMG LWMMG + LWMMG LWMMG (MTP) @@ -1758,6 +1783,7 @@ LWMMG (MTP) LWMMG (MTP) LWMMG (MTP) + LWMMG (MTP) LWMMG (Black) @@ -1767,6 +1793,7 @@ LWMMG (Чёрный) LWMMG (czarny) LWMMG (Schwarz) + LWMMG (Fekete) LWMMG (Sand) @@ -1776,6 +1803,7 @@ LWMMG (Песочный) LWMMG (piaskowy) LWMMG (Sand) + LWMMG (Homok) - + \ No newline at end of file diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index 8d0305c3ed..1e95313e0e 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -56,6 +56,7 @@ Точка сбора Синих (База) Punkt zbiórki Zachodu (Baza) Point de ralliement OUEST (Base) + Gyülekezőpont, Nyugat (Bázis) Rallypoint East (Base) @@ -64,6 +65,7 @@ Точка сбора Красных (База) Punkt zbiórki Wschodu (Baza) Point de ralliement EST (Base) + Gyülekezőpont, Kelet (Bázis) Rallypoint Independent (Base) @@ -72,6 +74,7 @@ Точка сбора Независимых (База) Punkt zbiórki Ruchu oporu (Baza) Point de ralliement Indépendant (Base) + Gyülekezőpont, Független (Bázis) Rallypoint West @@ -80,6 +83,7 @@ Точка сбора Синих Punkt zbiórki Zachodu Point de ralliement OUEST + Gyülekezőpont, Nyugat Rallypoint East @@ -88,6 +92,7 @@ Точка сбора Красных Punkt zbiórki Wschodu Point de ralliement EST + Gyülekezőpont, Kelet Rallypoint Independent @@ -96,6 +101,7 @@ Точка сбора Независимых Punkt zbiórki Ruchu oporu Point de ralliement Indépendant + Gyülekezőpont, Független - + \ No newline at end of file diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml index d84f0932af..257b78892b 100644 --- a/addons/scopes/stringtable.xml +++ b/addons/scopes/stringtable.xml @@ -9,6 +9,7 @@ Regola leggermente alzata in alto Hausse + Kleine Korrektur nach oben + Enyhe állítás fel Minor adjustment down @@ -18,6 +19,7 @@ Regola leggermente alzata in basso Hausse - Kleine Korrektur nach unten + Enyhe állítás le Minor adjustment right @@ -27,6 +29,7 @@ Regola leggermente il tiro a destra Dérive + Kleine Korrektur nach rechts + Enyhe állítás jobbra Minor adjustment left @@ -36,6 +39,7 @@ Regola leggermete il tiro a sinistra Dérive - Kleine Korrektur nach links + Enyhe állítás balra Major adjustment up @@ -45,6 +49,7 @@ Regola l'alzata in alto Hausse +++ Große Korrektur nach oben + Nagy állítás fel Major adjustment down @@ -54,6 +59,7 @@ Regola l'alzata in basso Hausse --- Große Korrektur nach unten + Nagy állítás le Major adjustment right @@ -63,6 +69,7 @@ Regola il tiro a destra Dérive +++ Große Korrektur nach rechts + Nagy állítás jobbra Major adjustment left @@ -72,6 +79,7 @@ Regola il tiro a sinistra Dérive --- Große Korrektur nach links + Nagy állítás balra Set zero adjustment @@ -81,6 +89,7 @@ Resetta i valori del tiro RAZ corrections Auf 0 justieren + Állítások nullázása - + \ No newline at end of file diff --git a/addons/weather/stringtable.xml b/addons/weather/stringtable.xml index 4e0723bb7a..0b891b3a78 100644 --- a/addons/weather/stringtable.xml +++ b/addons/weather/stringtable.xml @@ -9,6 +9,7 @@ Mostrar información del viento Mostra informazioni sul vento Zeige Windinformationen + Széladatok mutatása - + \ No newline at end of file From 7568773ecee066cf566a8c3454c203060e4f8c7f Mon Sep 17 00:00:00 2001 From: jaynus Date: Thu, 30 Apr 2015 09:00:09 -0700 Subject: [PATCH 15/42] class localize and disable all guidance/locking. --- addons/javelin/CfgVehicles.hpp | 42 ++++++++++++++++++-- addons/javelin/CfgWeapons.hpp | 40 +++++++++++++++++-- addons/javelin/functions/fnc_onFired.sqf | 5 +++ addons/javelin/functions/fnc_onOpticDraw.sqf | 6 ++- 4 files changed, 86 insertions(+), 7 deletions(-) diff --git a/addons/javelin/CfgVehicles.hpp b/addons/javelin/CfgVehicles.hpp index 5ea7e3327c..48781036ad 100644 --- a/addons/javelin/CfgVehicles.hpp +++ b/addons/javelin/CfgVehicles.hpp @@ -9,12 +9,48 @@ class CfgVehicles { class MainTurret; }; }; + class AT_01_base_F: StaticMGWeapon {}; - - class AT_01_base_F: StaticMGWeapon { + class B_static_AT_F: AT_01_base_F { class Turrets : Turrets { class MainTurret : MainTurret { - weapons[] = { "missiles_titan_static_at" }; + weapons[] = { QGVAR(Titan_Static) }; + magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"}; + + turretInfoType = "ACE_RscOptics_javelin"; + gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d); + opticsZoomMin = 0.08333; + opticsZoomMax = 0.04167; + opticsZoomInit = 0.08333; + opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"}; + opticsFlare = 0; + discretefov[] = {0.08333,0.04167}; + discreteInitIndex = 0; + }; + }; + }; + class O_static_AT_F: AT_01_base_F { + class Turrets : Turrets { + class MainTurret : MainTurret { + weapons[] = { QGVAR(Titan_Static) }; + magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"}; + + turretInfoType = "ACE_RscOptics_javelin"; + gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d); + opticsZoomMin = 0.08333; + opticsZoomMax = 0.04167; + opticsZoomInit = 0.08333; + opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"}; + opticsFlare = 0; + discretefov[] = {0.08333,0.04167}; + discreteInitIndex = 0; + }; + }; + }; + class I_static_AT_F: AT_01_base_F { + class Turrets : Turrets { + class MainTurret : MainTurret { + weapons[] = { QGVAR(Titan_Static) }; magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"}; turretInfoType = "ACE_RscOptics_javelin"; diff --git a/addons/javelin/CfgWeapons.hpp b/addons/javelin/CfgWeapons.hpp index 1392cd1a56..1bbf713b3b 100644 --- a/addons/javelin/CfgWeapons.hpp +++ b/addons/javelin/CfgWeapons.hpp @@ -11,7 +11,9 @@ class CfgWeapons { }; - class missiles_titan_at : missiles_titan { + class missiles_titan_at : missiles_titan { }; + class GVAR(Titan_Static) : missiles_titan_at { + GVAR(enabled) = 1; weaponInfoType = "ACE_RscOptics_javelin"; modelOptics = PATHTOF(data\reticle_titan.p3d); @@ -20,18 +22,50 @@ class CfgWeapons { lockingTargetSound[] = {"",0,1}; lockedTargetSound[] = {"",0,1}; }; - class missiles_titan_static_at : missiles_titan_at { }; // @TODO: AA by default, motherfuckers class launch_Titan_base : Launcher_Base_F {}; - class launch_Titan_short_base : launch_Titan_base { + class launch_Titan_short_base : launch_Titan_base { }; + + class launch_B_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = PATHTOF(data\reticle_titan.p3d); + + canLock = 0; + + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; + class launch_I_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = PATHTOF(data\reticle_titan.p3d); + + canLock = 0; + + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; + class launch_O_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; weaponInfoType = "ACE_RscOptics_javelin"; modelOptics = PATHTOF(data\reticle_titan.p3d); canLock = 0; + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; + class launch_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = PATHTOF(data\reticle_titan.p3d); + + canLock = 0; + lockingTargetSound[] = {"",0,1}; lockedTargetSound[] = {"",0,1}; }; diff --git a/addons/javelin/functions/fnc_onFired.sqf b/addons/javelin/functions/fnc_onFired.sqf index 8c6590f5df..4c0f798167 100644 --- a/addons/javelin/functions/fnc_onFired.sqf +++ b/addons/javelin/functions/fnc_onFired.sqf @@ -6,10 +6,15 @@ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); // Bail on not missile if( _shooter != ACE_player) exitWith { false }; +/* if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_short_base"] call EFUNC(common,inheritsFrom)) && { ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "missiles_titan_at"] call EFUNC(common,inheritsFrom)) } ) exitWith { }; +*/ +_configs = configProperties [configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) >> QGVAR(enabled), "true", false]; +if( (count _configs) < 1) exitWith {}; +_config = _configs select 1; _pfh_handle = uiNamespace getVariable ["ACE_RscOptics_javelin_PFH", nil]; if(!isNil "_pfh_handle") then { diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf index 8fa96c036a..134260c064 100644 --- a/addons/javelin/functions/fnc_onOpticDraw.sqf +++ b/addons/javelin/functions/fnc_onOpticDraw.sqf @@ -35,10 +35,14 @@ _soundTime = _args select 4; _randomLockInterval = _args select 5; _fireDisabledEH = _args select 6; +_configs = configProperties [configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) >> QGVAR(enabled), "true", false]; + +/* if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_short_base"] call EFUNC(common,inheritsFrom)) && { ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "missiles_titan_at"] call EFUNC(common,inheritsFrom)) } - ) exitWith { +*/ +if((count _config) < 1) exitWith { __JavelinIGUITargeting ctrlShow false; __JavelinIGUITargetingGate ctrlShow false; __JavelinIGUITargetingLines ctrlShow false; From 21cc0db28f03a9d7fe74dae54b1021a5592b4b14 Mon Sep 17 00:00:00 2001 From: jaynus Date: Thu, 30 Apr 2015 09:04:29 -0700 Subject: [PATCH 16/42] Correctly look up configs. --- addons/missileguidance/functions/fnc_onFired.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf index 6c6c2717bf..5145258cd3 100644 --- a/addons/missileguidance/functions/fnc_onFired.sqf +++ b/addons/missileguidance/functions/fnc_onFired.sqf @@ -17,7 +17,7 @@ if(! (_ammo isKindOf "MissileBase") ) exitWith { false }; _configs = configProperties [configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON), "true", false]; if( (count _configs) < 1) exitWith {}; -_config = _configs select 1; +_config = (configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON)); _enabled = getNumber ( _config >> "enabled"); // Bail if guidance is not enabled From f28a806938ba9bbcccdc7b1cb938b4e1d8defcc1 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:15:40 +0200 Subject: [PATCH 17/42] Remove max unconsciousness time again --- addons/medical/ACE_Settings.hpp | 4 ---- addons/medical/CfgVehicles.hpp | 6 ------ .../functions/fnc_moduleMedicalSettings.sqf | 1 - addons/medical/functions/fnc_setUnconscious.sqf | 16 ---------------- 4 files changed, 27 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index aa354f7c56..6006515b45 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -63,10 +63,6 @@ class ACE_Settings { typeName = "BOOL"; value = 0; }; - class GVAR(maxUnconsciousTime) { - typeName = "SCALAR"; - value = -1; - }; class GVAR(enableRevive) { typeName = "SCALAR"; value = 0; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 0a0d67559d..f41ecac36f 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -113,12 +113,6 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 0; }; - class maxUnconsciousTime { - displayName = "Max. Uncon. Time"; - description = "Maximum time a unit can be unconscious before dying. Negative Values disable this."; - typeName = "NUMBER"; - defaultValue = -1; - }; class bleedingCoefficient { displayName = "Bleeding coefficient"; description = "Coefficient to modify the bleeding speed"; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 388531a9b1..25020e227b 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -31,7 +31,6 @@ if !(_activated) exitWith {}; [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(maxUnconsciousTime), "maxUnconsciousTime"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index ce218b409c..60ca184bc9 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -25,12 +25,6 @@ _minWaitingTime = if (count _this > 2) then {_this select 2} else {DEFAULT_DELAY // No change, fuck off. (why is there no xor?) if (_set isEqualTo (_unit getVariable ["ACE_isUnconscious", false])) exitWith {}; -// Remove maximum unconsciousness time handler -_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1]; -if (_maxUnconHandle > 0) then { - [_maxUnconHandle] call CBA_fnc_removePerFrameHandler; -}; - if !(_set) exitwith { _unit setvariable ["ACE_isUnconscious", false, true]; }; @@ -101,16 +95,6 @@ _startingTime = time; [DFUNC(unconsciousPFH), 0.1, [_unit,_animState, _originalPos, _startingTime, _minWaitingTime, false, vehicle _unit isKindOf "ParachuteBase"] ] call CBA_fnc_addPerFrameHandler; -// Maximum unconsciousness time -_maxUnconTime = _unit getVariable [QGVAR(maxUnconsciousTime), GVAR(maxUnconsciousTime)]; -if (_maxUnconTime >= 0) then { - _handle = [{ - _unit = _this select 0; - [_unit] call FUNC(setDead); - }, [_unit], _maxUnconTime, 0.5] call EFUNC(common,waitAndExecute); - _unit setVariable [QGVAR(maxUnconTimeHandle), _handle]; -}; - // unconscious can't talk [_unit, "isUnconscious"] call EFUNC(common,muteUnit); From 965a976dafe6d2db3cb8237ac7d0f1c49c64392b Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:16:45 +0200 Subject: [PATCH 18/42] Reorganize AI unconsciousness --- addons/medical/ACE_Settings.hpp | 2 +- addons/medical/CfgVehicles.hpp | 8 ++++---- addons/medical/functions/fnc_moduleMedicalSettings.sqf | 2 +- addons/medical/functions/fnc_setUnconscious.sqf | 7 +++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 6006515b45..8e2d0421a7 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -54,7 +54,7 @@ class ACE_Settings { typeName = "SCALAR"; value = 1; }; - class GVAR(enableUnsconsiousnessAI) { + class GVAR(enableUnconsiousnessAI) { value = 1; typeName = "SCALAR"; values[] = {"Disabled", "Enabled", "50/50"}; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index f41ecac36f..70f88fa9b4 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -87,7 +87,7 @@ class CfgVehicles { typeName = "NUMBER"; defaultValue = 1; }; - class enableUnsconsiousnessAI { + class enableUnconsiousnessAI { displayName = "AI Unconsciousness"; description = "Allow AI to go unconscious"; typeName = "NUMBER"; @@ -97,12 +97,12 @@ class CfgVehicles { value = 0; }; class normal { - name = "Enabled"; + name = "50/50"; value = 1; default = 1; }; - class full { - name = "50/50"; + class full { + name = "Enabled"; value = 2; }; }; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 25020e227b..ad8fbba18a 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -29,7 +29,7 @@ if !(_activated) exitWith {}; [_logic, QGVAR(enableScreams), "enableScreams"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(playerDamageThreshold), "playerDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(enableUnconsiousnessAI), "enableUnconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 60ca184bc9..09b3faf07b 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -46,8 +46,11 @@ if (_unit == ACE_player) then { }; // if we have unconsciousness for AI disabled, we will kill the unit instead -if (!([_unit] call EFUNC(common,IsPlayer)) && (GVAR(enableUnsconsiousnessAI) == 0 || (GVAR(enableUnsconsiousnessAI) == 2 && random(1) <= 0.5))) exitwith { - [_unit, true] call FUNC(setDead); // force, to avoid getting into a loop in case revive is enabled. +if !([_unit] call EFUNC(common,isPlayer)) then { + _enableUncon = _unit getVariable [QGVAR(enableUnconsciousnessAI), GVAR(enableUnconsciousnessAI)]; + if (_enableUncon == 0 or {_enableUncon == 1 and (random 1) < 0.5}) exitWith { + [_unit, true] call FUNC(setDead); + }; }; // If a unit has the launcher out, it will sometimes start selecting the primairy weapon while unconscious, From 8fda984903d0c58a7f141496b3111af49b385e04 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:17:25 +0200 Subject: [PATCH 19/42] Fix missing semicolon --- addons/medical/functions/fnc_setUnconscious.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 09b3faf07b..41b965e7e1 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -84,7 +84,7 @@ if (GVAR(moveUnitsFromGroupOnUnconscious)) then { }; [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); -_anim = [_unit] call EFUNC(common,getDeathAnim) +_anim = [_unit] call EFUNC(common,getDeathAnim); [_unit, _anim, 1, true] call EFUNC(common,doAnimation); [{ _unit = _this select 0; From d59436c588138855fd093a60cd755e78799d4470 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:19:31 +0200 Subject: [PATCH 20/42] Only force animation when necessary --- addons/medical/functions/fnc_setUnconscious.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 41b965e7e1..12f5f8832c 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -89,7 +89,7 @@ _anim = [_unit] call EFUNC(common,getDeathAnim); [{ _unit = _this select 0; _anim = _this select 1; - if (_unit getVariable "ACE_isUnconscious") then { + if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then { [_unit, _anim, 2, true] call EFUNC(common,doAnimation); }; }, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute); From 03973f3dcfcd1c40d73843ecc9e1061074e9938a Mon Sep 17 00:00:00 2001 From: Grzegorz Sikora Date: Thu, 30 Apr 2015 22:54:15 +0200 Subject: [PATCH 21/42] PL translation --- addons/interact_menu/stringtable.xml | 6 +++++- addons/medical/stringtable.xml | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 5761815af1..b33e603d05 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,4 +1,5 @@  + @@ -115,15 +116,18 @@ Keep cursor centered Garder le curseur au centre Центрировать курсор + Utrzymaj kursor wyśrodkowany Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана. + Utrzymuje kursor na środku ekranu, zamiast tego ruch myszą powoduje przesuwanie menu interakcji. Użyteczne w przypadku kiedy rozmiar ekranu jest ograniczony. Do action when releasing menu key Aktion nach Loslassen der Taste ausführen + Wykonuj akcje po puszczeniu klawisza menu - + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index c164b37bf1..f73915e7af 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1,4 +1,5 @@  + @@ -1622,6 +1623,7 @@ He's lost a lot of blood + Stracił sporo krwi He hasn't lost blood @@ -1993,15 +1995,19 @@ Style of menu (Medical) + Styl menu medycznego Select the type of menu you prefer; default 3d selections or radial. + Wybierz rodzaj menu, który preferujesz: domyślne pozycje 3D lub radialne Selections (3d) + Pozycje (3D) Radial + Radialne Scrape @@ -2269,6 +2275,7 @@ Treating... + Leczenie... - + \ No newline at end of file From 1e0eaa1971625ca6f4acf062e6ad5fa5a3bd1858 Mon Sep 17 00:00:00 2001 From: Grzegorz Date: Thu, 30 Apr 2015 22:55:43 +0200 Subject: [PATCH 22/42] Update stringtable.xml --- addons/interact_menu/stringtable.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index b33e603d05..1e322d95d6 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,5 +1,4 @@  - @@ -130,4 +129,4 @@ Wykonuj akcje po puszczeniu klawisza menu - \ No newline at end of file + From 3f932c0a939a49307ea5d5d0d3876fcba969f0af Mon Sep 17 00:00:00 2001 From: Grzegorz Date: Thu, 30 Apr 2015 22:55:51 +0200 Subject: [PATCH 23/42] Update stringtable.xml --- addons/medical/stringtable.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index f73915e7af..5fd2ed9ba7 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1,5 +1,4 @@  - @@ -2278,4 +2277,4 @@ Leczenie... - \ No newline at end of file + From 47acc90db7d88e09d31a559dd2ea7ec2a4226b04 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Thu, 30 Apr 2015 14:21:13 -0700 Subject: [PATCH 24/42] Pretty up the name. --- mod.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod.cpp b/mod.cpp index f1cef6b6a2..0caaba2909 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,4 +1,4 @@ -name = "ACE3"; +name = "Advanced Combat Environment 3.0.0"; picture = "logo_ace3_ca.paa"; actionName = "GitHub"; action = "https://github.com/acemod/ACE3"; @@ -7,6 +7,6 @@ logo = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa"; tooltip = "ACE3"; tooltipOwned = "ACE3 Owned"; -overview = "ACE3 is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; +overview = "Advanced Combat Environment 3, or ACE3 is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; author = "ACE3 Team"; overviewPicture = "logo_ace3_ca.paa"; From d68e744fe2c63d039acd144e81c4da862e0b7b1d Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Thu, 30 Apr 2015 14:41:45 -0700 Subject: [PATCH 25/42] better grammar --- mod.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.cpp b/mod.cpp index 0caaba2909..b878c76a6d 100644 --- a/mod.cpp +++ b/mod.cpp @@ -7,6 +7,6 @@ logo = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa"; tooltip = "ACE3"; tooltipOwned = "ACE3 Owned"; -overview = "Advanced Combat Environment 3, or ACE3 is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; +overview = "Advanced Combat Environment 3, also known as ACE3, is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; author = "ACE3 Team"; overviewPicture = "logo_ace3_ca.paa"; From aa9f1c53c7466665920ad2218416ac306584b95c Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:34:18 +0200 Subject: [PATCH 26/42] Whoops --- .../functions/fnc_handleDamage_basic.sqf | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 044b35d5f2..68792b1656 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -24,14 +24,13 @@ #define ARMDAMAGETRESHOLD2 1.7 #define UNCONSCIOUSNESSTRESHOLD 0.7 -<<<<<<< HEAD -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_threshold"]; +private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage", "_armdamage", "_hitPoint", "_index", "_legdamage", "_newDamage", "_otherDamage", "_pain", "_restore"]; -_unit = _this select 0; +_unit = _this select 0; _selectionName = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; +_damage = _this select 2; +_shooter = _this select 3; +_projectile = _this select 4; // Apply damage treshold / coefficient _threshold = [ @@ -39,15 +38,6 @@ _threshold = [ _unit getVariable [QGVAR(damageThreshold), GVAR(playerDamageThreshold)] ] select ([_unit] call EFUNC(common,isPlayer)); _damage = _damage * (1 / _threshold); -======= -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage", "_armdamage", "_hitPoint", "_index", "_legdamage", "_newDamage", "_otherDamage", "_pain", "_restore"]; - -_unit = _this select 0; -_selectionName = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; ->>>>>>> origin/master // This is a new hit, reset variables. // Note: sometimes handleDamage spans over 2 or even 3 frames. From f7f416c8d3af17d64f6bf5551437154604d23632 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:34:38 +0200 Subject: [PATCH 27/42] Proper privates and alignment --- addons/medical/functions/fnc_handleDamage.sqf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index d457762321..25b65ac0b0 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -17,12 +17,12 @@ #include "script_component.hpp" -private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage", "_minLethalDamage", "_newDamage", "_typeIndex"]; -_unit = _this select 0; -_selection = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; +private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage", "_minLethalDamage", "_newDamage", "_typeIndex", "_preventDeath"]; +_unit = _this select 0; +_selection = _this select 1; +_damage = _this select 2; +_shooter = _this select 3; +_projectile = _this select 4; if !(local _unit) exitWith {nil}; From 98e44e86d801e626832fa7b265f24e4b6931d7fe Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:35:50 +0200 Subject: [PATCH 28/42] Offload ejecting to unloadPerson --- addons/medical/functions/fnc_setUnconscious.sqf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 048dd9633c..b752a51431 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -56,9 +56,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then { // If a unit has the launcher out, it will sometimes start selecting the primairy weapon while unconscious, // therefor we force it to select the primairy weapon before going unconscious if ((vehicle _unit) isKindOf "StaticWeapon") then { - moveOut _unit; - unassignVehicle _unit; - //_unit action ["eject", vehicle _unit]; + [_unit] call EFUNC(common,unloadPerson); }; if (animationState _unit in ["ladderriflestatic","laddercivilstatic"]) then { _unit action ["ladderOff", (nearestBuilding _unit)]; From 67bd2b4e2f30c35f1bb6a4ffa74fb636d304b926 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:36:09 +0200 Subject: [PATCH 29/42] Reduce animation forcing delay --- addons/medical/functions/fnc_setUnconscious.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index b752a51431..0e0e6cf67e 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -90,7 +90,7 @@ _anim = [_unit] call EFUNC(common,getDeathAnim); if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then { [_unit, _anim, 2, true] call EFUNC(common,doAnimation); }; -}, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute); +}, [_unit, _anim], 0.5, 0] call EFUNC(common,waitAndExecute); _startingTime = time; From 48770f77d222de037e4d2d7e01a36fac7b9d0ad0 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:37:58 +0200 Subject: [PATCH 30/42] Rename caching variables in basic HD --- addons/medical/functions/fnc_handleDamage_basic.sqf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 68792b1656..3b8f80a22f 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -41,14 +41,13 @@ _damage = _damage * (1 / _threshold); // This is a new hit, reset variables. // Note: sometimes handleDamage spans over 2 or even 3 frames. -if (diag_frameno > (_unit getVariable [QGVAR(frameNo), -3]) + 2) then { - _unit setVariable [QGVAR(frameNo), diag_frameno]; +if (diag_frameno > (_unit getVariable [QGVAR(basic_frameNo), -3]) + 2) then { + _unit setVariable [QGVAR(basic_frameNo), diag_frameno]; _unit setVariable [QGVAR(isFalling), false]; _unit setVariable [QGVAR(projectiles), []]; _unit setVariable [QGVAR(hitPoints), []]; _unit setVariable [QGVAR(damages), []]; _unit setVariable [QGVAR(structDamage), 0]; - _unit setVariable [QGVAR(preventDeath), false]; // Assign orphan structural damage to torso [{ private ["_unit", "_damagesum"]; From cb82b20464012ad8147ca0a629a1a5dabf45f87d Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:38:16 +0200 Subject: [PATCH 31/42] Let setUncon handle AI unconsciousness --- addons/medical/functions/fnc_handleDamage_basic.sqf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 3b8f80a22f..7b308ad188 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -178,11 +178,7 @@ if (_selectionName == "" and _damage < 1 and !(_unit getVariable ["ACE_isUnconscious", False] )) then { - if (_unit getVariable [QGVAR(allowUnconscious), ([_unit] call EFUNC(common,isPlayer)) or random 1 > 0.3]) then { - [_unit, true] call FUNC(setUnconscious); - } else { - _damage = 1; - }; + [_unit, true] call FUNC(setUnconscious); }; _damage From e06e1a2f89a0d2ff5f89af80bb0385b547db762a Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:38:36 +0200 Subject: [PATCH 32/42] Make preventDeath work --- addons/medical/functions/fnc_handleDamage.sqf | 58 ++++++++++++++----- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index 25b65ac0b0..1d8c821d1f 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -34,6 +34,30 @@ if (typeName _projectile == "OBJECT") then { // If the damage is being weird, we just tell it to fuck off. if !(_selection in (GVAR(SELECTIONS) + [""])) exitWith {0}; +// Exit if we disable damage temporarily +_damageOld = damage _unit; +if (_selection in GVAR(SELECTIONS)) then { + _damageOld = _unit getHit _selection; +}; +if !(_unit getVariable [QGVAR(allowDamage), true]) exitWith {_damageOld}; + +// Figure out whether to prevent death before handling damage +if (diag_frameno > (_unit getVariable [QGVAR(frameNo), -3]) + 2) then { + _unit setVariable [QGVAR(frameNo), diag_frameno]; + _unit setVariable [QGVAR(wasUnconscious), _unit getVariable ["ACE_isUnconscious", false]]; + + _preventDeath = _unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]; + if (_unit getVariable ["ACE_isUnconscious", false]) then { + _preventDeath = _unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]; + if !([_unit] call EFUNC(common,isPlayer)) then { + _preventDeath = _preventDeath - 1; + }; + _preventDeath = _preventDeath > 0; + }; + _unit setVariable [QGVAR(preventDeath), _preventDeath]; +}; + +// Get return damage _damageReturn = _damage; if (GVAR(level) < 2) then { _damageReturn = _this call FUNC(handleDamage_basic); @@ -73,26 +97,30 @@ if (GVAR(level) < 2) then { }; [_unit] call FUNC(addToInjuredCollection); -if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitWith { - if (_damageReturn >= 0.9 && {_selection in ["", "head", "body"]}) exitWith { - if (_unit getvariable ["ACE_isUnconscious", false]) exitwith { +// Prevent death if necessary +if (_unit getVariable QGVAR(preventDeath)) then { + if (_selection in ["", "head", "body"]) then { + _damageReturn = _damageReturn min 0.89; + }; + + // Move the unit out of the vehicle if necessary + if (vehicle _unit != _unit and damage (vehicle _unit) == 1) then { + [_unit] call EFUNC(common,unloadPerson); + if (_unit getVariable QGVAR(wasUnconscious)) then { [_unit] call FUNC(setDead); - 0.89 + } else { + [_unit, true] call FUNC(setUnconscious); }; - [{ [_this select 0, true] call FUNC(setUnconscious); }, [_unit]] call EFUNC(common,execNextFrame); - 0.89 }; - _damageReturn min 0.89; -}; -if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { - if (vehicle _unit != _unit and {damage (vehicle _unit) >= 1}) then { - // @todo - // [_unit] call FUNC(unload); + // Temporarily disable all damage to prevent stuff like + // being killed during the animation etc. + if (!_wasUnconscious and (_unit getVariable ["ACE_isUnconscious", false])) then { + _unit setVariable [QGVAR(allowDamage), false]; + [{ + _this setVariable [QGVAR(allowDamage), true]; + }, _unit, 0.7, 0] call EFUNC(common,waitAndExecute); }; - [_unit] call FUNC(setDead); - - 0.89 }; _damageReturn From e8264110bb02c1b910367ed6f52c5e8b257e0114 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 10:12:41 +0200 Subject: [PATCH 33/42] Replaced sleep with waitAndExecute --- addons/explosives/functions/fnc_startDefuse.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index d3631fdb5f..3d5a620ed2 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -43,15 +43,15 @@ if (ACE_player != _unit) then { if (isPlayer _unit) then { [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { - // TODO: use scheduled delay execution [_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { (_this select 0) playActionNow _actionToPlay; (_this select 0) disableAI "MOVE"; (_this select 0) disableAI "TARGET"; - sleep (_this select 2); - [(_this select 0), (_this select 1)] call FUNC(defuseExplosive); - (_this select 0) enableAI "MOVE"; - (_this select 0) enableAI "TARGET"; + [{ + [(_this select 0), (_this select 1)] call FUNC(defuseExplosive); + (_this select 0) enableAI "MOVE"; + (_this select 0) enableAI "TARGET"; + }, _this, (_this select 2), 0] call EFUNC(common,waitAndExecute); }; }; } else { From 965e45a53c6010ecacb7676c8123c77377ac9046 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 10:25:33 +0200 Subject: [PATCH 34/42] Takes negative initSpeed values into account --- addons/fcs/functions/fnc_firedEH.sqf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index 698a9bef22..1bdff913d4 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -44,9 +44,11 @@ _offset = 0; } forEach _FCSMagazines; // Correct velocity for weapons that have initVelocity -// @todo: Take into account negative initVelocities -_velocityCorrection = (vectorMagnitude velocity _projectile) - - getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed"); +_velocityCorrection = if (getNumber(configFile >> "CfgMagazines" >> _weapon >> "initSpeed") > 0) then { + (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") +} else { + 0 +}; [_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, -_velocityCorrection] call EFUNC(common,changeProjectileDirection); From 940f8e834980abddc3ef09a244ea34729fbc7d2c Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 11:38:09 +0200 Subject: [PATCH 35/42] Cleanup++: *Removed spawn *Added, moved and renamed some privates --- .../explosives/functions/fnc_startDefuse.sqf | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 3d5a620ed2..3ec6a21de6 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" EXPLODE_2_PVT(_this,_unit,_target); -private["_actionToPlay"]; +private["_actionToPlay", "_defuseTime", "_isEOD"]; _target = attachedTo (_target); @@ -43,23 +43,23 @@ if (ACE_player != _unit) then { if (isPlayer _unit) then { [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { - [_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { - (_this select 0) playActionNow _actionToPlay; - (_this select 0) disableAI "MOVE"; - (_this select 0) disableAI "TARGET"; - [{ - [(_this select 0), (_this select 1)] call FUNC(defuseExplosive); - (_this select 0) enableAI "MOVE"; - (_this select 0) enableAI "TARGET"; - }, _this, (_this select 2), 0] call EFUNC(common,waitAndExecute); - }; + //[_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { + _unit playActionNow _actionToPlay; + _unit disableAI "MOVE"; + _unit disableAI "TARGET"; + _defuseTime = [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime; + [{ + PARAMS_2(_unit,_target); + [_unit, _target] call FUNC(defuseExplosive); + _unit enableAI "MOVE"; + _unit enableAI "TARGET"; + }, [_unit, _target], _defuseTime, 0] call EFUNC(common,waitAndExecute); }; } else { _unit playActionNow _actionToPlay; - private ["_defuseSeconds", "_isEOD"]; _isEOD = [_unit] call EFUNC(Common,isEOD); - _defuseSeconds = [_isEOD, _target] call _fnc_DefuseTime; + _defuseTime = [_isEOD, _target] call _fnc_DefuseTime; if (_isEOD || {!GVAR(RequireSpecialist)}) then { - [_defuseSeconds, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize "STR_ACE_Explosives_DefusingExplosive")] call EFUNC(common,progressBar); + [_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize "STR_ACE_Explosives_DefusingExplosive")] call EFUNC(common,progressBar); }; }; From 5beca63ae20d15b8b75ceee2b499bc5106f3d39a Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 1 May 2015 11:51:23 +0200 Subject: [PATCH 36/42] Added missing private --- addons/medical/functions/fnc_getBloodLoss.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index 0ccbe6c29e..1881643d97 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -15,7 +15,7 @@ #define BLOODLOSSRATE_BASIC 0.2 -private ["_totalBloodLoss","_tourniquets","_openWounds", "_cardiacOutput", "_internalWounds"]; +private ["_unit", "_totalBloodLoss","_tourniquets","_openWounds", "_cardiacOutput", "_internalWounds"]; // TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical). _unit = _this select 0; From 4c0bed609e2709a8b78f65c51b6e2ce4c9282761 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 11:53:53 +0200 Subject: [PATCH 37/42] Fixed a typo --- addons/fcs/functions/fnc_firedEH.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index 1bdff913d4..e8f58298d3 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -44,7 +44,7 @@ _offset = 0; } forEach _FCSMagazines; // Correct velocity for weapons that have initVelocity -_velocityCorrection = if (getNumber(configFile >> "CfgMagazines" >> _weapon >> "initSpeed") > 0) then { +_velocityCorrection = if (getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed") > 0) then { (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") } else { 0 From e9a86da8e087d037c490ab6db2a78f9e00040089 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 1 May 2015 12:18:21 +0200 Subject: [PATCH 38/42] Should be in same order as the module --- addons/medical/ACE_Settings.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 0389c3eba4..a3e6c60167 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -57,7 +57,7 @@ class ACE_Settings { class GVAR(enableUnconsiousnessAI) { value = 1; typeName = "SCALAR"; - values[] = {"Disabled", "Enabled", "50/50"}; + values[] = {"Disabled", "50/50", "Enabled"}; }; class GVAR(preventInstaDeath) { typeName = "BOOL"; From a6f4c68ef437085c95eb88844dab5f66906840f5 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 13:50:01 +0200 Subject: [PATCH 39/42] Removed obsolete comment --- addons/explosives/functions/fnc_startDefuse.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 3ec6a21de6..11ca95f894 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -43,7 +43,6 @@ if (ACE_player != _unit) then { if (isPlayer _unit) then { [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { - //[_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { _unit playActionNow _actionToPlay; _unit disableAI "MOVE"; _unit disableAI "TARGET"; From b255d1040b6d6e8efd97e4dbc7f2917b8e49421f Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 1 May 2015 15:30:11 +0200 Subject: [PATCH 40/42] scope 1 for ACE_Comanche_Test, #943 --- addons/missileguidance/CfgVehicles.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/missileguidance/CfgVehicles.hpp b/addons/missileguidance/CfgVehicles.hpp index 301795b8d7..0d9ef54d07 100644 --- a/addons/missileguidance/CfgVehicles.hpp +++ b/addons/missileguidance/CfgVehicles.hpp @@ -19,6 +19,7 @@ class CfgVehicles { }; class ACE_Comanche_Test : B_Heli_Attack_01_F { + scope = 1; displayName = "ACE_Comanche_Test"; author = "ACE Team"; class Library { From cde80b29015f24469f0a84201b2e60ed56c9deae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Fri, 1 May 2015 10:38:41 -0300 Subject: [PATCH 41/42] Revert "Takes negative initSpeed values into account" --- addons/fcs/functions/fnc_firedEH.sqf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index e8f58298d3..698a9bef22 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -44,11 +44,9 @@ _offset = 0; } forEach _FCSMagazines; // Correct velocity for weapons that have initVelocity -_velocityCorrection = if (getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed") > 0) then { - (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") -} else { - 0 -}; +// @todo: Take into account negative initVelocities +_velocityCorrection = (vectorMagnitude velocity _projectile) - + getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed"); [_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, -_velocityCorrection] call EFUNC(common,changeProjectileDirection); From 9997b6d46439f2bfc21837461a4d300de1439a41 Mon Sep 17 00:00:00 2001 From: jaynus Date: Fri, 1 May 2015 06:57:49 -0700 Subject: [PATCH 42/42] action is select 1 --- addons/javelin/functions/fnc_onOpticDraw.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf index 134260c064..86e59bf692 100644 --- a/addons/javelin/functions/fnc_onOpticDraw.sqf +++ b/addons/javelin/functions/fnc_onOpticDraw.sqf @@ -134,7 +134,7 @@ FUNC(disableFire) = { if(_firedEH < 0 && difficulty > 0) then { _firedEH = [ACE_player, "DefaultAction", {true}, { - _canFire = _this getVariable["ace_missileguidance_target", nil]; + _canFire = (_this select 1) getVariable["ace_missileguidance_target", nil]; if(!isNil "_canFire") exitWith { false }; true }] call EFUNC(common,addActionEventHandler);