Merge pull request acemod#1 from acemod/AdlerSalbei-Trench-improvemen…

…ts-from-Grad-Trenches bring it up to speed
Theseus-Aegis · Jan 7, 2019 · 2a7ce51 · 2a7ce51
2 parents dfdd3e1 + 6690574
commit 2a7ce51
Show file tree

Hide file tree

Showing 131 changed files with 1,951 additions and 471 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -60,6 +60,7 @@ Coren <coren4@gmail.com>
 Crusty
 Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
 Dimaslg <dimaslg@telecable.es>
+diwako
 dixon13 <dixonbegay@gmail.com>
 Drill <drill87@gmail.com>
 Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.12.4-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.12.5-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.12.4.39
+3.12.5.40
diff --git a/addons/advanced_ballistics/stringtable.xml b/addons/advanced_ballistics/stringtable.xml
@@ -90,6 +90,7 @@
             <Chinese>啟用槍口初速變化</Chinese>
             <Chinesesimp>启用枪口初速变化</Chinesesimp>
             <French>Activer les variations de la vitesse initiale</French>
+            <Polish>Aktywuj wariację prędkości wylotowej</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_muzzleVelocityVariationEnabled_Description">
             <English>Simulates slight variations in muzzle velocity between each shot</English>
@@ -100,6 +101,7 @@
             <Chinese>模擬每發子彈的槍口初速都略有不同</Chinese>
             <Chinesesimp>模拟每发子弹的枪口初速都略有不同</Chinesesimp>
             <French>Simule les légères variations</French>
+            <Polish>Symuluje lekkie zmiany w prędkości wylotowej między każdym strzałem</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
             <English>Enable Ammo Temperature Simulation</English>

diff --git a/addons/advanced_fatigue/stringtable.xml b/addons/advanced_fatigue/stringtable.xml
@@ -10,6 +10,7 @@
             <Italian>ACE Fatica Avanzata</Italian>
             <Korean>ACE 고급 피로도</Korean>
             <French>ACE Fatigue Avancée</French>
+            <Polish>ACE Zaawansowane Zmęczenie</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor">
             <English>Performance Factor</English>
@@ -117,6 +118,7 @@
             <Chinese>抖動因素</Chinese>
             <French>Facteur de stabilisation</French>
             <Italian>Fattore di oscillazione</Italian>
+            <Polish>Czynnik kołysania</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_SwayFactor_Description">
             <English>Influences the amount of weapon sway. Higher means more sway.</English>
@@ -125,6 +127,7 @@
             <Chinese>影響手持武器晃動程度，數值越高抖動越厲害</Chinese>
             <French>Influence les mouvements de l'arme, une valeur plus élevée signifie plus de mouvements</French>
             <Italian>Influenza l'ammontare di oscillazione dell'arma. Maggiore significa più oscillazione.</Italian>
+            <Polish>Wpływa na poziom kołysania broni. Większa ilość znaczy większe kołysanie.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_Enabled">
             <English>Enabled</English>

diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml
@@ -9,6 +9,7 @@
             <Chinese>提供的位置無效</Chinese>
             <Chinesesimp>提供的位置无效。</Chinesesimp>
             <Korean>위치가 잘못되었습니다.</Korean>
+            <Polish>Podano błędną pozycję.</Polish>
         </Key>
         <Key ID="STR_ACE_ai_GarrisonNoUnits">
             <English>No units provided.</English>
@@ -18,6 +19,7 @@
             <Chinese>找不到可用的單位</Chinese>
             <Chinesesimp>找不到可用的单位。</Chinesesimp>
             <Korean>병력이 없습니다.</Korean>
+            <Polish>Nie podano żadnych jednostek.</Polish>
         </Key>
         <Key ID="STR_ACE_ai_GarrisonNotEnoughPos">
             <English>There aren't enough positions to place all units.</English>
