revert pt2

addons/dragon/config.cpp

@@ -8,7 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_hot","ace_csw"};
         author = ECSTRING(common,ACETeam);
-        authors[] = {"Dani (TCVM)"};
+        authors[] = {"tcvm"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/dragon/functions/fnc_attackProfile_DRAGON.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM) (Code inspired by NouberNou's Dragon Guidance)
+ * Author: tcvm (Code inspired by NouberNou's Dragon Guidance)
  * Attack profile: Dragon Guidance
  *
  * Arguments:

addons/dragon/functions/fnc_canPickupTripod.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM)
+ * Author: tcvm
  * Determines if you can pick-up the Dragon missile. If the missile was fired you will not be able to pick up the tripod.
  *
  * Arguments:
@@ -21,5 +21,4 @@ params ["_target", "_unit"];
 && {!alive (gunner _target)}
 && {!(_target getVariable [QGVAR(fired), false])}
 && {!(_target getVariable [QGVAR(sightAttached), ((typeOf _target) == QGVAR(staticAssembled))])}
-&& EFUNC(csw,assemble_canPickupTripod)
+&& EFUNC(csw,canPickupTripod)
-

addons/dragon/functions/fnc_onFired.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM)
+ * Author: tcvm
  * Runs when Dragon is fired
  *
  * Arguments:

addons/dragon/functions/fnc_sightAttach.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM)
+ * Author: tcvm
  * Attaches the sighting unit to the Dragon missile.
  *
  * Arguments:

addons/dragon/functions/fnc_sightCanAttach.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM)
+ * Author: tcvm
  * Determines if you can attach the sighting unit to the Dragon missile.
  *
  * Arguments:

addons/dragon/functions/fnc_sightCanDetach.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM)
+ * Author: tcvm
  * Determines if you can attach the sighting unit to the Dragon missile.
  *
  * Arguments:

addons/dragon/functions/fnc_sightDetach.sqf

@@ -1,6 +1,6 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
- * Author: Dani (TCVM)
+ * Author: tcvm
  * Attaches the sighting unit to the Dragon missile.
  *
  * Arguments:

addons/dragon/stringtable.xml

@@ -71,7 +71,7 @@
             <Japanese>SU-36/P デイサイト</Japanese>
             <Chinese>SU-36/P 日間瞄具</Chinese>
             <Chinesesimp>SU-36/P 常规瞄具</Chinesesimp>
-            <Italian>SU-36/P Daysight</Italian>
+            <Italian>SU-36/P Mirino Diurno</Italian>
             <Czech>SU-36/P denní puškohled</Czech>
             <Polish>SU-36/P Celownik dzienny</Polish>
             <Turkish>SU-36/P Daysight</Turkish>
@@ -84,10 +84,10 @@
             <German>Ein leichte, billige Visierung for Tageseinsätze. Beinhaltet den Zielsuchcomputer für das ganze System.</German>
             <Portuguese>Uma mira leve e comum utilizada para operações de dia. Contêm o computador de orientação para todo o sistema.</Portuguese>
             <French>Un viseur léger et bon marché utilisé pour les opérations de jour.\nContient l'ordinateur de guidage pour tout le système.</French>
-            <Japanese>昼間時に使用される軽量で、低価格の照準器です。システム全体の誘導コンピュータを備えています。</Japanese>
+            <Japanese>昼間時に使用される軽量で、低価格の照準器。システム全体の誘導コンピュータを備えている。</Japanese>
             <Chinese>一個輕量，便宜適合日間行動使用的廉價瞄具。內含全套制導電腦系統</Chinese>
             <Chinesesimp>一种用于日间作战的轻型廉价瞄准具。包含整个系统的制导计算机</Chinesesimp>
