diff --git a/README.md b/README.md index b885f22b23..733af4eaed 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- ACE3 Version + ACE3 Version ACE3 Issues diff --git a/addons/advanced_ballistics/stringtable.xml b/addons/advanced_ballistics/stringtable.xml index 606009a2c8..31b9b56bb9 100644 --- a/addons/advanced_ballistics/stringtable.xml +++ b/addons/advanced_ballistics/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -151,7 +151,7 @@ Active la balistique avancée pour tous les joueurs non locaux (activer cette option peut avoir un impact sur les performance en multi durant les grands échanges de tirs) Engedélyezi a fejlett ballisztikát az összes nem-helyi játékosnak (ez a funkció leronthatja a teljesítményt intenzív többjátékos tűzharcok alatt) Включает продвинутую баллистику для всех нелокальных игроков (включение этой опции может снизить производительность при массовых перестрелках в мультиплеере) - Abilita Balistica Avanzata per tutti i giocatori non locali (abilitare questo parametro potrebbe degradare le prestazioni durante scontri intensi in multiplayer) + Abilita Balistica Avanzata per tutti i giocatori non locali (abilitare questo parametro potrebbe ridurre le prestazioni durante scontri intensi in multiplayer) 非ローカルの全プレイヤーへアドバンスド バリスティックスを有効化します (マルチプレイで大規模な銃撃戦がおこなわれると、動作の低下を招きます) 고급 탄도학을 모든 비-로컬그룹에게도 적용합니다(적용 후 대규모 전투시 성능하락을 유발할 수 있습니다) @@ -179,7 +179,7 @@ Active tout le temps la balistique avancée quand un membre du groupe ouvre le feu Mindig engedélyezi a fejlett ballisztikát, ha egy csoporttag tüzel Всегда включает продвинутую баллистику когда стреляет член группы - Abilita sempre Balistica Avanzata quando un Membro del Gruppo spara + Abilita sempre Balistica Avanzata quando un membro del gruppo spara グループ メンバーが射撃した時、常にアドバンスド バリスティックスを有効化します 그룹 멤버가 발사시 항상 고급 탄도학을 적용합니다 @@ -235,7 +235,7 @@ La température de la munition influe sur la vélocité intiale A kezdősebesség a lőszer hőmérsékletétől függően változó Начальная скорость пули зависит от температуры - Velocità alla volata varia con la temperatura delle munizioni + La velocità dello sparo varia a seconda della temperatura delle munizioni 弾薬の温度により初速値を変化させます 탄약 온도에 비례해 총구 속도가 달라집니다 @@ -263,7 +263,7 @@ La longueur du canon influe sur la vélocité initale A kezdősebesség a cső hosszától függően változó Начальная скорость пули зависит от длины ствола - Velocità alla volata varia con la lunghezza della canna + La velocità di sparo varia a seconda della lunghezza della canna 銃身長により初速値を変化させます 총구 속도가 총열에 비례해 달라집니다 @@ -277,7 +277,7 @@ Activer l'effet balle traçante Nyomkövető-effekt engedélyezése Следы пуль - Abilita effetto di tracciatura dei proiettili + Abilita effetto dei Proiettili Traccianti 弾丸の痕跡表示を有効化 예광탄 효과 적용 @@ -291,7 +291,7 @@ Active une tracante pour les munitions de gros calibre (seulement visible en utilisant des optiques avancées) Engedélyezi a nagy kaliberű lövedékek nyomának vizuális követését (csak nagy teljesítményű optikán keresztül látható) Включает эффект следов пуль для больших калибров (видны только через мощную оптику) - Abilita effetto di tracciatura per proiettili di alto calibro (visibile solo attraverso ottiche ad alto potenziale) + Abilita effetto dei proiettili traccianti di alto calibro (visibile solo attraverso ottiche ad alto potenziale) 大口径の銃弾による弾丸の痕跡表示を有効化します (高倍率スコープを介してでしか見れません) 대구경 탄환에 예광탄 효과를 적용합니다(오직 고성능 조준경 사용시에만 보입니다) diff --git a/addons/advanced_fatigue/stringtable.xml b/addons/advanced_fatigue/stringtable.xml index 4a02cb07dd..02924c0ae9 100644 --- a/addons/advanced_fatigue/stringtable.xml +++ b/addons/advanced_fatigue/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -8,6 +8,7 @@ Współczynnik wydolności 성능 요인 Facteur de performance + Fattore Prestazione Influences the overall performance of all players with no custom factor. Higher means better. @@ -16,6 +17,7 @@ Wpływa na ogólną wydolność organizmu u wszystkich graczy bez ustawionego niestandardowego współczynnika. Więcej znaczy lepiej. 모든 성능이 임의로 설정된 값 없이 영향받습니다. 값이 클수록 더 나은 성능을 발휘합니다 Influence les performances générales de tous les joueurs sans facteurs personalisés. Une valeur plus élevée implique de meilleures performances. + Influenza qualsiasi prestazione di tutti i giocatori smuniti di un fattore personalizzato. Maggiore significa migliore. Influences the overall performance of this unit. Higher means better. @@ -24,6 +26,7 @@ Wpływa na ogólną wydolność tej jednostki. Więcej znaczy lepiej. 모든 성능이 이 단위로 영향을 받습니다. 값이 클수록 더 나은 성능을 발휘합니다 Influence les performances générales de cette unité. Une valeur plus élevée implique de meilleures performances. + Influenza qualsiasi prestazione di questa unità. Maggiore significa migliore. Recovery Factor @@ -32,6 +35,7 @@ Współczynnik regeneracji 회복 요인 Facteur de récupération + Fattore Recupero Changes how fast the player recovers when resting. Higher is faster. @@ -40,6 +44,7 @@ Wpływa na czas regeneracji podczas postoju. Więcej znaczy szybciej. 얼마나 빨리 회복하는지를 바꿉니다. 값이 클수록 더 나은 성능을 발휘합니다 Change la vitesse à laquelle les joueurs récupèrent leur endurance lorsqu'ils se reposent. Une valeur plus élevée implique une récupération plus rapide. + Determina in quanto tempo il giocatore recupera quando rilassato. Maggiore significa migliore. Load Factor @@ -48,6 +53,7 @@ Współczynnik masy ekwipunku 부담 요인 Facteur d'encombrement + Fattore Caricamento Increases or decreases how much weight influences the players performance. Zero means equipment weight has no performance influence. @@ -56,6 +62,7 @@ Zmniejsza lub zwiększa wpływ ciężaru ekwipunku na wydolność gracza. Zero oznacza kompletny brak wpływu na wydolność. 플레이어가 무게에 따라 얼마나 영향받는지를 증가시키거나 감소시킵니다. 0의 경우 플레이어가 장비 무게에 영향받지 않습니다. Augmente ou réduit l'influence que le poids à sur les performances des joueurs. Zéro implique que le poids de l'équipement n'a pas d'influence sur les performances. + Incrementa o decrementa quanto il peso influenza le prestazioni dei giocatori. Zero significa che il peso dell'equipaggiamento non ha alcuna influenza nelle prestazioni. Terrain Gradient Factor @@ -64,6 +71,7 @@ Współczynnik terenu 지형 경사도 요인 Facteur d'inclinaison du terrain + Fattore Pendenza Terreno Sets how much steep terrain increases stamina loss. Higher means higher stamina loss. @@ -72,6 +80,7 @@ Wpływa na to w jakim stopniu stromy teren wpływa na utratę wytrzymałości. Więcej oznacza szybszą utratę wytrzymałości. 경사도에 따라 얼마나 피로해지는지를 정합니다. 값이 클수록 더 많은 피로를 유발합니다. Configure l'influence de l'inclinaison du terrain sur la perte d'endurance. Une valeur plus élevée implique une perte d'endurance plus importante. + Stabilisce quanto la pendenza del terreno incrementa la perdita della stamina. Maggiore significa più stamina persa. Enabled @@ -80,6 +89,7 @@ Włączone 활성화 Activé + Abilitato Enables/disables Advanced Fatigue. @@ -88,6 +98,7 @@ Włącza/wyłącza zaawansowaną wytrzymałość 고급 피로도 활성화/비활성화 Active/désactive la fatigue avancée. + Abilita/disabilita la Fatica Avanzata. Show stamina bar @@ -96,6 +107,7 @@ Pokaż pasek wytrzymałości 피로도 막대 Afficher la barre d'endurance + Mostra barra stamina Shows the stamina bar. @@ -104,6 +116,7 @@ Pokazuje pasek wytrzymałości. 피로도 막대를 보여줍니다. Affiche la barre d'endurance. + Mostra la barra della stamina. diff --git a/addons/advanced_throwing/stringtable.xml b/addons/advanced_throwing/stringtable.xml index 2cc7a9c8b6..2874570523 100644 --- a/addons/advanced_throwing/stringtable.xml +++ b/addons/advanced_throwing/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -9,6 +9,7 @@ Erweitertes Wurfsystem 고급 투척 Lancé amélioré + Lancio Avanzato Allows changing advanced throwing behaviour. @@ -18,6 +19,7 @@ Erlaubt es, das Verhalten des erweiterten Wurfsystems zu ändern. 고급 투척 행위를 허가합니다 Permet de changer la configuration du lancé amélioré. + Permette il cambiamento della modalità di tiro. Enable Advanced Throwing @@ -27,6 +29,7 @@ Aktiviere erweitertes Wurfsystem 고급 투척 활성화 Active le lancé amélioré + Abilita Lancio Avanzato Enables advanced throwing system. @@ -36,6 +39,7 @@ Aktiviert das erweiterte Wurfsystem. 고급 투척을 활성화 합니다 Active le système de lancé amélioré. + Abilita il sistema di lancio avanzato. Show Throw Arc @@ -45,6 +49,7 @@ Zeige Wurfbogen 투척 궤적 표시 Afficher l'arc de lancé + Mostra Arco di Tiro Enables visualization of the throw arc (where throwable will fly). @@ -54,6 +59,7 @@ Aktiviert die Visualisierung des Wurfbogens (wohin das Objekt geworfen werden wird). 투척 궤도를 시각화 합니다(투척물이 어디로 갈지) Active la visualisation de l'arc de lancé (où l'objet lancé va atterrir). + Abilita la visualizzazione dell'arco del tiro (dove l'oggetto lanciabile volerà). Show Throwing Mouse Controls @@ -63,6 +69,7 @@ Zeige Maussteuerung beim Werfen 마우스 조작 표시 Afficher les contrôles à la souris du lancé + Mostra Comandi Mouse Lancio Enables visual cues for mouse controls when throwable is prepared. @@ -72,6 +79,7 @@ Aktiviert visuelle Hinweise zur Maussteuerung, wenn ein Objekt zum Werfen vorbereitet wird. 투척물을 준비시 마우스 조작을 시각화해서 보여줍니다 Active les aides visuels pour les controles à la souris lorsqu'un lancé est préparé. + Abilita la visualizzazione dei controlli del mouse quando l'oggetto lanciabile è pronto. Enable Throwables Pick Up @@ -81,6 +89,7 @@ Aktiviere Aufheben von Wurfobjekten 투척물 줍기 활성화 Active la récupération des objets lancés + Abilita Raccogli Oggetti Enables ability to pick up throwables from the ground. @@ -90,6 +99,7 @@ Aktiviert die Möglichkeit, geworfene Objekte wieder vom Boden aufzuheben. 땅에 떨어진 투척물을 주울 수 있게 해줍니다. Active la capacité de récupérer les objets lancés sur le sol. + Abilita la possibilità di raccogliere un oggetto lanciabile da terra. Enable Attached Throwables Pick Up @@ -99,6 +109,7 @@ Aktiviere erneute Aufnahme befestigter Wurfobjekte 부착 투척물 줍기 활성화 Active le ramassage d'objets lançables attachés + Abilita Raccogli Oggetti Lanciabili da altri Oggetti Enables ability to pick up throwables from attached objects. @@ -108,6 +119,7 @@ Aktiviert die Möglichkeit, befestigte Wurfobjekte erneut aufzunehmen. 부착된 투척물을 주울 수 있게 해줍니다. Active la capacité à ramasser les objets lançables attaché à d'autres objets. + Abilita la possibilità di raccogliere gli oggetti lanciabili dagli altri oggetti. Prepare/Change Throwable @@ -117,6 +129,7 @@ Wurfobjekt vorbereiten/wechseln 투척물 준비/변경 Préparer/changer d'objet + Prepara/Cambia Oggetto lanciabile Throwable Drop Mode (Hold) @@ -126,6 +139,7 @@ Wurfobjekt Fallmodus (halten) 투척물 떨어뜨리기 모드(꾹눌러서) Mode de lancé de l'objet (Tenir) + Modalità Oggetto Gettabile (Mantenere) Throwable Drop Mode (Toggle) @@ -135,6 +149,7 @@ Wurfobjekt Fallmodus (umschalten) 투척물 떨어뜨리기 모드(토글) Mode de lancé de l'objet (Basculer) + Modalità Oggetto lanciabile Gettabile (Interruttore) Primed @@ -144,6 +159,7 @@ Scharf gemacht 뇌관 작동 Amorcer + Armato Throw @@ -153,6 +169,7 @@ Werfen 던지기 Lancer + Lanciare (Scroll) Change Mode @@ -162,6 +179,7 @@ (Scrollen) Modus wechseln (마우스 휠) 모드 변경 (Molette souris) Changer de mode + (Scorrere) Cambio Modalità (Scroll) Extend @@ -171,6 +189,7 @@ (Scrollen) Erweitern (마우스 휠) 연장 (Molette souris) Etendre + (Scorrere) Estendere (Click) Cook @@ -180,6 +199,7 @@ (Klicken) Abkochen (클릭) 예열 (Clique) Dégoupiller + (Click) Arma Pick Up @@ -189,6 +209,7 @@ Aufheben 줍기 Ramasser + Raccogli diff --git a/addons/aircraft/CfgVehicles.hpp b/addons/aircraft/CfgVehicles.hpp index f5f496505e..8f3be35873 100644 --- a/addons/aircraft/CfgVehicles.hpp +++ b/addons/aircraft/CfgVehicles.hpp @@ -223,25 +223,16 @@ class CfgVehicles { class Plane_CAS_01_base_F: Plane_Base_F { lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; - class Turrets; - - #include }; class Plane_CAS_02_base_F: Plane_Base_F { lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; - class Turrets; - - #include }; class Plane_Fighter_03_base_F: Plane_Base_F { lockDetectionSystem = 12; incomingMissileDetectionSystem = 16; - class Turrets; - - #include }; class UAV_01_base_F: Helicopter_Base_F { diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index b94d9f4940..7e5c2a34bb 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -1,5 +1,3 @@ -class Mode_SemiAuto; -class Mode_Burst; class Mode_FullAuto; class CfgWeapons { @@ -18,20 +16,6 @@ class CfgWeapons { magazineReloadTime = 0.1; }; - // Manual Switching Of Flare Mode - class SmokeLauncher; - class CMFlareLauncher: SmokeLauncher { - modes[] = {"Single", "Burst", "AIBurst"}; - - class Single: Mode_SemiAuto { - reloadTime = 0.1; - }; - - class Burst: Mode_Burst { - displayName = CSTRING(CMFlareLauncher_Burst_Name); - }; - }; - // bigger mag for comanche class CannonCore; class gatling_20mm: CannonCore { diff --git a/addons/aircraft/flightmodel_alca.hpp b/addons/aircraft/flightmodel_alca.hpp deleted file mode 100644 index afe74ef9fd..0000000000 --- a/addons/aircraft/flightmodel_alca.hpp +++ /dev/null @@ -1,23 +0,0 @@ -acceleration = 300; -maxSpeed = 936; -irScanRangeMin = 500; -irScanRangeMax = 5000; -aileronSensitivity = 0.64; -elevatorSensitivity = 0.682; -rudderInfluence = 0.001; -aileronControlsSensitivityCoef = 3; -elevatorControlsSensitivity = 2; -rudderControlsSensitivityoef = 4; -elevatorCoef[] = {0.6, 0.73, 0.62, 0.52, 0.39, 0.33, 0.28}; -aileronCoef[] = {0.5, 0.68, 0.75, 0.86, 0.92, 0.96, 1}; -rudderCoef[] = {0.9, 0.75, 0.58, 0.45, 0.38, 0.35, 0.3}; -envelope[] = {0, 0.06, 1.2, 3, 3.6, 3.75, 3.65, 3.45, 3.3, 2.8, 2.4, 1.9, 1.5}; -angleOfIndicence = 0.0523599; //determines velocity vector behaviour, how quickly it catches up with where your nose is pointing, I think -draconicForceXCoef = 7.5; //max angle of attack, lower value gives higher aoa -draconicForceYCoef = 0.2198; //Something to do with bleed off of speed, low values seem to increase bleed off -draconicForceZCoef = 5.12; //???? -draconicTorqueXCoef = 0.18; //resistance to elevator input, also impacts speed degradation -draconicTorqueYCoef = 0.000017; -thrustCoef[] = {1.3, 1.27, 1.24, 1.2, 1.17, 1.15, 1.13, 1.1, 1.06, 1, 0.94, 0.72, 0.51, 0.4, 0.25, 0}; -gunAimDown = 0.029; -flapsFrictionCoef = 0.32; diff --git a/addons/aircraft/flightmodel_thunderbolt.hpp b/addons/aircraft/flightmodel_thunderbolt.hpp deleted file mode 100644 index 0f99f5ef91..0000000000 --- a/addons/aircraft/flightmodel_thunderbolt.hpp +++ /dev/null @@ -1,21 +0,0 @@ -maxSpeed = 736; -aileronSensitivity = 0.85; -elevatorSensitivity = 0.75; -rudderInfluence = 0.001; -aileronControlsSensitivityCoef = 3; -elevatorControlsSensitivity = 2; -rudderControlsSensitivityoef = 4; -elevatorCoef[] = {0.7, 0.75, 0.75, 0.65, 0.55, 0.45, 0.35}; -aileronCoef[] = {0.6, 0.85, 0.88, 0.92, 0.95, 0.97, 1}; -rudderCoef[] = {0.8, 0.75, 0.65, 0.5, 0.4, 0.33, 0.3}; -flapsFrictionCoef = 0.35; -angleOfIndicence = 0.0523599; -draconicForceXCoef = 9.5; -draconicForceYCoef = 0.56; -draconicForceZCoef = 0.1; -draconicTorqueXCoef = 0.58; -draconicTorqueYCoef = 0.00013; -envelope[] = {0, 0, 0.75, 2.4, 3.6, 3.8, 3.7, 3.2, 2.2, 1.7, 0.9}; -thrustCoef[] = {1, 1.2, 1.3, 1.25, 1.06, 1.01, 1, 0.92, 0.75, 0.65, 0.5, 0.25, 0}; -acceleration = 265; -landingSpeed = 220; diff --git a/addons/aircraft/flightmodel_yak.hpp b/addons/aircraft/flightmodel_yak.hpp deleted file mode 100644 index 9ba4c40c76..0000000000 --- a/addons/aircraft/flightmodel_yak.hpp +++ /dev/null @@ -1,20 +0,0 @@ -maxSpeed = 1059; -acceleration = 300; -aileronSensitivity = 0.635; -elevatorSensitivity = 0.814; -rudderInfluence = 0.001; -aileronControlsSensitivityCoef = 3; -elevatorControlsSensitivity = 2; -rudderControlsSensitivityoef = 4; -elevatorCoef[] = {0.6, 0.76, 0.7, 0.65, 0.58, 0.47, 0.43}; -aileronCoef[] = {0.5, 0.85, 0.87, 0.89, 0.92, 0.95, 1}; -rudderCoef[] = {0.8, 0.7, 0.6, 0.5, 0.4, 0.32, 0.27}; -angleOfIndicence = 0.0523599; -draconicForceXCoef = 7.6; -draconicForceYCoef = 0.75; -draconicForceZCoef = 0.085; -draconicTorqueXCoef = 0.815; -draconicTorqueYCoef = 0.000152; -envelope[] = {0, 0.446, 1.5, 3.9, 5.2, 4.8, 4.2, 3.5, 2, 1, 0.5}; -thrustCoef[] = {1, 1.2, 1.7, 1.7, 1.65, 1.54, 1.32, 1.1, 0.95, 0.75, 0.5, 0.35, 0}; -flapsFrictionCoef = 0.32; diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index 36012099b1..7e08f906ee 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -1,20 +1,6 @@ - - Burst - Feuerstoß - Ráfaga - Seria - Dávka - Rafale - Очередь - Sorozat - Rajada - Raffica - バースト - 점사 - XM301 XM301 diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml index 9eefee62c1..1caeccb40a 100644 --- a/addons/cargo/stringtable.xml +++ b/addons/cargo/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -243,7 +243,8 @@ 空中投下 Zrzut zaopatrzenia 공중 투하 - Largage aérien + Largage aérien + Lancio Aereo Unlevel Flight @@ -251,15 +252,18 @@ 機体が水平ではありません Nierówny lot 기체가 수평이 아닙니다 - Rétablir l'assiette + Rétablir l'assiette + Volo non Livellato Paradrop Time Coffecient 空中投下までの時間係数 + Coefficente Tempo Lancio Paracadute Modifier for how long it takes to paradrop a cargo item. カーゴ アイテムを空中投下するまでの時間を変更します。 + Modificato per quanto tempo ci impiega a paracadutare un oggetto cargo. diff --git a/addons/chemlights/stringtable.xml b/addons/chemlights/stringtable.xml index c95af9dc26..76e1ffd27e 100644 --- a/addons/chemlights/stringtable.xml +++ b/addons/chemlights/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -8,6 +8,7 @@ Knicklichter 켐라이트 Cyalumes + Luce chimica Prepare %1 @@ -16,6 +17,7 @@ %1 vorbereiten %1 준비 Prépare %1 + Prepara %1 %1<br/>Prepared @@ -24,6 +26,7 @@ %1<br/>vorbereitet %1<br/>준비됨 %1<br/>prêt + %1 <br/> Preparata No inventory space @@ -33,7 +36,7 @@ Pas de place Nedostatek místa v inventáři Sem espaço no inventário - Non hai più spazio + Nessuno spazio nell'inventario Nincs több hely В инвентаре нет места インベントリに空きがありません @@ -46,6 +49,7 @@ [ACE] Knicklichter [ACE] 켐라이트 [ACE] Cyalume + [ACE] Luci chimiche Chemlight (Orange) @@ -54,6 +58,7 @@ Knicklicht (orange) 켐라이트 (주황) Cyalume (orange) + Luce chimica (Arancione) Orange Light @@ -62,6 +67,7 @@ Oranges Knicklicht 주황색 Lum. orange + Luce Arancione Type: Light - Orange<br />Rounds: 1<br />Used in: Hand @@ -70,6 +76,7 @@ Typ: Licht - orange<br />Anzahl: 1<br />Benutzt in: Hand 종류:밝은 오렌지<br />수량: 1<br />사용처: 손 Type: Lumière - orange<br />Nbre: 1<br /> À main + Tipo: Luce - Arancione<br/>Rimanenti: 1<br/>Usata in: Mano Chemlight (White) @@ -78,6 +85,7 @@ Knicklicht (weiß) 켐라이트 (하양) Cyalume (blanc) + Luce chimica (Bianca) White Light @@ -86,6 +94,7 @@ Weißes Knicklicht 하얀색 Lum. blanche + Luce Bianca Type: Light - White<br />Rounds: 1<br />Used in: Hand @@ -94,6 +103,7 @@ Typ: Licht - weiß<br />Anzahl: 1<br />Benutzt in: Hand 종류:하얀색<br />수량: 1<br />사용처: 손 Type: Lumière - blanche<br />Nbre: 1<br /> À main + Tipo: Luce - Bianca<br/>Rimanenti: 1<br/>Usata in: Mano Chemlight (Hi Red) @@ -102,6 +112,7 @@ Knicklicht (rot, hell) 켐라이트 (밝은 빨간색) Cyalume (Hi rouge) + Luce chimica (Hi Rossa) Red Hi Light @@ -110,6 +121,7 @@ Helles, rotes Knicklicht 밝은 빨간색 Lum. rouge haute intensité + Luce Hi Rossa Type: Light - Red Hi (5 minute)<br />Rounds: 1<br />Used in: Hand @@ -118,6 +130,7 @@ Typ: Licht - rot, hell (5 Minuten)<br />Anzahl: 1<br />Benutzt in: Hand 종류: 밝은 빨간색 (5분)<br />수량: 1<br />사용처: 손 Type: Lumière - rouge Hi (5 minutes)<br />Nbre: 1<br /> À main + Tipo: Luce - Rossa Hi (5 minuti)<br />Rimanenti: 1<br/>Usata in: Mano Chemlight (Hi Yellow) @@ -126,6 +139,7 @@ Knicklicht (gelb, hell) 켐라이트 (밝은 노란색) Cyalume (Hi jaune) + Luce chimica (Hi Gialla) Yellow Hi Light @@ -134,6 +148,7 @@ Helles, gelbes Knicklicht 밝은 노란색 Lum. jaune haute intensité + Luce Hi Gialla Type: Light - Yellow Hi (5 minute)<br />Rounds: 1<br />Used in: Hand @@ -142,6 +157,7 @@ Typ: Licht - gelb, hell (5 Minuten)<br />Anzahl: 1<br />Benutzt in: Hand 종류:밝은 노란색 (5분)<br />수량: 1<br />사용처: Hand Type: Lumière - Jaune Hi (5 minutes)Nbre: 1<br /> À main + Tipo: Luce - Gialla Hi (5 minuti)<br />Rimanenti: 1<br/>Usata in: Mano Chemlight (Hi Orange) @@ -150,6 +166,7 @@ Knicklicht (orange, hell) 켐라이트 (밝은 주황색) Cyalume (Hi orange) + Luce chimica (Hi Arancione) Orange Hi Light @@ -158,6 +175,7 @@ Helles, oranges Knicklicht 밝은 주황색 Lum. orange haute intensité + Luce Hi Arancione Type: Light - Orange Hi (5 minute)<br />Rounds: 1<br />Used in: Hand @@ -166,6 +184,7 @@ Typ: Licht - orange, hell (5 Minuten)<br />Anzahl: 1<br />Benutzt in: Hand 종류: 밝은 주황색 (5분)<br />수량: 1<br />사용처: 손 Type: Lumière - orange Hi (5 minutes)<br />Nbre: 1<br /> À main + Tipo: Luce - Arancione Hi (5 minuti)<br />Rimanenti: 1<br/>Usata in: Mano Chemlight (Hi White) @@ -174,6 +193,7 @@ Knicklicht (weiß, hell) 켐라이트 (밝은 하얀색) Cyalume (Hi blanc) + Luce chimica (Hi Bianca) White Hi Light @@ -182,6 +202,7 @@ Helles, weißes Knicklicht 밝은 하얀색 Lum. blanche haute intensité + Luce Hi Bianca Type: Light - White Hi (5 minute)<br />Rounds: 1<br />Used in: Hand @@ -190,6 +211,7 @@ Typ: Licht - weiß, hell (5 Minuten)<br />Anzahl: 1<br />Benutzt in: Hand 종류: 밝은 하얀색 (5분)<br />수량: 1<br />사용처: 손 Type: Lumière - blanche Hi (5 minutes)<br />Nbre: 1<br /> À main + Tipo: Luce - Bianca Hi (5 minuti)<br />Rimanenti: 1<br/>Usata in: Mano Chemlight (IR) @@ -198,6 +220,7 @@ Knicklicht (IR) 켐라이트 (적외선) Cyalume (IR) + Luce chimica (IR) IR Light @@ -206,6 +229,7 @@ IR-Knicklicht 적외선 켐라이트 Lumière IR + Luce IR Type: Light - Infrared<br />Rounds: 1<br />Used in: Hand @@ -214,6 +238,7 @@ Typ: Licht - infrarot<br />Anzahl: 1<br />Benutzt in: Hand 종류: 적외선<br />수량: 1<br />사용처: 손 Type: Lumière - infrarouge<br />Nbre: 1<br /> À main + Tipo: Luce - Infrarossi<br />Usata in: Mano Chemlight Shield (Empty) @@ -222,6 +247,7 @@ Knicklicht-Abschirmung (leer) 켐라이트 쉴드 (비어있음) Étui cyalume (vide) + Scudo Luce chimica (Vuoto) Shield for chemlights. Combine with chemlight to prepare reading light. @@ -230,6 +256,7 @@ Abschirmung für Knicklichter. Mit Knicklicht kombinieren, um Leselicht zu erhalten. 켐라이트를 위한 가림막입니다. 켐라이트와 같이 사용하여 읽을 때 씁니다. Étui pour cyalume. Combiné avec un cyalume pour obtennir un lampe de lecture. + Scudo per luci chimiche. Combina con una luce chimica per una luce da lettura. Chemlight Shield (Green) @@ -238,6 +265,7 @@ Knicklicht-Abschirmung (grün) 켐라이트 쉴드 (초록) Étui cyalume (vert) + Scudo Luce Chimica (Verde) Green reading light. @@ -246,6 +274,7 @@ Grünes Leselicht. 초록빛 조명 Lampe d'orientation verte. + Luce da lettura Verde. Chemlight Shield (Red) @@ -254,6 +283,7 @@ Knicklicht-Abschirmung (rot) 켐라이트 쉴드 (빨강) Étui cyalume (rouge) + Scudo Luce Chimica (Rossa) Red reading light. @@ -262,6 +292,7 @@ Rotes Leselicht. 빨간색 조명 Lampe d'orientation rouge. + Luce da lettura Rossa. Chemlight Shield (Blue) @@ -270,6 +301,7 @@ Knicklicht-Abschirmung (blau) 켐라이트 쉴드 (파랑) Étui cyalume (bleu) + Scudo Luce Chimica (Blu) Blue reading light. @@ -278,6 +310,7 @@ Blaues Leselicht. 파란색 조명 Lampe d'orientation bleue. + Luce da lettura Blu. Chemlight Shield (Yellow) @@ -286,6 +319,7 @@ Knicklicht-Abschirmung (gelb) 켐라이트 쉴드 (노랑) Étui cyalume (jaune) + Scudo Luce Chimica (Gialla) Yellow reading light. @@ -294,6 +328,7 @@ Gelbes Leselicht. 노란색 조명 Lampe d'orientation jaune. + Luce da lettura Gialla. Chemlight Shield (Orange) @@ -302,6 +337,7 @@ Knicklicht-Abschirmung (orange) 켐라이트 쉴드 (주황) Étui cyalume (orange) + Scudo Luce Chimica (Arancione) Orange reading light. @@ -310,6 +346,7 @@ Oranges Leselicht. 주황색 조명 Lampe d'orientation orange. + Luce da lettura Arancione. Chemlight Shield (White) @@ -318,6 +355,7 @@ Knicklicht-Abschirmung (weiß) 켐라이트 쉴드 (하양) Étui cyalume (blanc) + Scudo Luce Chimica (Bianca) White reading light. @@ -326,6 +364,7 @@ Weißes Leselicht. 주황색 조명 Lampe d'orientation blanche. + Luce da lettura Bianca. diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index 98736a6dba..f0821f3f4c 100644 --- a/addons/common/functions/fnc_checkFiles.sqf +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -41,18 +41,29 @@ private _addons = "true" configClasses (configFile >> "CfgPatches");// _addons = _addons apply {toLower configName _x};// _addons = _addons select {_x find "ace_" == 0}; +private _oldCompats = []; { if (getText (configFile >> "CfgPatches" >> _x >> "versionStr") != _version) then { private _errorMsg = format ["File %1.pbo is outdated.", _x]; ERROR(_errorMsg); - if (hasInterface) then { - ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); + if ((_x select [0, 10]) != "ace_compat") then { + if (hasInterface) then { + ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); + }; + } else { + _oldCompats pushBack _x; // Don't block game if it's just an old compat pbo }; }; false } count _addons; +if (!(_oldCompats isEqualTo [])) then { + [{ + // Lasts for ~10 seconds + ERROR_WITH_TITLE_1("The following ACE compatiblity PBOs are outdated", "%1", _this); + }, _oldCompats, 1] call CBA_fnc_waitAndExecute; +}; /////////////// // check dlls diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml index 4aa9423b96..8e8e41ff4f 100644 --- a/addons/cookoff/stringtable.xml +++ b/addons/cookoff/stringtable.xml @@ -10,6 +10,7 @@ 쿡오프 현상 활성화 Aktywuj efekty samozapłonu amunicji Active le cook-off + Abilita Esplosione Enables cook off and related vehicle destruction effects. @@ -20,6 +21,7 @@ 쿡오프 현상을 활성화 하고 관련된 차량에 폭발 이펙트를 적용합니다. Aktywuje efekt samozapłonu amunicji na zniszczonych pojazdach. Active le cook-off (autocombustion des munitions) et les effets de destruction liés. + Abilita l'esplosione e i relativi effetti di distruzione del veicolo. Wreck (Turret) @@ -42,6 +44,7 @@ 탄약 상자 쿡오프 현상 활성화 Aktywuj samozapłon skrzyń z amunicją Cook-off caisses de munitions + Abilita esplosione cassa munizioni Enables cooking off of ammo boxes. @@ -50,6 +53,7 @@ 탄약 상자에 쿡오프 현상을 적용합니다. Aktywuje samozapłon skrzyń z amunicją Active le cook-off sur toutes les caisses de munitions. + Abilita l'esplosione della cassa di munizioni. Enable Ammunition cook off @@ -58,6 +62,7 @@ 탄약 쿡오프 현상 활성화 Aktywuj samozapłon amunicji Active le cook-off des munitions + Abilita Esplosione munizioni Enables Ammunition cook off. Fires ammunition projectiles while vehicle is on fire and has ammunition. @@ -65,18 +70,21 @@ Ermöglicht Selbstzündung von Munition. Feuert Projektile der Munition ab, solange das Fahrzeug brennt und Munition besitzt. Aktywuje samozapłon amunicji. Wystrzeliwuje pociski podczas gdy pojazd płonie i posiada amunicję. Mets à feu les munitions lorsqu'un véhicule est en feu et contient des munitions. + Abilita l'esplosione delle munizioni. Spara munizioni di proiettili quando il veicolo va a fuoco e contiene munizioni. Ammunition cook off duration Czas trwania samozapłonu amunicji 弾薬の誘爆持続時間 Durée cook-off des munitions + Durata esplosione munizioni Multiplier for how long cook off lasts [Setting to 0 will disable ammo cookoff] Multiplicateur de la durée du cook-off des munitions [Une valeur de 0 désactive l'effet] Mnożnik decydujący jak długo ma trwać samozapłon amunicji [Ustawienie na 0 spowoduje wyłącznie samozapłonu] 誘爆の持続時間を乗数で設定。[0 に設定で誘爆を無効化] + Moltiplicatore della durata dell'esplosione [Impostare 0 disabiliterà l'esplosione delle munizioni] diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 29d9d5e232..3d9df039a1 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ Lanzador utilizado Elhasznált kilövőcső Отстрелянная труба - Tubo usato + Lanciatore usato Tubo utilizado 使用済み 사용함 diff --git a/addons/dogtags/stringtable.xml b/addons/dogtags/stringtable.xml index 3e13f3621e..5aa5d80a4e 100644 --- a/addons/dogtags/stringtable.xml +++ b/addons/dogtags/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,6 +10,7 @@ Hundemarke 군번줄 Plaque d'identification + Piastrina Check Dog Tag @@ -20,6 +21,7 @@ Hundemarke prüfen 군번줄 확인 Vérifier les plaques d'identification + Controlla Piastrina Check @@ -30,6 +32,7 @@ Prüfen 확인 Vérifier + Controlla Take @@ -40,6 +43,7 @@ Nehmen 회수 Prendre + Prendi Dogtag taken from %1... @@ -50,6 +54,7 @@ Hundemarke von %1 genommen ... %1로부터 군번줄을 회수했습니다... Plaque d'identification pris sur %1... + Piastrina presa da %1... Somebody else has already taken the dogtag... @@ -60,7 +65,7 @@ Jemand anderes hat bereits die Hundemarke genommen ... 누군가 이미 군번줄을 회수해갔습니다... Quelqu'un d'autre a déjâ pris les plaques d'identification... + Qualcun altro ha già preso la piastrina... - diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 9b9296d3d4..e0cb44badf 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -883,6 +883,7 @@ Stolperdraht-Leuchtrakete 조명지뢰 Fusée éclairante avec fil de détente + Cavo d'innesco Type: Tripwire flare - Ignites a non-lethal flare when triggered.<br />Rounds: 1<br />Used on: Ground @@ -892,6 +893,7 @@ Typ: Stolperdraht-Leuchtrakete - Schießt bei Auslösung eine nicht-tödliche Leuchtrakete ab.<br />Ladungen: 1<br />Benutzt auf: Boden 종류: 조명지뢰 - 작동시 무해한 조명을 사출합니다.<br />장탄수: 1<br />사용처: 지면 Type : Fusée éclairante avec fil de détente - Allume une fusée éclairante lorsque déclenché. <br />Coups : 1<br />Utilisé sur : le sol + Tipo: Cavo d'innesco - Sfocio un abbaglio non letale quanto attivato. <br />Rimanenti: 1<br />Usato: A terra diff --git a/addons/fastroping/stringtable.xml b/addons/fastroping/stringtable.xml index 362b422fa1..26573f3e0d 100644 --- a/addons/fastroping/stringtable.xml +++ b/addons/fastroping/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ Wyposaż FRIES Equiper le FRIES Equipar FRIES - Equipaggia la FRIES + Equipaggia il FRIES Vybavit FRIES Equipar FRIES Десантирование по канатам @@ -20,7 +20,7 @@ Wyposaża kompatybilne helikoptery w zestaw Fast Rope Insertion Extraction System. Equipe les hélicoptères compatibles avec un Module Fast Rope Insertion Extraction System. Equipar helicoptero compatible con un Sistema de Inserción Extracción Fast Rope. - Equipagga l'elicottero compatibile con il Fast Rope Insertion Exstraction System + Equipagga l'elicottero compatibile con il Fast Rope Insertion Extraction System Vybavit kompatibilní vrtulníky systémem Fast Rope Insertion Extraction (FRIES). Equipa um helicóptero compatível com o Fast Rope Insertion Exctraction System. Снаряжает совместимые вертолеты оборудованием для спуска десанта по канатам. @@ -59,7 +59,7 @@ Zjedź na linie Descendre à la corde Descender por la cuerda - Scendi sulla corda + Scendi dalla corda SLANIT Descida rápida Спуститься по канату @@ -85,7 +85,7 @@ Wyposaż helikopter w FRIES Equiper l'hélicoptère avec le FRIES Equipar helicoptero con FRIES - Equipaggia l'elicottero con FRIES + Equipaggia l'elicottero con il FRIES Vybavit vrtulník pomocí FRIES Equipar helicóptero com FRIES Снарядить вертолет канатами для спуска diff --git a/addons/fcs/CfgOptics.hpp b/addons/fcs/CfgOptics.hpp index aa68a6f68a..f8770d7327 100644 --- a/addons/fcs/CfgOptics.hpp +++ b/addons/fcs/CfgOptics.hpp @@ -11,110 +11,13 @@ h = 0; \ }; +class RscText; class RscControlsGroup; class RscMapControl; class RscInGameUI { class RscUnitInfo; - class RscUnitInfo_AH64D_gunner { - controls[] = {"CA_Distance","ACE_CA_Distance"}; - MACRO_RANGEFINDER - }; - class RscWeaponRangeFinder { - controls[] = {"CA_Distance","ACE_CA_Distance"}; - MACRO_RANGEFINDER - }; - class RscWeaponRangeFinderPAS13 { - MACRO_RANGEFINDER - }; - class RscOptics_Rangefinder: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscWeaponRangeFinderMAAWS { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscWeaponRangeFinderAbramsCom { - controls[] = {"CA_Distance","ACE_CA_Distance"}; - MACRO_RANGEFINDER - }; - class RscWeaponRangeFinderAbramsGun { - controls[] = {"CA_Distance","ACE_CA_Distance"}; - MACRO_RANGEFINDER - }; - class RscWeaponRangeFinderStrykerMGSGun { - controls[] = {"CA_Distance","ACE_CA_Distance"}; - MACRO_RANGEFINDER - }; - class RscOptics_crows: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_strider_commander { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - - class RscWeaponRangeZeroing: RscUnitInfo { - controls[] = {"CA_Zeroing", "CA_DistanceText", "CA_Distance","ACE_CA_Distance", "ACE_Rangehelper"}; - MACRO_RANGEFINDER - }; - class RscOptics_sos: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_nightstalker: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_tws: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_punisher { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_tws_sniper: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_SDV_periscope { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; class RscOptics_Heli_Attack_02_gunner: RscUnitInfo { class CA_IGUI_elements_group: RscControlsGroup { class controls { @@ -122,7 +25,7 @@ class RscInGameUI { }; }; }; - class Rsc_ACE_Helo_UI_Turret: RscUnitInfo { + class Rsc_ACE_Helo_UI_Turret: RscUnitInfo { // RscOptics_Heli_Attack_01_gunner onLoad = "[""onLoad"",_this,""RscUnitInfo"",'IGUI'] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable ['ACE_dlgRangefinder', _this select 0]; ((_this select 0) displayCtrl 151) ctrlSetTextColor [0, 0, 0, 0];"; class CA_IGUI_elements_group: RscControlsGroup { class controls { @@ -130,103 +33,30 @@ class RscInGameUI { }; }; }; - class RscOptics_Heli_Attack_01_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_UAV_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_UGV_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; + class RscOptics_APC_Tracked_01_gunner: RscUnitInfo { class CA_IGUI_elements_group: RscControlsGroup { class controls { - MACRO_RANGEFINDER + class CA_Distance: RscText {}; }; }; }; - class RscOptics_APC_Tracked_03_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_APC_Wheeled_01_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_APC_Wheeled_03_commander: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_APC_Wheeled_03_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_MBT_01_commander: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_MBT_01_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_MBT_02_commander: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_MBT_02_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - class RscOptics_MBT_03_gunner: RscUnitInfo { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER - }; - }; - }; - - // marksmen - class RscOptics_LaserDesignator_02 { - class CA_IGUI_elements_group: RscControlsGroup { - class controls { - MACRO_RANGEFINDER + class ACE_RscOptics_APC_Tracked_01_gunner: RscOptics_APC_Tracked_01_gunner { + class CA_IGUI_elements_group: CA_IGUI_elements_group { + class controls: controls { + // MACRO_RANGEFINDER + modify IDC of CA_Distance + class CA_Distance: CA_Distance { + idc = 151; + }; + class ACE_CA_Distance: CA_Distance { + idc = 1713151; + text = "----"; + }; + class ACE_Rangehelper: RscMapControl { + onDraw = "((ctrlParent (_this select 0)) displayCtrl 1713151) ctrlShow (cameraView == 'GUNNER');"; + w = 0; + h = 0; + }; }; }; }; diff --git a/addons/fcs/CfgVehicles.hpp b/addons/fcs/CfgVehicles.hpp index 82572f2c68..47b731a66c 100644 --- a/addons/fcs/CfgVehicles.hpp +++ b/addons/fcs/CfgVehicles.hpp @@ -49,9 +49,6 @@ class CfgVehicles { class Turrets { class MainTurret: NewTurret { GVAR(Enabled) = 1; // all tracked vehicles get one by default - class Turrets { - class CommanderOptics; - }; }; }; }; @@ -60,231 +57,52 @@ class CfgVehicles { class Turrets { class MainTurret: NewTurret { GVAR(Enabled) = 1; // all tracked vehicles get one by default - class Turrets { - class CommanderOptics;//: CommanderOptics {}; - }; }; }; }; - class Car_F: Car { - class Turrets { - class MainTurret; - }; - }; - - class Wheeled_APC_F: Car_F { - class Turrets { - class MainTurret: NewTurret { - class Turrets { - class CommanderOptics;//: CommanderOptics {}; - }; - }; - }; - }; - - class MRAP_01_base_F: Car_F {}; - - class MRAP_01_gmg_base_F: MRAP_01_base_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - - class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - - class B_MRAP_01_F: MRAP_01_base_F { - class Turrets; - }; - - class MRAP_02_base_F: Car_F {}; - - class MRAP_02_hmg_base_F: MRAP_02_base_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - - class MRAP_02_gmg_base_F: MRAP_02_hmg_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - - class O_MRAP_02_F: MRAP_02_base_F { - class Turrets; - }; - - class MRAP_03_base_F: Car_F { - class Turrets: Turrets { - class CommanderTurret: MainTurret { - GVAR(Enabled) = 0; - }; - }; - }; - - class MRAP_03_hmg_base_F: MRAP_03_base_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - class CommanderTurret: CommanderTurret { - GVAR(Enabled) = 0; - }; - }; - }; - - class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - class CommanderTurret: CommanderTurret {}; - };*/ - }; - - class APC_Wheeled_01_base_F: Wheeled_APC_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret { - class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - }; - }; - };*/ - }; - - class B_APC_Wheeled_01_base_F: APC_Wheeled_01_base_F {}; - - class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - - class APC_Wheeled_02_base_F: Wheeled_APC_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - - // class CommanderOptics: CommanderOptics {}; - }; - }; - - class APC_Wheeled_03_base_F: Wheeled_APC_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - - /*class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - };*/ - }; - }; - }; - - class I_APC_Wheeled_03_base_F: APC_Wheeled_03_base_F {}; - - class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - class APC_Tracked_01_base_F: Tank_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret { - class Turrets; - }; - };*/ - }; - - class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - - class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F { class Turrets: Turrets { class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; + GVAR(Enabled) = 0; }; - class CommanderOptics: CommanderOptics {}; }; }; - class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { - //GVAR(Enabled) = 0; @todo - }; + class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F {}; class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F { class Turrets: Turrets { class MainTurret: MainTurret { + GVAR(Enabled) = 1; + turretinfotype = "ACE_RscOptics_APC_Tracked_01_gunner"; + GVAR(MaxDistance) = 2000; discreteDistance[] = {}; discreteDistanceInitIndex = 0; magazines[] += {"ACE_120Rnd_35mm_ABM_shells_Tracer_Red"}; - - /*class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - };*/ }; }; }; class APC_Tracked_02_base_F: Tank_F { - /*class Turrets: Turrets { + class Turrets: Turrets { class MainTurret: MainTurret { - class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - }; + GVAR(Enabled) = 0; }; - };*/ + }; }; class O_APC_Tracked_02_base_F: APC_Tracked_02_base_F {}; - - class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - + class O_APC_Tracked_02_AA_F: O_APC_Tracked_02_base_F { class Turrets: Turrets { class MainTurret: MainTurret { + GVAR(Enabled) = 1; + turretinfotype = "ACE_RscOptics_APC_Tracked_01_gunner"; + GVAR(MaxDistance) = 2000; + discreteDistance[] = {}; + discreteDistanceInitIndex = 0; magazines[] += {"ACE_120Rnd_35mm_ABM_shells_Tracer_Green"}; - - /*class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - };*/ }; }; }; @@ -292,151 +110,31 @@ class CfgVehicles { class APC_Tracked_03_base_F: Tank_F { class Turrets: Turrets { class MainTurret: MainTurret { - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - - /*class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - };*/ + GVAR(Enabled) = 0; }; }; }; class MBT_01_base_F: Tank_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - - /*class Turrets: Turrets { - class CommanderOptics: CommanderOptics {}; - };*/ - }; - }; - }; - - class B_MBT_01_base_F: MBT_01_base_F {}; - - class B_MBT_01_cannon_F: B_MBT_01_base_F {}; - - class B_MBT_01_TUSK_F: B_MBT_01_cannon_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - GVAR(Enabled) = 1; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - }; - }; - - class MBT_01_arty_base_F: MBT_01_base_F { class Turrets: Turrets { class MainTurret: MainTurret { GVAR(Enabled) = 0; - - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - }; - }; - - class MBT_01_mlrs_base_F: MBT_01_base_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 0; - //class Turrets; }; }; }; class MBT_02_base_F: Tank_F { - class Turrets: Turrets { - class MainTurret: MainTurret { - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - GVAR(Enabled) = 1; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - }; - }; - - class MBT_02_arty_base_F: MBT_02_base_F { class Turrets: Turrets { class MainTurret: MainTurret { GVAR(Enabled) = 0; - - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - GVAR(Enabled) = 1; - GVAR(MaxDistance) = 2000; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; }; }; }; - + class MBT_03_base_F: Tank_F { class Turrets: Turrets { class MainTurret: MainTurret { - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - GVAR(Enabled) = 1; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - }; - }; - - // SHIPS - class Ship: AllVehicles { - class Turrets { - class MainTurret; - }; - }; - - class Ship_F: Ship {}; - - class Boat_F: Ship_F {}; - - class Boat_Armed_01_base_F: Boat_F { - class Turrets: Turrets { - class FrontTurret: NewTurret { - GVAR(enabled) = 1; - GVAR(minDistance) = 100; - GVAR(maxDistance) = 2000; - GVAR(distanceInterval) = 5; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - class RearTurret: FrontTurret { - discreteDistance[] = {100,200,300,400,600,800,1000,1200}; // Originally inherited from FrontTurret - discreteDistanceInitIndex = 4; + GVAR(Enabled) = 0; }; }; }; @@ -450,51 +148,7 @@ class CfgVehicles { }; }; - class Plane: Air {}; - - class Helicopter_Base_F: Helicopter { - class Turrets: Turrets { - class CopilotTurret; - }; - }; - - class Helicopter_Base_H: Helicopter_Base_F { - class Turrets: Turrets { - class CopilotTurret; - }; - }; - - class Heli_Light_01_base_F: Helicopter_Base_H { - /*class Turrets: Turrets { - class CopilotTurret: CopilotTurret {}; - };*/ - }; - - class Heli_Light_01_unarmed_base_F: Heli_Light_01_base_F {}; - - class B_Heli_Light_01_F: Heli_Light_01_unarmed_base_F { - /*class Turrets: Turrets { - class CopilotTurret: CopilotTurret {}; - };*/ - }; - - class Heli_Light_01_armed_base_F: Heli_Light_01_base_F { - /*class Turrets: Turrets { - class CopilotTurret: CopilotTurret {}; - };*/ - }; - - class Heli_Light_02_base_F: Helicopter_Base_H { - /*class Turrets: Turrets { - class CopilotTurret: CopilotTurret {}; - };*/ - }; - - class Plane_Base_F: Plane { - class Turrets { - class CopilotTurret; - }; - }; + class Helicopter_Base_F: Helicopter {}; class Heli_Attack_01_base_F: Helicopter_Base_F { class Turrets: Turrets { @@ -515,80 +169,4 @@ class CfgVehicles { }; }; }; - - class Heli_Transport_01_base_F: Helicopter_Base_H { - /*class Turrets: Turrets { - class CopilotTurret: CopilotTurret {}; - class MainTurret: MainTurret {}; - class RightDoorGun: MainTurret {}; - };*/ - }; - - class Heli_Transport_02_base_F: Helicopter_Base_H { - /*class Turrets: Turrets { - class CopilotTurret: CopilotTurret {}; - };*/ - }; - - class Heli_light_03_base_F; - class I_Heli_light_03_base_F: Heli_light_03_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - class I_Heli_light_03_F: Heli_light_03_base_F { - /*class Turrets: Turrets { - class MainTurret: MainTurret {}; - };*/ - }; - - class Plane_CAS_01_base_F: Plane_Base_F { - class Turrets; - }; - - class Plane_CAS_02_base_F: Plane_Base_F { - class Turrets; - }; - - class Plane_Fighter_03_base_F: Plane_Base_F { - class Turrets; - }; - - // static weapons. - class StaticWeapon: LandVehicle { - class Turrets { - class MainTurret; //: NewTurret {}; - }; - }; - - class StaticMGWeapon: StaticWeapon {}; - - class HMG_01_base_F: StaticMGWeapon { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MinDistance) = 200; - GVAR(MaxDistance) = 2000; - GVAR(DistanceInterval) = 5; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; - - class StaticGrenadeLauncher: StaticWeapon {}; - class GMG_TriPod: StaticGrenadeLauncher {}; - - class GMG_01_base_F: GMG_TriPod { - class Turrets: Turrets { - class MainTurret: MainTurret { - GVAR(Enabled) = 1; - GVAR(MinDistance) = 200; - GVAR(MaxDistance) = 2000; - GVAR(DistanceInterval) = 5; - discreteDistance[] = {}; - discreteDistanceInitIndex = 0; - }; - }; - }; }; diff --git a/addons/fcs/CfgWeapons.hpp b/addons/fcs/CfgWeapons.hpp index 760e39e2de..555060b119 100644 --- a/addons/fcs/CfgWeapons.hpp +++ b/addons/fcs/CfgWeapons.hpp @@ -1,15 +1,6 @@ class CfgWeapons { - // disable locking, so it doesn't interfere with our system class CannonCore; - class cannon_120mm: CannonCore { - canLock = 0; - ballisticsComputer = 0; - }; - class autocannon_Base_F: CannonCore { - canLock = 0; - ballisticsComputer = 0; - }; class autocannon_35mm: CannonCore { canLock = 0; ballisticsComputer = 4; //was "4 + 2", 2 is for manual zeroing, 4 is for the lead indicator - https://community.bistudio.com/wiki/A3_Locking_Review#ballisticsComputer diff --git a/addons/fcs/XEH_postInit.sqf b/addons/fcs/XEH_postInit.sqf index 02c9e72ae5..ef6e89d5cc 100644 --- a/addons/fcs/XEH_postInit.sqf +++ b/addons/fcs/XEH_postInit.sqf @@ -21,3 +21,7 @@ if (!hasInterface) exitWith {}; // Register event for global updates [QGVAR(forceUpdate), {[ACE_player] call FUNC(onForceUpdate)}] call CBA_fnc_addEventHandler; + +#ifdef DEBUG_MODE_FULL +call compile preprocessFileLineNumbers QPATHTOF(functions\dev_debugConfigs.sqf); +#endif diff --git a/addons/fcs/functions/dev_debugConfigs.sqf b/addons/fcs/functions/dev_debugConfigs.sqf new file mode 100644 index 0000000000..73abd89771 --- /dev/null +++ b/addons/fcs/functions/dev_debugConfigs.sqf @@ -0,0 +1,88 @@ +// PabstMirror +#include "script_component.hpp" + +diag_log text format ["[ACE_FCS] ---------------"]; +private _vehicles = configProperties [configFile >> "CfgVehicles", "(isClass _x) && {2 == getNumber (_x >> 'scope')}", true]; +private _problemUIs = []; +{ + private _vehicleType = configName _x; + { + private _turret = _x; + private _config = [_vehicleType, _turret] call CBA_fnc_getTurret; + if (!isNull _config) then { + private _aceFCS = (getNumber (_config >> "ACE_FCS_Enabled")) == 1; + + private _vanillaFCS = false; + private _weapons = getArray (_config >> "weapons"); + { + private _weapon = _x; + private _ballisticComputer = getNumber (configFile >> "CfgWeapons" >> _weapon >> "ballisticsComputer"); + _ballisticComputer = [_ballisticComputer, 5] call ace_common_fnc_toBin; + if ((_ballisticComputer select [(count _ballisticComputer) - 5, 1]) == "1") then { + _vanillaFCS = true; + if (_aceFCS) then {diag_log text format ["%1 -> %2: ACE FCS Enabled CONFLICTS with vanilla FCS [%3]", _vehicleType, _weapon, _ballisticComputer];}; + }; + } forEach _weapons; + + if (!(_weapons isEqualTo [])) then { + private _fcsMsg = switch (true) do { + // case ((!_vanillaFCS) && {!_aceFCS}): {"No FCS"}; + // case ((_vanillaFCS) && {_aceFCS}): {"CONFLICT FCS"}; + // case (_vanillaFCS): {"Vanilla FCS"}; + // case (_aceFCS): {"ACE FCS"}; + default {""}; + }; + if (_fcsMsg != "") then {diag_log text format ["%1: %2", _vehicleType, _fcsMsg];}; + }; + + if (_vanillaFCS) then { + private _dd = getArray (_config >> "discreteDistance"); + if (_dd isEqualTo []) exitWith {diag_log format ["%1->%2: discreteDistance with vanillaFCS [%3]", _vehicleType, _turret, _config];}; + }; + + if (true) then { + private _turretInfo = getText (_config >> "turretInfoType"); + private _infoConfig = configFile >> "RscInGameUI" >> _turretInfo; + if (!isNull _infoConfig) then { + private _idcList = []; + + private _fncGetIDCS = { + params ["_subConfig"]; + if (!isClass _subConfig) exitWith {diag_log "err";}; + private _controlsArray = getArray (_subConfig >> "controls"); + { + [_subConfig >> _x] call _fncGetIDCS; + } forEach _controlsArray; + private _controlsConfig = configProperties [(_subConfig >> "controls"), "isClass _x", true]; + { + [_x] call _fncGetIDCS; + } forEach _controlsConfig; + _idcList pushBack getNumber (_subConfig >> "idc"); + }; + [_infoConfig] call _fncGetIDCS; + + if (_aceFCS && {!(1713151 in _idcList)}) then { + _problemUIs pushBackUnique format ["%1: ACE_FCS, but missing ACE_CA_DIST", _turretInfo]; + }; + if (_aceFCS && {(198 in _idcList)}) then { + _problemUIs pushBackUnique format ["%1: ACE_FCS, but NEW Lazr CA_DIST", _turretInfo, _vehicleType]; + }; + if ((!_aceFCS) && {(1713151 in _idcList)}) then { + _problemUIs pushBackUnique format ["%1: Not ACE but has ACE_CA_DIST", _turretInfo, _vehicleType]; + }; + if (_vanillaFCS && {!(198 in _idcList)}) then { + _problemUIs pushBackUnique format ["%1: vanillaFCS but missing NEW Lazr CA_DIST [just a warning]", _turretInfo, _vehicleType]; + }; + }; + }; + }; + } forEach [[0],[0,0]]; +} forEach _vehicles; + +_problemUIs sort true; + +diag_log text format ["[ACE_FCS] ------- Problem UIs --------"]; +{ + diag_log text format ["- %1", _x]; +} forEach _problemUIs; +diag_log text format ["[ACE_FCS] ---------------"]; diff --git a/addons/gestures/stringtable.xml b/addons/gestures/stringtable.xml index 46a3fdba6a..4f5063721b 100644 --- a/addons/gestures/stringtable.xml +++ b/addons/gestures/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ ACE Posunky ACE Gestes ACE Kézjelek - ACE Gesti + Gesti ACE ACE Gestos ACE Жесты ACE Gestos @@ -236,7 +236,7 @@ Zeige Gesten im Selbst-Interkationsmenü, lege sie auf Schnelltasten, oder deaktiviere sie vollständig. Zobrazit posunky pro vlastní interakční menu, nebo prostě použít klávesové zkratky, nebo to zakázat úplně Pokaż listę gestów w menu własnej interakcji, użyj tylko skrótów na klawiaturze lub wyłącz całkowicie - Mostra Gesti nel Menù Interazione Personale, o usa solamente Hotkey, o disabilita completamente + Mostra Gesti nel Menù Interazione Personale, o usa solamente tasti di scelta rapida, o disabilita completamente Muestror los gestos en el menú de interacción propia, utilizar solo combinación de teclas o desactivarlos completamente Afficher les gestes dans le menu d'interaction personnel, ou seulement utiliser les touches, ou desactiver complètement. Mostra gestos no menu de interação, ou utilize um dos atalhos de teclado ou desative completamente @@ -249,7 +249,7 @@ Nur Schnelltasten Pouze klávesové zkratky Tylko skróty klaw. - Solo Hotkey + Solo tasti di scelta rapida Solo mediante teclas Seulement les touches Somente atalhos de teclado @@ -262,7 +262,7 @@ Schnelltasten+ Interaktionsmenü Klávesové zkratky + interakční menu Skróty klaw. + menu interakcji - Hotkey + Menù Interazione + Tasti di scelta rapida + Menù Interazione Teclas y Menú de Interacción Touches + menu d'interaction Atalhos + Menu de Interação diff --git a/addons/gforces/stringtable.xml b/addons/gforces/stringtable.xml index 4bce899bd1..2abb558b58 100644 --- a/addons/gforces/stringtable.xml +++ b/addons/gforces/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -12,6 +12,7 @@ G による効果 Efekty przeciążeń 중력가속도 효과 + Effetti forza G Only Aircraft @@ -24,6 +25,7 @@ 航空機のみ Tylko samoloty 비행기에만 적용 + Solo Aerei diff --git a/addons/goggles/stringtable.xml b/addons/goggles/stringtable.xml index 6d37b00e21..c06d310ef7 100644 --- a/addons/goggles/stringtable.xml +++ b/addons/goggles/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -37,6 +37,7 @@ Brilleneffekt 고글 효과 Effets des lunettes + Effetto Occhiali Tint @@ -46,6 +47,7 @@ Tönung 색조 Teinte + Colore Tint + Effects @@ -55,7 +57,7 @@ Tönung + Effekte 색조+효과 Teinte + effets + Colore + Effetti - diff --git a/addons/grenades/CfgVehicles.hpp b/addons/grenades/CfgVehicles.hpp index 1315ccf611..f9ac60d9fe 100644 --- a/addons/grenades/CfgVehicles.hpp +++ b/addons/grenades/CfgVehicles.hpp @@ -2,40 +2,40 @@ class CfgVehicles { class NATO_Box_Base; class Box_NATO_Grenades_F: NATO_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_HandFlare_White,12); - MACRO_ADDITEM(ACE_HandFlare_Green,12); - MACRO_ADDITEM(ACE_M84,12); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_HandFlare_White,12); + MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12); + MACRO_ADDMAGAZINE(ACE_M84,12); }; }; class EAST_Box_Base; class Box_East_Grenades_F: EAST_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_HandFlare_Yellow,12); - MACRO_ADDITEM(ACE_HandFlare_Red,12); - MACRO_ADDITEM(ACE_M84,12); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12); + MACRO_ADDMAGAZINE(ACE_HandFlare_Red,12); + MACRO_ADDMAGAZINE(ACE_M84,12); }; }; class IND_Box_Base; class Box_IND_Grenades_F: IND_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_HandFlare_Yellow,12); - MACRO_ADDITEM(ACE_HandFlare_Green,12); - MACRO_ADDITEM(ACE_M84,12); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12); + MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12); + MACRO_ADDMAGAZINE(ACE_M84,12); }; }; class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - class TransportItems { - MACRO_ADDITEM(ACE_HandFlare_White,12); - MACRO_ADDITEM(ACE_HandFlare_Red,12); - MACRO_ADDITEM(ACE_HandFlare_Green,12); - MACRO_ADDITEM(ACE_HandFlare_Yellow,12); - MACRO_ADDITEM(ACE_M84,12); - MACRO_ADDITEM(ACE_M14,12); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_HandFlare_White,12); + MACRO_ADDMAGAZINE(ACE_HandFlare_Red,12); + MACRO_ADDMAGAZINE(ACE_HandFlare_Green,12); + MACRO_ADDMAGAZINE(ACE_HandFlare_Yellow,12); + MACRO_ADDMAGAZINE(ACE_M84,12); + MACRO_ADDMAGAZINE(ACE_M14,12); }; }; }; diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml index cbabdd01b2..fe102bec8f 100644 --- a/addons/grenades/stringtable.xml +++ b/addons/grenades/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -303,6 +303,7 @@ Granat zapalający AN-M14 AN-M14 소이 수류탄 Grenade incendiaire AN-M14 + AN-M14 Granata Incendiaria AN-M14 @@ -312,6 +313,7 @@ AN-M14 AN-M14 AN-M14 + AN-M14 Incendiary grenade used to destroy weapons, ammunition and other equipment. @@ -321,6 +323,7 @@ Granat zapalający, używany do niszczenia broni, amunicji i innego sprzętu. 소이 수류탄은 무기나 탄약 그리고 장비를 파괴할때 쓰입니다. Grenade incendiaire utilisé pour détruire des armes, munitions et autres équipements. + Granata incendiaria usata per distruggere armi, munizioni e altri equipaggiamenti. diff --git a/addons/gunbag/stringtable.xml b/addons/gunbag/stringtable.xml index 51a1e63cdf..5e5d8a7526 100644 --- a/addons/gunbag/stringtable.xml +++ b/addons/gunbag/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,6 +10,7 @@ ガンバッグ Torba na broń 총가방 + Borsa per Armi Gunbag (Tan) @@ -20,6 +21,7 @@ ガンバッグ (タン) Torba na broń (jasnobrązowa) 총가방 (황갈색) + Borsa per Armi (Tan) Put weapon into gunbag @@ -30,6 +32,7 @@ ガンバッグへ武器を入れる Włóż broń do torby 무기를 총가방에 넣기 + Metti l'arma nella borsa per armi Get weapon out of gunbag @@ -40,6 +43,7 @@ ガンバッグから武器を出す Wyciągnij broń z torby 무기를 총가방에서 꺼내기 + Prendi l'arma dalla borsa per armi Status @@ -50,6 +54,7 @@ 中身 Status 상태 + Stato Gunbag Empty @@ -60,6 +65,7 @@ ガンバッグは空 Torba jest pusta 총가방 비어있음 + Borsa per armi vuota diff --git a/addons/hearing/CfgWeapons.hpp b/addons/hearing/CfgWeapons.hpp index c063c0e896..8b138271b3 100644 --- a/addons/hearing/CfgWeapons.hpp +++ b/addons/hearing/CfgWeapons.hpp @@ -13,42 +13,42 @@ class CfgWeapons { }; }; + #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6; + #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5; + #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0; + class H_HelmetB; class H_HelmetCrew_B: H_HelmetB { - GVAR(protection) = 1; - GVAR(lowerVolume) = 0.80; + HEARING_PROTECTION_VICCREW }; class H_CrewHelmetHeli_B: H_HelmetB { - GVAR(protection) = 0.85; - GVAR(lowerVolume) = 0.75; + HEARING_PROTECTION_VICCREW }; class H_PilotHelmetHeli_B: H_HelmetB { - GVAR(protection) = 0.85; - GVAR(lowerVolume) = 0.75; + HEARING_PROTECTION_VICCREW }; class H_PilotHelmetFighter_B: H_HelmetB { - GVAR(protection) = 1; - GVAR(lowerVolume) = 0.80; + HEARING_PROTECTION_VICCREW }; class HelmetBase; class H_Cap_headphones: HelmetBase { - GVAR(protection) = 0.5; - GVAR(lowerVolume) = 0.60; + HEARING_PROTECTION_EARMUFF }; class H_HelmetB_light: H_HelmetB { - GVAR(protection) = 0.8; - GVAR(lowerVolume) = 0.20; + HEARING_PROTECTION_PELTOR + }; + class H_HelmetB_camo: H_HelmetB { + HEARING_PROTECTION_PELTOR }; class H_HelmetB_plain_mcamo; class H_HelmetSpecB: H_HelmetB_plain_mcamo { - GVAR(protection) = 0.8; - GVAR(lowerVolume) = 0.20; + HEARING_PROTECTION_PELTOR }; }; diff --git a/addons/javelin/stringtable.xml b/addons/javelin/stringtable.xml index ece03b3699..a1f786da72 100644 --- a/addons/javelin/stringtable.xml +++ b/addons/javelin/stringtable.xml @@ -9,7 +9,7 @@ Namierz cel (przytrzymaj) Verrouiller la cible (maintenir) Célpontra állás (Lenyomva tartott) - Aggangia il bersagio + Aggangia il bersaglio Fijar objetivo (Mantener) Travar Alvo(Segurar) 目標を捕捉 (押しっぱ) diff --git a/addons/laser/stringtable.xml b/addons/laser/stringtable.xml index 4014441551..7e8db0c87c 100644 --- a/addons/laser/stringtable.xml +++ b/addons/laser/stringtable.xml @@ -8,6 +8,7 @@ 레이저 분산 시뮬레이션 수 Wskaźnik poziomu rozproszenia wiązki lasera Compte de la simulation de la dispersion du laser + Contatore Simulazione Dispersione Laser Laser Code diff --git a/addons/logistics_wirecutter/stringtable.xml b/addons/logistics_wirecutter/stringtable.xml index f13cd9a288..542b152af3 100644 --- a/addons/logistics_wirecutter/stringtable.xml +++ b/addons/logistics_wirecutter/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ Służą do cięcia drutu i płotów Pince coupante Drótok, huzalok, és kábelek vágására alkalmas olló. - Trancia da ferro + Tronchese Cortador de Arame ワイヤーカッター 절단기 diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 6cb346a72b..f0681137a6 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -9,7 +9,7 @@ #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 1.64 +#define REQUIRED_VERSION 1.70 #define REQUIRED_CBA_VERSION {3,2,1} #ifdef COMPONENT_BEAUTIFIED diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 6b0cc9e423..a52346e875 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 9 -#define PATCHLVL 1 -#define BUILD 17 +#define PATCHLVL 2 +#define BUILD 18 diff --git a/addons/map/stringtable.xml b/addons/map/stringtable.xml index f5eb043e80..d7fb92a3d6 100644 --- a/addons/map/stringtable.xml +++ b/addons/map/stringtable.xml @@ -445,6 +445,7 @@ GPS피아식별기 끄기 Wyłącz BFT Désactive le BFT + Disablita BFT Always disable Blue Force Tracking for this group. @@ -453,6 +454,7 @@ 이 그룹에 한해 GPS피아식별기를 항상 끕니다. Zawsze wyłączaj Blue Force Tracking dla tej grupy. Désactive en permanence le Blue Force Tracking pour ce groupe. + Disabilita sempre il Blue Force Tracking per questo gruppo. diff --git a/addons/maptools/stringtable.xml b/addons/maptools/stringtable.xml index 8828aed603..da72ba5a52 100644 --- a/addons/maptools/stringtable.xml +++ b/addons/maptools/stringtable.xml @@ -163,6 +163,7 @@ Klawisz obrotu narzędzi nawigacyjnych Taste zum Drehen des Kartenwerkzeugs 독도용 도구 돌리기 키 + Ruota Strumenti di Mappatura Modifier key to allow rotating map tools @@ -172,6 +173,7 @@ Modyfikator pozwalający na obracanie narzędzi nawigacyjnych Steuerungstaste, um Drehung des Kartenwerkzeugs zu ermöglichen. 독도용 도구를 돌리기 위한 키를 변경할 수 있습니다. + Tasto modifica per consentire strumenti di mappatura rotanti Draw straight lines with maptools @@ -180,6 +182,7 @@ 독도용 도구로 직선 그리기 Rysuj proste linie przy użyciu narzędzi nawigacyjnych Tracer des lignes droites + Disegna linee dritte con gli strumenti di mappatura Draw on the edge of maptools to draw straight lines. Note: Must hover at midpoint to delete. @@ -188,6 +191,7 @@ 독도용 도구 가장자리에 직선을 그립니다. 주의: 삭제하기 위해선 선의 중앙에 가져다 대십시요 Przeciągnij po krawędzi narzędzi nawigacyjnych by narysować prostą linię. Uwaga: aby usunąć linię - nalezy ustawić kursor nad jej środkiem. Utiliser le bord des outils de navigation pour tracer des lignes droites. Note: l'on doit survoler le milieu du trait pour pouvoir le supprimer. + Disegna sul bordo degli strumenti di mappatura per disegnare linee dritte. Nota: Deve spostarsi al centro per essere cancellato. diff --git a/addons/medical_ai/stringtable.xml b/addons/medical_ai/stringtable.xml index c7eba9b03a..b2fdbbb773 100644 --- a/addons/medical_ai/stringtable.xml +++ b/addons/medical_ai/stringtable.xml @@ -9,6 +9,7 @@ サーバーと HC のみ Tylko serwer i HC Seulement sur le server ou le HC + Solo Server e HC diff --git a/addons/medical_blood/stringtable.xml b/addons/medical_blood/stringtable.xml index bd401f5c39..4bbd2c19a1 100644 --- a/addons/medical_blood/stringtable.xml +++ b/addons/medical_blood/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -8,6 +8,7 @@ 오직 플레이어만 Tylko gracze Joueurs seulement + Solo Giocatori Enable Blood Drops @@ -16,6 +17,7 @@ 피흘리기 활성화 Włącz ślady krwi na ziemi Active les gouttes de sang + Abilita Perdite di Sangue Enable or disable Blood Drops created on bleeding and taking damage @@ -23,6 +25,7 @@ Aktiviere oder deaktiviere Blutspritzer, die durch Blutungen oder bei Schadensnahme entstehen. Włącz lub wyłącz pozostawianie śladów krwi na ziemi kiedy postać odnosi obrażenia bądź krwawi (Dés)active les gouttes de sang lors d'un saignement ou de blessure + Abilita o disabilita la Perdite di Sangue create sanguinando e prendendo danno diff --git a/addons/minedetector/CfgVehicles.hpp b/addons/minedetector/CfgVehicles.hpp index 14273b108c..ab6c06b4cb 100644 --- a/addons/minedetector/CfgVehicles.hpp +++ b/addons/minedetector/CfgVehicles.hpp @@ -1,9 +1,9 @@ class CfgVehicles { class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - class TransportItems { - MACRO_ADDITEM(ACE_VMM3,4); - MACRO_ADDITEM(ACE_VMH3,4); + class TransportWeapons { + MACRO_ADDWEAPON(ACE_VMM3,4); + MACRO_ADDWEAPON(ACE_VMH3,4); }; }; diff --git a/addons/minedetector/stringtable.xml b/addons/minedetector/stringtable.xml index 14ff729334..456873d2c4 100644 --- a/addons/minedetector/stringtable.xml +++ b/addons/minedetector/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,6 +10,7 @@ Wykrywacz metali Metalldetektor 지뢰탐지기 + Metal detector Metal detector @@ -20,6 +21,7 @@ Wykrywacz metali Metalldetektor 지뢰탐지기 + Metal detector Activate @@ -30,6 +32,7 @@ Aktywuj Aktivieren 작동 + Attiva Deactivate @@ -40,6 +43,7 @@ Deaktywuj Deaktivieren 끄기 + Disattiva Connect Headphones @@ -50,6 +54,7 @@ Kopfhörer verbinden 헤드폰에 연결 Connecter les écouteurs + Connetti Auricolari Disconnect Headphones @@ -60,6 +65,7 @@ Kopfhörer trennen 헤드폰 연결끊기 Déconnecter les écouteurs + Disconnetti Auricolari Headphones Connected @@ -70,6 +76,7 @@ Kopfhörer verbunden 헤드폰 연결됨 Écouteurs connectés + Auricolari Connessi Headphones Disconnected @@ -80,7 +87,7 @@ Kopfhörer getrennt 헤드폰 연결끊김 Écouteurs déconnectés + Auricolari Disconnessi - diff --git a/addons/mx2a/CfgVehicles.hpp b/addons/mx2a/CfgVehicles.hpp index c450133ba7..51038b9625 100644 --- a/addons/mx2a/CfgVehicles.hpp +++ b/addons/mx2a/CfgVehicles.hpp @@ -6,15 +6,15 @@ class CfgVehicles { scopeCurator = 2; displayName = CSTRING(DisplayName); vehicleClass = "Items"; - class TransportWeapons { - MACRO_ADDWEAPON(ACE_MX2A,1); + class TransportItems { + MACRO_ADDITEM(ACE_MX2A,1); }; }; class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - class TransportWeapons { - MACRO_ADDWEAPON(ACE_MX2A,6); + class TransportItems { + MACRO_ADDITEM(ACE_MX2A,6); }; }; }; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 628384bc19..9a4acbe108 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -469,6 +469,7 @@ Ukryj na brzegach ekranu 화면 가장자리에서 사라짐 Estomper sur les bords de l'écran + Sfocatura nei bordi dello schermo diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 6d5b70baa7..58929567af 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ Napraw animację Corriger animation Animációk kijavítása - Fixa l'animazione + Sistema l'animazione Arrumar Animação アニメーションを修正 동작 고정 @@ -150,7 +150,7 @@ Tableau. Séparation par ,. Tabulka. Odděl elementy použitím ,. Array. Válasszad el az elemeket vesszővel. - Array. Separa gli elementi usando ,. + Vettor. Separa gli elementi usando ,. Vetor. Separe elementos usando *,*. アライ。,を使うことで区別できます。 배열. 요소를 ,. 로 나눔 @@ -445,7 +445,7 @@ Fix Headbug Fix Headbug Corregir error de cabeza (headbug) - Sistema Headbug + Sistema Bug della Testa ヘッドバグ修正 헤드버그 수정 @@ -473,7 +473,7 @@ Nouveautés ACE ACE hírek Новости ACE - News ACE + Novità ACE ACE からのお知らせ ACE 새소식 diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp index a096754ce3..2d6a48b7b3 100644 --- a/addons/overheating/CfgVehicles.hpp +++ b/addons/overheating/CfgVehicles.hpp @@ -68,62 +68,62 @@ class CfgVehicles { class FIA_Box_Base_F; class Box_NATO_Support_F: NATO_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class B_supplyCrate_F: ReammoBox_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class Box_East_Support_F: EAST_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class O_supplyCrate_F: B_supplyCrate_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class Box_IND_Support_F: IND_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class Box_FIA_Support_F: FIA_Box_Base_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class I_supplyCrate_F: B_supplyCrate_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class IG_supplyCrate_F: ReammoBox_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class C_supplyCrate_F: ReammoBox_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,2); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,2); }; }; class ACE_Box_Misc: Box_NATO_Support_F { - class TransportItems { - MACRO_ADDITEM(ACE_SpareBarrel,6); + class TransportMagazines { + MACRO_ADDMAGAZINE(ACE_SpareBarrel,6); }; }; }; diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 8c2eef1732..faa0462893 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -266,7 +266,7 @@ Смена ствола... Cső kicserélése folyamatban... Substituindo cano... - Sto sostituendo la canna... + Sostituendo la canna... 銃身を交換中・・・ 총열 교체중... @@ -321,7 +321,7 @@ Hőmérséklet ellenőrzése... Zjišťuju teplotu... Conferindo temperatura... - Sto controllando la temperatura... + Controllando la temperatura... Проверка температуры... 温度を測っている・・・ 무기 온도 확인중... @@ -336,6 +336,7 @@ Sprawdź temperaturę zapasowych luf Temperatur der Wechselläufe prüfen 총열 온도 확인 + Controlla la temperatura della canna di ricambio Checking spare barrels temperatures... @@ -347,6 +348,7 @@ Sprawdzanie temperatury zapasowych luf... Prüfe Temperatur der Wechselläufe ... 총열 온도 확인중... + Controllando la temperatura della canna di ricambio... Temperature @@ -372,6 +374,7 @@ Zimne zapasowe lufy Kalte Wechselläufe 차가운 예비 총열 + Canna/e di Ricambio Fredda Warm Spare Barrel/s @@ -383,6 +386,7 @@ Ciepłe zapasowe lufy Warme Wechselläufe 따뜻한 예비 총열 + Canna/e di Ricambio Calda Hot Spare Barrel/s @@ -394,6 +398,7 @@ Gorące zapasowe lufy Heiße Wechselläufe 뜨거운 예비 총열 + Canna/e di Ricambio Molto Calda Very Hot Spare Barrel/s @@ -405,6 +410,7 @@ Bardzo gorące zapasowe lufy Sehr heiße Wechselläufe 매우 뜨거운 예비 총열 + Canna/e di Ricambio Estremamente Calda Extremely Hot Spare Barrel/s @@ -416,6 +422,7 @@ Ekstremalnie gorące zapasowe lufy Extrem heiße Wechselläufe 엄청나게 뜨거운 예비 총열 + Canna/e di Ricambio Rovente Overheating Enabled @@ -428,6 +435,7 @@ 過熱を有効化 Przegrzewanie włączone 과열 활성화 + Surriscaldamento Abilitato Master enable for the overheating/jamming module @@ -438,6 +446,7 @@ Główny włącznik modułu przegrzewania/zacinania się broni Hauptschalter, um die Überhitzung-/Ladehemmung-Module zu aktivieren 과열/탄걸림 최종 활성화 + Abilitazione master per il modulo di surriscaldamento / inceppamento diff --git a/addons/overpressure/stringtable.xml b/addons/overpressure/stringtable.xml index 89d8cf8b2d..a982ec488c 100644 --- a/addons/overpressure/stringtable.xml +++ b/addons/overpressure/stringtable.xml @@ -7,6 +7,7 @@ 초과압력 거리 계수 Mnożnik dystansu nadciśnienia Coéfficient de distance pour la surpression + Coefficente Distanza Sovrapressione Scales the overpressure effect [Default: 1] @@ -14,6 +15,7 @@ 초과압력의 효과 크기 [기본설정: 1] Skaluje efekt nadciśnienia [Domyślne: 1] Échelonne les effets de la surpression [Par défaut : 1] + Scala l'effetto di sovrapressione [Predefinito: 1] diff --git a/addons/realisticnames/CfgMagazines.hpp b/addons/realisticnames/CfgMagazines.hpp index a6a64a4a15..d32ee3ec2c 100644 --- a/addons/realisticnames/CfgMagazines.hpp +++ b/addons/realisticnames/CfgMagazines.hpp @@ -417,4 +417,65 @@ class CfgMagazines { class SmokeShellYellow: SmokeShell { displayName = CSTRING(SmokeShellYellow_Name); }; + + + // 1.70 Pylon Magazines (Should Match Weapon Name) + class 2Rnd_Missile_AA_04_F; + class PylonRack_1Rnd_Missile_AA_04_F: 2Rnd_Missile_AA_04_F { + displayName = "AIM-9 Sidewinder"; // [vanilla: Falchion-22 - Missile_AA_04_Plane_CAS_01_F] + }; + class 4Rnd_AAA_missiles; + class PylonRack_1Rnd_AAA_missiles: 4Rnd_AAA_missiles { + displayName = "AIM-132 ASRAAM"; // [vanilla: ASRAAM - missiles_ASRAAM] + }; + class 4Rnd_GAA_missiles; + class PylonRack_1Rnd_GAA_missiles: 4Rnd_GAA_missiles { + displayName = "AIM-120A AMRAAM"; // [vanilla: Zephyr - missiles_Zephyr] + }; + class 6Rnd_Missile_AGM_02_F; + class PylonRack_1Rnd_Missile_AGM_02_F: 6Rnd_Missile_AGM_02_F { + displayName = "AGM-65 Maverick"; // [vanilla: Macer - Missile_AGM_02_Plane_CAS_01_F] + }; + class PylonRack_3Rnd_Missile_AGM_02_F: PylonRack_1Rnd_Missile_AGM_02_F { + displayName = "AGM-65 Maverick 3x"; // [vanilla: Macer 3x - Missile_AGM_02_Plane_CAS_01_F] + }; + class 2Rnd_LG_scalpel; + class PylonRack_1Rnd_LG_scalpel: 2Rnd_LG_scalpel { + displayName = "9K121 Vikhr"; // [vanilla: Scalpel - missiles_SCALPEL] + }; + class PylonRack_3Rnd_LG_scalpel: PylonRack_1Rnd_LG_scalpel { + displayName = "9K121 Vikhr 3x"; // [vanilla: Scalpel 3x - missiles_SCALPEL] + }; + class PylonRack_4Rnd_LG_scalpel: PylonRack_1Rnd_LG_scalpel { + displayName = "9K121 Vikhr 4x"; // [vanilla: Scalpel 4x - missiles_SCALPEL] + }; + class PylonRack_7Rnd_Rocket_04_HE_F: 7Rnd_Rocket_04_HE_F { + displayName = "Hydra 70 7x HE"; // [vanilla: Shrieker 7x HE - Rocket_04_HE_Plane_CAS_01_F] + }; + class PylonRack_7Rnd_Rocket_04_AP_F: 7Rnd_Rocket_04_AP_F { + displayName = "Hydra 70 7x AP"; // [vanilla: Shrieker 7x AP - Rocket_04_AP_Plane_CAS_01_F] + }; + class 12Rnd_missiles; + class PylonRack_12Rnd_missiles: 12Rnd_missiles { + displayName = "Hydra 70"; // [vanilla: DAR - missiles_DAR] + }; + class PylonRack_20Rnd_Rocket_03_HE_F: 20Rnd_Rocket_03_HE_F { + displayName = "S-8 20x HE"; // [vanilla: Tratnyr 20x HE - Rocket_03_HE_Plane_CAS_02_F] + }; + class PylonRack_20Rnd_Rocket_03_AP_F: 20Rnd_Rocket_03_AP_F { + displayName = "S-8 20x AP"; // [vanilla: Tratnyr 20x AP - Rocket_03_AP_Plane_CAS_02_F] + }; + class 2Rnd_Missile_AA_03_F; + class PylonRack_1Rnd_Missile_AA_03_F: 2Rnd_Missile_AA_03_F { + displayName = "Wympel R-73"; // [vanilla: Sahr-3 - Missile_AA_03_Plane_CAS_02_F] + }; + class 4Rnd_Missile_AGM_01_F; + class PylonRack_1Rnd_Missile_AGM_01_F: 4Rnd_Missile_AGM_01_F { + displayName = "Kh-25MTP"; // [vanilla: Sharur - Missile_AGM_01_Plane_CAS_02_F] + }; + class 2Rnd_Bomb_03_F; + class PylonMissile_1Rnd_Bomb_03_F: 2Rnd_Bomb_03_F { + displayName = "FAB-250M-54"; // [vanilla: LOM-250G - Bomb_03_Plane_CAS_02_F] + }; + }; diff --git a/addons/realisticnames/CfgWeapons.hpp b/addons/realisticnames/CfgWeapons.hpp index 3bc97b14ab..6aa3c7c3c8 100644 --- a/addons/realisticnames/CfgWeapons.hpp +++ b/addons/realisticnames/CfgWeapons.hpp @@ -319,7 +319,7 @@ class CfgWeapons { }; }; - class gatling_30mm: CannonCore { // This is a fictional veresion of the GSh-6-30, with 3 barrels + class gatling_30mm_base: CannonCore { // This is a fictional version of the GSh-6-30, with 3 barrels displayName = "GSh-3-30"; class LowROF: Mode_FullAuto { displayName = "GSh-3-30"; @@ -602,7 +602,7 @@ class CfgWeapons { class arifle_CTAR_GL_hex_F: arifle_CTAR_GL_base_F { displayName = CSTRING(arifle_CTAR_GL_hex); }; - + class arifle_CTARS_base_F; class arifle_CTARS_blk_F: arifle_CTARS_base_F { displayName = CSTRING(arifle_CTARS_blk); diff --git a/addons/realisticnames/dev_dumpPylon.sqf b/addons/realisticnames/dev_dumpPylon.sqf new file mode 100644 index 0000000000..df0d7ea4a5 --- /dev/null +++ b/addons/realisticnames/dev_dumpPylon.sqf @@ -0,0 +1,29 @@ +// [] execVM "z\ace\addons\realisticnames\dev_dumpPylon.sqf"; + +private _justLog = true; + +diag_log text format ["[Dumping Pylons] --------------------"]; +private _magazines = configProperties [configFile >> "CfgMagazines", "isClass _x", true]; +{ + private _pylonWeapon = getText (_x >> "pylonWeapon"); + if (_pylonWeapon != "") then { + private _weaponConfig = configFile >> "CfgWeapons" >> _pylonWeapon; + private _weaponName = getText (_weaponConfig >> "displayName"); + private _inherit = (configProperties [_x, "configName _x == 'displayName'", false]) isEqualTo []; + private _pylonMagName = getText (_x >> "displayName"); + if (_justLog) then { + if (!_inherit) then { + diag_log text format ["%1: [%2 vs %3]", configName _x, _pylonMagName, _weaponName]; + } else { + diag_log text format [" - %1: [%2 vs %3]", configName _x, _pylonMagName, _weaponName]; + }; + } else { + if (!_inherit) then { + diag_log text format ['class %1;', configName inheritsFrom _x]; + diag_log text format ['class %1: %2 {', configName _x, configName inheritsFrom _x]; + diag_log text format ['displayName = "%1"; [vanilla: %2 - %3]', _weaponName, _pylonMagName, _pylonWeapon]; + diag_log text format ['};', configName _x, configName inheritsFrom _x, _weaponName, _pylonMagName]; + }; + }; + }; +} forEach _magazines; diff --git a/addons/refuel/stringtable.xml b/addons/refuel/stringtable.xml index c685b520de..0bc50bb63d 100644 --- a/addons/refuel/stringtable.xml +++ b/addons/refuel/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -21,7 +21,7 @@ Скорость заправки Velocidade da vazão Rychlost tankování - Rateo Flusso + Portata Flusso Caudal de llenado Vitesse du ravitaillement 流量 @@ -60,7 +60,7 @@ Взять топливный шланг Pegar o bocal de combustível Vzít výdejní pistoli - Prenti manica benzina + Prendi manica benzina Tomar surtidor Prendre la pompe 給油ノズルを取る @@ -73,7 +73,7 @@ Берем топливный шланг... Pegando o bocal de combustível... Beru výdejní pistoli... - Sto prendendo manica benzina... + Prendendo manicotto benzina... Tomando surtidor... Prise de la pompe... 給油ノズルを取っている・・・ @@ -99,7 +99,7 @@ Присоединяем топливный шланг... Conectando o bocal de combustível... Připojuji výdejní pistoli... - Sto collegando la manica benzina... + Collegando manicotto benzina... Conectando surtidor... Connection de la pompe... 給油ノズルを接続している・・・ @@ -112,7 +112,7 @@ Отсоединить топливный шланг Desconectar o bocal de combustível Odpojit výdejní pistoli - Scollega manica benzina + Scollega manicotto benzina Desconectar surtidor Déconnecter la pompe 給油ノズルを外した @@ -151,7 +151,7 @@ Проверяем остаток топлива... Verificando combustível restante... Kontroluji zůstatek paliva... - Sto controllando la benzina rimanente... + Controllando la benzina rimanente... Verificando combustible remanente,,, Vérifie le carburant restant... 残燃料を見ている・・・ @@ -229,7 +229,7 @@ Останавливаем заправку... Parando reabastecimento... Zastavuji tankování... - Sto fermando il rifornimento... + Fermando il rifornimento... Deteniendo reabastecimiento... Arrête le ravitaillement... 給油をやめている・・・ @@ -255,7 +255,7 @@ Начинаем заправку... Começando reabastecimento... Spouštím tankování... - Sto iniziando il rifornimento... + Iniziando il rifornimento... Comenzando reabastecimiento... Début du ravitaillement... 給油を始めている・・・ @@ -281,7 +281,7 @@ Источник топлива пустой. A fonte de combustível está vazia. Zdroj paliva je prázdný. - La fonte di benzina èvuota. + La fonte di benzina è vuota. La fuente de combustible está vacía. La source de carburant est vide. 給油元は空です。 @@ -294,7 +294,7 @@ Достигнута максимальная длина шланга. Distância máxima da mangueira de combustível alcançada. Dosažena maximální délka hadice - Distanza massima della manica raggiunta. + Distanza massima della pompa raggiunta. Máxima longitud de manguera alcanzada. Tuyau tendu au maximum 給油ホースはもうこれ以上届かない。 @@ -346,7 +346,7 @@ Вернуть топливный шланг Retornar bocal de combustível Vrátit výdejní pistoli - Riponi manica benzina + Riponi manicotto benzina Devolver surtidor Retourner la pompe 給油ノズルを戻す @@ -359,7 +359,7 @@ Возвращаем топливный шланг... Retornando bocal de combustível... Vracím výdejní pistoli... - Sto riponendo la manica della benzina... + Riponendo la manica della benzina... Devolviendo el surtidor... Retourne la pompe 給油ノズルを戻している・・・ @@ -385,7 +385,7 @@ Проверяем счетчик топлива... Verificando contador de combustível... Konroluji palivoměr... - Sto controllando l'indicatore del livello benzina... + Controllando l'indicatore del livello benzina... Verificando el contador de combustible Vérification du compteur... 燃料計を見ている・・・ diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml index 10426344ed..4454bd3f9a 100644 --- a/addons/reload/stringtable.xml +++ b/addons/reload/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ Sprawdź stan amunicji przy przeładowaniu broni Vérification des munitions au rechargement Lőszer ellenőrzése a fegyver újratöltésekor - Controlla le munizioni ricaricando + Controlla le munizioni durante il ricaricamento Conferir munição ao recarregar a arma 再装填された武器の弾薬を確認 재장전시 장탄수 확인 @@ -80,7 +80,7 @@ Podłączanie taśmy... Gurt anhängen... Töltényheveder összekötése folyamatban... - Attacco la tracolla... + Attaccando la tracolla... Ligando cintos... ベルトをつなげている・・・ 벨트 연결중... diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml index cb9c610c56..c9ffa3cef8 100644 --- a/addons/reloadlaunchers/stringtable.xml +++ b/addons/reloadlaunchers/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ Nabíjím odpalovač... Ładowanie wyrzutni... Kilövő betöltés alatt... - Carico il lanciamissili... + Caricando il lanciamissili... Recarregando lançador... ランチャーを装填している・・・ 무기 재장전중... diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml index bdfa2001ad..d1926a47eb 100644 --- a/addons/repair/stringtable.xml +++ b/addons/repair/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -51,7 +51,7 @@ Замена колеса... Měním kolo... Cambiando rueda... - Sto sostituendo la ruota... + Sostituendo la ruota... Remplacement de la roue... タイヤを交換中・・・ 바퀴 교체중... @@ -91,7 +91,7 @@ Снятие колеса... Odstraňuji kolo... Quitando rueda... - Sto rimuovendo la ruota... + Rimuovendo la ruota... Démontage de la roue... タイヤを外している・・ 바퀴 제거중... @@ -130,7 +130,7 @@ Замена гусеницы... Měním pás... Cambiando oruga... - Sto sostituendo il cingolo... + Sostituendo il cingolo... Remplacement de la chenille... 履帯を交換中・・・ 궤도 교체중... @@ -169,7 +169,7 @@ Снятие гусеницы... Odstraňuji pás... Quitando oruga... - Sto rimuovendo il cingolo... + Rimuovendo il cingolo... Enlèvement de la chenille... 履帯を外している・・・ 궤도 제거중... @@ -208,7 +208,7 @@ Ремонт транспорта... Opravuji vozidlo... Reparando vehículo... - Sto riparando il veicolo... + Riparando il veicolo... Réparation du véhicule... 車両を修理中・・・ 차량 수리중... @@ -339,7 +339,7 @@ Naprawianie... Opravuji... Reparando... - Sto riparando... + Riparando... javítása... Ремонтируем... 修理中・・・ @@ -353,7 +353,7 @@ Naprawianie %1... Opravuji %1... Reparando %1... - Sto riparando %1... + Riparando %1... %1 javítása... Ремонтируем %1... %1 を修理中・・・ @@ -1563,6 +1563,7 @@ 修理のためにエンジンを停止させる必要があります。 Silnik musi być wyłączony w celu naprawy 수리를 위해서는 엔진을 꺼야만 합니다 + Il motore deve essere spento per poter riparare diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index 7a24936f65..a2d90acce4 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -330,7 +330,7 @@ ACE Respawn ACE Respawn ACE Возрождение - Respawn ACE + Rigenerazione ACE ACE リスポン ACE 재배치 diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml index 29b84cb095..d2c7ff3fd6 100644 --- a/addons/safemode/stringtable.xml +++ b/addons/safemode/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ Biztonságos mód Предохранитель Sécurité - Sicura inserita + Modalità Sicura Modo de segurança 安全装置 안전 모드 diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml index ce815a49df..d36161e99d 100644 --- a/addons/scopes/stringtable.xml +++ b/addons/scopes/stringtable.xml @@ -7,6 +7,7 @@ 조준경 Celowniki optyczne Scopes + Mirini Enable ACE Scope adjustment @@ -14,6 +15,7 @@ ACE 조준경 영점조작 활성화 Włącz ustawienia celowników optycznych ACE Active ACE Scope adjustment + Abilita Regolazione mirino ACE Enable adjustmet turrets on high powered scopes @@ -21,6 +23,7 @@ 고성능 조준경 조절 나사 활성화 Włącz pokrętła regulacyjne Permet de régler la hausse et la dérive sur les optiques de visée à fort grossissement + Abilita la regolazione delle torrette nei mirini a lunga gittata Force adjustment turrets @@ -28,6 +31,7 @@ 조절 나사 강제 Wymuś użycie pokręteł regulacyjnych Impose le réglage de la hausse/dérive + Forza la regolazione delle torrette Force usage of adjustmet turrets on high powered scopes @@ -35,6 +39,7 @@ 고성능 조준경의 조절 나사 사용을 강제합니다 Wymuś użycie pokręteł regulacyjnych dla celowników o dużym powiększeniu Impose le réglage de la hausse/dérive sur les optiques de visée à fort grossissement + Forza l'uso della regolazione nei mirini a lunga gittata Correct zeroing @@ -42,6 +47,7 @@ 영점 고치기 Poprawka zerowania Corrige le zérotage + Correggi azzeramento Corrects the zeroing of all small arms sights @@ -49,6 +55,7 @@ 모든 소화기의 영점을 고칩니다 Poprawia zerowanie wszystkich celowników broni ręcznej Corrige le zérotage des optiques de visée des petites armes + Corregge l'azzeramento di tutti i mirini di bassa portata Overwrite zero distance @@ -56,6 +63,7 @@ 영점거리 덮어쓰기 Nadpisuje ustawienie dla zerowego dystansu Remplace la distance de zérotage + Sovrascrivi la distanza zero Uses the 'defaultZeroRange' setting to overwrite the zero range of high power scopes @@ -63,6 +71,7 @@ 기존 고성능 조준경의 영점거리에 '기본설정 영점거리' 를 덮어씌웁니다 Używa 'defaultZeroRange' zamiast ustawionej odległości zerowania dla celowników o duzym przybliżeniu Utilise le paramètre 'defaultZeroRange' pour remplacer la distance de zérotage sur les optiques de visée à fort grossissement + Usa le impostazioni di "defaultZeroRange" (Portata Zero Predefinita) per sovrascrivere la portata zero dei mirini a lunga gittata Default zero distance @@ -70,6 +79,7 @@ 기본설정 영점거리 Domyślne zerowanie Distance de zérotage par défaut + Distanza zero predefinita High power scopes will be zeroed at this distance @@ -77,6 +87,7 @@ 고성능 조준경이 정해진 수만큼 영점거리를 맞추게 됩니다. Celowniki o dużym powiększeniu będą zerowane dla tej odległości Distance de zérotage par défaut des optiques de visée à fort grossissement + I mirini a lunga gittata verranno azzerrati a questa distanza Reference temperature @@ -84,6 +95,7 @@ 온도 기준 Referencyjna temperatura Température de référence + Temperatura di riferimento Temperature at which the scope was zeroed @@ -91,6 +103,7 @@ 조준경 영점조준시 온도 Temperatura, przy której celownik został wyzerowany Température de référence pour le zérotage des optiques + Temperatura a cui è stato azzerato il mirino Reference barometric pressure @@ -98,6 +111,7 @@ 기압 기준 Referencyjne ciśnienie barometryczne Pression barométrique de référence + Pressione barometrica di riferimento Barometric pressure at which the scope was zeroed @@ -105,6 +119,7 @@ 조준경 영점조준시 기압 Ciśnienie barometryczne, przy którym celownik został wyzerowany Pression barométrique de référence pour le zérotage des optiques + Pressione barometrica a cui è stato azzerato il mirino Reference humidity @@ -112,6 +127,7 @@ 습도 기준 Referencyjna wilgotność Humidité de référence + Umidità di riferimento Humidity at which the scope was zeroed @@ -119,6 +135,7 @@ 조준경 영점조준시 습도 Wilgotność powietrza, przy której celownik został wyzerowany Taux d'humidité de référence pour le zérotage des optiques + Umidità a cui è stato azzerato il mirino Deduce pressure from altitude @@ -126,6 +143,7 @@ 고도에 맞춰 기압 설정 Ciśnienie określone na podstawie wysokości Pression selon l'altitude + Ricava la pressione dall'altitudine Deduce the barometric pressure from the terrain altitude @@ -133,6 +151,7 @@ 주변 고도에 맞춰 기압을 설정합니다 Określ ciśnienie barometryczne na podstawie wysokości terenu Détermine la pression barométrique selon l'altitude du terrain + Ricava la pressione barometrica dall'altitudine del terreno Minor adjustment up @@ -266,6 +285,7 @@ 이 모듈은 고성능 조준경에 조준 나사를 이용한 편차 및 고도 조절 기능을 더해줍니다. Ten moduł włącza pokrętła kalibracyjne poprawki na wiatr oraz poprawki wysokości dla celowników o dużym powiększeniu. Ce module ajoute les tambours de correction de la hausse et de dérive sur les optiques de visée à fort grossissement. + Questo modulo aggiunge lo spostamento dell'aria e la regolazione dell'elevazione delle torrette in mirini a lunga gittata diff --git a/addons/slideshow/stringtable.xml b/addons/slideshow/stringtable.xml index 2f5c13b383..213834841d 100644 --- a/addons/slideshow/stringtable.xml +++ b/addons/slideshow/stringtable.xml @@ -144,12 +144,14 @@ Ustaw nazwę 名前設定 Définir le nom + Imposta Nome Name that will be used for main interaction entry (to distinguish multiple slideshows). Default: "Slides" Nazwa, która będzie użyta w głównym menu interakcji (w celu rozróżnienia różnych slajdów). Domyślnie: "Slides" メイン インタラクション エントリで使われる名前を設定します。(複数のスライドショーを区別するため)。標準: "Slides" Un nom qui sera utilisé pour interagir avec plusieurs diaporamas. Par défaut : "Slides" + Nome che sarà utilizzato per le principali interazioni (per distinguere le multiple diapositive). Predefinito: "Slides" Slide Duration diff --git a/addons/spectator/stringtable.xml b/addons/spectator/stringtable.xml index b2570dd08f..29262d06b5 100644 --- a/addons/spectator/stringtable.xml +++ b/addons/spectator/stringtable.xml @@ -1,9 +1,10 @@ - + ACE Spectator ACE スペクテイター + Spettatore ACE Spectator Settings diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml index d079350a19..c86142c877 100644 --- a/addons/switchunits/stringtable.xml +++ b/addons/switchunits/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -20,7 +20,7 @@ Versuche zu Wechseln Snažím se přehodit Próba zmiany - Sto provando a cambiare + Provando a cambiare Intentando cambiar Essaye de basculer Tentando trocar diff --git a/addons/tagging/stringtable.xml b/addons/tagging/stringtable.xml index 05a23e4cd1..ab5866dbfa 100644 --- a/addons/tagging/stringtable.xml +++ b/addons/tagging/stringtable.xml @@ -9,6 +9,7 @@ Markierungssystem 뿌리기 Marquage + Marcamento Configure how the tagging system will operate by default. @@ -18,6 +19,7 @@ Konfiguriert, wie das Markierungssystem standardmäßig funktioniert. 뿌리기 시스템의 기본사항을 설정합니다. Configure le fonctionnement par défaut du système de marquage. + Configura quanto il sistema di marcamento agirà da se. Quick Tag @@ -27,6 +29,7 @@ Schnelle Markierung 빠른 뿌리기 Marquage rapide + Marcamento Rapido Action performed on main tag interaction point. @@ -36,6 +39,7 @@ Aktion, die am Haupt-Interaktionspunkt ausgeführt werden soll. 이 동작은 상호작용에서 뿌리기를 할 수 있게 해준다 Action réalisé au point de marquage principal. + Azione eseguita sul punto di interazione dei tag principali. Last Used @@ -45,6 +49,7 @@ Zuletzt benutzt 최근 사용 Dernier utilisé + Ultimo Usato Random X @@ -54,6 +59,7 @@ Zufällig X 무작위 X Aléatoire X + Random X Random @@ -63,6 +69,7 @@ Zufällig 무작위 Aléatoire + Random Tag diff --git a/addons/trenches/stringtable.xml b/addons/trenches/stringtable.xml index 9203635d49..1fee5489df 100644 --- a/addons/trenches/stringtable.xml +++ b/addons/trenches/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -147,7 +147,7 @@ Digging Trench Grabe Schützengraben Kopanie wnęki - Sto Scavando la Trincea + Scavando la Trincea Cavando trinchera Creuse la tranchée Vykopat zákop @@ -166,6 +166,7 @@ 塹壕を掘りつづける Graben fortsetzen 계속해서 참호파기 + Continua a Scavare la Trincea Remove Trench @@ -177,6 +178,7 @@ 塹壕を消す Schützengraben entfernen 참호 제거 + Rimuove Trincea Removing Trench @@ -188,6 +190,7 @@ 塹壕を消している Entferne Schützengraben 참호 제거중... + Rimuovendo la Trincea diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index e13c38f6df..1bc2f8d888 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -11,6 +11,7 @@ Interfejs użytkownika Benutzeroberfläche 사용자 인터페이스 + Interfaccia Utente User Interface @@ -22,6 +23,7 @@ Interfejs użytkownika Benutzeroberfläche 사용자 인터페이스 + Interfaccia Utente This module allows toggling visible user interface parts. @@ -32,6 +34,7 @@ Moduł ten pozwala zmienić stan widoczności poszczególnych elementów UI. Dieses Modul erlaubt es, Teile der Benutzeroberfläche (UI) an- oder auszuschalten. 이 모듈은 사용자 인터페이스의 부분을 토글하는것을 가능케 해줍니다. + Questo modulo consente di commutare parti di interfaccia utente visibili. Allow Selective UI @@ -43,6 +46,7 @@ Zezwól na selektywne UI Erlaube selektives UI 선택적 사용자 인터페이스 허가 + Permette l'UI Selettiva Allow client to modify their UI. @@ -54,6 +58,7 @@ Zezwól klientowi na modyfikację UI. Erlaube Clients, ihr UI zu modifizieren. 클라이언트가 선택적 사용자 인터페이스 사용하는것을 허가합니다 + Permette al client di modificare la propria UI. Soldier/Vehicle/Weapon Information @@ -65,6 +70,7 @@ Informacje o żołnierzu/pojeździe/broni Soldat/Fahrzeug/Waffe Information 병사/차량/무기 정보 + Informazioni Soldato/Veicolo/Arma Vehicle Radar @@ -76,6 +82,7 @@ Radar w pojeździe Fahrzeugradar 차량 레이더 + Rada Veicolo Vehicle Compass @@ -87,6 +94,7 @@ Kompas w pojeździe Fahrzeugkompass 차량 나침반 + Bussola Veicolo Command Menu @@ -98,6 +106,7 @@ Menu dowodzenia Kommandomenü 지휘 메뉴 + Menù di Comando Group Bar @@ -109,6 +118,7 @@ Pasek grupy Gruppenleiste 그룹 막대 + Barra del Gruppo Weapon Name @@ -120,6 +130,7 @@ Nazwa broni Waffenname 무기 이름 + Nome Arma Weapon Name Background @@ -131,6 +142,7 @@ Tło nazwy broni Waffenname Hintergrund 무기 이름 배경 + Nome Sfondo Arma Firing Mode @@ -142,6 +154,7 @@ Tryb ognia Feuermodus 사격 모드 + Modalità di Fuoco Ammo Type @@ -153,6 +166,7 @@ Typ amunicji Munitionstyp 탄종 + Tipo Munizioni Ammo Count @@ -164,6 +178,7 @@ Ilość amunicji Munitionsanzahl 탄약수 + Contatore Munizioni Magazine Count @@ -175,6 +190,7 @@ Ilość magazynków Magazinanzahl 탄창수 + Contatore Caricatore Throwable Type @@ -186,6 +202,7 @@ Typ granatu Wurfobjekt-Typ 투척물 종류 + Tipo Lanciabile Throwable Count @@ -197,6 +214,7 @@ Ilość granatów Wurfobjekt-Anzahl 투척물 개수 + Contatore Lanciabili Zeroing @@ -208,6 +226,7 @@ Wyzerowanie broni Nullung 영점 + Azzeramento Weapon Lower Info Background @@ -218,6 +237,7 @@ Tło dolnej części informacji o broni Hintergrund der unteren Waffen-Info-Leiste 무기 상세 정보 배경 + Informazioni Sfondo Arma Bassa Stance @@ -229,6 +249,7 @@ Postura Haltung 자세 + Postura Stamina Bar @@ -240,6 +261,7 @@ Pasek staminy Ausdaueranzeige 체력 막대 + Barra Stamina Gunner Weapon Name @@ -250,6 +272,7 @@ Nazwa broni strzelca Richtschütze Waffenname 사수 무기 명칭 + Nome Arma Artigliere Gunner Weapon Name Background @@ -260,6 +283,7 @@ Tło nazwy broni strzelca Richtschütze Waffenname Hintergrund 사수 무기 명칭 배경 + Nome Sfondo Arma Artigliere Gunner Firing Mode @@ -270,6 +294,7 @@ Tryb ognia strzelca Richtschütze Feuermodus 사수 사격 모드 + Modalità di Fuoco Artigliere Gunner Ammo Type @@ -280,6 +305,7 @@ Typ amunicji strzelca Richtschütze Munitionstyp 사수 탄종 + Tipo Munizioni Artigliere Gunner Ammo Count @@ -290,6 +316,7 @@ Ilość amunicji strzelca Richtschütze Munitionsanzahl 사수 탄약 수량 + Contatore Munizioni Artigliere Gunner Magazine Count @@ -300,6 +327,7 @@ Ilość magazynków strzelca Richtschütze Magazinanzahl 사수 탄창 수량 + Contatore Caricatore Artigliere Gunner Launchable Type @@ -310,6 +338,7 @@ Typ rakiet strzelca Richtschütze Raketentyp 사수 발사체 종류 + Tipo Lanciabile Artigliere Gunner Launchable Count @@ -320,6 +349,7 @@ Ilość rakiet strzelca Richtschütze Raketenanzahl 사수 발사체 수량 + Contatore Lanciabili Artigliere Gunner Zeroing @@ -330,6 +360,7 @@ Wyzerowanie broni strzelca Richtschütze Nullung 사수 영점 + Azzeramento Artigliere Gunner Weapon Lower Info Background @@ -340,6 +371,7 @@ Tło dolnej części informacji o broni strzelca Hintergrund der unteren Waffen-Info-Leiste (Richtschütze) 사수 무기 상세 정보 배경 + Informazioni Sfondo Arma Artigliere Bassa Vehicle Name @@ -351,6 +383,7 @@ Nazwa pojazdu Fahrzeugname 차량 명칭 + Nome Veicolo Vehicle Name Background @@ -362,6 +395,7 @@ Tło nazwy pojazdu Fahrzeugname Hintergrund 차량 명칭 배경 + Nome Sfondo Veicolo Vehicle Fuel Bar @@ -373,6 +407,7 @@ Pasek paliwa Fahrzeug-Treibstoffleiste 차량 연료 막대 + Barra Carburante Veicolo Vehicle Speed @@ -384,6 +419,7 @@ Prędkościomierz Fahrzeuggeschwindigkeit 차량 속도 + Velocità Veicolo Vehicle Altitude @@ -395,6 +431,7 @@ Wysokościomierz radarowy Fahrzeughöhe 차량 고도 + Altitudine Veicolo Vehicle Damage @@ -406,6 +443,7 @@ Uszkodzenia pojazdu Fahrzeugschaden 차량 피해 + Danno Veicolo Vehicle Info Background @@ -417,6 +455,7 @@ Tło informacji o pojeździe Fahrzeug Info Hintergrund 차량 정보 배경 + Informazioni Sfondo Veicolo Requires Soldier/Vehicle/Weapon Information. @@ -428,6 +467,7 @@ Wymaga informacji o żołnierzu/pojeździe/broni. Benötigt Soldat/Fahrzeug/Waffe Information. 병사/차량/무기의 정보가 필요합니다. + Richiede informazione Soldato/Veicolo/Arma. Modifying User Interface is disabled. @@ -439,6 +479,7 @@ Modyfikacja interfejsu użytkownika jest wyłączona. Die Modifizierung des UI ist deaktiviert. 사용자 인터페이스 변경이 비활성화 되어있습니다. + La modifica dell'Interfaccia Utente è disabilitata. Cannot modify a forced User Interface element. @@ -449,6 +490,7 @@ Nie można modyfikować wymuszonego elementu interfejsu użytkownika. Gesperrte UI-Elemente können nicht modifiziert werden. 강제 사용자 인터페이스는 변경하실 수 없습니다. + Impossibile modificare un elemento forzato d' Interfaccia Utente. diff --git a/addons/vector/CfgVehicles.hpp b/addons/vector/CfgVehicles.hpp index f06f79aa12..23aa8d7412 100644 --- a/addons/vector/CfgVehicles.hpp +++ b/addons/vector/CfgVehicles.hpp @@ -6,15 +6,15 @@ class CfgVehicles { scopeCurator = 2; displayName = CSTRING(VectorName); vehicleClass = "Items"; - class TransportWeapons { - MACRO_ADDWEAPON(ACE_Vector,1); + class TransportItems { + MACRO_ADDITEM(ACE_Vector,1); }; }; class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - class TransportWeapons { - MACRO_ADDWEAPON(ACE_Vector,6); + class TransportItems { + MACRO_ADDITEM(ACE_Vector,6); }; }; }; diff --git a/addons/yardage450/CfgVehicles.hpp b/addons/yardage450/CfgVehicles.hpp index d8f2ccabe3..2dc52de68a 100644 --- a/addons/yardage450/CfgVehicles.hpp +++ b/addons/yardage450/CfgVehicles.hpp @@ -6,15 +6,15 @@ class CfgVehicles { scopeCurator = 2; displayName = CSTRING(DisplayName); vehicleClass = "Items"; - class TransportWeapons { - MACRO_ADDWEAPON(ACE_Yardage450,1); + class TransportItems { + MACRO_ADDITEM(ACE_Yardage450,1); }; }; class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - class TransportWeapons { - MACRO_ADDWEAPON(ACE_Yardage450,4); + class TransportItems { + MACRO_ADDITEM(ACE_Yardage450,4); }; }; }; diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index b9bd67cf3d..3a416358c8 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -774,6 +774,7 @@ Ładunek: Ladung: 화물: + Cargo: Task Position @@ -784,6 +785,7 @@ Pozycja zadania Position der Aufgabe 작업 위치 + Posizione Incarico Select a position to perform the task at @@ -793,6 +795,7 @@ Wybierz pozycję na której wykonać zadanie Wähle eine Position, an der die Aufgabe ausgeführt werden soll 작업을 할 위치를 선택하십시요 + Seleziona una posizione per eseguire l'incarico Task Radius @@ -802,6 +805,7 @@ Obszar zadania Radius der Aufgabe 작업 반경 + Raggio Incarico Radius to perform the task within @@ -811,6 +815,7 @@ Obszar na którym zadanie powinno zostać wykonane Radius, in dem die Aufgabe ausgeführt werden soll 다음 반경 내에서 작업 + Raggio per eseguire un incarico Invalid radius entered @@ -821,9 +826,11 @@ Wpisano nieprawidłowy promień Ungültiger Radius eingegeben 알 수 없는 반경 입력됨 + Raggio Invalido Inserito Suppressive Fire + Fuoco di Soppressione diff --git a/docs/README_DE.md b/docs/README_DE.md index fda503c4d2..52b11e0797 100644 --- a/docs/README_DE.md +++ b/docs/README_DE.md @@ -4,7 +4,7 @@