@@ -27,6 +29,7 @@
             <Chinese>沒有足夠的位置能擺放所有單位</Chinese>
             <Chinesesimp>没有足够的位置能摆放所有单位。</Chinesesimp>
             <Korean>모든 병력을 배치 할 공간이 없습니다.</Korean>
+            <Polish>Nie ma wystarczającej ilości pozycji, aby umieścić wszystkie jednostki.</Polish>
         </Key>
         <Key ID="STR_ACE_ai_GarrisonNoBuilding">
             <English>No building found.</English>
@@ -36,6 +39,7 @@
             <Chinese>沒找到建築物</Chinese>
             <Chinesesimp>没找到建筑物。</Chinesesimp>
             <Korean>건물이 없습니다.</Korean>
+            <Polish>Nie znaleziono budynku.</Polish>
         </Key>
     </Package>
 </Project>
diff --git a/addons/arsenal/stringtable.xml b/addons/arsenal/stringtable.xml
@@ -604,6 +604,7 @@
             <Korean>ACE 아스날을 열 수 없음</Korean>
             <Chinese>無法開啟ACE虛擬軍火庫</Chinese>
             <Chinesesimp>无法开启ACE虚拟军火库</Chinesesimp>
+            <Polish>Nie można otworzyć arsenału ACE</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_portLoadoutsText">
             <English>Import BI VA loadouts to ACE Arsenal</English>
@@ -614,6 +615,7 @@
             <Chinese>匯入BI原廠虛擬軍火庫的裝備到ACE虛擬軍火庫中</Chinese>
             <Chinesesimp>汇入BI原厂虚拟军火库的装备到ACE虚拟军火库中</Chinesesimp>
             <Italian>Importa l'arsenale virtuale BI nell'arsenale ACE</Italian>
+            <Polish>Importuj zestawy wyposażenia z wirtualnego arsenału BI do arsenału ACE</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_portLoadoutsPlayerError">
             <English>No player unit available! Place a unit and mark it as "Player".</English>
@@ -624,6 +626,7 @@
             <Chinese>沒有可用的玩家單位!請擺放一個單位並設定成"玩家"</Chinese>
             <Chinesesimp>没有可用的玩家单位!请摆放一个单位并设定成"玩家"。</Chinesesimp>
             <Italian>Non ci sono giocatori! Poisziona una unità e impostala come "Giocatore".</Italian>
+            <Polish>Brak dostępnych jednostek gracza! Postaw jednostkę i oznacz ją jako "Gracz".</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_portLoadoutsLoadoutError">
             <English>No loadouts to import.</English>
@@ -634,6 +637,7 @@
             <Chinese>沒有裝備被匯入</Chinese>
             <Chinesesimp>没有装备被汇入。</Chinesesimp>
             <Italian>Non ci sono equipaggiamenti da importare.</Italian>
+            <Polish>Brak zestawów wyposażenia do zaimportowania.</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_Mission">
             <English>ACE Arsenal</English>
@@ -643,6 +647,7 @@
             <Chinese>ACE虛擬軍火庫</Chinese>
             <Chinesesimp>ACE虚拟军火库</Chinesesimp>
             <Italian>Arsenale ACE</Italian>
+            <Polish>Arsenał ACE</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_ReturnToArsenal">
             <English>Return to ACE Arsenal.</English>
@@ -652,6 +657,7 @@
             <Chinese>返回到ACE虛擬軍火庫</Chinese>
             <Chinesesimp>返回到ACE虚拟军火库。</Chinesesimp>
             <Italian>Torna all'arsenale ACE</Italian>
+            <Polish>Wróć do arsenału ACE.</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_Mission_tooltip">
             <English>Use ACE Arsenal to try out different weapons and equipment.</English>
@@ -661,6 +667,7 @@
             <Chinese>使用ACE虛擬軍火庫來嘗試不同的武器與裝備</Chinese>
             <Chinesesimp>使用ACE虚拟军火库来尝试不同的武器与装备。</Chinesesimp>
             <Italian>Usa l'arsenale ACE per provare armi ed equipaggiamenti vari.</Italian>