-            <Italian>Una luce,un mirino usato per le operazioni diurne.Contiene il computer di guida per l'intero sistema </Italian>
+            <Italian>Un mirino leggero ed economico usato per le operazioni diurne. Contiene il computer di guida per l'intero sistema.</Italian>
             <Czech>Lehký a levný puškohled pro použití za denního světla. Obsahuje navigační počítač pro celý systém.</Czech>
             <Polish>Lekki, tani celownik używany do działania w trakcie dnia. Zawiera komputer naprowadząjący dla całego systemu</Polish>
             <Russian>Лёгкий дешёвый прицел, используемый для дневных операций. Содержит компьютер для всей системы</Russian>
@@ -102,7 +102,7 @@
             <Japanese>特徴的な飛行特性を持つ、ワイヤ誘導の SACLOS ミサイルです。</Japanese>
             <Chinese>一個有線制導半自動指令型飛彈並有著獨特的飛航動作</Chinese>
             <Chinesesimp>具有独特飞行特性的线导半自动指令型导弹</Chinesesimp>
-            <Italian>Un missile SACLOS  filo-guidato con uniche caratterische di volo </Italian>
+            <Italian>Un missile SACLOS filo-guidato con una caratterisca di volo particolare</Italian>
             <Czech>Drátem naváděná SACLOS raketa s unikátními letovými vlastnostmi</Czech>
             <Polish>Naprowadzany przewodowo rakietowy pocisk SACLOS o unikalnej charakterystyce lotu</Polish>
             <Russian>Ракета SACLOS с проводным наведением с уникальной характеристикой полета</Russian>

addons/hellfire/CfgMagazines.hpp

@@ -16,7 +16,7 @@ class CfgMagazines {
         count = 1;
         mass = 70;
         pylonWeapon = QGVAR(launcher);
-        hardpoints[] = {"SCALPEL_1RND"};
+        hardpoints[] = {"SCALPEL_1RND", "HellfireRail_MELB"};
         model = "\A3\Weapons_F\DynamicLoadout\PylonMissile_1x_Bomb_04_F.p3d";
     };
     class PylonRack_1Rnd_ACE_Hellfire_AGM114K: 6Rnd_ACE_Hellfire_AGM114K { // 1x Launcher Support Rack

addons/hellfire/functions/fnc_attackProfile.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * Hellfire attack profile. Handles all 4 modes LOBL, LOAL-DIR, LOAL-HI, LOAL-LO
@@ -93,5 +93,5 @@ if (_attackStage >= 3 && { _seekerType isEqualTo "ARH" }) then {
     };
 };
 
-// TRACE_1("Adjusted target position", _returnTargetPos);
+// TRACE_1("Adjusted target position",_returnTargetPos);
 _returnTargetPos;

