Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from acemod/master

Browse Source 
update from original
This commit is contained in:
classic 2016-12-23 04:39:41 +09:00 committed by GitHub
commit 964a54f4dc
27 changed files with 123 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ace_advanced_ballistics_x64.dll Normal file
View File

Binary file not shown.

BIN
ace_break_line_x64.dll Normal file
View File

Binary file not shown.

BIN
ace_clipboard_x64.dll Normal file
View File

Binary file not shown.

BIN
ace_fcs_x64.dll Normal file
View File

Binary file not shown.

BIN
ace_medical_x64.dll Normal file
View File

Binary file not shown.

BIN
ace_parse_imagepath_x64.dll Normal file
View File

Binary file not shown.

90
addons/ballistics/stringtable.xml
View File

@ -39,7 +39,7 @@
<Czech>Ráže: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Nábojů: 20&lt;br /&gt;Použití u: QBU-88</Czech>
<Portuguese>Calibre: 6.5x47mm (HPBT Scenar)&lt;br/&gt;Cartuchos: 20&lt;br/&gt;Usado em: QBU-88</Portuguese>
<Hungarian>Kaliber: 6,5x47mm (HPBT Scenar)&lt;br /&gt;Lövedékek: 20&lt;br /&gt;Használható: QBU-88</Hungarian>
<Japanese>口径: 6.5x47mm (HPBT Scenar)&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: QBU-88</Japanese>
<Japanese>口径: 6.5x47mm (HPBT Scenar)&lt;br /&gt;装填数: 20&lt;br /&gt;次で使用: QBU-88</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_65_Creedmor_mag_Name">
<English>6.5mm Creedmor 20Rnd Mag</English>
@ -78,7 +78,7 @@
<Czech>Ráže: 6.5x47mm Creedmor&lt;br /&gt;Nábojů: 20&lt;br /&gt;Použití u: QBU-88</Czech>
<Portuguese>Calibre: 6.5x47mm Creedmor&lt;br/&gt;Cartuchos: 20&lt;br/&gt;Usado em: QBU-88</Portuguese>
<Hungarian>Kaliber: 6,5x47mm Creedmor&lt;br /&gt;Lövedékek: 20&lt;br /&gt;Használható: QBU-88</Hungarian>
<Japanese>口径: 6.5x47mm Creedmor&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: QBU-88</Japanese>
<Japanese>口径: 6.5x47mm Creedmor&lt;br /&gt;装填数: 20&lt;br /&gt;次で使用: QBU-88</Japanese>
</Key>
<!-- MX -->
<Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_Tracer_DimName">
@ -118,7 +118,7 @@
<Portuguese>Calibre: 6,5x39mm Traçante IR-DIM&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: MX/C/M/SW/3GL</Portuguese>
<Italian>Calibro: 6.5x39mm Traccianti IR-DIM &lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MX/C/M/SW/3GL</Italian>
<Russian>Калибр: 6,5x39 мм ИК-трассирующие&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MX/C/M/SW/3GL</Russian>
<Japanese>口径: 6.5x39mm 曳光弾 IR-DIM&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MX/C/M/SW/3GL</Japanese>
<Japanese>口径: 6.5x39mm 曳光弾 IR-DIM&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: MX/C/M/SW/3GL</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_SDName">
<English>6.5mm 30Rnd SD Mag</English>
@ -157,7 +157,7 @@
<Portuguese>Calibre: 6,5x39mm SD&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: MX/C/M/SW/3GL</Portuguese>
<Italian>Calibro: 6.5x39mm Sil.&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MX/C/M/SW/3GL </Italian>
<Russian>Калибр: 6,5x39 мм дозвуковые&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MX/C/M/SW/3GL</Russian>
<Japanese>口径: 6.5x39mm 亜音速弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MX/C/M/SW/3GL</Japanese>
<Japanese>口径: 6.5x39mm 亜音速弾&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: MX/C/M/SW/3GL</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_APName">
<English>6.5mm 30Rnd AP Mag</English>
@ -196,7 +196,7 @@
<Portuguese>Calibre: 6,5x39mm AP&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: MX/C/M/SW/3GL</Portuguese>
<Italian>Calibro: 6.5x39mm AP&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MX/C/M/SW/3GL</Italian>
<Russian>Калибр: 6,5x39 мм бронебойные&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MX/C/M/SW/3GL</Russian>
<Japanese>口径: 6.5x39mm 徹甲弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MX/C/M/SW/3GL</Japanese>
<Japanese>口径: 6.5x39mm 徹甲弾&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: MX/C/M/SW/3GL</Japanese>
</Key>
<!-- KATIBA -->
<Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_Tracer_DimName">
@ -236,7 +236,7 @@
<Portuguese>Calibre: 6,5x39mm Traçante IR-DIM&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: Katiba</Portuguese>
<Italian>Calibro: 6.5x39mm Tracciant IR-DIM&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: Katiba</Italian>
<Russian>Калибр: 6,5x39 мм ИК-трассирующие&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: Katiba</Russian>
<Japanese>口径: 6.5x39mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: Katiba</Japanese>
<Japanese>口径: 6.5x39mm IR-DIM曳光弾&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: Katiba</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_SDName">
<English>6.5mm 30Rnd SD Mag</English>
@ -275,7 +275,7 @@
<Portuguese>Calibre: 6,5x39mm SD&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: Katiba</Portuguese>
<Italian>Calibro: 6.5x39mm Sil.&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: Katiba</Italian>
<Russian>Калибр: 6,5x39 мм дозвуковые&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: Katiba</Russian>
<Japanese>口径: 6.5x39mm 亜音速弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: Katiba</Japanese>
<Japanese>口径: 6.5x39mm 亜音速弾&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: Katiba</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_APName">
<English>6.5mm 30Rnd AP Mag</English>
@ -314,7 +314,7 @@
<Portuguese>Calibre: 6,5x39mm AP&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: Katiba</Portuguese>
<Italian>Calibro: 6.5x39mm AP&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: Katiba</Italian>
<Russian>Калибр: 6,5x39 мм бронебойные&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: Katiba</Russian>
<Japanese>口径: 6.5x39mm 徹甲弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: Katiba</Japanese>
<Japanese>口径: 6.5x39mm 徹甲弾&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: Katiba</Japanese>
</Key>
<!-- 5.56x45mm -->
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_mag_Tracer_DimName">
@ -354,7 +354,7 @@
<Portuguese>Calibre: 5,56x45mm Traçante IR-DIM&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Portuguese>
<Italian>Calibro: 5.56x45mm Traccianti IR-DIM&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Italian>
<Russian>Калибр: 5,56x45 мм ИК-трассирующие&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Russian>
<Japanese>口径: 5.56x45mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Japanese>
<Japanese>口径: 5.56x45mm IR-DIM曳光弾&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Japanese>
</Key>
<!-- 7.62x51mm -->
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_TracerName">
@ -394,7 +394,7 @@
<Portuguese>Calibre: 7,62x51mm Traçante&lt;br /&gt;Projéteis: 20&lt;br /&gt;Usado em: Mk18 ABR</Portuguese>
<Italian>Calibro: 7.62x51mm Traccianti&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
<Russian>Калибр: 7,62x51 мм трассирующие&lt;br /&gt;Патронов: 20&lt;br /&gt;Используются с: Mk18 ABR</Russian>
<Japanese>口径: 7.62x51mm 曳光弾&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: Mk18 ABR</Japanese>
<Japanese>口径: 7.62x51mm 曳光弾&lt;br /&gt;装填数: 20&lt;br /&gt;次で使用: Mk18 ABR</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_Tracer_DimName">
<English>7.62mm 20rnd Tracer IR-DIM Mag</English>
@ -433,7 +433,7 @@
<Portuguese>Calibre: 7,62x51mm Traçante IR-DIM&lt;br /&gt;Projéteis: 20&lt;br /&gt;Usado em: Mk18 ABR</Portuguese>
<Italian>Calibro: 7.62x51mm Traccianti IR-DIM&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
<Russian>Калибр: 7,62x51 мм ИК-трассирующие&lt;br /&gt;Патронов: 20&lt;br /&gt;Используются с: Mk18 ABR</Russian>
<Japanese>口径: 7.62x51mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: Mk18 ABR</Japanese>
<Japanese>口径: 7.62x51mm IR-DIM曳光弾&lt;br /&gt;装填数: 20&lt;br /&gt;次で使用: Mk18 ABR</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_SDName">
<English>7.62mm 20Rnd SD Mag</English>
@ -472,7 +472,7 @@
<Portuguese>Calibre: 7,62x51mm SD&lt;br /&gt;Projéteis: 20&lt;br /&gt;Usado em: Mk18 ABR</Portuguese>
<Italian>Calibro: 7.62x51mm Sil.&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
<Russian>Калибр: 7,62x51 мм дозвуковые&lt;br /&gt;Патронов: 20&lt;br /&gt;Используются с: Mk18 ABR</Russian>
<Japanese>口径: 7.62x51mm 亜音速弾&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: Mk18 ABR</Japanese>
<Japanese>口径: 7.62x51mm 亜音速弾&lt;br /&gt;装填数: 20&lt;br /&gt;次で使用: Mk18 ABR</Japanese>
</Key>
<!-- .338 Norma Magnum -->
<Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_TracerName">
@ -512,7 +512,7 @@
<Czech>Ráže: .338 Noma Magnum Svítící&lt;br /&gt;Nábojů: 130&lt;br /&gt;Použití u: LWMMG</Czech>
<Portuguese>Calibre: .338 Norma Magnum Traçante&lt;br /&gt;Cartuchos: 130&lt;br /&gt;Usado em: SPMG</Portuguese>
<Hungarian>Kaliber: .338 Norma Magnum nyomkövető&lt;br /&gt;Lövedékek: 130&lt;br /&gt;Használható: SPMG</Hungarian>
<Japanese>口径: .338 Norma Magnum 曳光弾&amp;lt;br /&amp;gt;装填数: 130&amp;lt;br /&amp;gt;次で使用: SPMG</Japanese>
<Japanese>口径: .338 Norma Magnum 曳光弾&lt;br /&gt;装填数: 130&lt;br /&gt;次で使用: SPMG</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_Tracer_DimName">
<English>.338 NM 130Rnd IR-DIM Belt</English>
@ -551,7 +551,7 @@
<Czech>Ráže: .338 Noma Magnum Svítící IR-DIM&lt;br /&gt;Nábojů: 130&lt;br /&gt;Použití u: LWMMG</Czech>
<Portuguese>Calibre: .338 Norma Magnum Traçante IR-DIM&lt;br /&gt;Cartuchos: 130&lt;br /&gt;Usado em: SPMG</Portuguese>
<Hungarian>Kaliber: .338 Norma Magnum infravörös nyomkövető&lt;br /&gt;Lövedékek: 130&lt;br /&gt;Használható: SPMG</Hungarian>
<Japanese>口径: .338 Norma Magnum IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 130&amp;lt;br /&amp;gt;次で使用: SPMG</Japanese>
<Japanese>口径: .338 Norma Magnum IR-DIM曳光弾&lt;br /&gt;装填数: 130&lt;br /&gt;次で使用: SPMG</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_APName">
<English>.338 NM 130Rnd AP Belt</English>
@ -590,7 +590,7 @@
<Czech>Ráže: .338 Noma Magnum AP&lt;br /&gt;Nábojů: 130&lt;br /&gt;Použití u: LWMMG</Czech>
<Portuguese>Calibre: .338 Norma Magnum AP&lt;br /&gt;Cartuchos: 130&lt;br /&gt;Usado em: SPMG</Portuguese>
<Hungarian>Kaliber: .338 Norma Magnum páncéltörő&lt;br /&gt;Lövedékek: 130&lt;br /&gt;Használható: SPMG</Hungarian>
<Japanese>口径: .338 Norma Magnum 徹甲弾&amp;lt;br /&amp;gt;装填数: 130&amp;lt;br /&amp;gt;次で使用: SPMG</Japanese>
<Japanese>口径: .338 Norma Magnum 徹甲弾&lt;br /&gt;装填数: 130&lt;br /&gt;次で使用: SPMG</Japanese>
</Key>
<!-- 9.3x64mm 10Rnd -->
<Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_TracerName">
@ -630,7 +630,7 @@
<Czech>Ráže: 9.3x64mm Svítící&lt;br /&gt;Nábojů: 10&lt;br /&gt;Použití u: Cyrus</Czech>
<Portuguese>Calibre: 9.3x64mm Traçante&lt;br /&gt;Cartuchos: 10&lt;br /&gt;Usado em: Cyrus</Portuguese>
<Hungarian>Kaliber: 9,3x64mm nyomkövető&lt;br /&gt;Lövedékek: 10&lt;br /&gt;Használható: Cyrus</Hungarian>
<Japanese>口径: 9.3x64mm 曳光弾&amp;lt;br /&amp;gt;装填数: 10&amp;lt;br /&amp;gt;次で使用: Cyrus</Japanese>
<Japanese>口径: 9.3x64mm 曳光弾&lt;br /&gt;装填数: 10&lt;br /&gt;次で使用: Cyrus</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_Tracer_DimName">
<English>9.3mm 10Rnd Tracer IR-DIM Mag</English>
@ -669,7 +669,7 @@
<Czech>Ráže: 9.3x64mm Svítící IR-DIM&lt;br /&gt;Nábojů: 10&lt;br /&gt;Použití u: Cyrus</Czech>
<Portuguese>Calibre: 9.3x64mm Traçante IR-DIM&lt;br /&gt;Cartuchos: 10&lt;br /&gt;Usado em: Cyrus</Portuguese>
<Hungarian>Kaliber: 9,3x64mm infravörös nyomkövető&lt;br /&gt;Lövedékek: 10&lt;br /&gt; Használható: Cyrus</Hungarian>
<Japanese>口径: 9.3x64mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 10&amp;lt;br /&amp;gt;次で使用: Cyrus</Japanese>
<Japanese>口径: 9.3x64mm IR-DIM曳光弾&lt;br /&gt;装填数: 10&lt;br /&gt;次で使用: Cyrus</Japanese>
</Key>
<!-- 9.3x64mm 150Rnd Belt-->
<Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_TracerName">
@ -709,7 +709,7 @@
<Czech>Ráže: 9.3x64mm Svítící&lt;br /&gt;Nábojů: 150&lt;br /&gt;Použití u: HK121</Czech>
<Portuguese>Calibre: 9.3x64mm Traçante&lt;br /&gt;Cartuchos: 150&lt;br /&gt;Usado em: Navid</Portuguese>
<Hungarian>Kaliber: 9,3x64mm nyomkövető&lt;br /&gt;Lövedékek: 150&lt;br /&gt;Használható: Navid</Hungarian>
<Japanese>口径: 9.3x64mm 曳光弾&amp;lt;br /&amp;gt;装填数: 150&amp;lt;br /&amp;gt;次で使用: Navid</Japanese>
<Japanese>口径: 9.3x64mm 曳光弾&lt;br /&gt;装填数: 150&lt;br /&gt;次で使用: Navid</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_Tracer_DimName">
<English>9.3mm 150Rnd Tracer IR-DIM Belt</English>
@ -748,7 +748,7 @@
<Czech>Ráže: 9.3x64mm Svítící IR-DIM&lt;br /&gt;Nábojů: 150&lt;br /&gt;Použití u: HK121</Czech>
<Portuguese>Calibre: 9.3x64mm Traçante IR-DIM&lt;br /&gt;Cartuchos: 150&lt;br /&gt;Usado em: Navid</Portuguese>
<Hungarian>Kaliber: 9,3x64mm infravörös nyomkövető&lt;br /&gt;Lövedékek: 150&lt;br /&gt;Használható: Navid</Hungarian>
<Japanese>口径: 9.3x64mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 150&amp;lt;br /&amp;gt;次で使用: Navid</Japanese>
<Japanese>口径: 9.3x64mm IR-DIM曳光弾&lt;br /&gt;装填数: 150&lt;br /&gt;次で使用: Navid</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_APName">
<English>9.3mm 150Rnd AP Belt</English>
@ -787,7 +787,7 @@
<Czech>Ráže: 9.3x64mm AP&lt;br /&gt;Nábojů: 150&lt;br /&gt;Použití u: HK121</Czech>
<Portuguese>Calibre: 9.3x64mm AP&lt;br /&gt;Cartuchos: 150&lt;br /&gt;Usado em: Navid</Portuguese>
<Hungarian>Kaliber: 9,3x64mm páncéltörő&lt;br /&gt;Lövedékek: 150&lt;br /&gt;Használható: Navid</Hungarian>
<Japanese>口径: 9.3x64mm 徹甲弾&amp;lt;br /&amp;gt;装填数: 150&amp;lt;br /&amp;gt;次で使用: Navid</Japanese>
<Japanese>口径: 9.3x64mm 徹甲弾&lt;br /&gt;装填数: 150&lt;br /&gt;次で使用: Navid</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_16Rnd_9x19_mag_Name">
<English>9x19mm 16Rnd Mag</English>
@ -943,7 +943,7 @@
<Czech>6.5mm 100náb. Svítící IR-DIM Zásobník&lt;br /&gt;Nábojů: 100&lt;br /&gt;Použití u: MX LSW</Czech>
<Portuguese>Carregador 6.5mm 100 Cartuchos Traçantes IR-DIM&lt;br /&gt;Cartuchos: 100&lt;br /&gt;Usado em: MX LSW</Portuguese>
<Hungarian>6.5mm 100-lövedékes infravörös nyomkövető tár&lt;br /&gt;Lövedékek: 100&lt;br /&gt;Használható: MX LSW</Hungarian>
<Japanese>6.5mm 100発入り IR-DIM曳光弾 弾倉&amp;lt;br /&amp;gt;装填数: 100&amp;lt;br /&amp;gt;次で使用: MX LSW</Japanese>
<Japanese>6.5mm 100発入り IR-DIM曳光弾 弾倉&lt;br /&gt;装填数: 100&lt;br /&gt;次で使用: MX LSW</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_200Rnd_65x39_cased_Box_Tracer_DimName">
<English>6.5mm 200Rnd Tracer IR-DIM Belt</English>
@ -982,7 +982,7 @@
<Czech>6.5mm 200náb. Svítící IR-DIM Pás&lt;br /&gt;Nábojů: 200&lt;br /&gt;Použití u: Stoner 99 LMG</Czech>
<Portuguese>Cinto de munição traçante 6.5mm IR-DIM com 200 cartuchos&lt;br /&gt;Cartuchos: 200&lt;br /&gt;Usado em: Stoner 99 LMG</Portuguese>
<Hungarian>6.5mm 200-lövedékes infravörös nyomkövető heveder&lt;br /&gt;Lövedékek: 200&lt;br /&gt;Használható: Stoner 99 LMG</Hungarian>
<Japanese>6.5mm 200発入り IR-DIM曳光弾ベルト&amp;lt;br /&amp;gt;装填数: 200&amp;lt;br /&amp;gt;次で使用: Stoner 99 LMG</Japanese>
<Japanese>6.5mm 200発入り IR-DIM曳光弾ベルト&lt;br /&gt;装填数: 200&lt;br /&gt;次で使用: Stoner 99 LMG</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk262_mag_Name">
<English>5.56mm 30Rnd Mag (Mk262)</English>
@ -1021,7 +1021,7 @@
<Czech>Ráže: 5.56x45mm NATO (Mk262)&lt;br /&gt;Nábojů: 30</Czech>
<Portuguese>Calibre: 5.56x45mm NATO (Mk262)&lt;br/&gt;Cartuchos: 30</Portuguese>
<Hungarian>Kaliber: 5,56x45mm NATO (Mk262)&lt;br /&gt;Lövedékek: 30</Hungarian>
<Japanese>口径: 5.56x45mm NATO (Mk262)&amp;lt;br /&amp;gt;装填数: 30</Japanese>
<Japanese>口径: 5.56x45mm NATO (Mk262)&lt;br /&gt;装填数: 30</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk318_mag_Name">
<English>5.56mm 30Rnd Mag (Mk318)</English>
@ -1060,7 +1060,7 @@
<Czech>Ráže: 5.56x45mm NATO (Mk318)&lt;br /&gt;Nábojů: 30</Czech>
<Portuguese>Calibre: 5.56x45mm NATO (Mk318)&lt;br/&gt;Cartuchos: 30</Portuguese>
<Hungarian>Kaliber: 5,56x45mm NATO (Mk318)&lt;br /&gt;Lövedékek: 30</Hungarian>
<Japanese>口径: 5.56x45mm NATO (Mk318)&amp;lt;br /&amp;gt;装填数: 30</Japanese>
<Japanese>口径: 5.56x45mm NATO (Mk318)&lt;br /&gt;装填数: 30</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M995_AP_mag_Name">
<English>5.56mm 30Rnd Mag (M995 AP)</English>
@ -1099,7 +1099,7 @@
<Czech>Ráže: 5.56x45mm NATO (M995 AP)&lt;br /&gt;Nábojů: 30</Czech>
<Portuguese>Calibre: 5.56x45mm NATO (M995 AP)&lt;br/&gt;Cartuchos: 30</Portuguese>
<Hungarian>Kaliber: 5,56x45mm NATO (M995 páncéltörő)&lt;br /&gt;Lövedékek: 30</Hungarian>
<Japanese>口径: 5.56x45mm NATO (M995 徹甲弾)&amp;lt;br /&amp;gt;装填数: 30</Japanese>
<Japanese>口径: 5.56x45mm NATO (M995 徹甲弾)&lt;br /&gt;装填数: 30</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_762x51_M118LR_Mag_Name">
<English>7.62mm 10Rnd Mag (M118LR)</English>
@ -1138,7 +1138,7 @@
<Czech>Ráže: 7.62x51mm NATO (M118LR)&lt;br /&gt;Nábojů: 10</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (M118LR)&lt;br/&gt;Cartuchos: 10</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (M118LR)&lt;br /&gt;Lövedékek: 10</Hungarian>
<Japanese>口径: 7.62x51mm NATO (M118LR)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
<Japanese>口径: 7.62x51mm NATO (M118LR)&lt;br /&gt;装填数: 10</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_M118LR_Mag_Name">
<English>7.62mm 20Rnd Mag (M118LR)</English>
@ -1177,7 +1177,7 @@
<Czech>Ráže: 7.62x51mm NATO (M118LR)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (M118LR)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (M118LR)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x51mm NATO (M118LR)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x51mm NATO (M118LR)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk316_Mod_0_Mag_Name">
<English>7.62mm 10Rnd Mag (Mk316 Mod 0)</English>
@ -1216,7 +1216,7 @@
<Czech>Ráže: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Nábojů: 10</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (Mk316 Mod 0)&lt;br/&gt;Cartuchos: 10</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Lövedékek: 10</Hungarian>
<Japanese>口径: 7.62x51mm NATO (Mk316 Mod 0)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
<Japanese>口径: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;装填数: 10</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk316_Mod_0_Mag_Name">
<English>7.62mm 20Rnd Mag (Mk316 Mod 0)</English>
@ -1255,7 +1255,7 @@
<Czech>Ráže: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (Mk316 Mod 0)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x51mm NATO (Mk316 Mod 0)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk319_Mod_0_Mag_Name">
<English>7.62mm 10Rnd Mag (Mk319 Mod 0)</English>
@ -1294,7 +1294,7 @@
<Czech>Ráže: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Nábojů: 10</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (Mk319 Mod 0)&lt;br/&gt;Cartuchos: 10</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Lövedékek: 10</Hungarian>
<Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
<Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;装填数: 10</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk319_Mod_0_Mag_Name">
<English>7.62mm 20Rnd Mag (Mk319 Mod 0)</English>
@ -1333,7 +1333,7 @@
<Czech>Ráže: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (Mk319 Mod 0)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_762x51_M993_AP_Mag_Name">
<English>7.62mm 10Rnd Mag (M993 AP)</English>
@ -1372,7 +1372,7 @@
<Czech>Ráže: 7.62x51mm NATO (M993 AP)&lt;br /&gt;Nábojů: 10</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (M993 AP)&lt;br/&gt;Cartuchos: 10</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (M993 páncéltörő)&lt;br /&gt;Lövedékek: 10</Hungarian>
<Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
<Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;装填数: 10</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x51_M993_AP_Mag_Name">
<English>7.62mm 20Rnd Mag (M993 AP)</English>
@ -1411,7 +1411,7 @@
<Czech>Ráže: 7.62x51mm NATO (M993 AP)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x51mm NATO (M993 AP)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (M993 páncéltörő)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x51mm NATO (M993 徹甲弾)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x51mm NATO (M993 徹甲弾)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_0_Mag_Name">
<English>7.62mm 20Rnd Mag (Mk248 Mod 0)</English>
@ -1450,7 +1450,7 @@
<Czech>Ráže: 7.62x67mm NATO (Mk248 Mod 0)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x67mm NATO (Mk248 Mod 0)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (Mk248 Mod 0)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x67mm NATO (Mk248 Mod 0)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x67mm NATO (Mk248 Mod 0)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_1_Mag_Name">
<English>7.62mm 20Rnd Mag (Mk248 Mod 1)</English>
@ -1489,7 +1489,7 @@
<Czech>Ráže: 7.62x67mm NATO (Mk248 Mod 1)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x67mm NATO (Mk248 Mod 1)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x51mm NATO (Mk248 Mod 1)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x67mm NATO (Mk248 Mod 1)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x67mm NATO (Mk248 Mod 1)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name">
<English>7.62mm 20Rnd Mag (Berger Hybrid OTM)</English>
@ -1528,7 +1528,7 @@
<Czech>Ráže: 7.62x67mm NATO (Berger Hybrid OTM)&lt;br /&gt;Nábojů: 20</Czech>
<Portuguese>Calibre: 7.26x67mm NATO (Berger Hybrid OTM)&lt;br/&gt;Cartuchos: 20</Portuguese>
<Hungarian>Kaliber: 7,62x67mm NATO (Berger Hybrid OTM)&lt;br /&gt;Lövedékek: 20</Hungarian>
<Japanese>口径: 7.62x67mm NATO (Berger Hybrid OTM)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
<Japanese>口径: 7.62x67mm NATO (Berger Hybrid OTM)&lt;br /&gt;装填数: 20</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_mag_Name">
<English>6.5x47mm 30Rnd Mag (HPBT Scenar)</English>
@ -1567,7 +1567,7 @@
<Czech>Ráže: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Nábojů: 30&lt;br /&gt;Použití u: MXM</Czech>
<Portuguese>Calibre: 6.5x47mm (HPBT Scenar)&lt;br/&gt;Cartuchos: 30&lt;br/&gt;Usado em: MXM</Portuguese>
<Hungarian>Kaliber: 6,5x47mm (HPBT Scenar)&lt;br /&gt;Lövedékek: 30&lt;br /&gt;Használható: MXM</Hungarian>
<Japanese>口径: 6.5x47mm (HPBT Scenar)&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MXM</Japanese>
<Japanese>口径: 6.5x47mm (HPBT Scenar)&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: MXM</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_mag_Name">
<English>6.5mm Creedmor 30Rnd Mag</English>
@ -1606,7 +1606,7 @@
<Czech>Ráže: 6.5x47mm Creedmor&lt;br /&gt;Nábojů: 30&lt;br /&gt;Použití u: MXM</Czech>
<Portuguese>Calibre: 6.5x47mm Creedmor&lt;br/&gt;Cartuchos: 30&lt;br/&gt;Usado em: MXM</Portuguese>
<Hungarian>Kaliber: 6,5x47mm Creedmor&lt;br /&gt;Lövedékek: 30&lt;br /&gt;Használható: MXM</Hungarian>
<Japanese>口径: 6.5x47mm Creedmor&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MXM</Japanese>
<Japanese>口径: 6.5x47mm Creedmor&lt;br /&gt;装填数: 30&lt;br /&gt;次で使用: MXM</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_338_300gr_HPBT_Mag_Name">
<English>.338 10Rnd Mag (300gr Sierra MatchKing HPBT)</English>
@ -1645,7 +1645,7 @@
<Czech>Ráže: 8.6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;Nábojů: 10</Czech>
<Portuguese>Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)&lt;br/&gt;Cartuchos: 10</Portuguese>
<Hungarian>Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;Lövedékek: 10</Hungarian>
<Japanese>口径: 8.6x70mm (300gr Sierra MatchKing HPBT)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
<Japanese>口径: 8.6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;装填数: 10</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_10Rnd_338_API526_Mag_Name">
<English>.338 10Rnd Mag (API526)</English>
@ -1684,7 +1684,7 @@
<Czech>Ráže: 8.6x70mm (API526)&lt;br /&gt;Nábojů: 10</Czech>
<Portuguese>Calibre: 8.6x70mm (API526)&lt;br/&gt;Cartuchos: 10</Portuguese>
<Hungarian>Kaliber: 8,6x70mm (API526)&lt;br /&gt;Lövedékek: 10</Hungarian>
<Japanese>口径: 8.6x70mm (API526)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
<Japanese>口径: 8.6x70mm (API526)&lt;br /&gt;装填数: 10</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_7Rnd_408_305gr_Mag_Name">
<English>.408 7Rnd Mag (305gr)</English>
@ -1723,7 +1723,7 @@
<Czech>Ráže: .408 CheyTac (305gr)&lt;br /&gt;Nábojů: 7</Czech>
<Portuguese>Calibre: .408 CheyTac (305gr)&lt;br/&gt;Cartuchos: 7</Portuguese>
<Hungarian>Kaliber: .408 CheyTac (305gr)&lt;br /&gt;Lövedékek: 7</Hungarian>
<Japanese>口径: .408 CheyTac (305gr)&amp;lt;br /&amp;gt;装填数: 7</Japanese>
<Japanese>口径: .408 CheyTac (305gr)&lt;br /&gt;装填数: 7</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_5Rnd_127x99_Mag_Name">
<English>12.7x99mm 5Rnd Mag</English>
@ -1762,7 +1762,7 @@
<Czech>Ráže: 12.7x99mm&lt;br /&gt;Nábojů: 5</Czech>
<Portuguese>Calibre: 12.7x99mm&lt;br/&gt;Cartuchos: 5</Portuguese>
<Hungarian>Kaliber: 12,7x99mm&lt;br /&gt;Lövedékek: 5</Hungarian>
<Japanese>口径: 12.7x99mm&amp;lt;br /&amp;gt;装填数: 5</Japanese>
<Japanese>口径: 12.7x99mm&lt;br /&gt;装填数: 5</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_5Rnd_127x99_API_Mag_Name">
<English>12.7x99mm API 5Rnd Mag</English>
@ -1801,7 +1801,7 @@
<Czech>Ráže: 12.7x99mm API&lt;br /&gt;Nábojů: 5</Czech>
<Portuguese>Calibre: 12.7x99mm API&lt;br/&gt;Cartuchos: 5</Portuguese>
<Hungarian>Kaliber: 12,7x99mm API&lt;br /&gt;Lövedékek: 5</Hungarian>
<Japanese>口径: 12.7x99mm 焼夷徹甲弾&amp;lt;br /&amp;gt;装填数: 5</Japanese>
<Japanese>口径: 12.7x99mm 焼夷徹甲弾&lt;br /&gt;装填数: 5</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_5Rnd_127x99_AMAX_Mag_Name">
<English>12.7x99mm 5Rnd Mag (AMAX)</English>
@ -1840,7 +1840,7 @@
<Czech>Ráže: 12.7x99mm (AMAX)&lt;br /&gt;Nábojů: 5</Czech>
<Portuguese>Calibre: 12.7x99mm (AMAX)&lt;br/&gt;Cartuchos: 5</Portuguese>
<Hungarian>Kaliber: 12,7x99mm (AMAX)&lt;br /&gt;Lövedékek: 5</Hungarian>
<Japanese>口径: 12.7x99mm (AMAX)&amp;lt;br /&amp;gt;装填数: 5</Japanese>
<Japanese>口径: 12.7x99mm (AMAX)&lt;br /&gt;装填数: 5</Japanese>
</Key>
<Key ID="STR_ACE_Ballistics_AmmoSupplyCrate_DisplayName">
<English>[ACE] Ammo Supply Crate</English>
@ -1856,4 +1856,4 @@
<Japanese>[ACE] 弾薬物資箱</Japanese>
</Key>
</Package>
</Project>
</Project>

