diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml
index f6bafa7762..cd5eff1181 100644
--- a/addons/atragmx/stringtable.xml
+++ b/addons/atragmx/stringtable.xml
@@ -20,6 +20,7 @@
Abrir ATragMX
Ouvrir ATragMX
ATragMX öffnen
+ Apri ATragMX
Rugged PDA with ATragMX
@@ -28,6 +29,7 @@
PDA rugerizada con ATragMX
Robuster PDA mit ATragMX
PDA robuste avec ATragMX
+ PDA Robusto con ATragMX
Open ATragMX
@@ -36,6 +38,7 @@
Abrir ATragMX
Ouvrir ATragMX
ATragMX öffnen
+ Apri ATragMX
\ No newline at end of file
diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
index c8df996313..02066f26b4 100644
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@@ -179,6 +179,7 @@
Erro ao anexar
Przyczepianie nie powiodło się
Hozzácsatolás sikertelen
+ Impossibile Attaccare
%1<br/>Attached
diff --git a/addons/ballistics/scripts/initTargetWall.sqf b/addons/ballistics/scripts/initTargetWall.sqf
index b09d5897bc..391faaa82e 100644
--- a/addons/ballistics/scripts/initTargetWall.sqf
+++ b/addons/ballistics/scripts/initTargetWall.sqf
@@ -1,6 +1,8 @@
// by commy2
#include "script_component.hpp"
+private ["_wall", "_paper"];
+
_wall = _this select 0;
if (local _wall) then {
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index b4d6750eb3..eea2f0cb9e 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -373,6 +373,7 @@
Bande .338 NM 130Cps Traçante
Cinta de 130 balas trazadoras de .338 NM
Лента из 130-ти .338 NM трассирующих
+ .338 NM 130Rnd Tracciante Belt
.338 NM Tracer
@@ -382,6 +383,7 @@
.338 NM Traçante
.338 NM trazadora
.338 NM трассирующие
+ .338 NM 130Rnd Tracciante
Caliber: .338 Norma Magnum Tracer<br />Rounds: 130<br />Used in: SPMG
@@ -390,6 +392,7 @@
Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé avec: SPMG
Calibre: .338 Norma Magnum trazadora<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum трассирующие<br />Патронов: 130<br />Используются в: SPMG
+ Calibro: .338 Norma Magnum Tracciante<br />Munizioni: 130<br />In uso su: SPMG
.338 NM 130Rnd IR-DIM Belt
@@ -398,6 +401,7 @@
Bande .338 NM 130Cps IR-DIM
Cinta de 130 balas IR-DIM de .338 NM
Лента из 130-ти .338 NM ИК-трассирующих
+ .338 NM 130Rnd IR-DIM Belt
.338 NM IR-DIM
@@ -407,6 +411,7 @@
.338 NM IR-DIM
.338 NM IR-DIM
.338 NM ИК-трассирующие
+ .338 NM IR-DIM
Caliber: .338 Norma Magnum Tracer IR-DIM<br />Rounds: 130<br />Used in: SPMG
@@ -415,6 +420,7 @@
Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé avec: SPMG
Calibre: .338 Norma Magnum trazadora IR-DIM<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum ИК-трассирующие<br />Патронов: 130<br />Используются с: SPMG
+ Calibro: .338 Norma Magnum Tracciante IR-DIM<br />Munizioni: 130<br />In uso su: SPMG
.338 NM 130Rnd AP Belt
@@ -423,6 +429,7 @@
Bande .338 NM 130Cps AP
Cinta de 130 balas AP de .338 NM
Лента из 130-ти .338 NM бронебойных
+ .338 NM 130Rnd AP Belt
.338 NM AP
@@ -432,6 +439,7 @@
.338 NM AP
.338 NM AP
.338 NM бронебойные
+ .338 NM AP
Caliber: .338 Norma Magnum AP<br />Rounds: 130<br />Used in: SPMG
@@ -440,6 +448,7 @@
Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé avec: SPMG
Calibre: .338 Norma Magnum AP<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum бронебойные<br />Патронов: 130<br />Используются с: SPMG
+ Calibro: .338 Norma Magnum AP<br />Munizioni: 130<br />In uso su: SPMG
@@ -449,6 +458,7 @@
Chargeur 9.3mm 10Cps Traçante
Cargador de 10 balas trazadoras de 9.3mm
Магазин из 10-ти 9,3 мм трассирующих
+ 9.3mm 10Rnd Tracer Mag
9.3mm Tracer
@@ -458,6 +468,7 @@
9.3mm Traçante
9.3mm trazadora
9,3 мм трассирующие
+ 9.3mm Tracer
Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus
@@ -466,6 +477,7 @@
Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé avec: Cyrus
Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм трассирующие<br />Патронов: 10<br />Используются с: Cyrus
+ Calibro: 9.3x64mm Tracer<br />Munizioni: 10<br />In uso su: Cyrus
9.3mm 10Rnd Tracer IR-DIM Mag
@@ -474,6 +486,7 @@
Chargeur 9.3mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 9.3mm
Магазин из 10-ти 9,3 мм ИК-трассирующих
+ 9.3mm 10Rnd Tracciante IR-DIM Mag
9.3mm IR-DIM
@@ -483,6 +496,7 @@
9.3mm IR-DIM
9.3mm IR-DIM
9,3 мм ИК-трассирующие
+ 9.3mm IR-DIM
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus
@@ -491,6 +505,7 @@
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé avec: Cyrus
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Cyrus
+ Calibro: 9.3x64mm Tracciante IR-DIM<br />Munizioni: 10<br />In uso su: Cyrus
@@ -500,6 +515,7 @@
Bande 9.3mm 150Cps Traçante
Cinta de 150 balas trazadoras de 9.3mm
Лента из 150-ти 9,3 мм трассирующих
+ 9.3mm 150Rnd Tracer Belt
9.3mm Tracer
@@ -509,6 +525,7 @@
9.3mm Traçante
9.3mm trazadora
9,3 мм трассирующие
+ 9.3mm Tracciante
Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid
@@ -517,6 +534,7 @@
Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé avec: Navid
Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм трассирующие<br />Патронов: 150<br />Используются с: Навид
+ Calibro: 9.3x64mm Tracciante<br />Munizioni: 150<br />In uso su: Navid
9.3mm 150Rnd Tracer IR-DIM Belt
@@ -525,6 +543,7 @@
Bande 9.3mm 150Cps Traçante IR-DIM
Cinta de 150 balas trazadoras IR-DIM de 9.3mm
Лента из 150-ти 9,3 мм ИК-трассирующих
+ 9.3mm 150Rnd Tracciante IR-DIM Belt
9.3mm IR-DIM
@@ -534,6 +553,7 @@
9.3mm IR-DIM
9.3mm IR-DIM
9,3 мм ИК-трассирующие
+ 9.3mm IR-DIM
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid
@@ -542,6 +562,7 @@
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé avec: Navid
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 150<br />Используются с: Навид
+ Calibro: 9.3x64mm Tracciante IR-DIM<br />Munizioni: 150<br />In uso su: Navid
9.3mm 150Rnd AP Belt
@@ -550,6 +571,7 @@
Bande 9.3mm 150Cps AP
Cinta de 150 balas AP de 9.3mm
Лента из 150-ти 9,3 мм бронебойных
+ 9.3mm 150Rnd AP Belt
9.3mm AP
@@ -559,6 +581,7 @@
9.3mm AP
9.3mm AP
9,3 мм бронебойные
+ 9.3mm AP
Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid
@@ -567,6 +590,7 @@
Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé avec: Navid
Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм бронебойные<br />Патронов: 150<br />Используются с: Навид
+ Calibro: 9.3x64mm AP<br />Munizioni: 150<br />In uso su: Navid
9x19mm 16Rnd Mag
@@ -575,6 +599,7 @@
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
9x19mm 20-Patronen-Magazin
+ 9x19mm 16Rnd Mag
9x19mm
@@ -583,6 +608,7 @@
9x19mm
9х19 мм
9x19mm
+ 9x19mm
9x19mm 30Rnd Mag
@@ -591,6 +617,7 @@
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
9x19mm 30-Patronen-Magazin
+ 9x19mm 30Rnd Mag
9x19mm 30Rnd Mag
@@ -599,6 +626,7 @@
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
9x19mm 30-Patronen-Magazin
+ 9x19mm 30Rnd Mag
9x19mm
@@ -607,6 +635,7 @@
9x19mm
9х19 мм
9x19mm
+ 9x19mm
9x19mm 30Rnd Mag
@@ -615,6 +644,7 @@
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
9x19mm 30-Patronen-Magazin
+ 9x19mm 30Rnd Mag
7.62x54mm 10Rnd Tracer Mag
@@ -623,6 +653,7 @@
Cargador de 10 balas trazadoras de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
7,62x54mm 10-Patronen-Magazin Leuchtspur
+ 7.62x54mm 10Munizioni Traccianti IR-DIM Mag
7.62mm
@@ -631,6 +662,7 @@
7.62mm
7,62 мм
7,62x54mm
+ 7.62mm IR-DIM
7.62x54mm 10Rnd Tracer Mag
@@ -639,6 +671,7 @@
Cargador de 10 balas trazadoras de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
7,62x54mm 10-Patronen-Magazin Leuchtspur
+ 7.62x54mm 10Munizioni Traccianti IR-DIM Mag
6.5mm 100Rnd Tracer IR-DIM Mag
@@ -647,6 +680,7 @@
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur
+ 6.5mm 100Munizioni Traccianti IR-DIM Mag
6.5mm IR-DIM
@@ -655,6 +689,7 @@
6.5mm IR-DIM
6,5 мм ИК-трассирующие
6,5mm IR-DIM
+ 6.5mm IR-DIM
6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW
@@ -663,6 +698,7 @@
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW
+ 6.5mm 100Rnd Tracer IR-DIM Mag<br />Munizioni: 100<br />In uso su: MX LSW
6.5mm 200Rnd Tracer IR-DIM Belt
@@ -671,6 +707,7 @@
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
6,5mm 200-Patronen-Gurt IR-DIM Leuchtspur
+ 6.5mm 200Rnd Tracer IR-DIM Belt
6.5mm IR-DIM
@@ -679,6 +716,7 @@
6.5mm IR-DIM
6,5 мм ИК-трассирующие
6,5mm IR-DIM
+ 6.5mm IR-DIM
6.5mm 200Rnd Tracer IR-DIM Belt<br />Rounds: 200<br />Used in: Stoner 99 LMG
@@ -687,6 +725,7 @@
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
6,5mm 200-Patronen-Gurt IR-DIM Leuchtspur<br />Patronen: 200<br />Eingesetzt von: Stoner 99 LMG
+ 6.5mm 200Rnd Tracer IR-DIM Belt<br />Munizioni: 200<br />In uso su: Stoner 99 LMG
5.56mm 30Rnd Mag (Mk262)
@@ -695,6 +734,7 @@
Cargador de 30 balas de 5.56mm (Mk262)
Магазин из 30-ти 5.56 мм Mk262
5,56mm 30-Patronen-Magazin (Mk262)
+ 5.56mm 30Rnd Mag (Mk262)
5.56mm Mk262
@@ -703,6 +743,7 @@
5.56mm Mk262
5,56 мм Mk262
5,56mm Mk262
+ 5.56mm Mk262
Caliber: 5.56x45mm NATO (Mk262)<br />Rounds: 30
@@ -711,6 +752,7 @@
Calibre: 5.56x45mm NATO (Mk262)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk262)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (Mk262)<br />Patronen: 30
+ Calibro: 5.56x45 mm NATO (Mk262)<br />Munizioni: 30
5.56mm 30Rnd Mag (Mk318)
@@ -719,6 +761,7 @@
Cargador de 30 balas de 5.56mm (Mk318)
Магазин из 30-ти 5.56 мм (Mk318)
5,56mm 30-Patronen-Magazin (Mk318)
+ 5.56mm 30Rnd Mag (Mk318)
5.56mm Mk318
@@ -727,6 +770,7 @@
5.56mm Mk318
5.56 мм Mk318
5,56mm Mk318
+ 5.56mm Mk318
Caliber: 5.56x45mm NATO (Mk318)<br />Rounds: 30
@@ -735,6 +779,7 @@
Calibre: 5.56x45mm NATO (Mk318)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk318)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (Mk318)<br />Patronen: 30
+ Calibro: 5.56x45 mm NATO (Mk318)<br />Munizioni: 30
5.56mm 30Rnd Mag (M995 AP)
@@ -743,6 +788,7 @@
Cargador de 30 balas de 5.56mm (M995 AP)
Магазин из 30-ти 5.56 мм (M995 бронебойные)
5,56mm 30-Patronen-Magazin (M995AP)
+ 5.56mm 30Rnd Mag (M995 AP)
5.56mm AP
@@ -751,6 +797,7 @@
5.56mm AP
5.56 мм бронебойные
5,56mm AP
+ 5.56mm AP
Caliber: 5.56x45mm NATO (M995 AP)<br />Rounds: 30
@@ -759,6 +806,7 @@
Calibre: 5.56x45mm NATO (M995 AP)<br />Balas: 30
Калибр: 5,56x45 мм NATO (M995 бронебойные)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (M995 AP)<br />Patronen: 30
+ Calibro: 5.56x45 mm NATO (M995 AP)<br />Munizioni: 30
7.62mm 10Rnd Mag (M118LR)
@@ -767,6 +815,7 @@
Cargador de 10 balas de 7.62mm (M118LR)
Магазин из 10-ти 7,62 мм (M118LR)
7,62mm 10-Patronen-Magazin (M118LR)
+ 7.62mm 10Rnd Mag (M118LR)
7.62mm M118LR
@@ -775,6 +824,7 @@
7.62mm (M118LR)
7,62 мм M118LR
7,62mm M118LR
+ 7.62mm M118LR
Caliber: 7.62x51mm NATO (M118LR)<br />Rounds: 10
@@ -783,6 +833,7 @@
Calibre: 7.62x51mm NATO (M118LR)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (M118LR)<br />Patronen: 10
+ Calibro: 7.62x51 mm NATO (M118LR)<br />Munizioni: 10
7.62mm 20Rnd Mag (M118LR)
@@ -791,6 +842,7 @@
Cargador de 20 balas de 7.62mm (M118LR)
Магазин из 20-ти 7,62 мм (M118LR)
7,62mm 20-Patronen-Magazin (M118LR)
+ 7.62mm 20Rnd Mag (M118LR)
7.62mm M118LR
@@ -799,6 +851,7 @@
7.62mm (M118LR)
7,62 мм M118LR
7,62mm M118LR
+ 7.62mm M118LR
Caliber: 7.62x51mm NATO (M118LR)<br />Rounds: 20
@@ -807,6 +860,7 @@
Calibre: 7.62x51mm NATO (M118LR)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (M118LR)<br />Patronen: 20
+ Calibro: 7.62x51 mm NATO (M118LR)<br />Munizioni: 20
7.62mm 10Rnd Mag (Mk316 Mod 0)
@@ -815,6 +869,7 @@
Cargador de 10 balas de 7.62mm (Mk316 Mod 0)
Магазин из 10-ти 7,62 мм (Mk316 Mod 0)
7,62mm 10-Patronen-Magazin (Mk316 Mod 0)
+ 7.62mm 10Rnd Mag (Mk316 Mod 0)
7.62mm Mk316
@@ -823,6 +878,7 @@
7.62mm Mk316
7,62 мм Mk316
7,62mm Mk316
+ 7.62mm Mk316
Caliber: 7.62x51mm NATO (Mk316 Mod 0)<br />Rounds: 10
@@ -831,6 +887,7 @@
Calibre: 7.62x51mm NATO (Mk316 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (Mk316 Mod 0)<br />Patronen: 10
+ Calibro: 7.62x51 mm NATO (Mk316 Mod 0)<br />Munizioni: 10
7.62mm 20Rnd Mag (Mk316 Mod 0)
@@ -839,6 +896,7 @@
Cargador de 20 balas de 7.62mm (Mk316 Mod 0)
Магазин из 20-ти 7,62 мм (Mk316 Mod 0)
7,62mm 20-Patronen-Magazin (Mk316 Mod 0)
+ 7.62mm 20Rnd Mag (Mk316 Mod 0)
7.62mm Mk316
@@ -847,6 +905,7 @@
7.62mm Mk316
7,62 мм Mk316
7,62mm Mk316
+ 7.62mm Mk316
Caliber: 7.62x51mm NATO (Mk316 Mod 0)<br />Rounds: 20
@@ -855,6 +914,7 @@
Calibre: 7.62x51mm NATO (Mk316 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (Mk316 Mod 0)<br />Patronen: 20
+ Calibro: 7.62x51 mm NATO (Mk316 Mod 0)<br />Munizioni: 20
7.62mm 10Rnd Mag (Mk319 Mod 0)
@@ -863,6 +923,7 @@
Cargador de 10 balas de 7.62mm (Mk319 Mod 0)
Магазин из 10-ти 7,62 мм (Mk319 Mod 0)
7,62mm 10-Patronen-Magazin (Mk319 Mod 0)
+ 7.62mm 10Rnd Mag (Mk319 Mod 0)
7.62mm Mk319
@@ -871,6 +932,7 @@
7.62mm Mk319
7,62 мм Mk319
7,62mm Mk319
+ 7.62mm Mk319
Caliber: 7.62x51mm NATO (Mk319 Mod 0)<br />Rounds: 10
@@ -879,6 +941,7 @@
Calibre: 7.62x51mm NATO (Mk319 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Patronen: 10
+ Calibro: 7.62x51 mm NATO (Mk319 Mod 0)<br />Munizioni: 10
7.62mm 20Rnd Mag (Mk319 Mod 0)
@@ -887,6 +950,7 @@
Cargador de 20 balas de 7.62mm (Mk319 Mod 0)
Магазин из 20-ти 7,62 мм (Mk319 Mod 0)
7,62mm 20-Patronen-Magazin (Mk319 Mod 0)
+ 7.62mm 20Rnd Mag (Mk319 Mod 0)
7.62mm Mk319
@@ -895,6 +959,7 @@
7.62mm Mk319
7,62 мм Mk319
7,62mm Mk319
+ 7.62mm Mk319
Caliber: 7.62x51mm NATO (Mk319 Mod 0)<br />Rounds: 20
@@ -903,6 +968,7 @@
Calibre: 7.62x51mm NATO (Mk319 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Patronen: 20
+ Calibro: 7.62x51 mm NATO (Mk319 Mod 0)<br />Munizioni: 20
7.62mm 10Rnd Mag (M993 AP)
@@ -911,6 +977,7 @@
Cargador de 10 balas de 7.62mm (M993 AP)
Магазин из 10-ти 7,62 мм (M993 бронебойные)
7,62mm 10-Patronen-Magazin (M993 AP)
+ 7.62mm 10Rnd Mag (M993 AP)
7.62mm AP
@@ -919,6 +986,7 @@
7.62mm AP
7,62mm бронебойные
7,62mm AP
+ 7.62mm AP
Caliber: 7.62x51mm NATO (M993 AP)<br />Rounds: 10
@@ -927,6 +995,7 @@
Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 10
+ Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 10
7.62mm 20Rnd Mag (M993 AP)
@@ -935,6 +1004,7 @@
Cargador de 20 balas de 7.62mm (M993 AP)
Магазин из 20-ти 7,62 мм (M993 бронебойные)
7,62mm 20-Patronen-Magazin (M993 AP)
+ 7.62mm 20Rnd Mag (M993 AP)
7.62mm AP
@@ -943,6 +1013,7 @@
7.62mm AP
7,62 мм бронебойные
7,62mm AP
+ 7.62mm AP
Caliber: 7.62x51mm NATO (M993 AP)<br />Rounds: 20
@@ -951,6 +1022,7 @@
Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 20
+ Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 20
7.62mm 20Rnd Mag (Mk248 Mod 0)
@@ -959,6 +1031,7 @@
Cargador de 20 balas de 7.62mm (Mk248 Mod 0)
Магазин из 20-ти 7,62 мм (Mk248 Mod 0)
7,62mm 20-Patronen-Magazin (Mk248 Mod 0)
+ 7.62mm 20Rnd Mag (Mk248 Mod 0)
7.62mm (Mk248 Mod 0)
@@ -967,6 +1040,7 @@
7.62mm (Mk248 Mod 0)
7,62 мм (Mk248 Mod 0)
7,62mm (Mk248 Mod 0)
+ 7.62mm (Mk248 Mod 0)
Caliber: 7.62x67mm NATO (Mk248 Mod 0)<br />Rounds: 20
@@ -975,6 +1049,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 0)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (Mk248 Mod 0)<br />Patronen: 20
+ Calibro: 7.62x67 mm NATO (Mk248 Mod 0)<br />Munizioni: 20
7.62mm 20Rnd Mag (Mk248 Mod 1)
@@ -983,6 +1058,7 @@
Cargador de 20 balas de 7.62mm (Mk248 Mod 1)
Магазин из 20-ти 7,62 мм (Mk248 Mod 1)
7,62mm 20-Patronen-Magazin (Mk248 Mod 1)
+ 7.62mm 20Rnd Mag (Mk248 Mod 1)
7.62mm (Mk248 Mod 1)
@@ -991,6 +1067,7 @@
7.62mm (Mk248 Mod 1)
7,62 мм (Mk248 Mod 1)
7,62mm (Mk248 Mod 1)
+ 7.62mm (Mk248 Mod 1)
Caliber: 7.62x67mm NATO (Mk248 Mod 1)<br />Rounds: 20
@@ -999,6 +1076,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (Mk248 Mod 1)<br />Patronen: 20
+ Calibro: 7.62x67 mm NATO (Mk248 Mod 1)<br />Munizioni: 20
7.62mm 20Rnd Mag (Berger Hybrid OTM)
@@ -1007,6 +1085,7 @@
Cargador de 20 balas de 7.62mm (Berger Hybrid OTM)
Магазин из 20-ти 7,62 мм (Berger Hybrid OTM)
7,62mm 20-Patronen-Magazin (Berger Hybrid OTM)
+ 7.62mm 20Rnd Mag (Berger Hybrid OTM)
7.62mm (OTM)
@@ -1015,6 +1094,7 @@
7.62mm (OTM)
7,62 мм (OTM)
7,62mm (OTM)
+ 7.62mm (OTM)
Caliber: 7.62x67mm NATO (Berger Hybrid OTM)<br />Rounds: 20
@@ -1023,6 +1103,7 @@
Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20
Kaliber: 7,62x67mm NATO (Berger Hybrid OTM)<br />Patronen: 20
+ Calibro: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Munizioni: 20
6.5x47mm 30Rnd Mag (HPBT Scenar)
@@ -1031,6 +1112,7 @@
Magazynek 6,5x47mm 30rd (HPBT Scenar)
Магазин из 30-ти 6,5x47 мм (экспансивные Scenar)
6,5x47mm 30-Patronen-Magazin (HPBT Scenar)
+ 6.5x47mm 30Rnd Mag (HPBT Scenar)
6.5mm Lapua
@@ -1039,6 +1121,7 @@
6,5mm Lapua
6,5 мм Lapua
6,5mm Lapua
+ 6.5mm Lapua
Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM
@@ -1047,13 +1130,15 @@
Kaliber: 6,5x47mm (HPBT Scenar)<br />Pociski: 30
Калибр: 6,5x47 мм (экспансивные Scenar)<br />Патронов: 30
Kaliber: 6,5x47mm (HPBT Scenar)<br />Patronen: 30<br />Eingesetzt von: MXM
+ Calibro: 6.5x47mm (HPBT Scenar)<br />Munizioni: 30<br />In uso su: MXM
6.5mm Creedmor 30Rnd Mag
Magazynek 6,5mm Creedmor 30rd
- Магазин из 30-ти 6,5 мм Creedmor
+ 6.5mm Creedmor 30Rnd Mag
+ Магазин из 30-ти 6,5 мм Creedmor
6,5mm Creedmor 30-Patronen-Magazin
- Chargeur 6.5mm Creedmor 30Cps
+ Chargeur 6.5mm Creedmor 30Cps
6.5mm CM
@@ -1062,12 +1147,14 @@
6,5mm CM
6,5 мм CM
6,5mm CM
+ 6.5mm CM
Caliber: 6.5x47mm Creedmor<br />Rounds: 30<br />Used in: MXM
Kaliber: 6,5x47mm Creedmor<br />Pociski: 30<br />Używany w: MXM
Kaliber: 6,5x47mm Creedmor<br />Patronen: 30<br />Eingesetzt von: MXM
Calibre: 6.5x47mm Creedmor <br />Cartouches: 30<br />Utilisé avec: MXM
+ Calibro: 6.5mm Creedmor<br />Munizioni: 30<br />In uso su: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
@@ -1076,6 +1163,7 @@
Magazynek .338 10rd (300gr Sierra MatchKing HPBT)
Магазин из 10-ти .338 (300 гран Sierra MatchKing экспансивные)
.338 10-Patronen-Magazin (300gr Sierra MatchKing HPBT)
+ .338 10Munizioni Mag (300gr Sierra MatchKing HPBT)
.338 HPBT
@@ -1084,6 +1172,7 @@
.338 HPBT
.338 экспансивные
.338 HPBT
+ .338 (HPBT)
Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Rounds: 10
@@ -1092,6 +1181,7 @@
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
Калибр: 8,6x70mm (300 гран Sierra MatchKing экспансивные)<br />Патронов: 10
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Patronen: 10
+ Calibro: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Munizioni: 10
.338 10Rnd Mag (API526)
@@ -1100,6 +1190,7 @@
Magazynek .338 10rd (API526)
Магазин из 10-ти .338 (API526)
.338 10-Patronen-Magazin (API526)
+ .338 10Rnd Mag (API526)
.338 AP
@@ -1108,6 +1199,7 @@
.338 AP
.338 AP
.338 AP
+ .338 AP
Caliber: 8.6x70mm (API526)<br />Rounds: 10
@@ -1116,6 +1208,7 @@
Kaliber: 8,6x70mm (API526)<br />Pociski: 10
Калибр: 8,6x70 мм (API526)<br />Патронов: 10
Kaliber: 8,6x70mm (API526)<br />Patronen: 10
+ Calibro: 8.6x70mm (API526)<br />Munizioni: 10
12.7x99mm 5Rnd Mag
@@ -1124,6 +1217,7 @@
Magazynek 12,7x99mm 5rd
Магазин из 5-ти 12,7x99 мм
12,7x99mm 5-Patronen-Magazin
+ 12.7x99mm 5Rnd Mag
12.7mm
@@ -1132,6 +1226,7 @@
12,7mm
12,7 мм
12,7mm
+ 12.7mm
Caliber: 12.7x99mm<br />Rounds: 5
@@ -1140,12 +1235,14 @@
Kaliber: 12,7x99mm<br />Pociski: 5
Калибр: 12,7x99 мм<br />Патронов: 5
Kaliber: 12,7x99mm<br />Patronen: 5
+ Calibro: 12.7x99mm<br />Munizioni: 5
12.7x99mm API 5Rnd Mag
Chargeur 12.7x99mm API 5Cps
Cargador de 5 balas de 12.7x99mm API
Magazynek 12,7x99mm API 5rd
+ 12.7x99mm API 5Rnd Mag
Магазин из 5-ти 12,7x99 мм (бронебойно-зажигательные)
12,7x99mm 5-Patronen-Magazin (API)
@@ -1154,6 +1251,7 @@
12.7mm API
12.7mm API
12,7mm API
+ 12.7mm API
12.7 мм бронебойно-зажигательные
12,7mm API
@@ -1164,6 +1262,7 @@
Kaliber: 12,7x99mm API<br />Pociski: 5
Калибр: 12,7x99 мм бронебойно-зажигательные<br />Патронов: 5
Kaliber:12,7x99mm API<br />Patronen: 5
+ Calibro: 12.7x99mm API<br />Munizioni: 5
12.7x99mm 5Rnd Mag (AMAX)
@@ -1172,6 +1271,7 @@
Magazynek 12,7x99mm 5rd (AMAX)
Магазин из 5-ти 12,7x99 мм (A-MAX)
12,7x99mm 5-Patronen-Magazin (AMAX)
+ 12.7x99mm 5Rnd Mag (AMAX)
12.7mm
@@ -1180,6 +1280,7 @@
12,7mm
12,7 мм
12,7mm
+ 12.7mm
Caliber: 12.7x99mm (AMAX)<br />Rounds: 5
@@ -1187,7 +1288,8 @@
Calibre: 12.7x99mm (AMAX)<br />Balas: 5
Kaliber: 12,7x99mm (AMAX)<br />Pociski: 5
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
+ Calibro: 12.7x99mm (AMAX)<br />Munizioni: 5
Kaliber:12,7x99mm (AMAX)<br />Patronen: 5
-
+
\ No newline at end of file
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index cbe5c315da..86722a0014 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -119,6 +119,7 @@
Ekwipunek rewidowanej osoby
Инвентарь обысканного человека
Inventário da pessoa revistada
+ Inventario delle persone perquisite
Frisk person
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 7dc07743ed..53de6b5d69 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -73,7 +73,7 @@ if (_currentVersion != _previousVersion) then {
// Synced ACE events
// Handle JIP scenario
if(!isServer) then {
- ["PlayerJip", {
+ ["PlayerJip", {
diag_log text format["[ACE] * JIP event synchronization initialized"];
["SEH_all", [player]] call FUNC(serverEvent);
}] call FUNC(addEventHandler);
@@ -112,7 +112,7 @@ enableCamShake true;
// Set the name for the current player
["playerChanged", {
EXPLODE_2_PVT(_this,_newPlayer,_oldPlayer);
-
+
if (alive _newPlayer) then {
[_newPlayer] call FUNC(setName)
};
@@ -227,6 +227,7 @@ GVAR(OldIsCamera) = false;
["displayTextStructured", FUNC(displayTextStructured)] call FUNC(addEventhandler);
["displayTextPicture", FUNC(displayTextPicture)] call FUNC(addEventhandler);
+["medical_onUnconscious", {if (local (_this select 0) && {!(_this select 1)}) then {[ _this select 0, false, QUOTE(FUNC(loadPerson)), west /* dummy side */] call FUNC(switchToGroupSide);};}] call FUNC(addEventhandler);
["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);
["isNotInside", {
@@ -243,10 +244,10 @@ GVAR(OldIsCamera) = false;
if(isMultiplayer && { time > 0 || isNull player } ) then {
// We are jipping! Get ready and wait, and throw the event
[{
- if(!(isNull player)) then {
+ if(!(isNull player)) then {
["PlayerJip", [player] ] call FUNC(localEvent);
[(_this select 1)] call cba_fnc_removePerFrameHandler;
- };
+ };
}, 0, []] call cba_fnc_addPerFrameHandler;
};
diff --git a/addons/common/data/insignia_ace3logo_ca.paa b/addons/common/data/insignia_ace3logo_ca.paa
index 04640aa187..5a8ca321d7 100644
Binary files a/addons/common/data/insignia_ace3logo_ca.paa and b/addons/common/data/insignia_ace3logo_ca.paa differ
diff --git a/addons/common/data/insignia_banana_ca.paa b/addons/common/data/insignia_banana_ca.paa
index 5302ac07ad..379fd9c733 100644
Binary files a/addons/common/data/insignia_banana_ca.paa and b/addons/common/data/insignia_banana_ca.paa differ
diff --git a/addons/common/functions/fnc_unloadPerson.sqf b/addons/common/functions/fnc_unloadPerson.sqf
index 33c0e9c0c2..60e4f56d7d 100644
--- a/addons/common/functions/fnc_unloadPerson.sqf
+++ b/addons/common/functions/fnc_unloadPerson.sqf
@@ -1,59 +1,44 @@
-/**
- * fn_unloadPerson_f.sqf
- * @Descr: Unload a person from a vehicle
- * @Author: Glowbal
+/*
+ * Author: Glowbal
+ * Unload a person from a vehicle
*
- * @Arguments: [caller OBJECT, unit OBJECT]
- * @Return: BOOL Returns true if succesfully unloaded person
- * @PublicAPI: true
+ * Arguments:
+ * 0: unit
Interaction - Shadow Max
@@ -99,6 +101,7 @@
Interaction - Ombre Max
Interaktionstextschatten Max
Interazioni - Ombra Massima
+ Взаимодействие - Тень Макс.
Interaction - Shadow Min
@@ -106,14 +109,21 @@
Interaction - Ombre Min
Interaktionstextschatten Min
Interazioni - Ombra Minima
+ Взаимодействие - Тень Мин.
Keep cursor centered
Garder le curseur au centre
+ Центрировать курсор
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.
+ Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана.
+
+
Interaction Text Size
@@ -128,4 +138,4 @@
Outline
-
\ No newline at end of file
+
diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf
index 8fa96c036a..505953d877 100644
--- a/addons/javelin/functions/fnc_onOpticDraw.sqf
+++ b/addons/javelin/functions/fnc_onOpticDraw.sqf
@@ -130,7 +130,7 @@ FUNC(disableFire) = {
if(_firedEH < 0 && difficulty > 0) then {
_firedEH = [ACE_player, "DefaultAction", {true}, {
- _canFire = _this getVariable["ace_missileguidance_target", nil];
+ _canFire = (_this select 0) getVariable["ace_missileguidance_target", nil];
if(!isNil "_canFire") exitWith { false };
true
}] call EFUNC(common,addActionEventHandler);
diff --git a/addons/medical/ACE_Medical_Actions.hpp b/addons/medical/ACE_Medical_Actions.hpp
index 70e286f7d8..9052df81da 100644
--- a/addons/medical/ACE_Medical_Actions.hpp
+++ b/addons/medical/ACE_Medical_Actions.hpp
@@ -3,8 +3,8 @@ class ACE_Head {
displayName = "$STR_ACE_Interaction_Head";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
+ ACTION_CONDITION
modifierFunction = QUOTE([ARR_4(_target,_player,0,_this select 3)] call FUNC(modifyMedicalAction));
- condition = "true";
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -21,7 +21,7 @@ class ACE_Head {
};
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(treatment));
@@ -32,47 +32,47 @@ class ACE_Head {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\bandage.paa);
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\bandage.paa);
};
class CheckPulse: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
+ displayName = "$STR_ACE_Medical_Actions_CheckPulse";
condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(treatment));
EXCEPTIONS
icon = "";
};
class CheckBloodPressure: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
+ displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure";
condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(treatment));
EXCEPTIONS
};
class CheckResponse: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_CHECK_RESPONSE";
+ displayName = "$STR_ACE_Medical_Check_Response";
condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckResponse')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckResponse')] call DFUNC(treatment));
EXCEPTIONS
};
class Diagnose: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Diagnose";
+ displayName = "$STR_ACE_Medical_Actions_Diagnose";
condition = QUOTE([ARR_4(_player, _target, 'head', 'Diagnose')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'head', 'Diagnose')] call DFUNC(treatment));
EXCEPTIONS
@@ -82,8 +82,8 @@ class ACE_Torso {
displayName = "$STR_ACE_Interaction_Torso";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation));
+ ACTION_CONDITION
modifierFunction = QUOTE([ARR_4(_target,_player,1,_this select 3)] call FUNC(modifyMedicalAction));
- condition = "true";
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -100,7 +100,7 @@ class ACE_Torso {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PlaceInBodyBag {
- displayName = "$STR_ACE_MEDICAL_PlaceInBodyBag";
+ displayName = "$STR_ACE_Medical_PlaceInBodyBag";
distance = 2.0;
condition = QUOTE([ARR_4(_player, _target, 'body', 'BodyBag')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'BodyBag')] call DFUNC(treatment));
@@ -111,7 +111,7 @@ class ACE_Torso {
enableInside = 1;
};
class TriageCard {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_TriageCard";
+ displayName = "$STR_ACE_Medical_Actions_TriageCard";
distance = 2.0;
condition = "true";
statement = QUOTE([ARR_2(_target, true)] call DFUNC(displayTriageCard));
@@ -125,7 +125,7 @@ class ACE_Torso {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(treatment));
@@ -137,42 +137,42 @@ class ACE_Torso {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\bandage.paa);
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\bandage.paa);
};
class SurgicalKit: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_USE_SURGICALKIT";
+ displayName = "$STR_ACE_Medical_Use_SurgicalKit";
condition = QUOTE([ARR_4(_player, _target, 'body', 'SurgicalKit')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'SurgicalKit')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\surgicalKit.paa);
};
class PersonalAidKit: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_USE_AID_KIT";
+ displayName = "$STR_ACE_Medical_Use_Aid_Kit";
condition = QUOTE([ARR_4(_player, _target, 'body', 'PersonalAidKit')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'PersonalAidKit')] call DFUNC(treatment));
EXCEPTIONS
icon = "";
};
class CPR: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CPR";
+ displayName = "$STR_ACE_Medical_Actions_CPR";
condition = QUOTE([ARR_4(_player, _target, 'body', 'CPR')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'body', 'CPR')] call DFUNC(treatment));
EXCEPTIONS
@@ -183,8 +183,8 @@ class ACE_ArmLeft {
displayName = "$STR_ACE_Interaction_ArmLeft";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 2)] call DFUNC(displayPatientInformation));
+ ACTION_CONDITION
modifierFunction = QUOTE([ARR_4(_target,_player,2,_this select 3)] call FUNC(modifyMedicalAction));
- condition = "true";
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -203,7 +203,7 @@ class ACE_ArmLeft {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(treatment));
@@ -214,28 +214,28 @@ class ACE_ArmLeft {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\bandage.paa);
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\bandage.paa);
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -263,75 +263,75 @@ class ACE_ArmLeft {
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class BloodIV: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_1000";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\iv.paa);
};
class BloodIV_500: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_500";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class BloodIV_250: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_250";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_1000";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_500: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_500";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_250: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_250";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_1000";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_500: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_500";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_250: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_250";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class CheckPulse: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
+ displayName = "$STR_ACE_Medical_Actions_CheckPulse";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(treatment));
EXCEPTIONS
icon = "";
};
class CheckBloodPressure: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
+ displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(treatment));
EXCEPTIONS
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -341,8 +341,8 @@ class ACE_ArmRight {
displayName = "$STR_ACE_Interaction_ArmRight";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 3)] call DFUNC(displayPatientInformation));
+ ACTION_CONDITION
modifierFunction = QUOTE([ARR_4(_target,_player,3,_this select 3)] call FUNC(modifyMedicalAction));
- condition = "true";
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -361,7 +361,7 @@ class ACE_ArmRight {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(treatment));
@@ -372,26 +372,26 @@ class ACE_ArmRight {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(treatment));
EXCEPTIONS
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(treatment));
EXCEPTIONS
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -417,75 +417,75 @@ class ACE_ArmRight {
EXCEPTIONS
};
class BloodIV: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_1000";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\iv.paa);
};
class BloodIV_500: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_500";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class BloodIV_250: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_250";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_1000";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_500: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_500";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_250: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_250";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_1000";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_500: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_500";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_250: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_250";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class CheckPulse: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
+ displayName = "$STR_ACE_Medical_Actions_CheckPulse";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(treatment));
EXCEPTIONS
icon = "";
};
class CheckBloodPressure: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
+ displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(treatment));
EXCEPTIONS
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -496,8 +496,8 @@ class ACE_LegLeft {
displayName = "$STR_ACE_Interaction_LegLeft";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 4)] call DFUNC(displayPatientInformation));
+ ACTION_CONDITION
modifierFunction = QUOTE([ARR_4(_target,_player,4,_this select 3)] call FUNC(modifyMedicalAction));
- condition = "true";
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -517,7 +517,7 @@ class ACE_LegLeft {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(treatment));
@@ -528,26 +528,26 @@ class ACE_LegLeft {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(treatment));
EXCEPTIONS
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(treatment));
EXCEPTIONS
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -574,62 +574,62 @@ class ACE_LegLeft {
EXCEPTIONS
};
class BloodIV: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_1000";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\iv.paa);
};
class BloodIV_500: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_500";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class BloodIV_250: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_250";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_1000";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_500: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_500";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_250: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_250";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_1000";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_500: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_500";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_250: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_250";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -639,8 +639,8 @@ class ACE_LegRight {
displayName = "$STR_ACE_Interaction_LegRight";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 5)] call DFUNC(displayPatientInformation));
+ ACTION_CONDITION
modifierFunction = QUOTE([ARR_4(_target,_player,5,_this select 3)] call FUNC(modifyMedicalAction));
- condition = "true";
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -660,7 +660,7 @@ class ACE_LegRight {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(treatment));
@@ -671,26 +671,26 @@ class ACE_LegRight {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(treatment));
EXCEPTIONS
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(treatment));
EXCEPTIONS
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(treatment));
EXCEPTIONS
@@ -716,62 +716,62 @@ class ACE_LegRight {
EXCEPTIONS
};
class BloodIV: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_1000";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV')] call DFUNC(treatment));
EXCEPTIONS
icon = PATHTOF(UI\icons\iv.paa);
};
class BloodIV_500: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_500";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class BloodIV_250: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250";
+ displayName = "$STR_ACE_Medical_Actions_Blood4_250";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_1000";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_500: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_500";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class PlasmaIV_250: PlasmaIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250";
+ displayName = "$STR_ACE_Medical_Actions_Plasma4_250";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV: BloodIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_1000";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_500: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_500";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_500')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_500')] call DFUNC(treatment));
EXCEPTIONS
};
class SalineIV_250: SalineIV {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250";
+ displayName = "$STR_ACE_Medical_Actions_Saline4_250";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_250')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_250')] call DFUNC(treatment));
EXCEPTIONS
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(canTreatCached));
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(treatment));
EXCEPTIONS
diff --git a/addons/medical/ACE_Medical_SelfActions.hpp b/addons/medical/ACE_Medical_SelfActions.hpp
index add07c8262..5b98448664 100644
--- a/addons/medical/ACE_Medical_SelfActions.hpp
+++ b/addons/medical/ACE_Medical_SelfActions.hpp
@@ -1,5 +1,5 @@
class Medical {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical";
+ displayName = "$STR_ACE_Medical_Actions_Medical";
runOnHover = 1;
hotkey = "M";
exceptions[] = {"isNotInside"};
@@ -29,7 +29,7 @@ class Medical {
};
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
@@ -40,35 +40,35 @@ class Medical {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\bandage.paa);
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\bandage.paa);
};
class CheckPulse: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
+ displayName = "$STR_ACE_Medical_Actions_CheckPulse";
condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(treatment));
icon = "";
};
class CheckBloodPressure: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
+ displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure";
condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(treatment));
@@ -100,7 +100,7 @@ class Medical {
};
class TriageCard {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_TriageCard";
+ displayName = "$STR_ACE_Medical_Actions_TriageCard";
distance = 2.0;
condition = "true";
exceptions[] = {"isNotInside"};
@@ -113,7 +113,7 @@ class Medical {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
@@ -124,21 +124,21 @@ class Medical {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\bandage.paa);
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(treatment));
@@ -168,7 +168,7 @@ class Medical {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
@@ -179,28 +179,28 @@ class Medical {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\bandage.paa);
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\bandage.paa);
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(treatment));
@@ -228,20 +228,20 @@ class Medical {
icon = PATHTOF(UI\icons\autoInjector.paa);
};
class CheckPulse: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
+ displayName = "$STR_ACE_Medical_Actions_CheckPulse";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(treatment));
icon = "";
};
class CheckBloodPressure: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
+ displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(treatment));
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(treatment));
@@ -270,7 +270,7 @@ class Medical {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
@@ -281,26 +281,26 @@ class Medical {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(treatment));
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(treatment));
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(treatment));
@@ -326,20 +326,20 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Epinephrine')] call DFUNC(treatment));
};
class CheckPulse: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse";
+ displayName = "$STR_ACE_Medical_Actions_CheckPulse";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(treatment));
icon = "";
};
class CheckBloodPressure: CheckPulse {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure";
+ displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(treatment));
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(treatment));
@@ -369,7 +369,7 @@ class Medical {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
@@ -380,26 +380,26 @@ class Medical {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(treatment));
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(treatment));
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(treatment));
@@ -426,7 +426,7 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Epinephrine')] call DFUNC(treatment));
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(treatment));
@@ -456,7 +456,7 @@ class Medical {
// Advanced medical
class FieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing";
+ displayName = "$STR_ACE_Medical_Actions_FieldDressing";
distance = 5.0;
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
@@ -467,26 +467,26 @@ class Medical {
icon = PATHTOF(UI\icons\bandage.paa);
};
class PackingBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage";
+ displayName = "$STR_ACE_Medical_Actions_PackingBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(treatment));
icon = PATHTOF(UI\icons\packingBandage.paa);
};
class ElasticBandage: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage";
+ displayName = "$STR_ACE_Medical_Actions_ElasticBandage";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(treatment));
};
class QuikClot: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot";
+ displayName = "$STR_ACE_Medical_Actions_QuikClot";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(treatment));
};
class Tourniquet: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet";
+ displayName = "$STR_ACE_Medical_Actions_Tourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(treatment));
@@ -512,7 +512,7 @@ class Medical {
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Epinephrine')] call DFUNC(treatment));
};
class RemoveTourniquet: Tourniquet {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet";
+ displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet";
condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(canTreatCached));
exceptions[] = {"isNotInside"};
statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(treatment));
diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp
index fced8c93bf..8a42bbbb68 100644
--- a/addons/medical/ACE_Medical_Treatments.hpp
+++ b/addons/medical/ACE_Medical_Treatments.hpp
@@ -56,8 +56,8 @@ class ACE_Medical_Actions {
litter[] = {};
};
class BodyBag: Bandage {
- displayName = "$STR_ACE_MEDICAL_PlaceInBodyBag";
- displayNameProgress = "$STR_ACE_MEDICAL_PlacingInBodyBag";
+ displayName = "$STR_ACE_Medical_PlaceInBodyBag";
+ displayNameProgress = "$STR_ACE_Medical_PlacingInBodyBag";
treatmentLocations[] = {"All"};
requiredMedic = 0;
treatmentTime = 2;
@@ -72,8 +72,8 @@ class ACE_Medical_Actions {
litter[] = {};
};
class Diagnose: Bandage {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Diagnose";
- displayNameProgress = "$STR_ACE_MEDICAL_ACTIONS_Diagnosing";
+ displayName = "$STR_ACE_Medical_Actions_Diagnose";
+ displayNameProgress = "$STR_ACE_Medical_Actions_Diagnosing";
treatmentLocations[] = {"All"};
requiredMedic = 0;
treatmentTime = 1;
@@ -225,7 +225,7 @@ class ACE_Medical_Actions {
};
class CheckPulse: fieldDressing {
displayName = "";
- displayNameProgress = "$STR_ACE_MEDICAL_CHECK_PULSE_CONTENT";
+ displayNameProgress = "$STR_ACE_Medical_Check_Pulse_Content";
treatmentLocations[] = {"All"};
requiredMedic = 0;
treatmentTime = 2;
@@ -240,11 +240,11 @@ class ACE_Medical_Actions {
};
class CheckBloodPressure: CheckPulse {
callbackSuccess = QUOTE(DFUNC(actionCheckBloodPressure));
- displayNameProgress = "$STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CONTENT";
+ displayNameProgress = "$STR_ACE_Medical_Check_Bloodpressure_Content";
};
class CheckResponse: CheckPulse {
callbackSuccess = QUOTE(DFUNC(actionCheckResponse));
- displayNameProgress = "$STR_ACE_MEDICAL_CHECK_RESPONSE_CONTENT";
+ displayNameProgress = "$STR_ACE_Medical_Check_Response_Content";
};
class RemoveTourniquet: CheckPulse {
treatmentTime = 2.5;
@@ -252,8 +252,8 @@ class ACE_Medical_Actions {
condition = QUOTE([ARR_2(_this select 1, _this select 2)] call FUNC(hasTourniquetAppliedTo));
};
class CPR: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_CPR";
- displayNameProgress = "$STR_ACE_MEDICAL_ACTIONS_PerformingCPR";
+ displayName = "$STR_ACE_Medical_Actions_CPR";
+ displayNameProgress = "$STR_ACE_Medical_Actions_PerformingCPR";
treatmentLocations[] = {"All"};
requiredMedic = 0;
treatmentTime = 15;
@@ -272,8 +272,8 @@ class ACE_Medical_Actions {
litter[] = {};
};
class BodyBag: fieldDressing {
- displayName = "$STR_ACE_MEDICAL_PlaceInBodyBag";
- displayNameProgress = "$STR_ACE_MEDICAL_PlacingInBodyBag";
+ displayName = "$STR_ACE_Medical_PlaceInBodyBag";
+ displayNameProgress = "$STR_ACE_Medical_PlacingInBodyBag";
treatmentLocations[] = {"All"};
requiredMedic = 0;
treatmentTime = 2;
diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp
index 1d87803f43..ef4a4f0162 100644
--- a/addons/medical/ACE_Settings.hpp
+++ b/addons/medical/ACE_Settings.hpp
@@ -148,4 +148,13 @@ class ACE_Settings {
typeName = "BOOL";
value = 0;
};
+
+ class GVAR(menuTypeStyle) {
+ displayName = "$STR_ACE_Medical_menuTypeDisplay";
+ description = "$STR_ACE_Medical_menuTypeDescription";
+ typeName = "SCALAR";
+ value = 0;
+ values[] = {"$STR_ACE_Medical_useSelection"/*, "$STR_ACE_Medical_useRadial"*/};
+ // isClientSettable = 1;
+ };
};
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index 179daae742..6149c57afd 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -438,20 +438,23 @@ class CfgVehicles {
class ACE_Actions {
// Include actions in body parts for treatment while in the open
#define EXCEPTIONS exceptions[] = {};
+ #define ACTION_CONDITION condition = QUOTE(GVAR(menuTypeStyle) == 0);
#include "ACE_Medical_Actions.hpp"
// Create a consolidates medical menu for treatment while boarded
class ACE_MainActions {
class Medical {
- displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical";
+ displayName = "$STR_ACE_Medical_Actions_Medical";
runOnHover = 1;
exceptions[] = {"isNotInside"};
- condition = QUOTE(vehicle _target != _target && vehicle _target == vehicle _player);
+ condition = QUOTE((vehicle _target != _target && vehicle _target == vehicle _player) || GVAR(menuTypeStyle) == 1);
statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
icon = PATHTOF(UI\icons\medical_cross.paa);
#undef EXCEPTIONS
+ #undef ACTION_CONDITION
#define EXCEPTIONS exceptions[] = {"isNotInside"};
+ #define ACTION_CONDITION condition = "true";
#include "ACE_Medical_Actions.hpp"
};
class GVAR(loadPatient) {
@@ -650,7 +653,7 @@ class CfgVehicles {
side = -1;
model = QUOTE(PATHTOF(data\bodybag.p3d));
icon = "";
- displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY;
+ displayName = $STR_ACE_Medical_Bodybag_Display;
EGVAR(dragging,canDrag) = 1;
EGVAR(dragging,dragPosition[]) = {0,1.2,0};
EGVAR(dragging,dragDirection) = 0;
@@ -703,7 +706,7 @@ class CfgVehicles {
class ACE_fieldDressingItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_BANDAGE_BASIC_DISPLAY;
+ displayName = $STR_ACE_Medical_Bandage_Basic_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -716,7 +719,7 @@ class CfgVehicles {
class ACE_packingBandageItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_PACKING_BANDAGE_DISPLAY;
+ displayName = $STR_ACE_Medical_Packing_Bandage_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -729,7 +732,7 @@ class CfgVehicles {
class ACE_elasticBandageItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DISPLAY;
+ displayName = $STR_ACE_Medical_Bandage_Elastic_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -742,7 +745,7 @@ class CfgVehicles {
class ACE_tourniquetItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_TOURNIQUET_DISPLAY;
+ displayName = $STR_ACE_Medical_Tourniquet_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -755,7 +758,7 @@ class CfgVehicles {
class ACE_morphineItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_MORPHINE_DISPLAY;
+ displayName = $STR_ACE_Medical_Morphine_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -768,7 +771,7 @@ class CfgVehicles {
class ACE_atropineItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_ATROPINE_DISPLAY;
+ displayName = $STR_ACE_Medical_Atropine_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -781,7 +784,7 @@ class CfgVehicles {
class ACE_epinephrineItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_EPINEPHRINE_DISPLAY;
+ displayName = $STR_ACE_Medical_Epinephrine_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -794,7 +797,7 @@ class CfgVehicles {
class ACE_plasmaIVItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_PLASMA_IV;
+ displayName = $STR_ACE_Medical_Plasma_IV;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -808,7 +811,7 @@ class CfgVehicles {
class ACE_bloodIVItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_BLOOD_IV;
+ displayName = $STR_ACE_Medical_Blood_IV;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -821,7 +824,7 @@ class CfgVehicles {
class ACE_salineIVItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_SALINE_IV;
+ displayName = $STR_ACE_Medical_Saline_IV;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -834,7 +837,7 @@ class CfgVehicles {
class ACE_quikClotItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_QUIKCLOT_DISPLAY;
+ displayName = $STR_ACE_Medical_QuikClot_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -847,7 +850,7 @@ class CfgVehicles {
class ACE_personalAidKitItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_AID_KIT_DISPLAY;
+ displayName = $STR_ACE_Medical_Aid_Kit_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -860,7 +863,7 @@ class CfgVehicles {
class ACE_surgicalKitItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_SURGICALKIT_DISPLAY;
+ displayName = $STR_ACE_Medical_SurgicalKit_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
@@ -873,7 +876,7 @@ class CfgVehicles {
class ACE_bodyBagItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
- displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY;
+ displayName = $STR_ACE_Medical_Bodybag_Display;
author = "$STR_ACE_Common_ACETeam";
vehicleClass = "Items";
class TransportItems {
diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp
index 8c45b6906c..d70b64a1d2 100644
--- a/addons/medical/CfgWeapons.hpp
+++ b/addons/medical/CfgWeapons.hpp
@@ -24,64 +24,64 @@ class CfgWeapons {
scope = 2;
model = QUOTE(PATHTOF(data\bandage.p3d));
picture = QUOTE(PATHTOF(ui\items\fieldDressing_x_ca.paa));
- displayName = $STR_ACE_MEDICAL_BANDAGE_BASIC_DISPLAY;
- descriptionShort = $STR_ACE_MEDICAL_BANDAGE_BASIC_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_BANDAGE_BASIC_DESC_USE;
+ displayName = $STR_ACE_Medical_Bandage_Basic_Display;
+ descriptionShort = $STR_ACE_Medical_Bandage_Basic_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Bandage_Basic_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_packingBandage: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_PACKING_BANDAGE_DISPLAY;
+ displayName = $STR_ACE_Medical_Packing_Bandage_Display;
picture = QUOTE(PATHTOF(ui\items\packingBandage_x_ca.paa));
model = QUOTE(PATHTOF(data\packingbandage.p3d));
- descriptionShort = $STR_ACE_MEDICAL_PACKING_BANDAGE_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_PACKING_BANDAGE_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Packing_Bandage_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Packing_Bandage_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_elasticBandage: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DISPLAY;
+ displayName = $STR_ACE_Medical_Bandage_Elastic_Display;
picture = QUOTE(PATHTOF(ui\items\elasticBandage_x_ca.paa));
model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d";
- descriptionShort = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Bandage_Elastic_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Bandage_Elastic_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_tourniquet: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_TOURNIQUET_DISPLAY;
+ displayName = $STR_ACE_Medical_Tourniquet_Display;
picture = QUOTE(PATHTOF(ui\items\tourniquet_x_ca.paa));
model = QUOTE(PATHTOF(data\tourniquet.p3d));
- descriptionShort = $STR_ACE_MEDICAL_TOURNIQUET_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_TOURNIQUET_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Tourniquet_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Tourniquet_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_morphine: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_MORPHINE_DISPLAY;
+ displayName = $STR_ACE_Medical_Morphine_Display;
picture = QUOTE(PATHTOF(ui\items\morphine_x_ca.paa));
model = QUOTE(PATHTOF(data\morphine.p3d));
- descriptionShort = $STR_ACE_MEDICAL_MORPHINE_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_MORPHINE_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Morphine_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Morphine_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_atropine: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_ATROPINE_DISPLAY;
+ displayName = $STR_ACE_Medical_Atropine_Display;
picture = QUOTE(PATHTOF(ui\items\atropine_x_ca.paa));
model = QUOTE(PATHTOF(data\atropine.p3d));
- descriptionShort = $STR_ACE_MEDICAL_ATROPINE_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_ATROPINE_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Atropine_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Atropine_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
@@ -89,33 +89,33 @@ class CfgWeapons {
};
class ACE_epinephrine: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_EPINEPHRINE_DISPLAY;
+ displayName = $STR_ACE_Medical_Epinephrine_Display;
picture = QUOTE(PATHTOF(ui\items\epinephrine_x_ca.paa));
model = QUOTE(PATHTOF(data\epinephrine.p3d));
- descriptionShort = $STR_ACE_MEDICAL_EPINEPHRINE_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_EPINEPHRINE_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Epinephrine_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Epinephrine_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_plasmaIV: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_PLASMA_IV;
+ displayName = $STR_ACE_Medical_Plasma_IV;
picture = QUOTE(PATHTOF(ui\items\plasmaIV_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_PLASMA_IV_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_PLASMA_IV_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Plasma_IV_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Plasma_IV_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 10;
};
};
class ACE_plasmaIV_500: ACE_plasmaIV {
- displayName = $STR_ACE_MEDICAL_PLASMA_IV_500;
+ displayName = $STR_ACE_Medical_Plasma_IV_500;
class ItemInfo: InventoryItem_Base_F {
mass = 5;
};
};
class ACE_plasmaIV_250: ACE_plasmaIV {
- displayName = $STR_ACE_MEDICAL_PLASMA_IV_250;
+ displayName = $STR_ACE_Medical_Plasma_IV_250;
class ItemInfo: InventoryItem_Base_F {
mass = 2.5;
};
@@ -123,86 +123,86 @@ class CfgWeapons {
class ACE_bloodIV: ACE_ItemCore {
scope = 2;
model = "\A3\Structures_F_EPA\Items\Medical\BloodBag_F.p3d";
- displayName = $STR_ACE_MEDICAL_BLOOD_IV;
+ displayName = $STR_ACE_Medical_Blood_IV;
picture = QUOTE(PATHTOF(ui\items\bloodIV_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_BLOOD_IV_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_BLOOD_IV_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Blood_IV_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Blood_IV_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 10;
};
};
class ACE_bloodIV_500: ACE_bloodIV {
- displayName = $STR_ACE_MEDICAL_BLOOD_IV_500;
+ displayName = $STR_ACE_Medical_Blood_IV_500;
class ItemInfo: InventoryItem_Base_F {
mass = 5;
};
};
class ACE_bloodIV_250: ACE_bloodIV {
- displayName = $STR_ACE_MEDICAL_BLOOD_IV_250;
+ displayName = $STR_ACE_Medical_Blood_IV_250;
class ItemInfo: InventoryItem_Base_F {
mass = 2.5;
};
};
class ACE_salineIV: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_SALINE_IV;
+ displayName = $STR_ACE_Medical_Saline_IV;
picture = QUOTE(PATHTOF(ui\items\salineIV_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_SALINE_IV_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_SALINE_IV_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Saline_IV_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Saline_IV_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 10;
};
};
class ACE_salineIV_500: ACE_salineIV {
- displayName = $STR_ACE_MEDICAL_SALINE_IV_500;
+ displayName = $STR_ACE_Medical_Saline_IV_500;
class ItemInfo: InventoryItem_Base_F {
mass = 2.5;
};
};
class ACE_salineIV_250: ACE_salineIV {
- displayName = $STR_ACE_MEDICAL_SALINE_IV_250;
+ displayName = $STR_ACE_Medical_Saline_IV_250;
class ItemInfo: InventoryItem_Base_F {
mass = 2.5;
};
};
class ACE_quikclot: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_QUIKCLOT_DISPLAY;
+ displayName = $STR_ACE_Medical_QuikClot_Display;
picture = QUOTE(PATHTOF(ui\items\quickclot_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_QUIKCLOT_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_QUIKCLOT_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_QuikClot_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_QuikClot_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 1;
};
};
class ACE_personalAidKit: ACE_ItemCore {
scope = 2;
- displayName = $STR_ACE_MEDICAL_AID_KIT_DISPLAY;
+ displayName = $STR_ACE_Medical_Aid_Kit_Display;
picture = QUOTE(PATHTOF(ui\items\personal_aid_kit_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_AID_KIT_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_AID_KIT_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Aid_Kit_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Aid_Kit_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 2;
};
};
class ACE_surgicalKit: ACE_ItemCore {
scope=2;
- displayName= $STR_ACE_MEDICAL_SURGICALKIT_DISPLAY;
+ displayName= $STR_ACE_Medical_SurgicalKit_Display;
model = QUOTE(PATHTOF(data\surgical_kit.p3d));
picture = QUOTE(PATHTOF(ui\items\surgicalKit_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_SURGICALKIT_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_SURGICALKIT_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_SurgicalKit_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_SurgicalKit_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 5;
};
};
class ACE_bodyBag: ACE_ItemCore {
scope=2;
- displayName= $STR_ACE_MEDICAL_BODYBAG_DISPLAY;
+ displayName= $STR_ACE_Medical_Bodybag_Display;
model = QUOTE(PATHTOF(data\bodybagItem.p3d));
picture = QUOTE(PATHTOF(ui\items\bodybag_x_ca.paa));
- descriptionShort = $STR_ACE_MEDICAL_BODYBAG_DESC_SHORT;
- descriptionUse = $STR_ACE_MEDICAL_BODYBAG_DESC_USE;
+ descriptionShort = $STR_ACE_Medical_Bodybag_Desc_Short;
+ descriptionUse = $STR_ACE_Medical_Bodybag_Desc_Use;
class ItemInfo: InventoryItem_Base_F {
mass = 15;
};
diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf
index a3eb468442..386eb4de93 100644
--- a/addons/medical/XEH_postInit.sqf
+++ b/addons/medical/XEH_postInit.sqf
@@ -14,6 +14,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
["medical_onUnconscious", {
if (local (_this select 0)) then {
+ private ["_unit"];
_unit = _this select 0;
if (_this select 1) then {
_unit setVariable ["tf_globalVolume", 0.4];
@@ -36,7 +37,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
// Initialize all effects
_fnc_createEffect = {
- private ["_type", "_layer", "_default"];
+ private ["_type", "_layer", "_default", "_effect"];
_type = _this select 0;
_layer = _this select 1;
_default = _this select 2;
@@ -91,6 +92,7 @@ GVAR(effectTimeBlood) = time;
// MAIN EFFECTS LOOP
[{
+ private["_bleeding", "_blood"];
// Zeus interface is open or player is dead; disable everything
if (!(isNull (findDisplay 312)) or !(alive ACE_player)) exitWith {
GVAR(effectUnconsciousCC) ppEffectEnable false;
@@ -155,6 +157,7 @@ GVAR(lastHeartBeatSound) = time;
// HEARTRATE BASED EFFECTS
[{
+ private["_heartRate", "_interval", "_minTime", "_sound", "_strength"];
_heartRate = ACE_player getVariable [QGVAR(heartRate), 70];
if (GVAR(level) == 1) then {
_heartRate = 60 + 40 * (ACE_player getVariable [QGVAR(pain), 0]);
diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
index a9228d1760..560b171400 100644
--- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
+++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_caller","_target","_bloodPressure","_bloodPressureHigh","_bloodPressureLow","_title","_content"];
+private ["_caller","_target","_bloodPressure","_bloodPressureHigh","_bloodPressureLow", "_logOutPut", "_output"];
_caller = _this select 0;
_target = _this select 1;
@@ -28,27 +28,27 @@ _bloodPressureLow = _bloodPressure select 0;
_output = "";
_logOutPut = "";
if ([_caller] call FUNC(isMedic)) then {
- _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_1";
+ _output = "STR_ACE_Medical_Check_Bloodpressure_Output_1";
_logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)];
} else {
if (_bloodPressureHigh > 20) then {
- _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_2";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_LOW";
+ _output = "STR_ACE_Medical_Check_Bloodpressure_Output_2";
+ _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_Low";
if (_bloodPressureHigh > 100) then {
- _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_3";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_NORMAL";
+ _output = "STR_ACE_Medical_Check_Bloodpressure_Output_3";
+ _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_Normal";
if (_bloodPressureHigh > 160) then {
- _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_4";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_HIGH";
+ _output = "STR_ACE_Medical_Check_Bloodpressure_Output_4";
+ _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_High";
};
};
} else {
if (random(10) > 3) then {
- _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_5";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_NOBLOODPRESSURE";
+ _output = "STR_ACE_Medical_Check_Bloodpressure_Output_5";
+ _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NoBloodpressure";
} else {
- _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_6";
+ _output = "STR_ACE_Medical_Check_Bloodpressure_Output_6";
};
};
};
@@ -56,5 +56,5 @@ if ([_caller] call FUNC(isMedic)) then {
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then {
- [_target,"activity", localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_LOG", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);
+ [_target,"activity", localize "STR_ACE_Medical_Check_Bloodpressure_Log", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);
};
diff --git a/addons/medical/functions/fnc_actionCheckPulse.sqf b/addons/medical/functions/fnc_actionCheckPulse.sqf
index f545c11144..fd96321e8f 100644
--- a/addons/medical/functions/fnc_actionCheckPulse.sqf
+++ b/addons/medical/functions/fnc_actionCheckPulse.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_caller","_target","_title","_content"];
+private ["_caller","_target"];
_caller = _this select 0;
_target = _this select 1;
[[_caller, _target], QUOTE(DFUNC(actionCheckPulseLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
diff --git a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf
index dcb098c925..85e9bee828 100644
--- a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf
+++ b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_caller","_unit", "_heartRateOutput", "_heartRate","_logOutPut","_content"];
+private ["_caller", "_unit", "_heartRateOutput", "_heartRate", "_logOutPut"];
_caller = _this select 0;
_unit = _this select 1;
@@ -23,24 +23,24 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80];
if (!alive _unit) then {
_heartRate = 0;
};
-_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_5";
+_heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_5";
_logOutPut = "No heart rate";
if (_heartRate > 1.0) then {
if ([_caller] call FUNC(isMedic)) then {
- _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_1";
+ _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_1";
_logOutPut = format["%1",round(_heartRate)];
} else {
// non medical personel will only find a pulse/HR
- _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_2";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_PULSE_WEAK";
+ _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_2";
+ _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Weak";
if (_heartRate > 60) then {
if (_heartRate > 100) then {
- _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_3";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_PULSE_STRONG";
+ _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_3";
+ _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Strong";
} else {
- _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_4";
- _logOutPut = localize "STR_ACE_MEDICAL_CHECK_PULSE_NORMAL";
+ _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_4";
+ _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Normal";
};
};
};
@@ -49,5 +49,5 @@ if (_heartRate > 1.0) then {
["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then {
- [_unit,"activity", localize "STR_ACE_MEDICAL_CHECK_PULSE_LOG",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);
+ [_unit,"activity", localize "STR_ACE_Medical_Check_Pulse_Log",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);
};
diff --git a/addons/medical/functions/fnc_actionCheckResponse.sqf b/addons/medical/functions/fnc_actionCheckResponse.sqf
index c483706274..92e724a3e0 100644
--- a/addons/medical/functions/fnc_actionCheckResponse.sqf
+++ b/addons/medical/functions/fnc_actionCheckResponse.sqf
@@ -14,15 +14,15 @@
#include "script_component.hpp"
-private ["_caller","_target"];
+private ["_caller","_target", "_output"];
_caller = _this select 0;
_target = _this select 1;
_output = "";
if ([_target] call EFUNC(common,isAwake)) then {
- _output = "STR_ACE_MEDICAL_CHECK_REPONSE_RESPONSIVE";
+ _output = "STR_ACE_Medical_Check_Response_Responsive";
} else {
- _output = "STR_ACE_MEDICAL_CHECK_REPONSE_UNRESPONSIVE";
+ _output = "STR_ACE_Medical_Check_Response_Unresponsive";
};
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName)], 2, _caller]] call EFUNC(common,targetEvent);
diff --git a/addons/medical/functions/fnc_actionDiagnose.sqf b/addons/medical/functions/fnc_actionDiagnose.sqf
index 886fa4752b..d0a5aebc9f 100644
--- a/addons/medical/functions/fnc_actionDiagnose.sqf
+++ b/addons/medical/functions/fnc_actionDiagnose.sqf
@@ -14,32 +14,32 @@
#include "script_component.hpp"
-private ["_caller","_target","_title","_content"];
+private ["_caller", "_target", "_genericMessages"];
_caller = _this select 0;
_target = _this select 1;
-_genericMessages = ["STR_ACE_MEDICAL_diagnoseMessage"];
+_genericMessages = ["STR_ACE_Medical_diagnoseMessage"];
_genericMessages pushBack ([_target] call EFUNC(common,getName));
if (alive _target) then {
- _genericMessages pushback "STR_ACE_MEDICAL_diagnoseAlive";
+ _genericMessages pushback "STR_ACE_Medical_diagnoseAlive";
} else {
- _genericMessages pushback "STR_ACE_MEDICAL_diagnoseDead";
+ _genericMessages pushback "STR_ACE_Medical_diagnoseDead";
};
if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then {
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
- _genericMessages pushback "STR_ACE_MEDICAL_lostBloodALot";
+ _genericMessages pushback "STR_ACE_Medical_lostBloodALot";
} else {
- _genericMessages pushback "STR_ACE_MEDICAL_lostBlood";
+ _genericMessages pushback "STR_ACE_Medical_lostBlood";
};
} else {
- _genericMessages pushback "STR_ACE_MEDICAL_noBloodloss";
+ _genericMessages pushback "STR_ACE_Medical_noBloodloss";
};
if (_target getvariable[QGVAR(hasPain), false]) then {
- _genericMessages pushback "STR_ACE_MEDICAL_inPain";
+ _genericMessages pushback "STR_ACE_Medical_inPain";
} else {
- _genericMessages pushback "STR_ACE_MEDICAL_noPain";
+ _genericMessages pushback "STR_ACE_Medical_noPain";
};
["displayTextStructured", [_caller], [_genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent);
diff --git a/addons/medical/functions/fnc_actionLoadUnit.sqf b/addons/medical/functions/fnc_actionLoadUnit.sqf
index 34f93fb11d..03d9a3ef54 100644
--- a/addons/medical/functions/fnc_actionLoadUnit.sqf
+++ b/addons/medical/functions/fnc_actionLoadUnit.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_caller", "_target","_vehicle", "_loaded"];
+private ["_caller", "_target","_vehicle"];
_caller = _this select 0;
_target = _this select 1;
diff --git a/addons/medical/functions/fnc_actionRemoveTourniquet.sqf b/addons/medical/functions/fnc_actionRemoveTourniquet.sqf
index 2eafe36732..a14dbc3bcd 100644
--- a/addons/medical/functions/fnc_actionRemoveTourniquet.sqf
+++ b/addons/medical/functions/fnc_actionRemoveTourniquet.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_caller","_target","_part","_selectionName","_removeItem","_tourniquets", "_output"];
+private ["_caller", "_target", "_part", "_selectionName", "_tourniquets", "_output"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_actionUnloadUnit.sqf b/addons/medical/functions/fnc_actionUnloadUnit.sqf
index 8c05a43fc9..bb66147f2a 100644
--- a/addons/medical/functions/fnc_actionUnloadUnit.sqf
+++ b/addons/medical/functions/fnc_actionUnloadUnit.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_caller", "_target","_vehicle", "_drag", "_handle"];
+private ["_caller", "_target", "_drag"];
_caller = _this select 0;
_target = _this select 1;
_drag = if (count _this > 2) then {_this select 2} else {false};
@@ -24,7 +24,7 @@ _drag = if (count _this > 2) then {_this select 2} else {false};
if (vehicle _target == _target) exitwith {};
if (([_target] call cse_fnc_isAwake)) exitwith {};
-if ([_caller, _target] call EFUNC(common,unloadPerson)) then {
+if ([_target] call EFUNC(common,unloadPerson)) then {
if (_drag) then {
if ((vehicle _caller) == _caller) then {
[[_caller, _target, true], QUOTE(DFUNC(actionDragUnit)), _caller, false] call EFUNC(common,execRemoteFnc); // TODO replace by event
diff --git a/addons/medical/functions/fnc_addToInjuredCollection.sqf b/addons/medical/functions/fnc_addToInjuredCollection.sqf
index cbe146d701..c95db059df 100644
--- a/addons/medical/functions/fnc_addToInjuredCollection.sqf
+++ b/addons/medical/functions/fnc_addToInjuredCollection.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private "_unit";
+private ["_unit", "_force"];
_unit = _this select 0;
_force = if (count _this > 1) then {_this select 1} else {false};
diff --git a/addons/medical/functions/fnc_addToLog.sqf b/addons/medical/functions/fnc_addToLog.sqf
index c36d57b482..46bacf2349 100644
--- a/addons/medical/functions/fnc_addToLog.sqf
+++ b/addons/medical/functions/fnc_addToLog.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_unit", "_type", "_message", "_arguments", "_lastNumber", "_moment", "_logVarName", "_log","_newLog"];
+private ["_unit", "_type", "_message", "_arguments", "_lastNumber", "_moment", "_logVarName", "_log","_newLog", "_logs"];
_unit = _this select 0;
_type = _this select 1;
_message = _this select 2;
diff --git a/addons/medical/functions/fnc_addToTriageCard.sqf b/addons/medical/functions/fnc_addToTriageCard.sqf
index 49e642cfc4..61add24cfc 100644
--- a/addons/medical/functions/fnc_addToTriageCard.sqf
+++ b/addons/medical/functions/fnc_addToTriageCard.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_unit","_caller","_newItem","_log", "_inList","_amount"];
+private ["_unit", "_newItem", "_log", "_inList", "_amount"];
_unit = _this select 0;
_newItem = _this select 1;
diff --git a/addons/medical/functions/fnc_addUnloadPatientActions.sqf b/addons/medical/functions/fnc_addUnloadPatientActions.sqf
index c792746d47..13a4177859 100644
--- a/addons/medical/functions/fnc_addUnloadPatientActions.sqf
+++ b/addons/medical/functions/fnc_addUnloadPatientActions.sqf
@@ -16,7 +16,7 @@
EXPLODE_3_PVT(_this,_vehicle,_player,_parameters);
-private ["_actions"];
+private ["_actions", "_unit"];
_actions = [];
{
diff --git a/addons/medical/functions/fnc_canTreat.sqf b/addons/medical/functions/fnc_canTreat.sqf
index 5f52759f54..062a696fcd 100644
--- a/addons/medical/functions/fnc_canTreat.sqf
+++ b/addons/medical/functions/fnc_canTreat.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_caller", "_target", "_selectionName", "_className", "_config", "_availableLevels", "_medicRequired", "_items", "_locations", "_return", "_condition"];
+private ["_caller", "_target", "_selectionName", "_className", "_config", "_medicRequired", "_items", "_locations", "_return", "_condition"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_copyDeadBody.sqf b/addons/medical/functions/fnc_copyDeadBody.sqf
index 8e476b8662..36bcd91487 100644
--- a/addons/medical/functions/fnc_copyDeadBody.sqf
+++ b/addons/medical/functions/fnc_copyDeadBody.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_oldBody","_newUnit","_class","_group","_position","_side","_allVariables"];
+private ["_oldBody","_newUnit","_class","_group","_position","_side", "_caller", "_name"];
_oldBody = _this select 0;
_caller = _this select 1;
diff --git a/addons/medical/functions/fnc_createLitter.sqf b/addons/medical/functions/fnc_createLitter.sqf
index 5299fbb244..253a3ed315 100644
--- a/addons/medical/functions/fnc_createLitter.sqf
+++ b/addons/medical/functions/fnc_createLitter.sqf
@@ -16,7 +16,7 @@
#define MIN_ENTRIES_LITTER_CONFIG 3
-private ["_target", "_className", "_config", "_litter", "_createLitter", "_litterObject", "_position", "_createdLitter"];
+private ["_target", "_className", "_config", "_litter", "_createLitter", "_position", "_createdLitter", "_caller", "_selectionName", "_usersOfItems"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_determineIfFatal.sqf b/addons/medical/functions/fnc_determineIfFatal.sqf
index aedcf161ee..bad15dbcad 100644
--- a/addons/medical/functions/fnc_determineIfFatal.sqf
+++ b/addons/medical/functions/fnc_determineIfFatal.sqf
@@ -10,7 +10,7 @@
#include "script_component.hpp"
-private ["_unit","_part","_damageThreshold", "_withDamage"];
+private ["_unit","_part","_damageThreshold", "_withDamage", "_damageBodyPart"];
_unit = _this select 0;
_part = _this select 1;
_withDamage = if (count _this > 2) then { _this select 2} else {0};
diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf
index a62bfcacbc..c5c5d23a01 100644
--- a/addons/medical/functions/fnc_displayPatientInformation.sqf
+++ b/addons/medical/functions/fnc_displayPatientInformation.sqf
@@ -16,7 +16,7 @@
// Exit for basic medical
if (GVAR(level) < 2) exitWith {};
-private ["_target", "_show", "_selectionN"];
+private ["_target", "_show", "_selectionN", "_amountOfGeneric", "_bandagedwounds", "_logCtrl", "_part", "_partText", "_pointDamage", "_severity", "_total", "_totalIvVolume", "_triageStatus", "_type"];
_target = _this select 0;
_show = if (count _this > 1) then {_this select 1} else {true};
_selectionN = if (count _this > 2) then {_this select 2} else {0};
@@ -55,17 +55,17 @@ if (_show) then {
};
if (_target getvariable[QGVAR(isBleeding), false]) then {
- _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_BLEEDING", [1, 0.1, 0.1, 1]];
+ _genericMessages pushback [localize "STR_ACE_Medical_Status_Bleeding", [1, 0.1, 0.1, 1]];
};
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
- _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_LOST_BLOOD", [1, 0.1, 0.1, 1]];
+ _genericMessages pushback [localize "STR_ACE_Medical_Status_Lost_Blood", [1, 0.1, 0.1, 1]];
};
if (((_target getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then {
- _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_TOURNIQUET_APPLIED", [0.77, 0.51, 0.08, 1]];
+ _genericMessages pushback [localize "STR_ACE_Medical_Status_Tourniquet_Applied", [0.77, 0.51, 0.08, 1]];
};
if (_target getvariable[QGVAR(hasPain), false]) then {
- _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_PAIN", [1, 1, 1, 1]];
+ _genericMessages pushback [localize "STR_ACE_Medical_Status_Pain", [1, 1, 1, 1]];
};
_totalIvVolume = 0;
@@ -77,7 +77,7 @@ if (_show) then {
};
}foreach GVAR(IVBags);
if (_totalIvVolume >= 1) then {
- _genericMessages pushback [format[localize "STR_ACE_MEDICAL_receivingIvVolume", floor _totalIvVolume], [1, 1, 1, 1]];
+ _genericMessages pushback [format[localize "STR_ACE_Medical_receivingIvVolume", floor _totalIvVolume], [1, 1, 1, 1]];
};
_damaged = [false, false, false, false, false, false];
@@ -192,7 +192,7 @@ if (_show) then {
_logCtrl = (_display displayCtrl 302);
lbClear _logCtrl;
- private ["_logs", "_log", "_message", "_moment", "_arguments", "_lbCtrl"];
+ private ["_logs", "_message", "_moment", "_arguments", "_lbCtrl"];
_logs = _target getvariable [QGVAR(logFile_Activity), []];
{
// [_message,_moment,_type, _arguments]
diff --git a/addons/medical/functions/fnc_displayTriageCard.sqf b/addons/medical/functions/fnc_displayTriageCard.sqf
index 8e9660a3d5..a9054dac46 100644
--- a/addons/medical/functions/fnc_displayTriageCard.sqf
+++ b/addons/medical/functions/fnc_displayTriageCard.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private ["_target", "_show"];
+private ["_target", "_show", "_amount", "_item", "_log", "_message", "_triageCardTexts", "_triageStatus"];
_target = _this select 0;
_show = if (count _this > 1) then {_this select 1} else {true};
@@ -24,7 +24,7 @@ if (_show) then {
createDialog QGVAR(triageCard);
[{
- private ["_target", "_display", "_alphaLevel", "_damaged", "_availableSelections", "_openWounds", "_selectionBloodLoss", "_red", "_green", "_blue", "_alphaLevel", "_allInjuryTexts", "_lbCtrl", "_genericMessages"];
+ private ["_target", "_display", "_alphaLevel", "_alphaLevel", "_lbCtrl"];
_target = (_this select 0) select 0;
if (GVAR(TriageCardTarget) != _target) exitwith {
[_this select 1] call CBA_fnc_removePerFrameHandler;
@@ -58,7 +58,7 @@ if (_show) then {
}foreach _log;
if (count _triageCardTexts == 0) then {
- _lbCtrl lbAdd (localize "STR_ACE_MEDICAL_TriageCard_NoEntry");
+ _lbCtrl lbAdd (localize "STR_ACE_Medical_TriageCard_NoEntry");
};
{
_lbCtrl lbAdd _x;
diff --git a/addons/medical/functions/fnc_dropDownTriageCard.sqf b/addons/medical/functions/fnc_dropDownTriageCard.sqf
index 6ea910b7af..6f30152c5f 100644
--- a/addons/medical/functions/fnc_dropDownTriageCard.sqf
+++ b/addons/medical/functions/fnc_dropDownTriageCard.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private ["_show"];
+private ["_show", "_ctrl", "_display", "_idc", "_pos"];
_show = _this select 0;
disableSerialization;
diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf
index f6b26f7686..414b3a47c7 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", "_value", "_cardiacOutput", "_internalWounds"];
+private ["_totalBloodLoss","_tourniquets","_openWounds", "_cardiacOutput", "_internalWounds"];
// TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical).
_totalBloodLoss = 0;
diff --git a/addons/medical/functions/fnc_getHeartRateChange.sqf b/addons/medical/functions/fnc_getHeartRateChange.sqf
index e7bc9407d2..7429d6dd43 100644
--- a/addons/medical/functions/fnc_getHeartRateChange.sqf
+++ b/addons/medical/functions/fnc_getHeartRateChange.sqf
@@ -15,7 +15,7 @@
#define HEART_RATE_MODIFIER 0.02
-private ["_unit", "_heartRate", "_hrIncrease", "_bloodLoss", "_time", "_values", "_adjustment", "_adjustments", "_additionalIncrease", "_change", "_callBack", "_bloodVolume"];
+private ["_unit", "_heartRate", "_hrIncrease", "_bloodLoss", "_time", "_values", "_adjustment", "_change", "_callBack", "_bloodVolume"];
_unit = _this select 0;
_hrIncrease = 0;
if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then {
diff --git a/addons/medical/functions/fnc_getTriageStatus.sqf b/addons/medical/functions/fnc_getTriageStatus.sqf
index d80cbe5d64..aaeec2d516 100644
--- a/addons/medical/functions/fnc_getTriageStatus.sqf
+++ b/addons/medical/functions/fnc_getTriageStatus.sqf
@@ -17,10 +17,10 @@ private ["_unit","_return","_status"];
_unit = _this select 0;
_status = _unit getvariable [QGVAR(triageLevel), -1];
_return = switch (_status) do {
- case 1: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_MINOR", 1, [0, 0.5, 0, 0.9]]};
- case 2: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_DELAYED", 2, [0.7, 0.5, 0, 0.9]]};
- case 3: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_IMMEDIATE", 3, [0.4, 0.07, 0.07, 0.9]]};
- case 4: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_DECEASED", 4, [0, 0, 0, 0.9]]};
- default {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_NONE", 0, [0, 0, 0, 0.9]]};
+ case 1: {[localize "STR_ACE_Medical_Triage_Status_Minor", 1, [0, 0.5, 0, 0.9]]};
+ case 2: {[localize "STR_ACE_Medical_Triage_Status_Delayed", 2, [0.7, 0.5, 0, 0.9]]};
+ case 3: {[localize "STR_ACE_Medical_Triage_Status_Immediate", 3, [0.4, 0.07, 0.07, 0.9]]};
+ case 4: {[localize "STR_ACE_Medical_Triage_Status_Deceased", 4, [0, 0, 0, 0.9]]};
+ default {[localize "STR_ACE_Medical_Triage_Status_None", 0, [0, 0, 0, 0.9]]};
};
_return;
diff --git a/addons/medical/functions/fnc_handleBandageOpening.sqf b/addons/medical/functions/fnc_handleBandageOpening.sqf
index 21211c9c1b..a92bf9029c 100644
--- a/addons/medical/functions/fnc_handleBandageOpening.sqf
+++ b/addons/medical/functions/fnc_handleBandageOpening.sqf
@@ -18,7 +18,7 @@
#include "script_component.hpp"
-private ["_target", "_impact", "_part", "_injuryIndex", "_injury", "_bandage", "_classID", "_className", "_reopeningChance", "_reopeningMinDelay", "_reopeningMaxDelay", "_config", "_woundTreatmentConfig", "_bandagedWounds", "_exist", "_injuryId", "_existingInjury", "_delay", "_openWounds", "_selectedInjury"];
+private ["_target", "_impact", "_part", "_injuryIndex", "_injury", "_bandage", "_classID", "_className", "_reopeningChance", "_reopeningMinDelay", "_reopeningMaxDelay", "_config", "_woundTreatmentConfig", "_bandagedWounds", "_exist", "_injuryId", "_existingInjury", "_delay", "_openWounds", "_selectedInjury", "_bandagedInjury"];
_target = _this select 0;
_impact = _this select 1;
_part = _this select 2;
diff --git a/addons/medical/functions/fnc_handleCreateLitter.sqf b/addons/medical/functions/fnc_handleCreateLitter.sqf
index ee7e591cd1..617d05e519 100644
--- a/addons/medical/functions/fnc_handleCreateLitter.sqf
+++ b/addons/medical/functions/fnc_handleCreateLitter.sqf
@@ -5,6 +5,7 @@ if(!hasInterface) exitWith { false };
PARAMS_3(_litterClass,_position,_direction);
private["_litterObject", "_maxLitterCount"];
+//IGNORE_PRIVATE_WARNING(_values);
if (isNil QGVAR(allCreatedLitter)) then {
GVAR(allCreatedLitter) = [];
diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf
index 0a39bea055..d457762321 100644
--- a/addons/medical/functions/fnc_handleDamage.sqf
+++ b/addons/medical/functions/fnc_handleDamage.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage"];
+private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage", "_minLethalDamage", "_newDamage", "_typeIndex"];
_unit = _this select 0;
_selection = _this select 1;
_damage = _this select 2;
@@ -52,7 +52,7 @@ if (GVAR(level) < 2) then {
_minLethalDamage = GVAR(minLethalDamages) select _typeIndex;
};
- if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isNull _source} && {_projectile == ""} && {_selection == ""}) then {
+ if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isNull _shooter} && {_projectile == ""} && {_selection == ""}) then {
if (GVAR(enableVehicleCrashes)) then {
_selection = GVAR(SELECTIONS) select (floor(random(count GVAR(SELECTIONS))));
};
@@ -86,7 +86,7 @@ if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitW
};
if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith {
- if (vehicle _unit != _unit and {damage _vehicle >= 1}) then {
+ if (vehicle _unit != _unit and {damage (vehicle _unit) >= 1}) then {
// @todo
// [_unit] call FUNC(unload);
};
diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf
index aa9c2f61df..1647cc8442 100644
--- a/addons/medical/functions/fnc_handleDamage_basic.sqf
+++ b/addons/medical/functions/fnc_handleDamage_basic.sqf
@@ -24,7 +24,7 @@
#define ARMDAMAGETRESHOLD2 1.7
#define UNCONSCIOUSNESSTRESHOLD 0.7
-private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage"];
+private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage", "_armdamage", "_hitPoint", "_index", "_legdamage", "_newDamage", "_otherDamage", "_pain", "_restore"];
_unit = _this select 0;
_selectionName = _this select 1;
diff --git a/addons/medical/functions/fnc_handleDamage_wounds.sqf b/addons/medical/functions/fnc_handleDamage_wounds.sqf
index b45a974166..9172304dd2 100644
--- a/addons/medical/functions/fnc_handleDamage_wounds.sqf
+++ b/addons/medical/functions/fnc_handleDamage_wounds.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_unit", "_selectionName", "_damage", "_typeOfProjectile", "_typeOfDamage", "_bodyPartn", "_woundType", "_injuryTypeInfo", "_allInjuriesForDamageType", "_allPossibleInjuries", "_highestPossibleDamage", "_highestPossibleSpot", "_minDamage", "_openWounds", "_woundID", "_toAddInjury", "_painToAdd"];
+private ["_unit", "_selectionName", "_damage", "_typeOfProjectile", "_typeOfDamage", "_bodyPartn", "_injuryTypeInfo", "_allInjuriesForDamageType", "_allPossibleInjuries", "_highestPossibleDamage", "_highestPossibleSpot", "_minDamage", "_openWounds", "_woundID", "_toAddInjury", "_painToAdd", "_bloodLoss", "_bodyPartNToAdd", "_classType", "_damageLevels", "_foundIndex", "_i", "_injury", "_maxDamage", "_pain", "_painLevel", "_selections", "_toAddClassID", "_woundsCreated"];
_unit = _this select 0;
_selectionName = _this select 1;
_damage = _this select 2;
diff --git a/addons/medical/functions/fnc_handleKilled.sqf b/addons/medical/functions/fnc_handleKilled.sqf
index ce0f087836..5003ec189c 100644
--- a/addons/medical/functions/fnc_handleKilled.sqf
+++ b/addons/medical/functions/fnc_handleKilled.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private["_unit"];
+private["_unit", "_openWounds"];
_unit = _this select 0;
if (!local _unit) exitwith {};
diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf
index 0e01ef654c..aff3b48945 100644
--- a/addons/medical/functions/fnc_handleUnitVitals.sqf
+++ b/addons/medical/functions/fnc_handleUnitVitals.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private ["_unit", "_heartRate","_bloodPressure","_bloodVolume","_painStatus", "_lastTimeValuesSynced", "_syncValues"];
+private ["_unit", "_heartRate","_bloodPressure","_bloodVolume","_painStatus", "_lastTimeValuesSynced", "_syncValues", "_airwayStatus", "_blood", "_bloodPressureH", "_bloodPressureL", "_interval"];
_unit = _this select 0;
_interval = time - (_unit getVariable [QGVAR(lastMomentVitalsHandled), 0]);
diff --git a/addons/medical/functions/fnc_hasItem.sqf b/addons/medical/functions/fnc_hasItem.sqf
index 551d532ae4..cfec633b55 100644
--- a/addons/medical/functions/fnc_hasItem.sqf
+++ b/addons/medical/functions/fnc_hasItem.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_medic", "_patient", "_item", "_return"];
+private ["_medic", "_patient", "_item", "_return", "_crew"];
_medic = _this select 0;
_patient = _this select 1;
_item = _this select 2;
diff --git a/addons/medical/functions/fnc_init.sqf b/addons/medical/functions/fnc_init.sqf
index 80e8d9ba19..0ec6ce3ce2 100644
--- a/addons/medical/functions/fnc_init.sqf
+++ b/addons/medical/functions/fnc_init.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private ["_unit", "_allUsedMedication", "_logs", "_forceNew"];
+private ["_unit", "_allUsedMedication", "_logs"];
_unit = _this select 0;
diff --git a/addons/medical/functions/fnc_isMedic.sqf b/addons/medical/functions/fnc_isMedic.sqf
index cc07948f4b..122d261238 100644
--- a/addons/medical/functions/fnc_isMedic.sqf
+++ b/addons/medical/functions/fnc_isMedic.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private ["_unit","_class","_return"];
+private ["_unit", "_class", "_medicN"];
_unit = _this select 0;
_medicN = if (count _this > 1) then {_this select 1} else {1};
diff --git a/addons/medical/functions/fnc_modifyMedicalAction.sqf b/addons/medical/functions/fnc_modifyMedicalAction.sqf
index 66398a2590..179ae9eb83 100644
--- a/addons/medical/functions/fnc_modifyMedicalAction.sqf
+++ b/addons/medical/functions/fnc_modifyMedicalAction.sqf
@@ -19,15 +19,15 @@
EXPLODE_4_PVT(_this,_target,_player,_selectionN,_actionData);
if (GVAR(level) < 2) exitwith {
- private ["_pointDamage"];
- _pointDamage = _target getHitPointDamage (["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"] select _selectionN);
+ private ["_pointDamage"];
+ _pointDamage = _target getHitPointDamage (["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"] select _selectionN);
- if (_pointDamage >= 0.8) exitWith {
- _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))];
- };
- if (_pointDamage > 0) exitWith {
- _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossYellow.paa))];
- };
+ if (_pointDamage >= 0.8) exitWith {
+ _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))];
+ };
+ if (_pointDamage > 0) exitWith {
+ _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossYellow.paa))];
+ };
};
private ["_openWounds", "_amountOf"];
@@ -35,6 +35,6 @@ _openWounds = _target getvariable [QGVAR(openWounds), []];
{
_amountOf = _x select 3;
if (_amountOf > 0 && {(_selectionN == (_x select 2))}) exitwith {
- _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))];
+ _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))];
};
-}foreach _openWounds;
+} foreach _openWounds;
diff --git a/addons/medical/functions/fnc_onWoundUpdateRequest.sqf b/addons/medical/functions/fnc_onWoundUpdateRequest.sqf
index ccbb373648..3c99496d7b 100644
--- a/addons/medical/functions/fnc_onWoundUpdateRequest.sqf
+++ b/addons/medical/functions/fnc_onWoundUpdateRequest.sqf
@@ -13,7 +13,7 @@
*/
#include "script_component.hpp"
-private ["_unit", "_openWounds"];
+private ["_unit", "_openWounds", "_originOfrequest"];
_unit = _this select 0;
_originOfrequest = _this select 1;
diff --git a/addons/medical/functions/fnc_parseConfigForInjuries.sqf b/addons/medical/functions/fnc_parseConfigForInjuries.sqf
index c624b1af1b..503ff9833e 100644
--- a/addons/medical/functions/fnc_parseConfigForInjuries.sqf
+++ b/addons/medical/functions/fnc_parseConfigForInjuries.sqf
@@ -12,7 +12,7 @@
#include "script_component.hpp"
-private ["_injuriesRootConfig", "_woundsConfig", "_allWoundClasses", "_amountOf", "_entry","_classType", "_selections", "_bloodLoss", "_pain","_minDamage","_causes", "_damageTypesConfig", "_thresholds", "_typeThresholds", "_selectionSpecific", "_selectionSpecificType", "_classDisplayName", "_subClassDisplayName", "_maxDamage", "_subClassmaxDamage", "_defaultMinLethalDamage", "_minLethalDamage"];
+private ["_injuriesRootConfig", "_woundsConfig", "_allWoundClasses", "_amountOf", "_entry","_classType", "_selections", "_bloodLoss", "_pain","_minDamage","_causes", "_damageTypesConfig", "_thresholds", "_typeThresholds", "_selectionSpecific", "_selectionSpecificType", "_classDisplayName", "_subClassDisplayName", "_maxDamage", "_subClassmaxDamage", "_defaultMinLethalDamage", "_minLethalDamage", "_allFoundDamageTypes", "_classID", "_configDamageTypes", "_i", "_parseForSubClassWounds", "_subClass", "_subClassConfig", "_subClassbloodLoss", "_subClasscauses", "_subClassminDamage", "_subClasspain", "_subClassselections", "_subClasstype", "_type", "_varName", "_woundTypes"];
_injuriesRootConfig = (configFile >> "ACE_Medical_Advanced" >> "Injuries");
_allFoundDamageTypes = [];
diff --git a/addons/medical/functions/fnc_playInjuredSound.sqf b/addons/medical/functions/fnc_playInjuredSound.sqf
index 16a7d69116..c48e3d0a4c 100644
--- a/addons/medical/functions/fnc_playInjuredSound.sqf
+++ b/addons/medical/functions/fnc_playInjuredSound.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_unit","_amountOfDamage","_bodyPartStatus","_availableSounds_A","_availableSounds_B","_availableSounds_C","_sound"];
+private ["_unit","_availableSounds_A","_availableSounds_B","_availableSounds_C","_sound", "_pain"];
_unit = _this select 0;
_pain = _this select 1;
if (!local _unit || !GVAR(enableScreams)) exitwith{};
diff --git a/addons/medical/functions/fnc_requestWoundSync.sqf b/addons/medical/functions/fnc_requestWoundSync.sqf
index 7144c49684..74fd3e230d 100644
--- a/addons/medical/functions/fnc_requestWoundSync.sqf
+++ b/addons/medical/functions/fnc_requestWoundSync.sqf
@@ -14,7 +14,7 @@
#include "script_component.hpp"
-private [ "_target", "_caller", "_openWounds"];
+private [ "_target", "_caller"];
_target = _this select 0;
_caller = _this select 1;
diff --git a/addons/medical/functions/fnc_setDead.sqf b/addons/medical/functions/fnc_setDead.sqf
index 9d8498cd04..411fd6dc06 100644
--- a/addons/medical/functions/fnc_setDead.sqf
+++ b/addons/medical/functions/fnc_setDead.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private ["_unit", "_force", "_reviveVal"];
+private ["_unit", "_force", "_reviveVal", "_lifesLeft"];
_unit = _this select 0;
_force = false;
if (count _this >= 2) then {
diff --git a/addons/medical/functions/fnc_setHitPointDamage.sqf b/addons/medical/functions/fnc_setHitPointDamage.sqf
index d71edc94df..18d4fc616e 100644
--- a/addons/medical/functions/fnc_setHitPointDamage.sqf
+++ b/addons/medical/functions/fnc_setHitPointDamage.sqf
@@ -21,7 +21,7 @@
#define ARMDAMAGETRESHOLD1 1
#define ARMDAMAGETRESHOLD2 1.7
-private ["_unit", "_selection", "_damage", "_selections", "_damages", "_damageOld", "_damageSumOld", "_damageNew", "_damageSumNew", "_damageFinal"];
+private ["_unit", "_selection", "_damage", "_selections", "_damages", "_damageOld", "_damageSumOld", "_damageNew", "_damageSumNew", "_damageFinal", "_armdamage", "_legdamage"];
_unit = _this select 0;
_selection = _this select 1;
diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf
index 86f9425d23..82e93eb1fb 100644
--- a/addons/medical/functions/fnc_setUnconscious.sqf
+++ b/addons/medical/functions/fnc_setUnconscious.sqf
@@ -17,7 +17,7 @@
#define DEFAULT_DELAY (round(random(10)+5))
-private ["_unit", "_set", "_animState", "_originalPos", "_captiveSwitch", "_startingTime","_minWaitingTime"];
+private ["_unit", "_set", "_animState", "_originalPos", "_startingTime","_minWaitingTime"];
_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};
diff --git a/addons/medical/functions/fnc_treatment.sqf b/addons/medical/functions/fnc_treatment.sqf
index df6cc173d0..f50ff505e0 100644
--- a/addons/medical/functions/fnc_treatment.sqf
+++ b/addons/medical/functions/fnc_treatment.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_caller", "_target", "_selectionName", "_className", "_config", "_availableLevels", "_medicRequired", "_items", "_locations", "_return", "_callbackSuccess", "_callbackFailure", "_callbackProgress", "_treatmentTime", "_callerAnim", "_patientAnim", "_iconDisplayed", "_return", "_usersOfItems", "_consumeItems"];
+private ["_caller", "_target", "_selectionName", "_className", "_config", "_medicRequired", "_items", "_locations", "_return", "_callbackProgress", "_treatmentTime", "_callerAnim", "_patientAnim", "_iconDisplayed", "_return", "_usersOfItems", "_consumeItems", "_condition", "_displayText", "_wpn"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf b/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
index ee3f51f549..0a49420783 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
@@ -16,7 +16,7 @@
#include "script_component.hpp"
-private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"];
+private ["_caller", "_target", "_selectionName", "_className", "_items"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
index 146e996d25..394595ade3 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"];
+private ["_caller", "_target", "_selectionName", "_className", "_items", "_specificSpot"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
@@ -37,6 +37,6 @@ if !([_target] call FUNC(hasMedicalEnabled)) exitwith {
};
}foreach _items;*/
-[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_bandagedPatient", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
+[_target, "activity", "STR_ACE_Medical_Activity_bandagedPatient", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
true;
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
index 2884503599..d6c490d3c6 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_target", "_bandage", "_part", "_selectionName", "_openWounds", "_config", "_effectiveness","_mostEffectiveInjury", "_mostEffectiveSpot", "_woundEffectivenss", "_mostEffectiveInjury", "_impact", "_exit", "_specificClass", "_classID", "_effectivenessFound"];
+private ["_target", "_bandage", "_part", "_selectionName", "_openWounds", "_config", "_effectiveness","_mostEffectiveInjury", "_mostEffectiveSpot", "_woundEffectivenss", "_mostEffectiveInjury", "_impact", "_exit", "_specificClass", "_classID", "_effectivenessFound", "_className", "_hitPoints", "_hitSelections", "_point", "_woundTreatmentConfig"];
_target = _this select 0;
_bandage = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
index 807be828e8..37627a8c5d 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
@@ -10,7 +10,7 @@
#include "script_component.hpp"
-private ["_unit", "_caller", "_selectionName", "_className", "_items"];
+private ["_target", "_caller", "_selectionName", "_className", "_items"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
index 508040b8af..c6ac2dc8e5 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"];
+private ["_caller", "_target", "_selectionName", "_className", "_items"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
@@ -32,6 +32,6 @@ _items = _this select 4;
};
}foreach _items;
-[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_usedItem", [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog);
+[_target, "activity", "STR_ACE_Medical_Activity_usedItem", [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog);
true;
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
index bbf5aea6c0..934bc9239a 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_target", "_className", "_currentInSystem", "_medicationConfig", "_painReduce", "_hrIncreaseLow", "_hrIncreaseNorm", "_hrIncreaseHigh", "_maxDose", "_inCompatableMedication", "_timeInSystem", "_heartRate", "_pain", "_resistance", "_hrCallback"];
+private ["_target", "_className", "_currentInSystem", "_medicationConfig", "_painReduce", "_hrIncreaseLow", "_hrIncreaseNorm", "_hrIncreaseHigh", "_maxDose", "_inCompatableMedication", "_timeInSystem", "_heartRate", "_pain", "_resistance", "_hrCallback", "_varName", "_viscosityChange"];
_target = _this select 0;
_className = _this select 1;
@@ -77,9 +77,9 @@ if (_painReduce > 0) then {
_target setvariable [QGVAR(pain), (_pain - (_pain * _painReduce)) max 0];
};
-_resistance = _unit getvariable [QGVAR(peripheralResistance), 100];
+_resistance = _target getvariable [QGVAR(peripheralResistance), 100];
_resistance = _resistance + _viscosityChange;
-_unit setvariable [QGVAR(peripheralResistance), _resistance max 0];
+_target setvariable [QGVAR(peripheralResistance), _resistance max 0];
// Call back to ensure that the medication is decreased over time
[_target, _classname, _varName, _maxDose, _timeInSystem, _inCompatableMedication, _viscosityChange] call FUNC(onMedicationUsage);
diff --git a/addons/medical/functions/fnc_treatmentBasic_bandage.sqf b/addons/medical/functions/fnc_treatmentBasic_bandage.sqf
index 4b07e989aa..75b0b6bfdd 100644
--- a/addons/medical/functions/fnc_treatmentBasic_bandage.sqf
+++ b/addons/medical/functions/fnc_treatmentBasic_bandage.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
#define BANDAGEHEAL 0.8
-private ["_caller", "_target","_selection","_className","_target","_hitSelections","_hitPoints","_point"];
+private ["_caller", "_target","_selection","_className","_target","_hitSelections","_hitPoints","_point", "_damage"];
_caller = _this select 0;
_target = _this select 1;
_selection = _this select 2;
diff --git a/addons/medical/functions/fnc_treatmentIV.sqf b/addons/medical/functions/fnc_treatmentIV.sqf
index c171d7364f..c0f4e4681f 100644
--- a/addons/medical/functions/fnc_treatmentIV.sqf
+++ b/addons/medical/functions/fnc_treatmentIV.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem", "_attributes"];
+private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
@@ -29,4 +29,4 @@ if (count _items == 0) exitwith {};
_removeItem = _items select 0;
[[_target, _removeItem], QUOTE(DFUNC(treatmentIVLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
[_target, _removeItem] call FUNC(addToTriageCard);
-[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_gaveIV", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
+[_target, "activity", "STR_ACE_Medical_Activity_gaveIV", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
diff --git a/addons/medical/functions/fnc_treatmentIVLocal.sqf b/addons/medical/functions/fnc_treatmentIVLocal.sqf
index 66ecdf9d90..04708b965f 100644
--- a/addons/medical/functions/fnc_treatmentIVLocal.sqf
+++ b/addons/medical/functions/fnc_treatmentIVLocal.sqf
@@ -15,7 +15,7 @@
#include "script_component.hpp"
-private ["_target", "_ivItem", "_config", "_volumeAdded", "_typeOf", "_varName"];
+private ["_target", "_ivItem", "_config", "_volumeAdded", "_typeOf", "_varName", "_bloodVolume"];
_target = _this select 0;
_ivItem = _this select 1;
@@ -27,8 +27,8 @@ _config = (configFile >> "ACE_Medical_Advanced" >> "Treatment" >> "IV");
_volumeAdded = getNumber (_config >> "volume");
_typeOf = getText (_config >> "type");
-if (isClass (_config >> _className)) then {
- _config = (_config >> _className);
+if (isClass (_config >> _ivItem)) then {
+ _config = (_config >> _ivItem);
if (isNumber (_config >> "volume")) then { _volumeAdded = getNumber (_config >> "volume");};
if (isText (_config >> "type")) then { _typeOf = getText (_config >> "type"); };
};
diff --git a/addons/medical/functions/fnc_treatmentTourniquet.sqf b/addons/medical/functions/fnc_treatmentTourniquet.sqf
index da50c5c1bf..c4ee10011e 100644
--- a/addons/medical/functions/fnc_treatmentTourniquet.sqf
+++ b/addons/medical/functions/fnc_treatmentTourniquet.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_caller","_target","_part","_selectionName","_removeItem", "_tourniquets", "_items", "_output"];
+private ["_caller","_target","_part","_selectionName","_removeItem", "_tourniquets", "_items", "_output", "_className"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
@@ -43,7 +43,7 @@ _removeItem = _items select 0;
[[_target, _removeItem, _selectionName], QUOTE(DFUNC(treatmentTourniquetLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
[_target, _removeItem] call FUNC(addToTriageCard);
-[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_appliedTourniquet", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
+[_target, "activity", "STR_ACE_Medical_Activity_appliedTourniquet", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog);
true;
diff --git a/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf b/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
index 289f852a06..02484bbca6 100644
--- a/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
+++ b/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
@@ -29,7 +29,7 @@ _tourniquets set[_part, _applyingTo];
_target setvariable [QGVAR(tourniquets), _tourniquets, true];
[{
- private ["_args","_target","_applyingTo","_part", "_tourniquets"];
+ private ["_args","_target","_applyingTo","_part", "_tourniquets", "_time"];
_args = _this select 0;
_target = _args select 0;
_applyingTo = _args select 1;
diff --git a/addons/medical/functions/fnc_treatment_failure.sqf b/addons/medical/functions/fnc_treatment_failure.sqf
index 33712956a0..c329bf724c 100644
--- a/addons/medical/functions/fnc_treatment_failure.sqf
+++ b/addons/medical/functions/fnc_treatment_failure.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_caller", "_target","_selectionName","_className","_config","_callback", "_usersOfItems", "_weaponSelect"];
+private ["_args", "_caller", "_target","_selectionName","_className","_config","_callback", "_usersOfItems", "_weaponSelect"];
_args = _this select 0;
_caller = _args select 0;
diff --git a/addons/medical/functions/fnc_treatment_success.sqf b/addons/medical/functions/fnc_treatment_success.sqf
index 66406a180a..0178ea78fd 100644
--- a/addons/medical/functions/fnc_treatment_success.sqf
+++ b/addons/medical/functions/fnc_treatment_success.sqf
@@ -17,7 +17,7 @@
#include "script_component.hpp"
-private ["_caller", "_target","_selectionName","_className","_config","_callback", "_weaponSelect"];
+private ["_args", "_caller", "_target","_selectionName","_className","_config","_callback", "_weaponSelect"];
_args = _this select 0;
_caller = _args select 0;
_target = _args select 1;
diff --git a/addons/medical/functions/fnc_unconsciousPFH.sqf b/addons/medical/functions/fnc_unconsciousPFH.sqf
index fc60c2bb02..bf328648d5 100644
--- a/addons/medical/functions/fnc_unconsciousPFH.sqf
+++ b/addons/medical/functions/fnc_unconsciousPFH.sqf
@@ -13,7 +13,7 @@
#include "script_component.hpp"
-private ["_unit", "_vehicleOfUnit","_minWaitingTime", "_oldAnimation", "_captiveSwitch", "_hasMovedOut", "_parachuteCheck"];
+private ["_unit", "_minWaitingTime", "_oldAnimation", "_hasMovedOut", "_parachuteCheck", "_args", "_originalPos", "_startingTime"];
_args = _this select 0;
_unit = _args select 0;
_oldAnimation = _args select 1;
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 2cb2d5715d..c164b37bf1 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -296,7 +296,7 @@
Sto applicando il laccio emostatico ...
Applicando Torniquete
-
+
Medical
Zdravotní
Médical
@@ -308,7 +308,7 @@
Médico
Orvosi
-
+
Field Dressing
Verbandpäckchen
Compresa de campaña
@@ -320,7 +320,7 @@
Bendaggio rapido
Curativo de Campo
-
+
Packing Bandage
Mullbinde
Vendaje compresivo
@@ -331,7 +331,7 @@
Bandage gauze
Bandagem de Compressão
-
+
Elastic Bandage
Elastischer Verband
Vendaje elástico
@@ -343,11 +343,11 @@
Bendaggio elastico
Bandagem Elástica
-
+
QuikClot
QuikClot
QuikClot
- QuickClot
+ QuikClot
Opatrunek QuikClot
QuikClot
Hémostatique
@@ -355,7 +355,7 @@
QuikClot(polvere emostatica)
QuikClot
-
+
Check Pulse
Puls überprüfen
Comprobar pulso
@@ -367,7 +367,7 @@
Controlla il polso
Checar Pulso
-
+
Check Blood Pressure
Blutdruck überprüfen
Comprobar presión arterial
@@ -379,7 +379,7 @@
Controlla pressionsa sanguigna
Chegar Pressão Sanguínea
-
+
Triage Card
Triagekarte
Tarjeta de triaje
@@ -391,7 +391,7 @@
Triage Card
Cartão de Triagem
-
+
No entries on this triage card.
Keine Einträge auf der Triagekarte
Nessuna voce sulla Triage Card
@@ -399,7 +399,7 @@
Aucune entrée sur cette carte de triage
Brak wpisów w tej karcie segregacyjnej.
-
+
Tourniquet
Tourniquet
Torniquete
@@ -411,7 +411,7 @@
Laccio emostatico
Torniquete
-
+
Remove Tourniquet
Tourniquet entfernen
Quitar torniquete
@@ -423,7 +423,7 @@
Rimuovi laccio emostatico
Remover Torniquete
-
+
Diagnose
Diagnose
Diagnosi
@@ -431,7 +431,7 @@
Diagnostiquer
Diagnoza
-
+
Diagnosing ...
Diagnostizieren ...
Diagnosi in corso...
@@ -439,23 +439,23 @@
Diagnostic en cours
Diagnozowanie ...
-
+
CPR
HLW
RCP
- Сердечно-легочная реанимация
+ Сердечно-лёгочная реанимация
RPC
RKO
-
+
Performing CPR ...
HLW durchführen ...
Eseguendo RCP...
- Сердечно-легочная реанимация ...
+ Сердечно-лёгочная реанимация ...
RPC en cours
Przeprowadzanie RKO ...
-
+
Give Blood IV (1000ml)
Bluttransfusion IV (1000ml)
Dar Sangre IV (1000ml)
@@ -467,7 +467,7 @@
Effettua trasfusione sangue IV (1000ml)
Administrar Sangue IV (1000ml)
-
+
Give Blood IV (500ml)
Bluttransfusion IV (500ml)
Dar Sangre IV (500ml)
@@ -479,7 +479,7 @@
Effettua trasfusione sangue IV (500ml)
Administrar Sangue IV (500ml)
-
+
Give Blood IV (250ml)
Bluttransfusion IV (250ml)
Dar Sangre IV (250ml)
@@ -491,7 +491,7 @@
Effettua trasfusione sangue IV (250ml)
Administrar Sangue IV (250ml)
-
+
Give Plasma IV (1000ml)
Plasmatransfusion IV (1000ml)
Dar Plasma IV (1000ml)
@@ -503,7 +503,7 @@
Effettua trasfusione plasma IV (1000ml)
Administrar Plasma IV (1000ml)
-
+
Give Plasma IV (500ml)
Plasmatransfusion IV (500ml)
Dar Plasma IV (500ml)
@@ -515,7 +515,7 @@
Effettua trasfusione plasma IV (500ml)
Administrar Plasma IV (500ml)
-
+
Give Plasma IV (250ml)
Plasmatransfusion IV (250ml)
Dar Plasma IV (250ml)
@@ -527,7 +527,7 @@
Effettua trasfusione plasma IV (250ml)
Administrar Plasma IV (250ml)
-
+
Give Saline IV (1000ml)
Kochsalzlösung IV (1000ml)
Dar Salino IV (1000ml)
@@ -539,7 +539,7 @@
Effettua trasfusione salina IV (1000ml)
Administrar Soro IV (1000ml)
-
+
Give Saline IV (500ml)
Kochsalzlösung IV (500ml)
Dar Salino IV (500ml)
@@ -551,7 +551,7 @@
Effettua trasfusione salina IV (500ml)
Administrar Soro IV (500ml)
-
+
Give Saline IV (250ml)
Kochsalzlösung IV (250ml)
Dar Salino IV (250ml)
@@ -563,7 +563,7 @@
Effettua trasfusione salina IV (250ml)
Administrar Soro IV (250ml)
-
+
Minor
Gering
Menor
@@ -575,7 +575,7 @@
Minore
Leve
-
+
Delayed
Retrasado
Срочная помощь
@@ -587,7 +587,7 @@
Differito
Atrasado
-
+
Immediate
Inmediato
Неотложная помощь
@@ -599,7 +599,7 @@
Immediata
Imediato
-
+
Deceased
Fallecido
Труп
@@ -611,7 +611,7 @@
Deceduto
Falecido
-
+
None
Ninguno
Отсутствует
@@ -623,7 +623,7 @@
Nessuna
Nenhum
-
+
Normal breathing
Дыхание в норме
Respiración normal
@@ -635,7 +635,7 @@
Respiro normale
Respiração normal
-
+
No breathing
Keine Atmung
Дыхание отсутствует
@@ -647,7 +647,7 @@
Mancanza di respiro
Não respira
-
+
Difficult breathing
Дыхание затруднено
Dificultad para respirar
@@ -659,7 +659,7 @@
Difficoltà a respirare
Dificuldade para respirar
-
+
Almost no breathing
Fast keine Atmung
Дыхание очень слабое
@@ -671,7 +671,7 @@
Respira a fatica
Quase não respira
-
+
Bleeding
Blutet
Кровотечение
@@ -683,7 +683,7 @@
Sanguinando
Sangrando
-
+
In Pain
Hat Schmerzen
Испытывает боль
@@ -695,7 +695,7 @@
Con dolore
Com dor
-
+
Lost a lot of Blood
Hat eine große Menge Blut verloren
Большая кровопотеря
@@ -707,7 +707,7 @@
Ha perso parecchio sangue
Perdeu muito sangue
-
+
Tourniquet [CAT]
Tourniquet [CAT]
Жгут
@@ -719,7 +719,7 @@
Laccio emostatico [CAT]
Torniquete [CAT]
-
+
Receiving IV [%1ml]
Erhalte IV [%1ml]
Reciviendo IV [%1ml]
@@ -731,7 +731,7 @@
Ricevendo IV [%1ml]
Recebendo IV [%1ml]
-
+
Bandage (Basic)
Bandage (Standard)
Повязка (обычная)
@@ -743,7 +743,7 @@
Bendaggio (base)
Bandagem(Básico)
-
+
Used to cover a wound
Для перевязки ран
Utilizado para cubrir una herida
@@ -754,7 +754,7 @@
Usato per coprire una ferita
Usado para cobrir um ferimento
-
+
A dressing, that is a particular material used to cover a wound, which is applied over the wound once bleeding has been stemmed.
Ein Verband, der aus einem besonderen Material besteht um die Wunde zu schützen, nachdem die Blutung gestoppt wurde.
Повязка, накладываемая поверх раны после остановки кровотечения.
@@ -765,7 +765,7 @@
Una benda apposita, utilizzata per coprire una ferita, la quale è applicata sopra di essa una volta fermata l'emorragia.
Uma curativo, material específico para cobrir um ferimento que é aplicado assim que o sangramento é estancando.
-
+
Packing Bandage
Mullbinde
Тампонирующая повязка
@@ -776,7 +776,7 @@
Bendaggio compressivo
Bandagem de Compressão
-
+
Used to pack medium to large wounds and stem the bleeding
Wird verwendet, um mittlere bis große Wunden abzudecken und Blutungen zu stoppen
Для тампонирования ран среднего и большого размера и остановки кровотечения.
@@ -787,9 +787,9 @@
Usato su medie o larghe ferite per fermare emorragie.
Usado para o preenchimento de cavidades geradas por ferimentos médios e grandes e estancar o sangramento.
-
+
A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries.
- Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых сочетанных ранениях возможно тампонирование раны.
+ Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжёлых сочетанных ранениях возможно тампонирование раны.
Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos.
Bandage servant à recouvrir les blessures pour arrêter les hémmoragies et faciliter la guérisson. Recouvrir une blessure est optionnel dans le cas de blessures polytraumatiques
Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran.
@@ -798,7 +798,7 @@
Ein Verband, um die Wunde abzudecken und die Wundheilung zu fördern. Wunden abdecken ist eine Option bei größeren Polytraumen
Uma bandagem usada para preencher o ferimento para estancar o sangramento e facilitar a cicatrização. Preenchimento de feridas é uma opção em ferimentos de politrauma grandes.
-
+
Bandage (Elastic)
Bandage (Elastisch)
Повязка (давящая)
@@ -810,7 +810,7 @@
Benda (Elastica)
Bandagem (Elástica)
-
+
Bandage kit, Elastic
Elastische Binde (Kompressionsbinde)
Давящая повязка
@@ -821,10 +821,10 @@
Kit bendaggio, elastico
Kit de Bandagem, Elástica
-
+
Allows an even compression and extra support to the injured area.
Ermöglicht eine gleichmäßige Kompression und zusätzliche Unterstützung für den verletzten Bereich.
- Давящая повязка обеспечивает равномерное сжатие и дополнительную поддержку поврежденной области
+ Давящая повязка обеспечивает равномерное сжатие и дополнительную поддержку повреждённой области
Ce bandage peut être utilisé pour compresser la plaie afin de ralentir le saignement et assurer la tenue du bandage lors de mouvement.
Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów.
Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada
@@ -832,7 +832,7 @@
Permette di comprimevere e aiutare la zone ferita.
Esta bandagem pode ser utilizada para comprimir o ferimento e diminuir o sangramento e garantir que o ferimento não abra em movimento.
-
+
Tourniquet (CAT)
Tourniquet [CAT]
Жгут
@@ -844,7 +844,7 @@
Laccio emostatico (CAT)
Torniquete (CAT)
-
+
Slows down blood loss when bleeding
Замедляет кровопотерю при кровотечении
Reduce la velocidad de pérdida de sangre
@@ -855,7 +855,7 @@
Rallenta la perdita di sangue in caso di sanguinamento
Reduz a velocidade da perda de sangue
-
+
A constricting device used to compress venous and arterial circulation in effect inhibiting or slowing blood flow and therefore decreasing loss of blood.
Жгут используется для прижатия сосудов к костным выступам, которое приводит к остановке или значительному уменьшению кровотечения
Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre
@@ -866,7 +866,7 @@
Un laccio emostatico usato per comprimere le vene e arterie per bloccare o rallentare la circolazione del sangue e quindi rallentare dissanguamenti.
A aparelho que comprime as artérias e veias para diminuir a perda de sangue.
-
+
Morphine autoinjector
Morphium Autoinjektor
Морфин в пневмошприце
@@ -878,7 +878,7 @@
Autoiniettore di morfina
Auto-injetor de morfina
-
+
Used to combat moderate to severe pain experiences
Wird verwendet um moderate bis starke Schmärzen zu lindern.
Для снятия средних и сильных болевых ощущений
@@ -889,7 +889,7 @@
Usato per combattere il dolore.
Usado para combater dores moderadas e severas
-
+
An analgesic used to combat moderate to severe pain experiences.
Обезболивающее для снятия средних и сильных болевых ощущений.
Analgésico usado para combatir los estados dolorosos de moderados a severos.
@@ -900,7 +900,7 @@
Un analgesico usato per combattere il dolore.
Um analgésico usado para combater dores moderadas e fortes.
-
+
Atropin autoinjector
Атропин в пневмошприце
Atropina auto-inyectable
@@ -912,7 +912,7 @@
Autoiniettore di Atropina
Auto-injetor de Atropina
-
+
Used in NBC scenarios
Применяется для защиты от ОМП
Usado en escenarios NBQ
@@ -923,7 +923,7 @@
Usato in situazioni con gas nervino.
Usado em casos de ataque QBRN
-
+
A drug used by the Military in NBC scenarios.
Препарат, используемый в войсках для защиты от оружия массового поражения.
Medicamento usado por militares en escenarios NBQ
@@ -934,7 +934,7 @@
E' un farmaco usato in ambito militare in scenari con presenza di gas nervino.
Uma droga usada por militares em casos de ataque QBRN.
-
+
Epinephrine autoinjector
Адреналин в пневмошприце
Epinefrina auto-inyectable
@@ -946,7 +946,7 @@
Autoiniettore di Epinefrina
Auto-injetor de epinefrina
-
+
Increase heart rate and counter effects given by allergic reactions
Стимулирует работу сердца и купирует аллергические реакции
Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas
@@ -957,7 +957,7 @@
Aumenta il battito cardiaco e combatte gli effetti di reazioni allergiche.
Aumenta a frequência cardíaca e combate efeitos causados por reações alérgicas
-
+
A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with decreasing positive outcomes.
Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при остановке сердца с уменьшенной вероятностью благоприятного исхода.
Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos.
@@ -967,7 +967,7 @@
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.
-
+
Plasma IV (1000ml)
Плазма для в/в вливания (1000 мл)
Plasma IV (1000ml)
@@ -978,7 +978,7 @@
Plasma IV (1000ml)
Plasma IV (1000ml)
-
+
A volume-expanding blood supplement.
Дополнительный препарат, применяемый при возмещении объема крови.
Suplemento para expandir el volumen sanguíneo.
@@ -989,7 +989,7 @@
Volumenerweiterungsmittel (künstliches Blutvolumen)
Suplemento para expandir o volume sanguíneo.
-
+
A volume-expanding blood supplement.
Дополнительный препарат, применяемый при возмещении объема крови.
Suplemento para expandir el volumen sanguíneo.
@@ -1000,7 +1000,7 @@
Volumenerweiterungsmittel (künstliches Blutvolumen)
Suplemento para expandir o volume sanguíneo.
-
+
Plasma IV (500ml)
Плазма для в/в вливания (500 мл)
Plasma IV (500ml)
@@ -1011,7 +1011,7 @@
Plasma IV (500ml)
Plasma IV (500ml)
-
+
Plasma IV (250ml)
Плазма для в/в вливания (250 мл)
Plasma IV (250ml)
@@ -1022,7 +1022,7 @@
Plasma IV (250ml)
Plasma IV (250ml)
-
+
Blood IV (1000ml)
Кровь для переливания (1000 мл)
Sangre IV (1000ml)
@@ -1033,9 +1033,9 @@
Sangue IV (1000ml)
Sangue IV (1000ml)
-
+
Blood IV, for restoring a patients blood (keep cold)
- Пакет крови для возмещения объема потерянной крови (хранить в холодильнике)
+ Пакет крови для возмещения объёма потерянной крови (хранить в холодильнике)
Sangre intravenosa, para restarurar el volumen sanguíneo (mantener frío)
Cullot sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin.
Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych
@@ -1044,7 +1044,7 @@
Blut IV, Bluthaushalt des Patienten wiederherstellen. (Kühl halten)
Sangue intravenoso, para restaurar o volume sanguinio do paciente.(Manter frio)
-
+
O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care.
Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи.
Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala.
@@ -1054,7 +1054,7 @@
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.
-
+
Blood IV (500ml)
Кровь для переливания (500 мл)
Sangre IV (500ml)
@@ -1065,7 +1065,7 @@
Sangue IV (500ml)
Sangue IV (500ml)
-
+
Blood IV (250ml)
Кровь для переливания (250 мл)
Sangre IV (250ml)
@@ -1076,7 +1076,7 @@
Samgue IV (250ml)
Sangue IV (250ml)
-
+
Saline IV (1000ml)
Физраствор для в/в вливания (1000 мл)
Solución Salina IV (1000ml)
@@ -1087,9 +1087,9 @@
Soluzione salina IV (1000ml)
Soro IV (1000ml)
-
+
Saline IV, for restoring a patients blood
- Пакет физраствора для возмещения объема потерянной крови
+ Пакет физраствора для возмещения объёма потерянной крови
Solución salina intravenosa, para restaurar el volumen sanguíneo
Solution saline 0.9% IV, pour rétablir temporairement la tension artérielle
Sól fizjologiczna, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta
@@ -1098,9 +1098,9 @@
Kochsalzlösung, ein medizinisches Volumenersatzmittel
Solução Salina Intravenosa 0.9%, para restaurar o volume de sangue temporariamente.
-
+
A medical volume-replenishing agent introduced into the blood system through an IV infusion.
- Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного вливания
+ Пакет физиологического раствора для возмещения объёма потерянной крови путем внутривенного вливания
Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa.
Un remplacant temporaire pour rétablir la tension artérielle lors de perte sanguine, administré par intra-veineuse
Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór elektrolitów, podawany dożylnie (IV).
@@ -1109,7 +1109,7 @@
Ein medizinisches Volumenersatzmittel, dass durch einen intravenösen Zugang in den Blutkreislauf verabreicht wird.
Uma reposição temporaria para restaurar a pressão arterial perdida por perda de sangue.
-
+
Saline IV (500ml)
Физраствор для в/в вливания (500 мл)
Salino IV (500ml)
@@ -1120,7 +1120,7 @@
Soluzione salina IV (500ml)
Soro IV (1000ml)
-
+
Saline IV (250ml)
Физраствор для в/в вливания (250 мл)
Salino IV (250ml)
@@ -1131,7 +1131,7 @@
Soluzione salina IV (250ml)
Soro IV (1000ml)
-
+
Basic Field Dressing (QuikClot)
Первичный перевязочный пакет (QuikClot)
Vendaje básico (QuickClot)
@@ -1142,7 +1142,7 @@
Bendaggio emostatico (QuikClot)
Bandagem básica (Coagulante)
-
+
QuikClot bandage
Гемостатический пакет QuikClot
Vendaje QuikClot
@@ -1153,7 +1153,7 @@
Bendaggio emostatico (QuikClot)
Bandagem com agente coagulante
-
+
Hemostatic bandage with coagulant that stops bleeding.
Медицинский коагулянт для экстренной остановки кровотечения
Un bandage aidant à coaguler les saignements mineurs à moyens.
@@ -1164,7 +1164,7 @@
Bendaggio emostatico con coagulante che permette di arrestare perdite di sangue
Bandagem Hemostática com coagulante que controla hemorragia médias e grandes com risco de vida.
-
+
Personal Aid Kit
Аптечка
Botiquín de primeros auxilios
@@ -1175,7 +1175,7 @@
Pronto soccorso personale
Kit De Primeiros Socorros Pessoal
-
+
Includes various treatment kit needed for stitching or advanced treatment
Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи.
Incluye material médico para tratamientos avanzados
@@ -1186,21 +1186,21 @@
Include vario materiale medico per trattamenti avanzati.
Inclui vários tratamentos materiais para custura e tratamento avançado
-
+
Personal Aid Kit for in field stitching or advanced treatment
W znacznym stopniu poprawia stan pacjenta
Полевая аптчека для продвинутого лечения и зашивания ран
Persönliches Verbandspäckchen zum ambulanten Nähen und fortgeschrittener Behandlung.
Trousse de premiers soins pour coudre sur le terrain et traitements avancés.
-
+
Use Personal Aid Kit
Verbandpäckchen benutzen
Использовать аптечку
Utiliser la Trousse de premier soins
Użyj apteczki osobistej
-
+
Surgical Kit
Trousse chirurgicale
Хирургический набор
@@ -1211,7 +1211,7 @@
Kit chirurgico
Kit Cirurgico
-
+
Surgical Kit for in field advanced medical treatment
Trousse chirurgicale pour le traitement sur le terrain
Набор для хирургической помощи в полевых условиях
@@ -1222,7 +1222,7 @@
Kit chirurgico per trattamenti avanzati sul campo.
Kit Cirurgico para uso de tratamento médico avançado em campo
-
+
Surgical Kit for in field advanced medical treatment
Набор для хирургической помощи в полевых условиях
Kit quirúrgico para el tratamiento avanzado en el campo de batalla
@@ -1233,14 +1233,15 @@
Kit chirurgico per trattamenti avanzati sul campo.
Kit Cirurgico para uso de tratamento médico avançado em campo.
-
+
Use Surgical Kit
Operationsset benutzen
+ Usa kit chirurgico
Использовать хирургический набор
Utiliser la trousse chirugicale
Zszyj rany
-
+
Bodybag
Housse mortuaire
Мешок для трупов
@@ -1251,7 +1252,7 @@
Sacca per corpi
Saco para cadáver
-
+
A bodybag for dead bodies
Housse de transport des corps
Мешок для упаковки трупов
@@ -1262,7 +1263,7 @@
Una sacca nera per trasportare cadaveri.
Um saco para corpos mortos
-
+
A bodybag for dead bodies
Housse de transport des corps
Мешок для упаковки трупов
@@ -1273,7 +1274,7 @@
Una sacca nera per trasportare cadaveri.
Um saco para corpos mortos.
-
+
Blood Pressure
Tension artérielle
Артериальное давление
@@ -1284,7 +1285,7 @@
Pressione sanguigna
Pressão Arterial
-
+
Checking Blood Pressure..
Mesure de la tension ...
Проверка артериального давления ...
@@ -1295,14 +1296,15 @@
Controllando la pressione sanguigna..
Aferindo Pressão Arterial...
-
+
%1 checked Blood Pressure: %2
%1 kontrollierte Blutdruck: %2
+ %1 controllata pressione sanguigna: %2
%1 проверил артериальное давление: %2
%1 à vérifié la tension: %2
%1 sprawdził ciśnienie krwi: %2
-
+
You checked %1
Vous diagnostiquez %1
Вы осмотрели раненого %1
@@ -1313,7 +1315,7 @@
Hai diagnosticato %1
Você aferiu o paciente %1
-
+
You find a blood pressure of %2/%3
Vous avez trouvé une tension de %2/%3
Артериальное давление %2/%3
@@ -1324,7 +1326,7 @@
Der Blutdruck liegt bei %2/%3
A Pressão Arterial é de %2/%3
-
+
You find a low blood pressure
Tension basse
Давление низкое
@@ -1335,7 +1337,7 @@
La pressione sanguigna è bassa
Pressão Arterial baixa
-
+
You find a normal blood pressure
Tension normale
Давление нормальное
@@ -1346,7 +1348,7 @@
La pressione sanguigna è normale
Pressão Arterial normal
-
+
You find a high blood pressure
Tension haute
Давление высокое
@@ -1357,7 +1359,7 @@
La pressione sanguigna è alta
Pressão Arterial Alta
-
+
You find no blood pressure
Pas de tension
Давления нет
@@ -1368,7 +1370,7 @@
La pressione sanguigna è assente
Sem Pressão Arterial
-
+
You fail to find a blood pressure
Vous n'avez pas pu mesurer de tension
Артериальное давление не определяется
@@ -1379,35 +1381,39 @@
Manca strumento per misurare pressione sanguigna
Você falhou em aferir a Pressão Arterial
-
+
Low
Niedrig
+ Basso
Низкое
Faible
Niskie
-
+
Normal
Normal
+ Normale
Нормальное
Normale
Normalne
-
+
High
Hoch
+ Alto
Высокое
Haute
Wysokie
-
+
No Blood Pressure
Kein Blutdruck
+ Nessuna Pressione Sanguigna
Артериальное давление отсутствует
Aucune tension
Brak ciśnienia krwi
-
+
Pulse
Пульс
Pouls
@@ -1418,7 +1424,7 @@
Polso
Pulso
-
+
Checking Heart Rate ...
Vérification du rythme cardiaque ...
Проверка пульса ...
@@ -1429,7 +1435,7 @@
Controllando il battito cardiaco ...
Aferindo Pulso ...
-
+
You checked %1
Вы осмотрели раненого %1
Vous examinez %1
@@ -1440,35 +1446,39 @@
Hai diagnosticato %1
Você aferiu o paciente %1
-
+
%1 checked Heart Rate: %2
%1 kontrollierte Herzfrequenz: %2
+ %1 Controllata Frequenza Cardiaca: %2
%1 проверил пульс: %2
%1 à vérifié le rythme cardiaque: %2
%1 sprawdził tętno: %2
-
+
Weak
Schwach
+ Lento
Слабый
Faible
Słabe
-
+
Normal
Normal
+ Normale
Нормальный
Normal
Normalne
-
+
Strong
Stark
+ Veloce
Сильный
Fort
Silne
-
+
You find a Heart Rate of %2
Rythme cardiaque de %2
Пульс %2 уд./мин.
@@ -1479,7 +1489,7 @@
Il battito cardiaco è %2
A Freqüência Cardíaca é de %2
-
+
You find a weak Heart Rate
Rythme cardiaque faible
Пульс слабый
@@ -1490,7 +1500,7 @@
Hai riscontrato un debole battito cardiaco
Freqüência Cardíaca baixa
-
+
You find a strong Heart Rate
Rythme cardiaque élevé
Пульс учащенный
@@ -1501,7 +1511,7 @@
Hai riscontrato un forte battito cardiaco
Freqüência Cardíaca normal
-
+
You find a normal Heart Rate
Rythme cardiaque normal
Пульс в норме
@@ -1512,7 +1522,7 @@
Hai riscontrato un normale battito cardiaco
Freqüência Cardíaca alta
-
+
You find no Heart Rate
Pas de rythme cardiaque
Пульс не прощупывается
@@ -1523,7 +1533,7 @@
Hai riscontrato una assenza di battito cardiaco
Sem Freqüência Cardíaca
-
+
Response
Etat de Conscience
Реакция
@@ -1534,7 +1544,7 @@
Risposta
Reação
-
+
You check response of patient
Vous vérifiez la réponse du patient
Вы проверяете реакцию раненого
@@ -1545,7 +1555,7 @@
Controlli la risposta del paziente
Aferindo se o paciente tem reação...
-
+
%1 is responsive
%1 реагирует на раздражители
%1 est conscient
@@ -1556,7 +1566,7 @@
%1 e' cosciente
%1 está respondendo
-
+
%1 is not responsive
%1 не реагирует на раздражители
%1 est inconscient
@@ -1567,7 +1577,7 @@
%1 e' incosciente
%1 não está respondendo
-
+
You checked %1
Вы осмотрели раненого %1
Vous avez examiné %1
@@ -1578,59 +1588,66 @@
Hai controllato %1
Você aferiu o paciente %1
-
+
Patient %1<br/>is %2.<br/>%3.<br/>%4
+ Paziente %1<br/>è %2.<br/>%3.<br/>%4
Пациент %1<br/>%2.<br/>%3.<br/>%4
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
-
+
alive
+ Vivo
жив
lebendig
vivant
żywy
-
+
dead
+ Morto
мёртв
tot
mort
martwy
-
+
He's lost some blood
+ Ha perso molto sangue
Есть кровопотеря
Er hat etwas Blut verloren
Il à perdu du sang
Stracił trochę krwi
-
+
He's lost a lot of blood
-
+
He hasn't lost blood
+ Non ha perso sangue
Нет кровопотери
Er hat kein Blut verloren
il n'a pas perdu de sang
Nie stracił krwi
-
+
He is in pain
+ è affetto da dolore
Испытывает боль
Er hat Schmerzen
il souffre
Odczuwa ból
-
+
He is not in pain
+ Non è affetto da dolore
Не испытывает боли
Er hat keine Schmerzen
Il ne souffre pas
Nie odczuwa bólu
-
+
Bandaged
Bandé
Повязка наложена
@@ -1641,7 +1658,7 @@
verbunden
Enfaixado
-
+
You bandage %1 (%2)
Vous bandez %1 (%2)
Вы перевязали раненого %1 (%2)
@@ -1652,7 +1669,7 @@
Du verbindest %1 (%2)
Você aplica bandagem no paciente %1 (%2)
-
+
%1 is bandaging you
%1 vous bande
%1 перевязывает вас
@@ -1663,7 +1680,7 @@
%1 verbindet dich
%1 está aplicando uma bandagem em você
-
+
You start stitching injuries from %1 (%2)
Вы зашиваете ранения от %1 (%2)
Du nähst die Wunden von %1 (%2)
@@ -1674,7 +1691,7 @@
Stai suturando le ferite di %1 (%2)
Você começa a suturar os ferimentos do %1 (%2)
-
+
Stitching
Наложение швов
Suturando
@@ -1685,7 +1702,7 @@
Suturando
Suturando...
-
+
You treat the airway of %1
Вы интубируете раненого %1
Estás intubando a %1
@@ -1696,7 +1713,7 @@
Controlli le vie respiratorie di %1
Você entuba o %1
-
+
Airway
Дыхательные пути
Vías aéreas
@@ -1707,7 +1724,7 @@
Vie respiratorie
Vias Aéreas
-
+
%1 is treating your airway
%1 проводит вам интубацию
%1 traite vos voies respiratoires
@@ -1718,7 +1735,7 @@
%1 ti sta trattando le vie respiratorie
%1 está te entubando
-
+
Drag
Ziehen
Arrastrar
@@ -1730,7 +1747,7 @@
Arrastar
Trascina
-
+
Carry
Tragen
Cargar
@@ -1742,7 +1759,7 @@
Carregar
Trasporta
-
+
Release
Loslassen
Soltar
@@ -1754,7 +1771,7 @@
Soltar
Rrilascia
-
+
Load Patient Into
Patient Einladen
Cargar el paciente en
@@ -1766,7 +1783,7 @@
Carregar Paciente Em
Carica paziente nel
-
+
Unload Patient
Patient Ausladen
Descargar el paciente
@@ -1800,7 +1817,7 @@
Carica il paziente
Carregar Paciente Em
-
+
Place body in bodybag
Colocar cuerpo en bolsa para cadáveres
Поместить тело в мешок для трупов
@@ -1811,7 +1828,7 @@
Metti il corpo nella sacca per cadaveri
Colocar corpo dentro do saco para cadáver
-
+
Placing body in bodybag
Colocando cuerpo en bolsa para cadáveres
Упаковка тела ...
@@ -1822,7 +1839,7 @@
Stai mettendo il corpo nella sacca
Colocando corpo dentro do saco para cadáver...
-
+
%1 has bandaged patient
%1 has vendado al paciente
%1 перевязал пациента
@@ -1833,7 +1850,7 @@
%1 ha bendato il paziente
%1 aplicou bandagem no paciente
-
+
%1 used %2
%1 usó %2
%1 benutzt %2
@@ -1844,7 +1861,7 @@
%1 ha usato %2
%1 usou %2
-
+
%1 has given an IV
%1 has puesto una IV
%1 провёл переливание
@@ -1855,7 +1872,7 @@
%1 ha somministrato una IV
%1 aplicou um intravenoso
-
+
%1 applied a tourniquet
%1 aplicado torniquete
%1 наложил жгут
@@ -1974,9 +1991,22 @@
Aberración cromática
Aberration chromatique
+
+
+
+ Selections (3d)
+
+
+ Radial
+
Scrape
Kratzer
+ Scorticatura
Ссадина
Eraflure
Draśnięcie
@@ -1984,6 +2014,7 @@
Minor Scrape
Kleiner Kratzer
+ Minima Scorticatura
Малая ссадина
Eraflure Mineure
Pomniejsze draśnięcie
@@ -1991,6 +2022,7 @@
Medium Scrape
Mittlerer Kratzer
+ Media Scorticatura
Средняя ссадина
Moyenne Eraflure
Średnie draśnięcie
@@ -1998,6 +2030,7 @@
Large Scrape
Großer Kratzer
+ Alta Scorticatura
Большая ссадина
Large Eraflure
Duże draśnięcie
@@ -2005,6 +2038,7 @@
Avulsion
Avulsion
+ Avulsione
Рваная рана
Avulsion
Rana płatowa
@@ -2012,6 +2046,7 @@
Minor Avulsion
Kleine Avulsion
+ Minima Avulsione
Малая рваная рана
Avulsion Mineure
Pomniejsza rana płatowa
@@ -2019,6 +2054,7 @@
Medium Avulsion
Mittlere Avulsion
+ Media Avulsione
Средняя рваная рана
Avulsion Moyenne
Średnia rana płatowa
@@ -2026,6 +2062,7 @@
Large Avulsion
Große Avulsion
+ Alta Avulsione
Большая рваная рана
Large Avulsion
Duża rana płatowa
@@ -2033,6 +2070,7 @@
Bruise
Prellung
+ Contusione
Ушиб
Hématome
Stłuczenie
@@ -2040,6 +2078,7 @@
Minor Bruise
Kleine Prellung
+ Minima Contusione
Малый ушиб
Hématome Mineur
Pomniejsze stłuczenie
@@ -2047,6 +2086,7 @@
Medium Bruise
Mittlere Prellung
+ Media Contusione
Средний ушиб
Hématome Moyen
Średnie stłuczenie
@@ -2054,6 +2094,7 @@
Large Bruise
Große Prellung
+ Alta Contusione
Большой ушиб
Large Hématome
Duże stłuczenie
@@ -2061,6 +2102,7 @@
Crushed tissue
Quetschverletzung
+ Tessuto Schiacciato
Компресионная травма
Tissu écrasé
Zgniecienie tkanek miękkich
@@ -2068,6 +2110,7 @@
Minor crushed tissue
Kleine Quetschverletzung
+ Minimo Tessuto Schiacciato
Малая компрессионная травма
Tissu écrasé Mineur
Pomniejsze zgniecienie tkanek miękkich
@@ -2075,6 +2118,7 @@
Medium crushed tissue
Mittlere Quetschverletzung
+ Medio Tessuto Schiacciato
Средняя компрессионная травма
Tissu écrasé Moyen
Średnie zgniecienie tkanek miękkich
@@ -2082,6 +2126,7 @@
Large crushed tissue
Große Quetschverletzung
+ Alto Tessuto Schiacciato
Большая компрессионная травма
Tissu écrasé Large
Duże zgniecienie tkanek miękkich
@@ -2089,6 +2134,7 @@
Cut
Schnittwunde
+ Taglio
Резаная рана
Coupure
Rana cięta
@@ -2096,6 +2142,7 @@
Small Cut
Kleine Schnittwunde
+ Piccolo Taglio
Малая резаная рана
Pomniejsza rana cięta
Petite Coupure
@@ -2103,6 +2150,7 @@
Medium Cut
Mittlere Schnittwunde
+ Medio Taglio
Средняя резаная рана
Średnia rana cięta
Moyenne Coupure
@@ -2110,6 +2158,7 @@
Large Cut
Große Schnittwunde
+ Grande Taglio
Большая резаная рана
Duża rana cięta
Large Coupure
@@ -2117,6 +2166,7 @@
Tear
Riss
+ Strappo
Рваная рана
Rozerwanie skóry
Déchirure
@@ -2124,6 +2174,7 @@
Small Tear
Kleiner Riss
+ Piccolo Strappo
Малая рваная рана
Pomniejsze rozerwanie skóry
Petite Déchirure
@@ -2131,6 +2182,7 @@
Medium Tear
Mittlerer Riss
+ Medio Strappo
Средняя рваная рана
Średnie rozerwanie skóry
Moyenne Déchirure
@@ -2138,6 +2190,7 @@
Large Tear
Großer Riss
+ Grande Strappo
Большая рваная рана
Duże rozerwanie skóry
Large Déchirure
@@ -2145,6 +2198,7 @@
Velocity Wound
Ballistisches Trauma
+ Velocità Ferita
Огнестрельная рана
Rana postrzałowa
Blessure de vélocité
@@ -2152,6 +2206,7 @@
Smal Velocity Wound
Kleines Ballistisches Trauma
+ Lenta Velocità Ferita
Малая огнестрельная рана
Pomniejsza rana postrzałowa
Petite Bessure de vélocité
@@ -2159,6 +2214,7 @@
Medium Velocity Wound
Mittleres Ballistisches Trauma
+ Media Velocità Ferita
Средняя огнестрельная рана
Średnia rana postrzałowa
Moyenne Blessure de vélocité
@@ -2166,6 +2222,7 @@
Large Velocity Wound
Großes Ballistisches Trauma
+ Alta Velocità Ferita
Большая огнестрельная рана
Duża rana postrzałowa
Large Blessure de vélocité
@@ -2173,6 +2230,7 @@
Puncture Wound
Stichwunde
+ Puntura Ferita
Колотая рана
Rana kłuta
Blessure de perforation
@@ -2180,6 +2238,7 @@
Minor Puncture Wound
Kleine Stichwunde
+ Piccola Puntura Ferita
Малая колотая рана
Pomniejsza rana kłuta
Blessure de perforation Mineure
@@ -2187,6 +2246,7 @@
Medium Puncture Wound
Mittlere Stichwunde
+ Media Puntura Ferita
Средняя колотая рана
Średnia rana kłuta
Blessure de perforation Moyenne
@@ -2194,6 +2254,7 @@
Large Puncture Wound
Große Stichwunde
+ Grande Puntura Ferita
Большая колотая рана
Duża rana kłuta
Large Blessure de perforation
@@ -2201,6 +2262,7 @@
Broken Femur
Gebrochener Oberschenkelknochen
+ Femore Rotto
Перелом
Zkłamana kość udowa
Femur Cassé
diff --git a/addons/medical/ui/triagecard.hpp b/addons/medical/ui/triagecard.hpp
index a93440d13a..c4d3145964 100644
--- a/addons/medical/ui/triagecard.hpp
+++ b/addons/medical/ui/triagecard.hpp
@@ -49,7 +49,7 @@ class GVAR(triageCard) {
font = "PuristaMedium";
colorText[] = {0,0,0,1};
colorBackground[] = {0,0,0,0};
- text = "$STR_ACE_MEDICAL_ACTIONS_TriageCard";
+ text = "$STR_ACE_Medical_Actions_TriageCard";
};
class TriageList: ACE_gui_listBoxBase {
idc = 200;
@@ -103,7 +103,7 @@ class GVAR(triageCard) {
y = 0;
w = 0;
h = 0;
- text = $STR_ACE_MEDICAL_TRIAGE_STATUS_NONE;
+ text = $STR_ACE_Medical_Triage_Status_None;
style = 0x02;
size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
@@ -121,7 +121,7 @@ class GVAR(triageCard) {
y = 0;
w = 0;
h = 0;
- text = $STR_ACE_MEDICAL_TRIAGE_STATUS_MINOR;
+ text = $STR_ACE_Medical_Triage_Status_Minor;
style = 0x02;
size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
@@ -139,7 +139,7 @@ class GVAR(triageCard) {
y = 0;
w = 0;
h = 0;
- text = $STR_ACE_MEDICAL_TRIAGE_STATUS_DELAYED;
+ text = $STR_ACE_Medical_Triage_Status_Delayed;
style = 0x02;
size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
@@ -157,7 +157,7 @@ class GVAR(triageCard) {
y = 0;
w = 0;
h = 0;
- text = $STR_ACE_MEDICAL_TRIAGE_STATUS_IMMEDIATE;
+ text = $STR_ACE_Medical_Triage_Status_Immediate;
style = 0x02;
size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
@@ -175,7 +175,7 @@ class GVAR(triageCard) {
y = 0;
w = 0;
h = 0;
- text = $STR_ACE_MEDICAL_TRIAGE_STATUS_DECEASED;
+ text = $STR_ACE_Medical_Triage_Status_Deceased;
style = 0x02;
size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 15a87c31ba..00ada46a41 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -17,6 +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 framework requerido para armas de tipo misil.
+ Guida dei missili avanzata, o AMG, offre diversi miglioramenti alla teleguida di missili. E' anche un sistema necessario per i tipi di armi missile.
Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия.
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.
diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml
index 490af169c1..05234a6874 100644
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@@ -11,6 +11,7 @@
Affiche texte si enrayé
Szöveges értesítés kijelzése a fegyver elakadásakor
Mostrar texto quando trava acontecer
+ Visualizza testo in caso di inceppamento
Display a notification whenever your weapon gets jammed
@@ -22,6 +23,7 @@
Affiche une notification lors d'un enrayement
Egy szöveges értesítés jelenik meg, amikor a fegyver megakad
Mostra uma notificação quando sua arma sofre um travamento.
+ Visualizza una notifica in caso la tua arma si inceppasse
Spare barrel
@@ -141,6 +143,7 @@
Fegyverhő ellenőrzése
Проверить температуру оружия
Conferir temperatura
+ Controlla la temperatura della canna
Checking temperature ...
@@ -167,4 +170,4 @@
Температура
-
+
\ No newline at end of file
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 49ffbf1773..868da182a2 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -118,6 +118,7 @@
YABHON-R3 (штурмовик)
YABHON-R3 (CAS)
YABHON-R3 (Légitámogató)
+ YABHON-R3 (CAS)
M-ATV
@@ -728,6 +729,7 @@
CH-47I Chinook (neozbrojený)
CH-47I Chinook (non-armé)
CH-47I Chinook (fegyvertelen)
+ CH-47I Chinook (disarmato)
A-10D Thunderbolt II
@@ -1051,6 +1053,7 @@
P99
P99
P99
+ P99
MP-443 Grach
@@ -1062,6 +1065,7 @@
MP-443 Grach
МР-443 "Грач"
MP-443 Grach
+ MP-443 Grach
Custom Covert II
@@ -1073,6 +1077,7 @@
Custom Covert II
Custom Covert II
Custom Covert II
+ ACP-C2
FNX-45 Tactical
@@ -1084,6 +1089,7 @@
FNX-45 Tactical
FNX-45 Tactical
FNX-45 Tactical
+ FNX-45 Tactical
Chiappa Rhino 60DS
@@ -1095,6 +1101,7 @@
Chiappa Rhino 60DS
Chiappa Rhino 60DS
Chiappa Rhino 60DS
+ Chiappa Rhino 6DS
Taurus Judge
@@ -1106,6 +1113,7 @@
Taurus Judge
Taurus Judge
Taurus Judge
+ Taurus Judge
NLAW
@@ -1117,6 +1125,7 @@
NLAW
NLAW
NLAW
+ NLAW
RPG-32
@@ -1128,6 +1137,7 @@
RPG-32
РПГ-32
RPG-32
+ RPG-32
Mini-Spike (AA)
@@ -1139,6 +1149,7 @@
Mini-Spike (AA)
Mini-Spike (AA)
Mini-Spike (AA)
+ Mini-Spike (AA)
Mini-Spike (AT)
@@ -1150,6 +1161,7 @@
Mini-Spike (AT)
Mini-Spike (AT)
Mini-Spike (AT)
+ Mini-Spike (AT)
MX
@@ -1161,6 +1173,7 @@
MX
MX
MX
+ MX
MX (Black)
@@ -1172,6 +1185,7 @@
MX (Negro)
MX (Чёрный)
MX (Preto)
+ MX (Nero)
MXC
@@ -1183,6 +1197,7 @@
MXC
MXC
MXC
+ MXC
MXC (Black)
@@ -1194,6 +1209,7 @@
MXC (Negro)
MXC (Чёрный)
MXC (Preto)
+ MXC (Nero)
MX 3GL
@@ -1205,6 +1221,7 @@
MX 3GL
MX 3GL
MX 3GL
+ MX 3GL
MX 3GL (Black)
@@ -1216,6 +1233,7 @@
MX 3GL (Negro)
MX 3GL (Чёрный)
MX 3GL (Preto)
+ MX 3GL (Nero)
MX LSW
@@ -1227,6 +1245,7 @@
MX LSW
MX LSW
MX LSW
+ MX LSW
MX LSW (Black)
@@ -1238,6 +1257,7 @@
MX LSW (Negro)
MX LSW (Чёрный)
MX LSW (Preto)
+ MX LSW (Nero)
MXM
@@ -1249,6 +1269,7 @@
MXM
MXM
MXM
+ MXM
MXM (Black)
@@ -1260,6 +1281,7 @@
MXM (Negro)
MXM (Чёрный)
MXM (Preto)
+ MXM (Nero)
KH2002 Sama
@@ -1271,6 +1293,7 @@
KH2002 Sama
KH2002 Сама
KT2002 Sama
+ KT2002 Katiba
KH2002C Sama
@@ -1282,6 +1305,7 @@
KH2002C Sama
KH2002C Сама
KT2002C Sama
+ KT2002C Katiba
KH2002 Sama KGL
@@ -1293,6 +1317,7 @@
KH2002 Sama KGL
KH2002 Сама KGL
KT2002 Sama KGL
+ KT2002 Katiba KGL
F2000 (Camo)
@@ -1304,6 +1329,7 @@
F2000 (Camuflaje)
F2000 (Камо)
F2000 (Camo)
+ F2000 (Camo)
F2000
@@ -1315,6 +1341,7 @@
F2000
F2000
F2000
+ F2000
F2000 Tactical (Camo)
@@ -1326,6 +1353,7 @@
F2000 Tactical (Camuflaje)
F2000 Tactical (Камо)
F2000 Tactical (Camo)
+ F2000 Tactical (Camo)
F2000 Tactical
@@ -1337,6 +1365,7 @@
F2000 Tactical
F2000 Tactical
F2000 Tactical
+ F2000 Tactical
F2000 EGLM (Camo)
@@ -1348,6 +1377,7 @@
F2000 EGLM (Camuflaje)
F2000 EGLM (Камо)
F2000 EGLM (Camo)
+ F2000 EGLM (Camo)
F2000 EGLM
@@ -1359,6 +1389,7 @@
F2000 EGLM
F2000 EGLM
F2000 EGLM
+ F2000 EGLM
TAR-21
@@ -1370,6 +1401,7 @@
TAR-21
TAR-21
TAR-21
+ TAR-21
CTAR-21
@@ -1381,6 +1413,7 @@
CTAR-21
CTAR-21
CTAR-21
+ CTAR-21
TAR-21 EGLM
@@ -1392,6 +1425,7 @@
TAR-21 EGLM
TAR-21 EGLM
TAR-21 EGLM
+ TAR-21 EGLM
Vector SMG
@@ -1403,6 +1437,7 @@
Vector SMG
Vector SMG
Vector SMG
+ Vector SMG
Scorpion Evo 3 A1
@@ -1414,6 +1449,7 @@
Scorpion Evo 3 A1
Scorpion Evo 3 A1
Scorpion Evo 3 A1
+ Scorpion Evo 3 A1
CPW
@@ -1425,6 +1461,7 @@
CPW
CPW
CPW
+ CPW
RFB SDAR
@@ -1436,6 +1473,7 @@
RFB SDAR
RFB SDAR
RFB SDAR
+ RFB SDAR
Stoner 99 LMG
@@ -1447,6 +1485,7 @@
Stoner 99 LMG
Stoner 99 LMG
Stoner 99 LMG
+ Stoner 99 LMG
Negev NG7
@@ -1458,6 +1497,7 @@
Negev NG7
Negev NG7
Negev NG7
+ Negev NG7
Mk14 Mod 1 EBR
@@ -1469,6 +1509,7 @@
Mk14 Mod 1 EBR
Mk14 Mod 1 EBR
Mk14 Mod 1 EBR
+ Mk14 Mod 1 EBR
GM6 Lynx
@@ -1480,6 +1521,7 @@
GM6 Lynx
GM6 Lynx
GM6 Lynx
+ GM6 Lynx
GM6 Lynx (Camo)
@@ -1491,6 +1533,7 @@
GM6 Lynx (Camuflaje)
GM6 Lynx (камо)
GM6 Lynx (Camo)
+ GM6 Lynx (Camo)
M200 Intervention
@@ -1502,6 +1545,7 @@
M200 Intervention
M200 Intervention
M200 Intervention
+ M200 Intervention
M200 Intervention (Camo)
@@ -1513,6 +1557,7 @@
M200 Intervention (Camuflaje)
M200 Intervention (камо)
M200 Intervention (Camo)
+ M200 Intervention (Camo)
VS-121
@@ -1524,6 +1569,7 @@
VS-121
VS-121
VS-121
+ VS-121
Noreen "Bad News" ULR
@@ -1531,6 +1577,7 @@
Noreen "Bad News" ULR
Noreen "Bad News" ULR
Noreen "Bad News" ULR
+ Noreen "Bad News" ULR
Noreen "Bad News" ULR
Noreen "Bad News" ULR
@@ -1542,6 +1589,7 @@
Noreen "Bad News" ULR (Чёрный)
Noreen "Bad News" ULR (Schwarz)
Noreen "Bad News" ULR (czarny)
+ Noreen "Bad News" ULR (Nero)
Noreen "Bad News" ULR (Camo)
@@ -1551,6 +1599,7 @@
Noreen "Bad News" ULR (Камо)
Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (kamuflaż)
+ Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Sand)
@@ -1560,6 +1609,7 @@
Noreen "Bad News" ULR (Песочный)
Noreen "Bad News" ULR (Sand)
Noreen "Bad News" ULR (piaskowy)
+ Noreen "Bad News" ULR (Sabbia)
SIG 556
@@ -1569,6 +1619,7 @@
SIG 556
SIG 556
SIG 556
+ SIG 556
SIG 556 (Black)
@@ -1578,6 +1629,7 @@
SIG 556 (Чёрный)
SIG 556 (czarny)
SIG 556 (Schwarz)
+ SIG 556 (Nero)
SIG 556 (Khaki)
@@ -1587,6 +1639,7 @@
SIG 556 (Хаки)
SIG 556 (khaki)
SIG 556 (Khaki)
+ SIG 556 (Khaki)
SIG 556 (Sand)
@@ -1596,6 +1649,7 @@
SIG 556 (Песочный)
SIG 556 (piaskowy)
SIG 556 (Sand)
+ SIG 556 (Sabbia)
SIG 556 (Camo)
@@ -1605,6 +1659,7 @@
SIG 556 (Камо)
SIG 556 (kamuflaż)
SIG 556 (Camo)
+ SIG 556 (Camo)
SIG 556 (Woodland)
@@ -1614,6 +1669,7 @@
SIG 556 (Лесной)
SIG 556 (leśny)
SIG 556 (Woodland)
+ SIG 556 (Woodland)
SIG 556 (provisional) spotter
@@ -1623,6 +1679,7 @@
SIG 556 (provisional) корректировщик
SIG 556 (prowizoryczny) obserwator
SIG 556 (provisorisch) Beobachter
+ SIG 556 (provisional) spotter
ASP-1 Kir
@@ -1631,6 +1688,7 @@
ASP-1 Kir
ASP-1 Kir
ASP-1 Kir
+ ASP-1 Kir
ASP-1 Kir
@@ -1641,6 +1699,7 @@
ASP-1 Kir (Чёрный)
ASP-1 Kir (Schwarz)
ASP-1 Kir (czarny)
+ ASP-1 Kir (Nero)
ASP-1 Kir (Tan)
@@ -1650,6 +1709,7 @@
ASP-1 Kir (Бронзовый)
ASP-1 Kir (Hellbraun)
ASP-1 Kir (Tan)
+ ASP-1 Kir (Tan)
Cyrus
@@ -1658,6 +1718,7 @@
Cyrus
Cyrus
Cyrus
+ Cyrus
Cyrus
@@ -1668,6 +1729,7 @@
Cyrus (Чёрный)
Cyrus (Schwarz)
Cyrus (czarny)
+ Cyrus (Nero)
Cyrus (Hex)
@@ -1677,6 +1739,7 @@
Cyrus (Гекс)
Cyrus (Hex)
Cyrus (hex)
+ Cyrus (Hex)
Cyrus (Tan)
@@ -1686,6 +1749,7 @@
Cyrus (Бронза)
Cyrus (Hellbraun)
Cyrus (podpalany)
+ Cyrus (Tan)
M14
@@ -1695,6 +1759,7 @@
M14
M14
M14
+ M14
M14 (Camo)
@@ -1704,6 +1769,7 @@
M14 (Камо)
M14 (kamuflaż)
M14 (Camo)
+ M14 (Camo)
M14 (Olive)
@@ -1713,6 +1779,7 @@
M14 (Олива)
M14 (oliwkowy)
M14 (Olive)
+ M14 (Olive)
HK121
@@ -1721,6 +1788,7 @@
HK121
HK121
HK121
+ HK121
HK121
@@ -1731,6 +1799,7 @@
HK121 (Гекс)
HK121 (Hex)
HK121 (hex)
+ HK121 (Hex)
HK121 (Tan)
@@ -1740,6 +1809,7 @@
HK121 (Бронза)
HK121 (Hellbraun)
HK121 (podpalany)
+ HK121 (Tan)
LWMMG
@@ -1749,6 +1819,7 @@
LWMMG
LWMMG
LWMMG
+ LWMMG
LWMMG (MTP)
@@ -1758,6 +1829,7 @@
LWMMG (MTP)
LWMMG (MTP)
LWMMG (MTP)
+ LWMMG (MTP)
LWMMG (Black)
@@ -1767,6 +1839,7 @@
LWMMG (Чёрный)
LWMMG (czarny)
LWMMG (Schwarz)
+ LWMMG (Nero)
LWMMG (Sand)
@@ -1776,6 +1849,7 @@
LWMMG (Песочный)
LWMMG (piaskowy)
LWMMG (Sand)
+ LWMMG (Sabbia)
-
+
\ No newline at end of file
diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml
index 8d0305c3ed..cfd1d51bb9 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)
+ Rallypoint West (Base)
Rallypoint East (Base)
@@ -64,6 +65,7 @@
Точка сбора Красных (База)
Punkt zbiórki Wschodu (Baza)
Point de ralliement EST (Base)
+ Rallypoint East (Base)
Rallypoint Independent (Base)
@@ -72,6 +74,7 @@
Точка сбора Независимых (База)
Punkt zbiórki Ruchu oporu (Baza)
Point de ralliement Indépendant (Base)
+ Rallypoint Independent (Base)
Rallypoint West
@@ -80,6 +83,7 @@
Точка сбора Синих
Punkt zbiórki Zachodu
Point de ralliement OUEST
+ Rallypoint West
Rallypoint East
@@ -88,6 +92,7 @@
Точка сбора Красных
Punkt zbiórki Wschodu
Point de ralliement EST
+ Rallypoint East
Rallypoint Independent
@@ -96,6 +101,7 @@
Точка сбора Независимых
Punkt zbiórki Ruchu oporu
Point de ralliement Indépendant
+ Rallypoint Independent
diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml
index e8491451a2..afcbd14559 100644
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@@ -106,7 +106,7 @@
Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni.
Klíč který by měl otevřít vetšinu Východních vozidel.
Ключ для открытия большинства машин Синих.
- Una chaive che apr ela maggior parte dei veicoli EAST
+ Una chaive che apre la maggior parte dei veicoli EAST
Uma chave que abre a maioria dos veículos orientais
@@ -134,4 +134,4 @@
Uma chave que abre a maioria dos veículos civis.
-
+
\ No newline at end of file
diff --git a/documentation/development/how-to-translate-ace3.md b/documentation/development/how-to-translate-ace3.md
index b7e23fa575..576cd3a98b 100644
--- a/documentation/development/how-to-translate-ace3.md
+++ b/documentation/development/how-to-translate-ace3.md
@@ -24,3 +24,7 @@ This page describes in short how you can help translating ACE3 into your languag
(The last three steps require some git knowledge, but there are a lot of tutorials out there)
[GitHub for Windows help](https://windows.github.com/help.html)
+
+
+#### Community Translation Guides
+**Spanish:** [https://gist.github.com/Legolasindar/bf8a3b09cb835f72501f](https://gist.github.com/Legolasindar/bf8a3b09cb835f72501f)
diff --git a/optionals/compat_asdg/config.cpp b/optionals/compat_asdg/config.cpp
index b485685c55..c7e7903ce2 100644
--- a/optionals/compat_asdg/config.cpp
+++ b/optionals/compat_asdg/config.cpp
@@ -28,6 +28,7 @@ class asdg_OpticRail1913: asdg_OpticRail {
ACE_optic_Arco_2D = 1;
ACE_optic_Arco_PIP = 1;
ACE_optic_MRCO_2D = 1;
+ ACE_optic_MRCO_PIP = 1;
ACE_optic_SOS_2D = 1;
ACE_optic_SOS_PIP = 1;
ACE_optic_LRPS_2D = 1;