addons/hellfire/functions/fnc_getAttackProfileSettings.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * Gets attack profile parameters for first run of hellfire attack profile function
@@ -31,11 +31,10 @@ private _configLaunchHeightClear = getNumber (_attackConfig >> QGVAR(launchHeigh
 private _startingStage = if (_configLaunchHeightClear > 0) then {
     STAGE_LAUNCH; // LOAL-HI / LO
 } else {
-    if (_seekerTargetPos isEqualTo [0,0,0]) then {
+    [
-        STAGE_SEEK_CRUISE; // LOAL-DIR
+        STAGE_ATTACK_CRUISE,
-    } else {
+        STAGE_SEEK_CRUISE
-        STAGE_ATTACK_CRUISE // LOBL
+    ] select (_seekerTargetPos isEqualTo [0,0,0]);
-    };
 };
 
 // Set data in param array

addons/hellfire/functions/fnc_setupVehicle.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * Adds interaction menu actions to switch the firemode to a vehicle.

addons/hellfire/stringtable.xml

@@ -22,33 +22,39 @@
             <Russian>Самонаводящаяся Ракета с фугасной противотанковой боевой частью и полуактивной лазерной системой наведения</Russian>
             <Spanish>Misil de guiado láser semi-activo con cabeza de alto explosivo anti-tanque</Spanish>
             <French>Missile antichar à guidage laser semi-actif (charge HEAT)</French>
+            <Italian>Missile a guida laser semi-attiva con una testata HEAT</Italian>
             <Japanese>セミ アクティブ レーダー誘導の対戦車弾頭</Japanese>
             <Polish>Rakieta naprowadzana laserowo z głowicą przeciwpancerną</Polish>
             <German>Halbaktive Laser-Zielsuchrakete mit HEAT-Gefechtskopf</German>
             <Chinesesimp>高爆反坦克弹头半主动激光制导导弹</Chinesesimp>
             <Korean>반능동 레이저 유도미사일로 대전차 고폭 탄두를 탑재하고 있습니다.</Korean>
+            <Portuguese>Míssil teleguiado a laser semi-ativo com ogiva antitanque altamente explosiva</Portuguese>
         </Key>
         <Key ID="STR_ACE_Hellfire_LDescriptionShort">
             <English>Millimeter-wave radar guided missile with high explosive anti-tank warhead</English>
             <Russian>Радиолокационная управляемая ракета миллиметрового диапазона с фугасной противотанковой боевой частью</Russian>
             <Spanish>Misil guiado por radar de onda milimétrica con cabeza de alto explosivo anti-tanque</Spanish>
             <French>Missile antichar à guidage radar à ondes courtes (charge HEAT)</French>
+            <Italian>Missile a guida radar con una testata HEAT</Italian>
             <Japanese>ミリ波レーダー誘導の対戦車弾頭</Japanese>
             <Polish>Rakieta namierzana radarowo z głowicą przeciwpancerną</Polish>
             <German>Millimeterwellenradar-Lenkflugkörper mit HEAT-Gefechtskopf</German>
             <Chinesesimp>高爆反坦克弹头毫米波雷达制导导弹</Chinesesimp>
             <Korean>밀리미터파 레이더 유도 미사일로 대전차 고폭 탄두를 탑재하고 있습니다.</Korean>
+            <Portuguese>Míssil guiado por radar de ondas milimétricas com ogiva antitanque altamente explosiva</Portuguese>
         </Key>
         <Key ID="STR_ACE_Hellfire_NDescriptionShort">
             <English>Semi-active laser homing missile with metal augmented charge anti-personnel warhead</English>
             <Russian>Самонаводящаяся ракета с металлической увеличенной зарядной противопехотной боевой частью и полуактивной лазерной системой наведения</Russian>
             <Spanish>Misil guiado por láser semi-activo con cabeza de carga de metal aumentada anti-persona</Spanish>
+            <Italian>Missile a guida laser semi-attiva con una testata a frammentazione antiuomo</Italian>
             <French>Missile antipersonnel thermobarique à guidage laser semi-actif</French>
             <Japanese>セミ アクティブ レーダー誘導の対人弾</Japanese>
             <Polish>Rakieta naprowadzana laserowo z głowicą odłamkową</Polish>
             <German>Halbaktive Laser-Zielsuchrakete mit metallverstärktem Antipersonen-Gefechtskopf</German>
             <Chinesesimp>金属增强人员杀伤弹头半主动激光制导导弹</Chinesesimp>
             <Korean>반능동 레이저 유도 미사일로 대인 금속 강화 탄두가 탑재하고 있습니다.</Korean>
+            <Portuguese>Míssil teleguiado a laser semi-ativo com ogiva antipessoal de carga aumentada de metal</Portuguese>
         </Key>
     </Package>
 </Project>

addons/hot/config.cpp

@@ -8,7 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common","ace_missileguidance"};
         author = ECSTRING(common,ACETeam);
-        authors[] = {"Dani (TCVM)"};
+        authors[] = {"tcvm"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/hot/stringtable.xml

@@ -6,7 +6,7 @@
             <German>Drahtgelenkt</German>
             <Polish>Kierowany przewodem</Polish>
             <Italian>Filoguidato</Italian>
-            <Japanese>ワイヤ有線誘導</Japanese>
+            <Japanese>有線誘導</Japanese>
             <Russian>Проводное управление</Russian>
             <Portuguese>Guiado por Fio</Portuguese>
             <Chinese>有線制導</Chinese>
@@ -18,11 +18,11 @@
             <Korean>유선 유도</Korean>
         </Key>
         <Key ID="STR_ACE_HOT_SACLOS_Description">
-            <English>Semi-automatic command to line of sight</English>
+            <English>Semi-automatic command to line of sight (SACLOS)</English>
             <German>Halbautomatische Steuerung über Sichtverbindung (SACLOS)</German>
             <Polish>Semi-automatyczna komenda do pola widzenia</Polish>
-            <Italian>Comando Semi-Automatico via Contatto Visivo(SACLOS)</Italian>
+            <Italian>Comando Semi-Automatico su Contatto Visivo (SACLOS)</Italian>
-            <Japanese>半自動指令照準線一致誘導方式</Japanese>
+            <Japanese>半自動指令照準線一致誘導方式 (SACLOS)</Japanese>
             <Russian>Полуавтоматическое командное наведение по линии визирования (SACLOS)</Russian>
             <Portuguese>Comando semi-automático para a linha de visão (SACLOS)</Portuguese>
             <Chinese>視線內半自動指令</Chinese>
@@ -37,8 +37,8 @@
             <English>Wire-Guided Missile</English>
             <German>Drahtgelenkte Rakete</German>
             <Polish>Pocisk kierowany przewodowo</Polish>
-            <Italian>Missile filoguidato</Italian>
+            <Italian>Missile Filoguidato</Italian>
-            <Japanese>ワイヤ有線誘導ミサイル</Japanese>
+            <Japanese>有線誘導ミサイル</Japanese>
             <Russian>Ракета с проводным управлением</Russian>
             <Portuguese>Míssil Guiado por Fio</Portuguese>
             <Chinese>有線制導飛彈</Chinese>
@@ -133,8 +133,8 @@
             <English>Wire-Guided Missile (Anti-Personnel)</English>
             <German>Anti Personen Lenkflugkörper</German>
             <Polish>Pocisk kierowany przewodowo (przeciwpiechotny)</Polish>
-            <Italian>Missile filoguidato antiuomo</Italian>
+            <Italian>Missile Filoguidato Antiuomo</Italian>
-            <Japanese>ワイヤ有線誘導ミサイル (対人)</Japanese>
+            <Japanese>有線誘導ミサイル (対人)</Japanese>
             <Russian>Ракета с проводным управлением (Противопехотная)</Russian>
             <Portuguese>Míssil Guiado por Fio (Anti-Pessoal)</Portuguese>
             <Chinese>有線制導飛彈（反步兵）</Chinese>

addons/maverick/config.cpp

@@ -9,10 +9,6 @@ class CfgPatches {
         authors[] = {"xrufix"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        ammo[] = {
-            QGVAR(L),
-            "ace_kh25ml"
-        };
         magazines[] = {
             QGVAR(L_magazine_x1),
             QGVAR(L_pylonmissile_x1),

addons/maverick/stringtable.xml

@@ -5,7 +5,7 @@
             <Key ID="STR_ACE_Maverick_l_mag_descr">
                 <English>AGM-65 Maverick L, Laser Guided Anti-Ground-Missile</English>
                 <German>AGM-65 Maverick L, lasergelenkte Luft-Boden-Rakete</German>
-                <Italian>AGM-65 Maverick L, Guida Laser Missile Anti-Terra</Italian>
+                <Italian>AGM-65 Maverick L, Missile Aria-Terra Laserguidato</Italian>
                 <Japanese>AGM-65 マーベリック L、レーザー誘導対地ミサイル</Japanese>
                 <Chinese>AGM-65"小牛"飛彈L型，雷射導引對地導彈</Chinese>
                 <Chinesesimp>AGM-65"小牛"L型激光制导对地导弹</Chinesesimp>
@@ -70,12 +70,14 @@
                 <English>MAVL</English>
                 <Spanish>MAVL</Spanish>
                 <French>MAVL</French>
+                <Italian>MAVL</Italian>
                 <Russian>MAVL</Russian>
                 <Polish>MAVL</Polish>
                 <Japanese>MAVL</Japanese>
                 <German>MAVL</German>
                 <Korean>MAVL</Korean>
                 <Chinesesimp>MAVL</Chinesesimp>
+                <Portuguese>MAVL</Portuguese>
             </Key>
             <Key ID="STR_ACE_Maverick_kh25ml_mag_descr">
                 <English>Kh-25ML, Laser Guided Air-to-Ground-Missile</English>
@@ -84,7 +86,7 @@
                 <Chinese>Kh-25ML，雷射導引對地導彈</Chinese>
                 <Chinesesimp>Kh-25ML，激光制导空地导弹</Chinesesimp>
                 <Japanese>Kh-25ML、レーザー誘導対地ミサイル</Japanese>
-                <Italian>Kh-25ML, a Guida Laser Missile Aria-Terra</Italian>
+                <Italian>Kh-25ML, Missile Aria-Terra Laserguidato</Italian>
                 <Polish>Kh-25ML, Kierowany laserowo pocisk powietrze-ziemia</Polish>
                 <Russian>Х-25МЛ, ракета Воздух-Земля с лазерным наведением</Russian>
                 <Portuguese>Kh-25ML, Míssil Ar para Chão Guiado a Laser</Portuguese>

addons/metis/config.cpp

@@ -8,7 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_missileguidance"};
         author = ECSTRING(common,ACETeam);
-        authors[] = {"Dani (TCVM)"};
+        authors[] = {"tcvm"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/nlaw/functions/fnc_attackProfile.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * NLAW missile guidance attack profile.
@@ -56,5 +56,5 @@ if ((count _test) > 0) then {
 };
 #endif
 
-// TRACE_1("Adjusted target position", _returnTargetPos);
+// TRACE_1("Adjusted target position",_returnTargetPos);
 _returnTargetPos;

addons/nlaw/functions/fnc_keyDown.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * Handles the track key being held down.

addons/nlaw/functions/fnc_onFired.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * Sets up missile guidance state arrays (called from missileGuidance's onFired).

addons/nlaw/functions/fnc_seeker.sqf

@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "..\script_component.hpp"
 /*
  * Author: PabstMirror
  * Handles the top down attack seeker for missile guidance.

addons/nlaw/stringtable.xml

@@ -4,8 +4,8 @@
         <Key ID="STR_ACE_NLAW_trackTarget">
             <English>NLAW Track Target (Hold)</English>
             <German>NLAW Zielverfolgung</German>
-            <Italian>NLAW Traccia Bersaglio (Mantieni)</Italian>
+            <Italian>NLAW Traccia Bersaglio (Tieni Premuto)</Italian>
-            <Japanese>NALW 目標の追跡 (押しっぱ)</Japanese>
+            <Japanese>NLAW 目標追跡 (ホールド)</Japanese>
             <Chinesesimp>NLAW 追踪目标（按住）</Chinesesimp>
             <Chinese>次世代輕型反坦克導彈發射器追蹤目標 (按住)</Chinese>
             <Polish>Śledzenie Celu NLAW (Przytrzymaj)</Polish>
@@ -25,7 +25,7 @@
             <Chinesesimp>直射模式</Chinesesimp>
             <Chinese>直射模式</Chinese>
             <Polish>Bezpośredni atak</Polish>
-            <Korean>직선 공격</Korean>
+            <Korean>직사 타격</Korean>
             <Russian>Прямая атака</Russian>
             <Portuguese>Ataque Direto</Portuguese>
             <French>Attaque directe</French>
@@ -41,7 +41,7 @@
             <Chinesesimp>飞越攻顶模式</Chinesesimp>
             <Chinese>攻頂模式</Chinese>
             <Polish>Atak z góry</Polish>
-            <Korean>탑어택</Korean>
+            <Korean>상부 타격</Korean>
             <Russian>Атака сверху</Russian>
             <Portuguese>Ataque por cima</Portuguese>
             <French>Attaque par le haut</French>