25
addons/common/functions/fnc_addLineToDebugDraw.sqf
View File

@ -7,42 +7,41 @@
* 1: End point ASL <ARRAY>
* 2: Color <ARRAY>
*
* None
* Return Value:
* Nothing
*
* Example:
* [[0,0,0], [1,1,0], [1,0,0,1]]] call ace_common_fnc_addLineToDebugDraw;
*
* Public: No
*/
#include "script_component.hpp"
params ["_startASL", "_endASL", "_color"];
if (isNil QGVAR(debugLines)) then {
GVAR(debugLines) = [];
GVAR(debugLinesIndex) = 0;
};
if (count GVAR(debugLines) < 100) then {
GVAR(debugLines) pushBack _this;
GVAR(debugLines) pushBack [ASLtoAGL _startASL, ASLtoAGL _endASL, _color];
GVAR(debugLinesIndex) = 0;
} else {
GVAR(debugLines) set [GVAR(debugLinesIndex), _this];
GVAR(debugLines) set [GVAR(debugLinesIndex), [ASLtoAGL _startASL, ASLtoAGL _endASL, _color]];
GVAR(debugLinesIndex) = (GVAR(debugLinesIndex) + 1) mod 100;
};
if (isNil QGVAR(debugDrawHandler)) then {
GVAR(debugDrawHandler) = addMissionEventHandler ["Draw3D", {
if (count GVAR(debugLines) == 0) exitWith {
if (GVAR(debugLines) isEqualTo []) exitWith {
removeMissionEventHandler ["Draw3D", GVAR(debugDrawHandler)];
GVAR(debugDrawHandler) = nil;
};
{
_p0 = _x select 0;
if (!surfaceIsWater _p0) then {
_p0 = ASLtoATL _p0;
};
_p1 = _x select 1;
if (!surfaceIsWater _p1) then {
_p1 = ASLtoATL _p1;
};
drawLine3D [_p0, _p1, _x select 2];
_x params ["_start", "_end", "_color"];
drawLine3D [_start, _end, _color];
} forEach GVAR(debugLines);
}];
};

4
addons/medical_menu/stringtable.xml
View File

@ -131,7 +131,7 @@
<Portuguese>EXAMINAR &amp; TRATAMENTO</Portuguese>
<Czech>VYŠETŘENÍ &amp; LÉČBA</Czech>
<Italian>ESAMINA &amp; TRATTA</Italian>
<Japanese>診断 &amp;amp; 治療</Japanese>
<Japanese>診断 &amp; 治療</Japanese>
</Key>
<Key ID="STR_ACE_Medical_Menu_STATUS">
<English>STATUS</English>
@ -662,4 +662,4 @@
<Japanese>鼻咽頭チューブ [NPA]</Japanese>
</Key>
</Package>
</Project>
</Project>

8
addons/overpressure/ACE_Settings.hpp Normal file
View File

@ -0,0 +1,8 @@
class ACE_Settings {
class GVAR(distanceCoefficient) {
displayName = CSTRING(distanceCoefficient_displayName);
description = CSTRING(distanceCoefficient_toolTip);
typeName = "SCALAR";
value = 1;
};
};

13
addons/overpressure/XEH_postInit.sqf
View File

@ -1,7 +1,12 @@
#include "script_component.hpp"
["ace_overpressure", FUNC(overpressureDamage)] call CBA_fnc_addEventHandler;
["ace_settingsInitialized", {
TRACE_1("settingsInit eh",GVAR(distanceCoefficient));
if (GVAR(distanceCoefficient) <= 0) exitWith {};
// Register fire event handler
["ace_firedPlayer", DFUNC(firedEHBB)] call CBA_fnc_addEventHandler;
["ace_firedPlayerVehicle", DFUNC(firedEHOP)] call CBA_fnc_addEventHandler;
["ace_overpressure", LINKFUNC(overpressureDamage)] call CBA_fnc_addEventHandler;
// Register fire event handler
["ace_firedPlayer", LINKFUNC(firedEHBB)] call CBA_fnc_addEventHandler;
["ace_firedPlayerVehicle", LINKFUNC(firedEHOP)] call CBA_fnc_addEventHandler;
}] call CBA_fnc_addEventHandler;

1
addons/overpressure/config.cpp
View File

@ -14,5 +14,6 @@ class CfgPatches {
};
};
#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"
#include "CfgWeapons.hpp"