- ACE3 Version + ACE3 Version ACE3 Fehlermeldungen diff --git a/docs/README_PL.md b/docs/README_PL.md index 01aa93ddb0..5c5163313f 100644 --- a/docs/README_PL.md +++ b/docs/README_PL.md @@ -3,7 +3,7 @@

- ACE3 Wersja + ACE3 Wersja ACE3 Zagadnienia diff --git a/docs/_config.yml b/docs/_config.yml index 22352d1375..ab86d182c5 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -9,8 +9,8 @@ ace: version: major: 3 minor: 9 - patch: 1 - build: 17 + patch: 2 + build: 18 acex: githubUrl: https://github.com/acemod/ACEX diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index d3ec0acb83..227d4029bf 100644 --- a/docs/_config_dev.yml +++ b/docs/_config_dev.yml @@ -11,8 +11,8 @@ ace: version: major: 3 minor: 9 - patch: 1 - build: 17 + patch: 2 + build: 18 acex: githubUrl: https://github.com/acemod/ACEX diff --git a/mod.cpp b/mod.cpp index 639e957a64..3357f64b54 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,8 +1,8 @@ -name = "Advanced Combat Environment 3.9.1"; +name = "Advanced Combat Environment 3.9.2"; picture = "logo_ace3_ca.paa"; actionName = "GitHub"; action = "https://github.com/acemod/ACE3"; -description = "ACE3 - Version 3.9.1"; +description = "ACE3 - Version 3.9.2"; logo = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa"; tooltip = "ACE3"; diff --git a/optionals/compat_rhs_afrf3/CfgVehicles.hpp b/optionals/compat_rhs_afrf3/CfgVehicles.hpp index 9eca6c1c3a..5771ea3e16 100644 --- a/optionals/compat_rhs_afrf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_afrf3/CfgVehicles.hpp @@ -451,6 +451,11 @@ class CfgVehicles { class rhs_2s3tank_base : Tank_F { EGVAR(refuel,fuelCapacity) = 830; + class Turrets: Turrets { + class MainTurret: MainTurret { + EGVAR(fcs,enabled) = 0; + }; + }; }; class OTR21_Base : Truck_F { diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index 09a3af7384..14431a92ae 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -87,24 +87,20 @@ class CfgWeapons { ace_reloadlaunchers_enabled = 1; }; + #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6; + #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5; + #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0; class H_HelmetB; class rhs_tsh4: H_HelmetB { - ace_hearing_protection = 1; - ace_hearing_lowerVolume = 0.80; + HEARING_PROTECTION_VICCREW }; - class rhs_tsh4_ess: rhs_tsh4 {}; - class rhs_tsh4_bala: rhs_tsh4 {}; - class rhs_tsh4_ess_bala: rhs_tsh4 {}; class rhs_zsh7a: H_HelmetB { - ace_hearing_protection = 1; - ace_hearing_lowerVolume = 0.80; + HEARING_PROTECTION_VICCREW }; - class rhs_zsh7a_mike: rhs_zsh7a {}; class rhs_gssh18: H_HelmetB { - ace_hearing_protection = 0.5; - ace_hearing_lowerVolume = 0.60; + HEARING_PROTECTION_EARMUFF }; class rhs_weap_d81; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 2c1594143c..d67879916b 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -30,7 +30,7 @@ class CfgWeapons { ACE_barrelTwist = 304.8; // 1:12" ACE_barrelLength = 635.0; // 25" ACE_RailHeightAboveBore = 2.6; - }; + }; class arifle_MX_Base_F; class rhs_weap_m4_Base: arifle_MX_Base_F { ACE_barrelTwist = 177.8; @@ -195,7 +195,7 @@ class CfgWeapons { class Snip { discreteDistance[] = {100}; discreteDistanceInitIndex = 0; - }; + }; }; }; }; @@ -212,36 +212,176 @@ class CfgWeapons { lockedTargetSound[] = {"",0,1}; }; - class rhsusf_ach_helmet_ocp; - class rhsusf_opscore_01: rhsusf_ach_helmet_ocp { - ace_hearing_protection = 0.50; - ace_hearing_lowerVolume = 0.60; - }; - class rhsusf_opscore_01_tan: rhsusf_opscore_01 {}; - class rhsusf_opscore_03_ocp: rhsusf_opscore_01 {}; - class rhsusf_cvc_helmet: rhsusf_opscore_01 { - ace_hearing_protection = 1; - ace_hearing_lowerVolume = 0.80; + + #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6; + #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5; + #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0; + // Fast Helmets + class rhsusf_opscore_01; + class rhsusf_opscore_aor1_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR }; - class rhsusf_cvc_green_helmet: rhsusf_cvc_helmet {}; - class rhsusf_cvc_ess: rhsusf_cvc_helmet {}; - class rhsusf_cvc_green_ess: rhsusf_cvc_ess {}; + class rhsusf_opscore_aor1_pelt_nsw: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_bk_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_fg_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_fg_pelt_nsw: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_fg_pelt_cam: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_paint_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_paint_pelt_nsw: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_paint_pelt_nsw_cam: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_aor2_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_aor2_pelt_nsw: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_ut_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_ut_pelt_cam: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_ut_pelt_nsw_cam: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_mc_pelt: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_mc_pelt_nsw: rhsusf_opscore_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_cover; + class rhsusf_opscore_mc_cover_pelt: rhsusf_opscore_cover { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_mc_cover_pelt_cam: rhsusf_opscore_cover { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_rg_cover_pelt: rhsusf_opscore_cover { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_coy_cover_pelt: rhsusf_opscore_cover { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_mar_01; + class rhsusf_opscore_mar_ut_pelt: rhsusf_opscore_mar_01 { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_opscore_mar_fg_pelt: rhsusf_opscore_mar_01 { + HEARING_PROTECTION_PELTOR + }; + + // ACH Helmets + class rhsusf_ach_helmet_ocp; + class rhsusf_ach_bare_des_headset: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_des_headset_ess: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_headset: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_headset_ess: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_semi_headset: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_semi_headset_ess: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_tan_headset: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_tan_headset_ess: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_wood_headset: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_bare_wood_headset_ess: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_helmet_headset_ocp: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_ach_helmet_headset_ess_ocp: rhsusf_ach_helmet_ocp { + HEARING_PROTECTION_PELTOR + }; + + // ACVC Helmets + class rhsusf_cvc_helmet: rhsusf_opscore_01 { + HEARING_PROTECTION_VICCREW + }; + + // MICH Helmets + class rhsusf_mich_bare; + class rhsusf_mich_bare_alt: rhsusf_mich_bare { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_norotos; + class rhsusf_mich_bare_norotos_alt: rhsusf_mich_bare_norotos { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_norotos_arc; + class rhsusf_mich_bare_norotos_arc_alt: rhsusf_mich_bare_norotos_arc { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_semi; + class rhsusf_mich_bare_alt_semi: rhsusf_mich_bare_semi { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_norotos_semi; + class rhsusf_mich_bare_norotos_alt_semi: rhsusf_mich_bare_norotos_semi { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_norotos_arc_semi; + class rhsusf_mich_bare_norotos_arc_alt_semi: rhsusf_mich_bare_norotos_arc_semi { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_tan; + class rhsusf_mich_bare_alt_tan: rhsusf_mich_bare_tan { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_norotos_tan; + class rhsusf_mich_bare_norotos_alt_tan: rhsusf_mich_bare_norotos_tan { + HEARING_PROTECTION_PELTOR + }; + class rhsusf_mich_bare_norotos_arc_tan; + class rhsusf_mich_bare_norotos_arc_alt_tan: rhsusf_mich_bare_norotos_arc_tan { + HEARING_PROTECTION_PELTOR + }; + class H_PilotHelmetHeli_B; class H_CrewHelmetHeli_B; class rhsusf_hgu56p: H_PilotHelmetHeli_B { - ace_hearing_protection = 0.85; - ace_hearing_lowerVolume = 0.75; + HEARING_PROTECTION_VICCREW }; class rhsusf_hgu56p_mask: H_CrewHelmetHeli_B { - ace_hearing_protection = 0.85; - ace_hearing_lowerVolume = 0.75; + HEARING_PROTECTION_VICCREW }; class H_HelmetB; class RHS_jetpilot_usaf: H_HelmetB { - ace_hearing_protection = 1; - ace_hearing_lowerVolume = 0.80; + HEARING_PROTECTION_VICCREW }; };