+            <Polish>Skorzystaj z arsenału ACE by wypróbować broń i ekwipunek.</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_Mission_overview">
             <English>Try weapons and equipment and create your own loadouts.</English>
@@ -670,6 +677,7 @@
             <Chinese>嘗試不同的武器與裝備來組合你個人的裝備配置</Chinese>
             <Chinesesimp>尝试不同的武器与装备来组合你个人的装备配置。</Chinesesimp>
             <Italian>Prova armi ed equipaggiamenti e creai i tuoi equipaggiamenti personalizzati.</Italian>
+            <Polish>Wypróbuj broń i ekwipunek i stwórz swoje własne zestawy wyposażenia.</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_buttonLoadoutsTooltip">
             <English>Open the loadouts screen</English>
@@ -678,6 +686,7 @@
             <Chinesesimp>开启装备选单</Chinesesimp>
             <Japanese>装備画面を開く</Japanese>
             <Italian>Apri la pagina degli equipaggiamenti</Italian>
+            <Polish>Otwórz ekran zestawów</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_buttonExportTooltip">
             <English>Export current / default loadouts</English>
@@ -686,6 +695,7 @@
             <Chinesesimp>汇出当前/预设的装备</Chinesesimp>
             <Japanese>現在 / 標準装備を出力</Japanese>
             <Italian>Esporta l'equipaggiamento attuale oppure la lista degli equipaggiamenti di base</Italian>
+            <Polish>Eksportuj obecne / domyślne zestawy wyposażenia </Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_buttonImportTooltip">
             <English>Import current / default loadouts</English>
@@ -694,6 +704,7 @@
             <Chinesesimp>汇入当前/预设的装备</Chinesesimp>
             <Japanese>現在 / 標準装備を取込</Japanese>
             <Italian>Importa l'equipaggiamento attuale oppure la lista degli equipaggiamenti di base</Italian>
+            <Polish>Importuj obecne / domyślne zestawy wyposażenia</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_statPotassium">
             <English>Potassium levels</English>
@@ -702,6 +713,7 @@
             <Chinesesimp>钾水平</Chinesesimp>
             <Chinese>鉀水平</Chinese>
             <Italian>Ilvello di potassio</Italian>
+            <Polish>Poziomy potasu</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_statMagnification">
             <English>Magnification</English>
@@ -723,26 +735,36 @@
             <English>Nightvision Support</English>
             <German>Nachtsicht Unterstützung</German>
             <Japanese>暗視装置に対応</Japanese>
+            <Polish>Wsparcie noktowizyjne</Polish>
+            <Italian>Supporto visore notturno</Italian>
         </Key>
         <Key ID="STR_ACE_Arsenal_statVisionMode_supPrim">
             <English>Primary supported</English>
             <German>Primär unterstützt</German>
             <Japanese>プライマリが対応</Japanese>
+            <Polish>Wspierane przez broń główną</Polish>
+            <Italian>Primario supportato</Italian>
         </Key>
         <Key ID="STR_ACE_Arsenal_statVisionMode_supSec">
             <English>Secondary supported</English>
             <German>Sekundär unterstützt</German>
             <Japanese>セカンダリが対応</Japanese>
+            <Polish>Wspierane przez broń drugorzędną</Polish>
+            <Italian>Secondario supportato</Italian>
         </Key>
         <Key ID="STR_ACE_Arsenal_statVisionMode_IntPrim">
             <English>Primary integrated</English>
             <German>Primär Integriert</German>
             <Japanese>プライマリに内蔵</Japanese>
+            <Polish>Zintegrowane z bronią główną</Polish>
+            <Italian>Primario integrato</Italian>
         </Key>
         <Key ID="STR_ACE_Arsenal_statVisionMode_NoSup">
             <English>Not Supported</English>
             <German>Nicht unterstützt</German>
             <Japanese>セカンダリに内蔵</Japanese>