2
addons/overpressure/functions/fnc_cacheOverPressureValues.sqf
View File

@ -46,7 +46,7 @@ TRACE_1("ConfigPath",_config);
// get the Variables out of the Configes and create a array with then
private _return = [
(getNumber (_config >> QGVAR(angle))),
(getNumber (_config >> QGVAR(range))),
(getNumber (_config >> QGVAR(range))) * GVAR(distanceCoefficient),
(getNumber (_config >> QGVAR(damage)))
];

1
addons/overpressure/functions/fnc_overpressureDamage.sqf
View File

@ -51,6 +51,7 @@ TRACE_3("cache",_overpressureAngle,_overpressureRange,_overpressureDamage);
private _beta = sqrt (1 - _angle / _overpressureAngle);
private _damage = _alpha * _beta * _overpressureDamage;
TRACE_1("",_damage);
// If the target is the ACE_player
if (_x == ACE_player) then {[_damage * 100] call BIS_fnc_bloodEffect};

11
addons/overpressure/stringtable.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="overpressure">
<Key ID="STR_ACE_overpressure_distanceCoefficient_displayName">
<English>Overpressure Distance Coefficient</English>
</Key>
<Key ID="STR_ACE_overpressure_distanceCoefficient_toolTip">
<English>Scales the overpressure effect [Default: 1]</English>
</Key>
</Package>
</Project>

