From 71afce53c1bde666369344652a30a71ec8ad751a Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:56:00 +0200
Subject: [PATCH 1/7] Dogtags - Make "Dog Tag" consistent (#10099)
Make Dog Tag consistent
---
addons/dogtags/stringtable.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/dogtags/stringtable.xml b/addons/dogtags/stringtable.xml
index d19c61f505..73d2d07e56 100644
--- a/addons/dogtags/stringtable.xml
+++ b/addons/dogtags/stringtable.xml
@@ -66,7 +66,7 @@
Al
- Dogtag taken from %1...
+ Dog Tag taken from %1...
Zabrałeś nieśmiertelnik %1...
Жетон снят с %1...
Sebral jsem známku od %1...
@@ -82,7 +82,7 @@
Künye %1 kişisinden alındı
- Somebody else has already taken the dogtag...
+ Somebody else has already taken the Dog Tag...
Ktoś już zabrał ten nieśmiertelnik...
Кто-то уже забрал жетон...
Někdo jiný už vzal identifikační známku...
@@ -98,7 +98,7 @@
Başka biri zaten künyeyi almış
- Onscreen display for checking dogtags
+ Onscreen display for checking Dog Tags
Anzeige um Erkennungsmarke zu überprüfen
在畫面中顯示檢查兵籍牌
在画面中显示检查兵籍牌
From ba47c12a974200262d07f70057e1c6a9bdd0d7e8 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:16:27 +0200
Subject: [PATCH 2/7] Dogtags - Drop dogtag on ground if unit doesn't have
inventory space (#10094)
* Drop dogtag on ground if unit doesn't have inventory space
* Only allow taking of dogtags if unit has space
---
addons/dogtags/functions/fnc_addDogtagItem.sqf | 3 ++-
addons/dogtags/functions/fnc_canTakeDogtag.sqf | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/addons/dogtags/functions/fnc_addDogtagItem.sqf b/addons/dogtags/functions/fnc_addDogtagItem.sqf
index 970bb1926e..803c54d82f 100644
--- a/addons/dogtags/functions/fnc_addDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_addDogtagItem.sqf
@@ -20,7 +20,8 @@ params ["_item", "_dogtagData"];
if (_item == "") exitWith {};
-[ace_player, _item] call CBA_fnc_addItem;
+// Verify that the unit has inventory space, otherwise drop the dogtag on the ground
+[ace_player, _item, true] call CBA_fnc_addItem;
_dogtagData params ["_nickName"];
private _displayText = format [localize LSTRING(takeDogtagSuccess), _nickName];
diff --git a/addons/dogtags/functions/fnc_canTakeDogtag.sqf b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
index c482d74c1c..815aeb7a79 100644
--- a/addons/dogtags/functions/fnc_canTakeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) exitWith {false};
// check if disabled for faction
if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
-(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}
+((!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}) && {_player canAdd ["ACE_dogtag", 1/*, true*/]} // Todo: Uncomment in 2.18
From aecafe673bc7020857fad7aaa2941a182be6c935 Mon Sep 17 00:00:00 2001
From: Fabio Schick <58027418+mrschick@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:16:48 +0200
Subject: [PATCH 3/7] Aircraft - Drone "Follow Unit" Waypoint Action (#9889)
* Fix "Recharge" interaction showing on destroyed drone
* Add "Follow Unit" action
* Improve condition check
* UGV Following via PFH that updates WP Pos
* Use HOLD WP for all Follow Actions
Since FOLLOW WP would stop working on AI Soldiers after some time.
* Allow selecting a follow distance
* Follow Distance under separate interaction, just like Loiter Alt
Only visible when a HOLD waypoint is selected, which is pretty much always going to have been created by the "Follow" interaction.
* Localize "Follow" Interaction
* Show structuredText Hint when following/changing distance
* Variable for cursorTarget Reuse
* Better isKindOf condition use
* Make "Ship"-kind vehicles followable
* Clean up Comments and systemChat Debugs
* Comment explanation for custom PFH solution over vanilla "Follow"-WP
* Trim excess brackets from setWaypointPosition argument
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Broader determination for UGV follow distances
Co-Authored-By: PabstMirror
* Prevent infinite PFH loop if follow target is deleted
Co-Authored-By: PabstMirror
* Delete Follow WP when PFH terminates
* The ternary rules
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Various requested changes
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror
---
.../functions/fnc_droneAddActions.sqf | 61 +++++++++++++++++--
.../functions/fnc_droneSetWaypoint.sqf | 32 +++++++++-
addons/aircraft/stringtable.xml | 10 +++
.../functions/fnc_canRefuelUAV.sqf | 2 +-
4 files changed, 95 insertions(+), 10 deletions(-)
diff --git a/addons/aircraft/functions/fnc_droneAddActions.sqf b/addons/aircraft/functions/fnc_droneAddActions.sqf
index 38ca53e4c6..895004f0e9 100644
--- a/addons/aircraft/functions/fnc_droneAddActions.sqf
+++ b/addons/aircraft/functions/fnc_droneAddActions.sqf
@@ -22,7 +22,7 @@ if (!alive _vehicle) exitWith {};
if (_vehicle getVariable [QGVAR(droneActionsAdded), false]) exitWith {};
_vehicle setVariable [QGVAR(droneActionsAdded), true];
-// move to location
+// Move to location
private _condition = {
params ["_vehicle"];
(missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]}
@@ -37,14 +37,63 @@ private _action = [QGVAR(droneSetWaypointMove), localize "$STR_AC_MOVE",
"\a3\3DEN\Data\CfgWaypoints\Move_ca.paa", _statement, _condition] call EFUNC(interact_menu,createAction);
[_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
+// Follow unit/vehicle at turret location
+_condition = {
+ params ["_vehicle"];
+ private _target = cursorTarget;
+ (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} && {!isNull _target} && {["CAManBase", "LandVehicle", "Ship"] findIf {_target isKindOf _x} != -1}
+};
+_statement = {
+ params ["_vehicle"];
+ private _group = group driver _vehicle;
+ private _pos = ([_vehicle, [0]] call FUNC(droneGetTurretTargetPos)) select 0;
+ [QGVAR(droneSetWaypoint), [_vehicle, _group, _pos, "FOLLOW", cursorTarget], _group] call CBA_fnc_targetEvent;
+ private _followDistance = _vehicle getVariable [QGVAR(wpFollowDistance), 0];
+ [[LLSTRING(DroneFollowHint), _followDistance], 3] call EFUNC(common,displayTextStructured);
+};
+_action = [QGVAR(droneSetWaypointFollow), localize "$STR_AC_FOLLOW", "\a3\3DEN\Data\CfgWaypoints\Follow_ca.paa", _statement, _condition] call EFUNC(interact_menu,createAction);
+[_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
+
+// Set drone follow distance
+_condition = {
+ params ["_vehicle"];
+ private _group = group driver _vehicle;
+ private _index = (currentWaypoint _group) min count waypoints _group;
+ private _waypoint = [_group, _index];
+ (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} && {(waypointType _waypoint) == "HOLD"}
+};
+_statement = {
+ params ["_vehicle", "", "_value"];
+ _vehicle setVariable [QGVAR(wpFollowDistance), _value];
+ [[LLSTRING(DroneFollowHint), _value], 3] call EFUNC(common,displayTextStructured);
+};
+_action = [QGVAR(droneSetFollowDistance), LLSTRING(DroneFollowDistance), "", {}, _condition] call EFUNC(interact_menu,createAction);
+private _base = [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
+private _followDistances = if (_vehicle isKindOf "Car_F") then {
+ [0, 25, 50, 100, 200]
+} else {
+ [0, 100, 200, 300, 400, 500]
+};
+{
+ _action = [
+ QGVAR(droneSetFollowDistance_) + str _x,
+ str _x,
+ "",
+ _statement,
+ {true},
+ {},
+ _x
+ ] call EFUNC(interact_menu,createAction);
+ [_vehicle, 1, _base, _action] call EFUNC(interact_menu,addActionToObject);
+} forEach _followDistances;
if (_vehicle isKindOf "Air") then {
- // loiter at location
+ // Loiter at location
_condition = {
params ["_vehicle"];
(missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]}
};
- _statement = {
+ _statement = {
params ["_vehicle"];
private _group = group driver _vehicle;
private _pos = ([_vehicle, [0]] call FUNC(droneGetTurretTargetPos)) select 0;
@@ -55,7 +104,7 @@ if (_vehicle isKindOf "Air") then {
[_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
- // set height
+ // Set height
_condition = {
params ["_vehicle"];
(missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]}
@@ -74,7 +123,7 @@ if (_vehicle isKindOf "Air") then {
} forEach [20, 50, 200, 500, 2000];
- // set loiter radius
+ // Set loiter radius
_condition = {
params ["_vehicle"];
private _group = group driver _vehicle;
@@ -97,7 +146,7 @@ if (_vehicle isKindOf "Air") then {
} forEach [500, 750, 1000, 1250, 1500];
- // set loiter direction
+ // Set loiter direction
_condition = {
params ["_vehicle", "", "_args"];
private _group = group driver _vehicle;
diff --git a/addons/aircraft/functions/fnc_droneSetWaypoint.sqf b/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
index 5ffbbae825..953b99a357 100644
--- a/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
+++ b/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
@@ -8,6 +8,7 @@
* 1: Group
* 2: Pos 2D
* 3: Type
+ * 4: Target to follow
+
+ Follow Distance
+ Distanza di seguimento
+ Folge-Entfernung
+
+
+ Following unit within %1m
+ Seguendo unità entro %1m
+ Folgt Einheit bis zu %1m
+
diff --git a/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf b/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf
index 3e7ce4f15c..925178d642 100644
--- a/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf
+++ b/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf
@@ -18,4 +18,4 @@
params ["_caller", "_target"];
-("ACE_UAVBattery" in (_caller call EFUNC(common,uniqueItems))) && {(fuel _target) < 1} && {(speed _target) < 1} && {!(isEngineOn _target)} && {(_target distance _caller) <= 4}
+(alive _target) && {"ACE_UAVBattery" in (_caller call EFUNC(common,uniqueItems))} && {(fuel _target) < 1} && {(speed _target) < 1} && {!(isEngineOn _target)} && {(_target distance _caller) <= 4}
From 45f9301019e31e04c46154b3fc7fe81f15903407 Mon Sep 17 00:00:00 2001
From: Psycool <104776717+Psycool3695@users.noreply.github.com>
Date: Wed, 3 Jul 2024 03:14:19 +0900
Subject: [PATCH 4/7] Korean translation updated (#10104)
* KoreanTranslation
Someone has returned all the translations in Korean to English. there is no need to return them.
* koreantranslation
* Korean Typo Fix
* Korean Translation
* Update stringtable.xml
* Korean Translation Added
Added Korean translation related to Cargo Refuel
* Merge branch 'master' of https://github.com/Psycool3695/ACE3
* Korean translation Add/Updated
* Fixed wrong strings
* Korean translation improved
* Korean translation updated
* Korean translation updated
* Fix Merge
* Update stringtable.xml
* Update stringtable.xml
* Korean translation updated
* Korean translation minor fix
* Korean translation fixed
* Korean translation updated
* Update stringtable.xml
* Spacing fixed
* Korean translation updated
* Spacing fixed
* Korean translation updated
* Korean translation updated
* Korean translation updated
---------
Co-authored-by: PabstMirror
---
addons/aircraft/stringtable.xml | 10 ++++---
addons/ballistics/stringtable.xml | 16 ++++++------
.../compat_rf_realisticnames/stringtable.xml | 2 ++
addons/concertina_wire/stringtable.xml | 2 +-
addons/killtracker/stringtable.xml | 2 ++
addons/overpressure/stringtable.xml | 2 ++
addons/realisticnames/stringtable.xml | 26 +++++++++----------
7 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml
index a60706aad3..01c5b41e36 100644
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@@ -129,7 +129,7 @@
30mm コンバット ミックス 4:1 劣化ウラン徹甲弾:焼夷榴弾
30mm Bojový Mix 4:1 DU:HEI
30мм Смешанное боепитание 4:1 ОУ:ОФЗ
- 30mm 4:1 열화:고폭소이
+ 30mm 열화우라늄:고폭소이 4:1 혼합
30mm Mix de Combate 4:1 DU:AEI
@@ -145,7 +145,7 @@
30mm CM 4:1
30mm BM 4:1
30мм СБ 4:1
- 30mm CM 4:1
+ 30mm 4:1 혼합
30mm Combat Mix 5:1 DU:HEI
@@ -160,7 +160,7 @@
30mm コンバット ミックス 5:1 劣化ウラン徹甲弾:焼夷榴弾
30mm Bojový Mix 5:1 DU:HEI
30мм Смешанное боепитание 5:1 ОУ:ОФЗ
- 30mm 5:1 열화:고폭소이
+ 30mm 열화우라늄:고폭소이 5:1 혼합
30mm CM 5:1
@@ -175,17 +175,19 @@
30mm CM 5:1
30mm BM 5:1
30мм СБ 5:1
- 30mm CM 5:1
+ 30mm 5:1 혼합
Follow Distance
Distanza di seguimento
Folge-Entfernung
+ 따라가는 거리
Following unit within %1m
Seguendo unità entro %1m
Folgt Einheit bis zu %1m
+ %1m 이내로 유닛을 따라갑니다
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index a4c67c68d5..7137735233 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -1505,7 +1505,7 @@
Carregador de 10 cartuchos 9.3 mm traçantes IR-DIM
9,3 mm 10-lövedékes infravörös nyomkövető tár
9.3mm 10Rnd IR-DIM トレーサー マガジン
- 10발들이 9.3mm IR-DIM 예광탄 탄창
+ 10발 들이 9.3mm IR-DIM 예광탄 탄창
9.3毫米 10發 低視度紅外線曳光彈 彈匣
9.3 mm 10发 弹匣(红外曳光)
9.3 mm 10Rnd Tracer IR-DIM Mag
@@ -1608,7 +1608,7 @@
Cinto de munição traçante 9.3 mm IR-DIM com 150 cartuchos
9,3 mm 150-lövedékes infravörös nyomkövető heveder
9.3mm 150Rnd IR-DIM トレーサー ベルト
- 150발들이 9.3mm IR-DIM 예광탄 벨트
+ 150발 들이 9.3mm IR-DIM 예광탄 벨트
9.3毫米 150發 低視度紅外線曳光彈 彈鏈
9.3 mm 150发 弹链(红外曳光)
9.3 mm 150Rnd Tracer IR-DIM Belt
@@ -1659,7 +1659,7 @@
Cinto de munição 9.3 mm AP com 150 cartuchos
9,3 mm 150-lövedékes páncéltörő heveder
9.3mm 150Rnd 徹甲弾 ベルト
- 150발들이 9.3mm 철갑탄 벨트
+ 150발 들이 9.3mm 철갑탄 벨트
9.3毫米 150發 穿甲彈 彈鏈
9.3 mm 150发 弹链(穿甲)
9.3 mm 150Rnd AP Belt
@@ -1710,7 +1710,7 @@
Carregador de 16 cartuchos 9x19 mm
9x19 mm 16-lövedékes tár
9x19 mm 16Rnd マガジン
- 17발들이 9x19mm 탄창
+ 16발 들이 9x19mm 탄창
9x19毫米 16發 彈匣
9x19 mm 16发 弹匣
9x19 mm 16Rnd Mag
@@ -2016,7 +2016,7 @@
Carregador 5.56 mm com 30 cartuchos (Mk318)
5,56 mm 30-lövedékes tár (Mk318)
5.56mm 30Rnd マガジン (Mk318)
- 30발들이 5.56mm 탄창 (Mk.318)
+ 30발 들이 5.56mm 탄창 (Mk.318)
5.56毫米 30發 彈匣 (Mk318 特戰專用彈)
5.56 mm 30发 弹匣(Mk318)
5.56 mm 30Rnd Mag (Mk318)
@@ -2322,7 +2322,7 @@
Carregador 7.62 mm com 10 cartuchos (Mk319 Mod 0)
7,62 mm 10-lövedékes tár (Mk319 Mod 0)
7.62mm 10Rnd マガジン (Mk319 Mod 0)
- 10발들이 7.62mm 탄창 (Mk.319 Mod 0)
+ 10발 들이 7.62mm 탄창 (Mk.319 Mod 0)
7.62毫米 10發 彈匣 (Mk319 Mod 0 特戰專用彈)
7.62 mm 10发 弹匣(Mk319 Mod 0)
7.62 mm 10Rnd Mag (Mk319 Mod 0)
@@ -3344,7 +3344,7 @@
Carregador 12.7x99 mm (AMAX) com 5 cartuchos
12,7x99 mm 5-lövedékes tár (AMAX)
12.7x99mm 5Rnd マガジン (AMAX)
- 5발들이 12.7x99mm 탄창 (AMAX)
+ 5발 들이 12.7x99mm 탄창 (AMAX)
12.7x99毫米 5發 彈匣 (AMAX 比賽專用彈)
12.7x99 mm 5发 弹匣(AMAX)
12.7x99 mm 5Rnd Şarjör (AMAX)
@@ -3378,7 +3378,7 @@
Carregador 12.7x99 mm (AMAX) com 10 cartuchos
12,7x99 mm 10-lövedékes tár (AMAX)
12.7x99mm 10Rnd マガジン (AMAX)
- 10발들이 12.7x99mm 탄창 (AMAX)
+ 10발 들이 12.7x99mm 탄창 (AMAX)
12.7x99毫米 10發 彈匣 (AMAX 比賽專用彈)
12.7x99 mm 10发 弹匣(AMAX)
12.7x99 mm 10Rnd Şarjör (AMAX)
diff --git a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
index c65a8fd4ad..03d5003a62 100644
--- a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
+++ b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
@@ -377,6 +377,7 @@
H225M シュペル クーガー (非武装)
H225M Super Cougar (Unbewaffnet)
H225M Super Cougar (Disarmato)
+ H225M 슈퍼 쿠거 (비무장)
HEMTT Fire Truck
@@ -389,6 +390,7 @@
HEMTT contra incêndio
HEMTT 消防車
HEMTT Autobotte
+ HEMTT 소방트럭
Typhoon Water
diff --git a/addons/concertina_wire/stringtable.xml b/addons/concertina_wire/stringtable.xml
index 0ea44fc063..603cc5a7a8 100644
--- a/addons/concertina_wire/stringtable.xml
+++ b/addons/concertina_wire/stringtable.xml
@@ -30,7 +30,7 @@
Concertina wire coil
Bobina de arame farpado
鉄条網コイル
- 코일형 철조망
+ 윤형철조망
鐵絲網捲
铁丝网卷
Bıçaklı Tel Rulo
diff --git a/addons/killtracker/stringtable.xml b/addons/killtracker/stringtable.xml
index b7a97df15a..64b9ee764d 100644
--- a/addons/killtracker/stringtable.xml
+++ b/addons/killtracker/stringtable.xml
@@ -125,6 +125,7 @@
Zeige der Fahrzeugbesatzung die Abschüsse des Fahrzeugs
Mostra uccisioni del veicolo a membri dell'equipaggio
車両でのキルを乗員全員に表示する
+ 다른 승무원에게 차량 처치 표시
Show kills from a vehicle to driver, gunner and commander
@@ -132,6 +133,7 @@
Zeige Abschüsse des Fahrzeugs dem Fahrer, Richtschützen und Kommandanten an
Mostra uccisioni del veicolo al pilota, artigliere e comandante
車両でのキルを操縦手、砲手、車長で共有して表示する
+ 차량 처치를 운전수, 사수, 지휘관에게 보여줍니다
diff --git a/addons/overpressure/stringtable.xml b/addons/overpressure/stringtable.xml
index 0d43f01825..2ce7615ad4 100644
--- a/addons/overpressure/stringtable.xml
+++ b/addons/overpressure/stringtable.xml
@@ -51,6 +51,7 @@
Rückstrahl-Entfernung Multiplikator
Coefficiente distanza di svampata
後方噴射の距離係数
+ 후폭풍 거리 계수
Scales the backblast effect
@@ -58,6 +59,7 @@
Skaliert den Rückstrahl-Effekt
Scala l'effetto delle svampate dei lanciarazzi
無反動砲による後方噴射の影響範囲の大きさ
+ 후폭풍 효과의 스케일을 조정합니다
Backblast range
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 70b78e6d25..af864f64df 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -13,7 +13,7 @@
XM312
XM312
XM312
- XM312
+ XM312 중기관총
XM312重機槍
XM312
XM312
@@ -30,7 +30,7 @@
XM312A
XM312A
XM312A
- XM312A
+ XM312A 무인중기관총
XM312A重機槍
XM312A
XM312A
@@ -47,7 +47,7 @@
XM312 (Magasított)
XM312 (Alto)
XM312 (ハイマウント)
- XM312 (높음)
+ XM312 중기관총 (높음)
XM312重機槍 (高射腳架)
XM312(高)
XM312 (Yüksek)
@@ -64,7 +64,7 @@
XM307
XM307
XM307
- XM307
+ XM307 유탄기관총
XM307榴彈機槍
XM307
XM307
@@ -81,7 +81,7 @@
XM307A
XM307A
XM307A
- XM307A
+ XM307A 무인유탄기관총
XM307A榴彈機槍
XM307A
XM307A
@@ -98,7 +98,7 @@
XM307 (Magasított)
XM307 (Alto)
XM307 (ハイマウント)
- XM307 (높음)
+ XM307 유탄기관총 (높음)
XM307榴彈機槍 (高射腳架)
XM307(高)
XM307 (Yüksek)
@@ -149,7 +149,7 @@
YABHON-R3
YABHON-R3
YABHON-R3
- YABHON-R3
+ YABHON-R3 무인기
"亞伯罕-R3型"空中無人載具
"联合"-R3
YABHON-R3
@@ -166,7 +166,7 @@
YABHON-R3 (CAS)
YABHON-R3 (CAS)
YABHON-R3 (CAS)
- YABHON-R3 (근접지원)
+ YABHON-R3 무인기 (근접지원)
"亞伯罕-R3型"空中無人載具 (近空支援)
"联合"-R3(近空支援)
YABHON-R3 (CAS)
@@ -3668,7 +3668,7 @@
Polaris DAGOR (XM312)
Polaris DAGOR (XM312)
Polaris DAGOR (XM312)
- 폴라리스 DAGOR (XM312)
+ 폴라리스 DAGOR (XM312 중기관총)
Polaris DAGOR (Mini-Spike AT)
@@ -3684,7 +3684,7 @@
Polaris DAGOR (Mini-Spike AT)
Polaris DAGOR (Mini-Spike AT)
Polaris DAGOR (Mini-Spike AT)
- 폴라리스 DAGOR (스파이크 미사일 대전차)
+ 폴라리스 DAGOR (스파이크 대전차미사일)
Polaris DAGOR
@@ -3732,7 +3732,7 @@
LSV Mk. II (M134)
LSV Mk. II (M134)
LSV Mk. II (M134)
- LSV Mk.II (M134)
+ LSV Mk.II (M134 미니건)
LSV Mk. II (Metis-M)
@@ -3844,7 +3844,7 @@
Wiesel 2 Ozelot (AA)
Wiesel 2 Ozelot (AA)
Wiesel 2 Ozelot (AA)
- 비젤 2 오셀롯 (대공)
+ 비젤 2 오젤롯 (대공)
Wiesel 2 (ATGM)
@@ -3860,7 +3860,7 @@
Wiesel 2 (ATGM)
Wiesel 2 (ATGM)
Wiesel 2 (ATGM)
- 비젤 2 (대전차유도)
+ 비젤 2 (대전차미사일)
Wiesel 2 (MK20)
From 516eb48c93a21d77db5e2a51aa08f81cee9a91c1 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:16:28 +0200
Subject: [PATCH 5/7] Dogtags - Stop throwing error when trying to take dog
tags (#10103)
Stop throwing error
---
addons/dogtags/functions/fnc_canTakeDogtag.sqf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/dogtags/functions/fnc_canTakeDogtag.sqf b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
index 815aeb7a79..796f219f56 100644
--- a/addons/dogtags/functions/fnc_canTakeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) exitWith {false};
// check if disabled for faction
if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
-((!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}) && {_player canAdd ["ACE_dogtag", 1/*, true*/]} // Todo: Uncomment in 2.18
+((!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}) && {_player canAdd ["ACE_dogtag_1", 1/*, true*/]} // Todo: Uncomment in 2.18
From ee0e947611d72378580099019153c51e67da838c Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 2 Jul 2024 21:38:14 +0200
Subject: [PATCH 6/7] General - Use `ace_common_fnc_isAwake` where possible
(#10098)
* Use `ace_common_fnc_isAwake` where possible
* Revert bad change
---
addons/captives/functions/fnc_canEscortCaptive.sqf | 3 +--
addons/captives/functions/fnc_canLoadCaptive.sqf | 2 +-
addons/captives/functions/fnc_doEscortCaptive.sqf | 2 +-
.../captives/functions/fnc_handleAnimChangedHandcuffed.sqf | 2 +-
.../captives/functions/fnc_handleAnimChangedSurrendered.sqf | 2 +-
addons/captives/functions/fnc_setHandcuffed.sqf | 2 +-
addons/captives/functions/fnc_setSurrendered.sqf | 5 ++---
addons/common/functions/fnc_disableAI.sqf | 2 +-
addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf | 2 +-
addons/dogtags/functions/fnc_canCheckDogtag.sqf | 2 +-
addons/dogtags/functions/fnc_canTakeDogtag.sqf | 2 +-
addons/dragging/functions/fnc_dropObject.sqf | 2 +-
addons/dragging/functions/fnc_dropObject_carry.sqf | 2 +-
addons/gforces/functions/fnc_pfhUpdateGForces.sqf | 2 +-
addons/goggles/functions/fnc_canWipeGlasses.sqf | 2 +-
addons/interaction/functions/fnc_canJoinGroup.sqf | 3 +--
addons/interaction/functions/fnc_canJoinTeam.sqf | 3 +--
addons/interaction/functions/fnc_canTapShoulder.sqf | 5 ++---
addons/towing/functions/fnc_towStateMachinePFH.sqf | 5 ++---
19 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/addons/captives/functions/fnc_canEscortCaptive.sqf b/addons/captives/functions/fnc_canEscortCaptive.sqf
index f39ff2ac5f..204206e506 100644
--- a/addons/captives/functions/fnc_canEscortCaptive.sqf
+++ b/addons/captives/functions/fnc_canEscortCaptive.sqf
@@ -21,7 +21,6 @@ params ["_unit", "_target"];
(_target getVariable [QGVAR(isHandcuffed), false]) &&
{isNull (attachedTo _target)} &&
-{alive _target} &&
-{!(_target getVariable ["ACE_isUnconscious", false])} &&
+{_target call EFUNC(common,isAwake)} &&
{(vehicle _unit) == _unit} &&
{(vehicle _target) == _target}
diff --git a/addons/captives/functions/fnc_canLoadCaptive.sqf b/addons/captives/functions/fnc_canLoadCaptive.sqf
index 982e4025a2..46da188238 100644
--- a/addons/captives/functions/fnc_canLoadCaptive.sqf
+++ b/addons/captives/functions/fnc_canLoadCaptive.sqf
@@ -20,7 +20,7 @@
params ["_unit", "_target", "_vehicle"];
// Don't show "Load Captive" if unit is unconscious (already has "Load Patient")
-if (_target getVariable ["ACE_isUnconscious", false]) exitWith {false};
+if !(_target call EFUNC(common,isAwake)) exitWith {false};
if ((isNull _target) && {_unit getVariable [QGVAR(isEscorting), false]}) then {
//Looking at a vehicle while escorting, get target from attached objects:
diff --git a/addons/captives/functions/fnc_doEscortCaptive.sqf b/addons/captives/functions/fnc_doEscortCaptive.sqf
index 7eb25ccc4c..86cc52cb9c 100644
--- a/addons/captives/functions/fnc_doEscortCaptive.sqf
+++ b/addons/captives/functions/fnc_doEscortCaptive.sqf
@@ -39,7 +39,7 @@ if (_state) then {
_args params ["_unit", "_target", "_actionID"];
if (_unit getVariable [QGVAR(isEscorting), false]) then {
- if (!alive _target || {!alive _unit} || {!canStand _target} || {!canStand _unit} || {_target getVariable ["ACE_isUnconscious", false]} || {_unit getVariable ["ACE_isUnconscious", false]} || {!isNull (attachedTo _unit)}) then {
+ if (!canStand _target || {!canStand _unit} || {!(_target call EFUNC(common,isAwake))} || {!(_unit call EFUNC(common,isAwake))} || {!isNull (attachedTo _unit)}) then {
_unit setVariable [QGVAR(isEscorting), false, true];
};
};
diff --git a/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf b/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf
index 3363ca923e..8ce4391783 100644
--- a/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf
+++ b/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf
@@ -19,7 +19,7 @@
params ["_unit", "_newAnimation"];
TRACE_2("AnimChanged",_unit,_newAnimation);
if (_unit == (vehicle _unit)) then {
- if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+ if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {_unit call EFUNC(common,isAwake)}) then {
TRACE_1("Handcuff animation interrupted",_newAnimation);
[_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
};
diff --git a/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf b/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf
index b9164ddbe5..7d69c8c7fa 100644
--- a/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf
+++ b/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf
@@ -19,7 +19,7 @@
params ["_unit", "_newAnimation"];
TRACE_2("AnimChanged",_unit,_newAnimation);
-if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {_unit call EFUNC(common,isAwake)}) then {
TRACE_1("Surrender animation interrupted",_newAnimation);
[_unit, "ACE_AmovPercMstpSsurWnonDnon", 1] call EFUNC(common,doAnimation);
};
diff --git a/addons/captives/functions/fnc_setHandcuffed.sqf b/addons/captives/functions/fnc_setHandcuffed.sqf
index 0c54d9a70a..d3d9fa4e6b 100644
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@@ -91,7 +91,7 @@ if (_state) then {
_unit removeEventHandler ["AnimChanged", _animChangedEHID];
_unit setVariable [QGVAR(handcuffAnimEHID), -1];
- if (((vehicle _unit) == _unit) && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+ if (((vehicle _unit) == _unit) && {_unit call EFUNC(common,isAwake)}) then {
//Break out of hands up animation loop
[_unit, "ACE_AmovPercMstpScapWnonDnon_AmovPercMstpSnonWnonDnon", 2] call EFUNC(common,doAnimation);
};
diff --git a/addons/captives/functions/fnc_setSurrendered.sqf b/addons/captives/functions/fnc_setSurrendered.sqf
index 4acc8529bb..887bfb2680 100644
--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@@ -86,8 +86,7 @@ if (_state) then {
};
};
- if (!alive _unit) exitWith {};
- if (_unit getVariable ["ACE_isUnconscious", false]) exitWith {}; //don't touch animations if unconscious
+ if !(_unit call EFUNC(common,isAwake)) exitWith {}; //don't touch animations if unconscious
//if we are in "hands up" animationState, crack it now
if (((vehicle _unit) == _unit) && {(animationState _unit) == "ACE_AmovPercMstpSsurWnonDnon"}) then {
@@ -99,7 +98,7 @@ if (_state) then {
params ["_args", "_pfID"];
_args params ["_unit", "_maxTime"];
//If waited long enough or they re-surrendered or they are unconscious, exit loop
- if ((CBA_missionTime > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {_unit getVariable ["ACE_isUnconscious", false]}) exitWith {
+ if ((CBA_missionTime > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {!(_unit call EFUNC(common,isAwake))}) exitWith {
[_pfID] call CBA_fnc_removePerFrameHandler;
};
//Only break animation if they are actualy the "hands up" animation (because we are using switchmove there won't be an transition)
diff --git a/addons/common/functions/fnc_disableAI.sqf b/addons/common/functions/fnc_disableAI.sqf
index 52f1ed37c3..a0c725c7db 100644
--- a/addons/common/functions/fnc_disableAI.sqf
+++ b/addons/common/functions/fnc_disableAI.sqf
@@ -29,7 +29,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then {
_unit disableConversation true;
} else {
//Sanity check to make sure we don't enable unconsious AI
- if (_unit getVariable ["ace_isunconscious", false] && alive _unit) exitWith {
+ if (_unit getVariable ["ACE_isUnconscious", false] && alive _unit) exitWith {
ERROR("Enabling AI for unconsious unit");
};
diff --git a/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf b/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf
index 71f62959b9..2108751066 100644
--- a/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf
+++ b/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf
@@ -22,7 +22,7 @@ params ["_unit", ["_distance", 10], ["_cargoOnly", false]];
private _nearVehicles = nearestObjects [_unit, ["Car", "Air", "Tank", "Ship_F", "Pod_Heli_Transport_04_crewed_base_F"], _distance];
_nearVehicles select {
// Filter cargo seats that will eject unconscious units (e.g. quad bike)
- private _canSitInCargo = (!(_unit getVariable ['ACE_isUnconscious', false])) || {(getNumber (configOf _x >> "ejectDeadCargo")) == 0};
+ private _canSitInCargo = (_unit call EFUNC(common,isAwake)) || {(getNumber (configOf _x >> "ejectDeadCargo")) == 0};
((fullCrew [_x, "", true]) findIf {
_x params ["_body", "_role", "_cargoIndex"];
(isNull _body) // seat empty
diff --git a/addons/dogtags/functions/fnc_canCheckDogtag.sqf b/addons/dogtags/functions/fnc_canCheckDogtag.sqf
index bec3ef0dfa..98d437cbac 100644
--- a/addons/dogtags/functions/fnc_canCheckDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canCheckDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) exitWith {false};
// check if disabled for faction
if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
-(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}
+!(_target call EFUNC(common,isAwake))
diff --git a/addons/dogtags/functions/fnc_canTakeDogtag.sqf b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
index 796f219f56..5f0a6d1afe 100644
--- a/addons/dogtags/functions/fnc_canTakeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) exitWith {false};
// check if disabled for faction
if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
-((!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}) && {_player canAdd ["ACE_dogtag_1", 1/*, true*/]} // Todo: Uncomment in 2.18
+!(_target call EFUNC(common,isAwake)) && {_player canAdd ["ACE_dogtag_1", 1/*, true*/]} // Todo: Uncomment in 2.18
diff --git a/addons/dragging/functions/fnc_dropObject.sqf b/addons/dragging/functions/fnc_dropObject.sqf
index 10cfda1703..4115f28820 100644
--- a/addons/dragging/functions/fnc_dropObject.sqf
+++ b/addons/dragging/functions/fnc_dropObject.sqf
@@ -33,7 +33,7 @@ if (!GVAR(dragAndFire)) then {
private _inBuilding = _unit call FUNC(isObjectOnObject);
// Play release animation
-if !(_unit getVariable ["ACE_isUnconscious", false]) then {
+if (_unit call EFUNC(common,isAwake)) then {
[_unit, "released"] call EFUNC(common,doGesture);
};
diff --git a/addons/dragging/functions/fnc_dropObject_carry.sqf b/addons/dragging/functions/fnc_dropObject_carry.sqf
index 7a81d94a05..ff6324e0f3 100644
--- a/addons/dragging/functions/fnc_dropObject_carry.sqf
+++ b/addons/dragging/functions/fnc_dropObject_carry.sqf
@@ -44,7 +44,7 @@ if (_tryLoad && {!(_target isKindOf "CAManBase")} && {["ace_cargo"] call EFUNC(c
// Fix anim when aborting carrying persons
if (_target isKindOf "CAManBase" || {animationState _unit in CARRY_ANIMATIONS}) then {
- if (isNull objectParent _unit && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+ if (isNull objectParent _unit && {_unit call EFUNC(common,isAwake)}) then {
[_unit, "", 2] call EFUNC(common,doAnimation);
};
diff --git a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
index 4bb680ee47..487ba15b2a 100644
--- a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
+++ b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
@@ -77,7 +77,7 @@ if (_average > _gBlackOut && {GETEGVAR(medical,enabled,false) && {ACE_player cal
GVAR(GForces_CC) ppEffectAdjust [1,1,0,[0,0,0,1],[0,0,0,0],[1,1,1,1],[10,10,0,0,0,0.1,0.5]];
-if !(ACE_player getVariable ["ACE_isUnconscious", false]) then {
+if (ACE_player call EFUNC(common,isAwake)) then {
if (_average > 0.30 * _gBlackOut) then {
private _strength = ((_average - 0.30 * _gBlackOut) / (0.70 * _gBlackOut)) max 0;
GVAR(GForces_CC) ppEffectAdjust [1,1,0,[0,0,0,1],[0,0,0,0],[1,1,1,1],[2 * (1 - _strength),2 * (1 - _strength),0,0,0,0.1,0.5]];
diff --git a/addons/goggles/functions/fnc_canWipeGlasses.sqf b/addons/goggles/functions/fnc_canWipeGlasses.sqf
index ef9d961bc1..cb24b4137a 100644
--- a/addons/goggles/functions/fnc_canWipeGlasses.sqf
+++ b/addons/goggles/functions/fnc_canWipeGlasses.sqf
@@ -15,4 +15,4 @@
* Public: No
*/
-GVAR(effects) in [2, 3] && {!GETVAR(ACE_player,ACE_isUnconscious,false)} // return
+GVAR(effects) in [2, 3] && {ACE_player call EFUNC(common,isAwake)} // return
diff --git a/addons/interaction/functions/fnc_canJoinGroup.sqf b/addons/interaction/functions/fnc_canJoinGroup.sqf
index facc3376ee..ec2feb8240 100644
--- a/addons/interaction/functions/fnc_canJoinGroup.sqf
+++ b/addons/interaction/functions/fnc_canJoinGroup.sqf
@@ -18,7 +18,6 @@
params ["_unit", "_target"];
-alive _target
-&& {!(_target getVariable ["ACE_isUnconscious", false])}
+_target call EFUNC(common,isAwake)
&& {side group _unit == side group _target}
&& {group _unit != group _target} // return
diff --git a/addons/interaction/functions/fnc_canJoinTeam.sqf b/addons/interaction/functions/fnc_canJoinTeam.sqf
index 09d0281dca..e0e3684ce9 100644
--- a/addons/interaction/functions/fnc_canJoinTeam.sqf
+++ b/addons/interaction/functions/fnc_canJoinTeam.sqf
@@ -18,7 +18,6 @@
params ["_unit", "_target"];
-alive _target
-&& {!(_target getVariable ["ACE_isUnconscious", false])}
+_target call EFUNC(common,isAwake)
&& {!([_target] call EFUNC(common,isPlayer))}
&& {_target in units group _unit}
diff --git a/addons/interaction/functions/fnc_canTapShoulder.sqf b/addons/interaction/functions/fnc_canTapShoulder.sqf
index 049c178152..51f271fb4c 100644
--- a/addons/interaction/functions/fnc_canTapShoulder.sqf
+++ b/addons/interaction/functions/fnc_canTapShoulder.sqf
@@ -19,6 +19,5 @@
params ["_unit", "_target"];
_target isKindOf "CAManBase" &&
-{alive _target} &&
-{_unit distance _target < 4} &&
-{!(_target getVariable ["ACE_isUnconscious", false])} // return
+{_target call EFUNC(common,isAwake)} &&
+{_unit distance _target < 4} // return
diff --git a/addons/towing/functions/fnc_towStateMachinePFH.sqf b/addons/towing/functions/fnc_towStateMachinePFH.sqf
index 50afdeb153..7b295754fa 100644
--- a/addons/towing/functions/fnc_towStateMachinePFH.sqf
+++ b/addons/towing/functions/fnc_towStateMachinePFH.sqf
@@ -44,15 +44,14 @@ if (GVAR(isSwimming) && {currentWeapon _unit isNotEqualTo ""}) then {
private _exitCondition = !(
(alive GVAR(attachHelper)) &&
{ alive _parent } &&
- { alive _unit } &&
+ { _unit call EFUNC(common,isAwake) } &&
{
currentWeapon _unit isEqualTo ""
|| {_unit call EFUNC(common,isSwimming)} // swimming in wetsuit forces weapon in hands
|| {getPosASLW _unit select 2 < -1.5} // walking-to-swimming animation in wetsuit lasts for 3 seconds
} &&
{ [_unit, objNull, [INTERACTION_EXCEPTIONS]] call EFUNC(common,canInteractWith) } &&
- { "unconscious" isNotEqualTo toLowerANSI animationState _unit } &&
- { !(_unit getVariable ["ACE_isUnconscious", false]) } &&
+ { "unconscious" != animationState _unit } &&
{ ACE_player == _unit }
);
From b714c8bce2628ff8d4795da8a7f2fc05bb82f474 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Wed, 3 Jul 2024 11:02:43 +0200
Subject: [PATCH 7/7] Nametags - Only display talking waves when unit is alive
and conscious (#10106)
Only display waves when unit is alive and conscious
---
addons/nametags/functions/fnc_initIsSpeaking.sqf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/nametags/functions/fnc_initIsSpeaking.sqf b/addons/nametags/functions/fnc_initIsSpeaking.sqf
index 5bae931e60..db2bf30ac3 100644
--- a/addons/nametags/functions/fnc_initIsSpeaking.sqf
+++ b/addons/nametags/functions/fnc_initIsSpeaking.sqf
@@ -41,14 +41,14 @@ switch (true) do {
INFO("ACRE Detected.");
DFUNC(isSpeaking) = {
params ["_unit"];
- ([_unit] call acre_api_fnc_isSpeaking) && {!(_unit getVariable ["ACE_isUnconscious", false])}
+ ([_unit] call acre_api_fnc_isSpeaking) && {_unit call EFUNC(common,isAwake)}
};
};
case (["task_force_radio"] call EFUNC(common,isModLoaded)): {
INFO("TFAR Detected.");
DFUNC(isSpeaking) = {
params ["_unit"];
- (_unit getVariable ["tf_isSpeaking", false]) && {!(_unit getVariable ["ACE_isUnconscious", false])}
+ (_unit getVariable ["tf_isSpeaking", false]) && {_unit call EFUNC(common,isAwake)}
};
};
default {
@@ -65,7 +65,7 @@ switch (true) do {
DFUNC(isSpeaking) = {
params ["_unit"];
- (_unit getVariable [QGVAR(isSpeakingInGame), false]) && {!(_unit getVariable ["ACE_isUnconscious", false])}
+ (_unit getVariable [QGVAR(isSpeakingInGame), false]) && {_unit call EFUNC(common,isAwake)}
};
};
};