+            <Polish>Nie wspierane</Polish>
+            <Italian>Non supportato</Italian>
         </Key>
         <Key ID="STR_ACE_Arsenal_page">
             <English>Page</English>
@@ -751,6 +773,7 @@
             <Chinesesimp>页面</Chinesesimp>
             <Chinese>頁面</Chinese>
             <Italian>Pagina</Italian>
+            <Polish>Strona</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_enableIdentityTabsSettings">
             <English>Enable the faces / voices / insignias tabs</English>
@@ -759,6 +782,7 @@
             <Chinesesimp>启用脸谱/声音/徽章/选项 </Chinesesimp>
             <Chinese>啟用臉譜/聲音/徽章選項</Chinese>
             <Italian>Abilita volti, voci e insegne</Italian>
+            <Polish>Aktywuj zakładki twarz / głos / insygnia</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_buttonClearContainerTooltip">
             <English>Empty the selected container</English>
@@ -767,6 +791,7 @@
             <Chinesesimp>选择的箱子是空的</Chinesesimp>
             <Chinese>清空選擇的箱子</Chinese>
             <Italian>Svuota il contenitore selezionato</Italian>
+            <Polish>Opróżnij wybrany pojemnik</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_exportedClassnameText">
             <English>Exported class name to clipboard</English>
@@ -775,6 +800,7 @@
             <Chinesesimp>将种类复制到剪贴板</Chinesesimp>
             <Chinese>輸出 class name 到剪貼簿上</Chinese>
             <Italian>Copiato il nome della classe negli appunti</Italian>
+            <Polish>Wyeksportowano nazwę klasy do schowka</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_Mode">
             <English>Mode</English>
@@ -812,6 +838,7 @@
             <English>Blacklist</English>
             <Japanese>禁止リスト</Japanese>
             <Italian>Lista Nera</Italian>
+            <Polish>Czarna lista</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_Items">
             <English>Items</English>
@@ -833,11 +860,14 @@
             <English>Export current items list as an array for use in scripts</English>
             <Japanese>スクリプト用に現在のアイテム リストをアレイで出力します</Japanese>
             <Italian>Esporta l'attuale lista di elementi come un array, per essere usati negli script</Italian>
+            <Polish>Eksportuj obecną listę przedmiotów jako tablicę do wykorzystania w skryptach</Polish>
         </Key>
         <Key ID="STR_ACE_Arsenal_statTTL">
             <English>Time to live</English>
             <French>Durée de vie</French>
             <Japanese>生存時間</Japanese>
+            <Polish>Czas by żyć</Polish>
+            <Italian>Scadenza (TTL)</Italian>
         </Key>
     </Package>
 </Project>
diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp
@@ -603,6 +603,17 @@ class CfgAmmo {
         ACE_muzzleVelocities[]={510, 550, 596};
         ACE_barrelLengths[]={304.8, 406.4, 609.6};
     };
+    class B_570x28_Ball: BulletBase {
+        ACE_caliber = 5.7;
+        ACE_bulletLength = 21.6; // http://blog.thejustnation.org/2011/04/5-7x28mm-ammo-review/
+        ACE_bulletMass = 2; // based on the SS190
+        ACE_ballisticCoefficients[] = {0.177}; //http://m.delphiforums.com/autogun/messages/5267/7
+        ACE_velocityBoundaries[] = {};
+        ACE_standardAtmosphere = "ASM"; // 50/50 chance to get it right
+        ACE_dragModel = 7;
+        ACE_muzzleVelocities[] = {716,776};
+        ACE_barrelLengths[] = {264,407};
+    };
     class B_19mm_HE: BulletBase {
         tracerScale = 1;
     };

diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
@@ -70,6 +70,18 @@ class CfgWeapons {
         };
     };
 