6
addons/trenches/stringtable.xml
View File

@ -3,7 +3,7 @@
<Package name="trenches">
<Key ID="STR_ACE_Trenches_EntrenchingToolName">
<English>Entrenching Tool</English>
<German>Schanzzeug</German>
<German>Klappspaten</German>
<Polish>Saperka</Polish>
<Italian>Pala</Italian>
<Spanish>Pala para trincheras</Spanish>
@ -16,7 +16,7 @@
<Key ID="STR_ACE_Trenches_EntrenchingToolDescription">
<English>Entrenching Tool</English>
<Polish>Saperka, używana do budowy wnęk</Polish>
<German>Mit Schanzzeug können Erdwälle oder Gräben ausgehoben werden. </German>
<German>Mit dem Klappspaten können Erdwälle oder Gräben ausgehoben werden. </German>
<Italian>Pala</Italian>
<Spanish>Pala para trincheras</Spanish>
<French>Outil de tranchée</French>
@ -175,4 +175,4 @@
<German>Entferne Schützengraben</German>
</Key>
</Package>
</Project>
</Project>

6
addons/winddeflection/functions/fnc_updateTrajectoryPFH.sqf
View File

@ -29,16 +29,16 @@
_x params ["_bullet", "_airFriction"];
private _bulletVelocity = velocity _bullet;
private _bulletSpeed = vectorMagnitude _bulletVelocity;
private _bulletSpeedSqr = vectorMagnitudeSqr _bulletVelocity;
if ((!alive _bullet) || {(_bullet isKindOf "BulletBase") && {_bulletSpeed < 100}}) then {
if ((!alive _bullet) || {(_bullet isKindOf "BulletBase") && {_bulletSpeedSqr < 10000}}) then {
GVAR(trackedBullets) deleteAt (GVAR(trackedBullets) find _x);
} else {
if (_isWind) then {
private _trueVelocity = _bulletVelocity vectorDiff ACE_wind;
private _trueSpeed = vectorMagnitude _trueVelocity;
private _dragRef = _deltaT * _airFriction * _bulletSpeed * _bulletSpeed;
private _dragRef = _deltaT * _airFriction * _bulletSpeedSqr;
private _accelRef = (vectorNormalized _bulletVelocity) vectorMultiply (_dragRef);
_bulletVelocity = _bulletVelocity vectorDiff _accelRef;

4
addons/zeus/stringtable.xml
View File

@ -395,12 +395,15 @@
</Key>
<Key ID="STR_ACE_Zeus_ModuleAddOrRemoveFRIES_DisplayName">
<English>Add/Remove FRIES</English>
<Japanese>FRUES の追加と削除</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_NotFastRopeCompatible">
<English>%1 is not fastrope compatible.</English>
<Japanese>%1 はファストロープに対応していません。</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_CantRemoveFRIES">
<English>Unable to remove FRIES, ropes are deployed.</English>
<Japanese>すでにロープが展開されているため、FRIES を削除できません。</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleTeleportPlayers_DisplayName">
<English>Teleport Players</English>
@ -516,6 +519,7 @@
</Key>
<Key ID="STR_ACE_Zeus_ModuleSimulation_DisplayName">
<English>Toggle Simulation</English>
<Japanese>シミュレーションをトグル</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleAddSpareWheel_DisplayName">
<English>Add Spare Wheel</English>

2
docs/_includes/dependencies_list.md
View File

@ -447,7 +447,7 @@
{% endif %}
{% if include.component == "compat_rhs_afrf3" %}
`ace_rearm`, `ace_refuel`, `ace_repair`, `rhs_c_weapons`, `rhs_c_troops`, `rhs_c_bmd`, `rhs_c_bmp`, `rhs_c_bmp3`, `rhs_c_a2port_armor`, `rhs_c_btr`, `rhs_c_sprut`, `rhs_c_t72`, `rhs_c_tanks`, `rhs_c_a2port_air`, `rhs_c_a2port_car`, `rhs_c_cars`, `rhs_c_trucks`, `rhs_c_2s3`, `rhs_c_rva`
`ace_rearm`, `ace_refuel`, `ace_repair`, `rhs_c_weapons`, `rhs_c_troops`, `rhs_c_bmd`, `rhs_c_bmp`, `rhs_c_bmp3`, `rhs_c_a2port_armor`, `rhs_c_btr`, `rhs_c_sprut`, `rhs_c_t72`, `rhs_c_tanks`, `rhs_c_a2port_air`, `rhs_c_a2port_car`, `rhs_c_cars`, `rhs_c_trucks`, `rhs_c_2s3`, `rhs_c_rva`, `rhs_c_heavyweapons`
{% endif %}
{% if include.component == "compat_rhs_usf3" %}

2
optionals/compat_adr_97/meta.cpp Normal file
View File

@ -0,0 +1,2 @@
protocol = 1;
publishedid = 773136286;

2
optionals/compat_rhs_afrf3/CfgAmmo.hpp
View File

@ -213,7 +213,7 @@ class CfgAmmo {
class rhs_g_vg40sz: rhs_g_vog25 { //Flashbang
ace_frag_force = 0;
};
class rhs_GDM40: rhs_g_vog25 { //Smoke
class rhs_g_gdm40: rhs_g_vog25 { //Smoke
ace_frag_force = 0;
};
class rhs_g_vg40md_white: rhs_g_vog25 { //Smoke

11
optionals/compat_rhs_afrf3/CfgWeapons.hpp
View File

@ -85,4 +85,15 @@ class CfgWeapons {
ace_hearing_protection = 0.5;
ace_hearing_lowerVolume = 0.60;
};
class rhs_weap_d81;
class rhs_weap_2a70: rhs_weap_d81 { // "Low pressure" 100mm cannon
ace_overpressure_range = 15;
ace_overpressure_damage = 0.5;
};
class cannon_120mm;
class rhs_weap_2a28_base: cannon_120mm { // "Low pressure"
ace_overpressure_range = 15;
ace_overpressure_damage = 0.5;
};
};

2
optionals/compat_rhs_afrf3/config.cpp
View File

@ -6,7 +6,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_rearm", "ace_refuel", "ace_repair", "rhs_c_weapons", "rhs_c_troops", "rhs_c_bmd", "rhs_c_bmp", "rhs_c_bmp3", "rhs_c_a2port_armor", "rhs_c_btr", "rhs_c_sprut", "rhs_c_t72", "rhs_c_tanks", "rhs_c_a2port_air", "rhs_c_a2port_car", "rhs_c_cars", "rhs_c_trucks", "rhs_c_2s3", "rhs_c_rva"};
requiredAddons[] = {"ace_rearm", "ace_refuel", "ace_repair", "rhs_c_weapons", "rhs_c_troops", "rhs_c_bmd", "rhs_c_bmp", "rhs_c_bmp3", "rhs_c_a2port_armor", "rhs_c_btr", "rhs_c_sprut", "rhs_c_t72", "rhs_c_tanks", "rhs_c_a2port_air", "rhs_c_a2port_car", "rhs_c_cars", "rhs_c_trucks", "rhs_c_2s3", "rhs_c_rva", "rhs_c_heavyweapons"};
author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
url = ECSTRING(main,URL);

2
optionals/compat_rhs_afrf3/meta.cpp Normal file
View File

@ -0,0 +1,2 @@
protocol = 1;
publishedid = 773131200;

2
optionals/compat_rhs_usf3/meta.cpp Normal file
View File

@ -0,0 +1,2 @@
protocol = 1;
publishedid = 773125288;

2
optionals/particles/CfgAmmo.hpp
View File

@ -63,7 +63,7 @@ class CfgAmmo {
// - Artillery smoke submunition ------------------------------------------
class SmokeShellArty: SmokeShell {
explosionTime = 0;
explosionTime = 0.1;
effectsSmoke = "ACE_ArtillerySmoke";
};

4
tools/publish.py
View File

@ -112,11 +112,11 @@ def main(argv):
#RHS Compat USA - http://steamcommunity.com/sharedfiles/filedetails/?id=773125288
folder = buildCompatFolder("@ace_compat_rhs_afrf3", ["ace_compat_rhs_afrf3.*"])
folder = buildCompatFolder("@ace_compat_rhs_usf3", ["ace_compat_rhs_usf3.*"])
publishFolder(folder, "773125288", changelog_path)
#RHS Compat Commies - http://steamcommunity.com/sharedfiles/filedetails/?id=773131200
folder = buildCompatFolder("@ace_compat_rhs_usf3", ["ace_compat_rhs_usf3.*"])
folder = buildCompatFolder("@ace_compat_rhs_afrf3", ["ace_compat_rhs_afrf3.*"])
publishFolder(folder, "773131200", changelog_path)
#ADR97 (p90)- http://steamcommunity.com/sharedfiles/filedetails/?id=773136286