+    // P90 (1.86)
+    class SMG_03_TR_BASE: Rifle_Base_F {
+        ACE_barrelTwist = 228.6; // 1:9 inch twist
+        ACE_barrelLength = 407;
+        ACE_twistDirection = 1;
+        modes[] = {"Single"};
+    };
+    class SMG_03C_BASE: SMG_03_TR_BASE {
+        ACE_barrelLength = 264;
+        modes[] = {"Single", "FullAuto"};
+    };
+
     // Noreen "Bad News" ULR
     class DMR_02_base_F: Rifle_Long_Base_F {
         class Single: Mode_SemiAuto {

diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
@@ -2287,6 +2287,7 @@
             <Chinesesimp>膛线缠距</Chinesesimp>
             <Chinese>膛線扭度</Chinese>
             <Italian>Rigatura della canna</Italian>
+            <Polish>Gwintowanie lufy</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_statBarrelLength">
             <English>Barrel length</English>
@@ -2295,6 +2296,7 @@
             <Chinesesimp>身管长度</Chinesesimp>
             <Chinese>槍管長度</Chinese>
             <Italian>Lunghezza della canna</Italian>
+            <Polish>Długość lufy</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_statBallisticCoef">
             <English>Ballistic coefficient</English>
@@ -2303,6 +2305,7 @@
             <Chinesesimp>弹道系数</Chinesesimp>
             <Chinese>彈道係數</Chinese>
             <Italian>Coefficente balistico</Italian>
+            <Polish>Współczynnik balistyczny</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_statBulletMass">
             <English>Bullet mass</English>
@@ -2311,6 +2314,7 @@
             <Chinesesimp>弹头重量</Chinesesimp>
             <Chinese>彈頭重量</Chinese>
             <Italian>Massa del proiettile</Italian>
+            <Polish>Masa pocisku</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_statMuzzleVelocity">
             <English>Muzzle velocity</English>
@@ -2319,6 +2323,7 @@
             <Chinesesimp>枪口初速</Chinesesimp>
             <Chinese>槍口初速</Chinese>
             <Italian>Velocità iniziale</Italian>
+            <Polish>Prędkość wylotowa</Polish>
         </Key>
     </Package>
 </Project>
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
@@ -9,6 +9,7 @@
             <Chinesesimp>俘虏</Chinesesimp>
             <Japanese>捕虜</Japanese>
             <Korean>포로설정</Korean>
+            <Polish>Jeńcy</Polish>
         </Key>
         <Key ID="STR_ACE_Captives_SetCaptive">
             <English>Take Prisoner</English>
@@ -444,6 +445,7 @@
             <Chinese>設置在游標下的單位成俘虜狀態</Chinese>
             <Chinesesimp>设置在游标下的单位成俘虏状态。</Chinesesimp>
             <Korean>커서의 병력을 포박합니다.</Korean>
+            <Polish>Ustawia jednostkę pod kursorem jako jeniec.</Polish>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrenderAi_name">
             <English>Require AI surrendering</English>
@@ -453,6 +455,7 @@
             <Chinese>需要AI先行投降</Chinese>
             <Chinesesimp>需要AI先行投降</Chinesesimp>
             <Korean>AI 항복 필요</Korean>
+            <Polish>Wymaga poddania się przez SI</Polish>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrenderAi_description">
             <English>Require AI to surrender before they can be arrested</English>
@@ -462,6 +465,7 @@
             <Chinese>在逮捕AI之前該AI必須先進入投降狀態</Chinese>
             <Chinesesimp>在逮捕AI之前该AI必须先进入投降状态。</Chinesesimp>
             <Korean>포박하기 전에 먼저 AI가 투항해야만 합니다.</Korean>
+            <Polish>Wymaga poddania się przez SI zanim aresztowanie będzie możliwe</Polish>
         </Key>
     </Package>
 </Project>