Merge pull request #3782 from official-antistasi-community/unstable

Unstable -> master merge for 3.10.2 update

Author: jaj22

A3A/addons/config_fixes/EF/CfgVehicles.hpp

@@ -0,0 +1,58 @@
+//EF - CfgVehicles.hpp
+
+class CfgVehicles {
+    class EF_O_Gyra_OPF;
+    class EF_O_Gyra_HMG_OPF;
+    class EF_O_Gyra_Armed_OPF;
+    class EF_O_Gyra_Antiair_OPF;
+    class EF_O_Gyra_Mortar_OPF;
+    class B_Plane_Fighter_01_F;
+    class B_Heli_Transport_03_unarmed_F;
+    class B_Heli_Transport_03_F;
+    class B_T_VTOL_01_infantry_F;
+
+    class a3a_black_Gyra_EF : EF_O_Gyra_OPF {
+        textureList[] = {"Black",1};
+        hiddenSelectionsTextures[] = {"ef\ef_gyra_t\data\gyra_hull_1_black_co.paa","ef\ef_gyra_t\data\gyra_details_1_black_co.paa","ef\ef_gyra_t\data\gyra_int_1_black_co.paa","ef\ef_gyra_t\data\gyra_hmg_1_black_co.paa","ef\ef_gyra_t\data\gyra_rws_1_black_co.paa","ef\ef_gyra_t\data\gyra_turret_1_black_co.paa","ef\ef_gyra_t\data\gyra_mortar_1_black_co.paa","a3\armor_f\data\camonet_CSAT_HEX_Desert_CO.paa"};
+    };
+    class a3a_black_Gyra_HMG_EF : EF_O_Gyra_HMG_OPF {
+        textureList[] = {"Black",1};
+        hiddenSelectionsTextures[] = {"ef\ef_gyra_t\data\gyra_hull_1_black_co.paa","ef\ef_gyra_t\data\gyra_details_1_black_co.paa","ef\ef_gyra_t\data\gyra_int_1_black_co.paa","ef\ef_gyra_t\data\gyra_hmg_1_black_co.paa","ef\ef_gyra_t\data\gyra_rws_1_black_co.paa","ef\ef_gyra_t\data\gyra_turret_1_black_co.paa","ef\ef_gyra_t\data\gyra_mortar_1_black_co.paa","a3\armor_f\data\camonet_CSAT_HEX_Desert_CO.paa"};
+    };
+    class a3a_black_Gyra_Armed_EF : EF_O_Gyra_Armed_OPF {
+        textureList[] = {"Black",1};
+        hiddenSelectionsTextures[] = {"ef\ef_gyra_t\data\gyra_hull_1_black_co.paa","ef\ef_gyra_t\data\gyra_details_1_black_co.paa","ef\ef_gyra_t\data\gyra_int_1_black_co.paa","ef\ef_gyra_t\data\gyra_hmg_1_black_co.paa","ef\ef_gyra_t\data\gyra_rws_1_black_co.paa","ef\ef_gyra_t\data\gyra_turret_1_black_co.paa","ef\ef_gyra_t\data\gyra_mortar_1_black_co.paa","a3\armor_f\data\camonet_CSAT_HEX_Desert_CO.paa"};
+    };
+    class a3a_black_Gyra_Antiair_EF : EF_O_Gyra_Antiair_OPF {
+        textureList[] = {"Black",1};
+        hiddenSelectionsTextures[] = {"ef\ef_gyra_t\data\gyra_hull_1_black_co.paa","ef\ef_gyra_t\data\gyra_details_1_black_co.paa","ef\ef_gyra_t\data\gyra_int_1_black_co.paa","ef\ef_gyra_t\data\gyra_hmg_1_black_co.paa","ef\ef_gyra_t\data\gyra_rws_1_black_co.paa","ef\ef_gyra_t\data\gyra_turret_1_black_co.paa","ef\ef_gyra_t\data\gyra_mortar_1_black_co.paa","a3\armor_f\data\camonet_CSAT_HEX_Desert_CO.paa"};
+    };
+    class a3a_black_Gyra_Mortar_EF : EF_O_Gyra_Mortar_OPF {
+        textureList[] = {"Black",1};
+        hiddenSelectionsTextures[] = {"ef\ef_gyra_t\data\gyra_hull_1_black_co.paa","ef\ef_gyra_t\data\gyra_details_1_black_co.paa","ef\ef_gyra_t\data\gyra_int_1_black_co.paa","ef\ef_gyra_t\data\gyra_hmg_1_black_co.paa","ef\ef_gyra_t\data\gyra_rws_1_black_co.paa","ef\ef_gyra_t\data\gyra_turret_1_black_co.paa","ef\ef_gyra_t\data\gyra_mortar_1_black_co.paa","a3\armor_f\data\camonet_CSAT_HEX_Desert_CO.paa"};
+    };
+    class a3a_wdl_camo_FA181_EF : B_Plane_Fighter_01_F {
+        textureList[] = {"MJTF Camo",1};
+        hiddenSelectionsTextures[] = {"\ef\ef_fa181\Data\Fighter_01_ext_01_camo_CO.paa","\ef\ef_fa181\Data\Fighter_01_ext_02_camo_CO.paa","a3\air_f_jets\plane_fighter_01\data\fighter_01_glass_01_ca.paa","a3\air_f_jets\plane_fighter_01\data\fighter_01_cockpit_01_co.paa","a3\air_f_jets\plane_fighter_01\data\fighter_01_cockpit_02_co.paa","a3\air_f_jets\plane_fighter_01\data\fighter_01_cockpit_03_co.paa","a3\air_f_jets\plane_fighter_01\data\fighter_01_cockpit_05_co.paa"};
+    };
+    class a3a_grey_unarmed_ch67_EF : B_Heli_Transport_03_unarmed_F {
+        textureList[] = {"Dark Grey",1};
+        hiddenSelectionsTextures[] = {"\ef\ef_ch67\data\Heli_Transport_03_ext_01_MJTF_CO.paa","\ef\ef_ch67\data\Heli_Transport_03_ext_02_MJTF_CO.paa"};
+    };
+    class a3a_grey_armed_ch67_EF : B_Heli_Transport_03_F {
+        textureList[] = {"Dark Grey",1};
+        hiddenSelectionsTextures[] = {"\ef\ef_ch67\data\Heli_Transport_03_ext_01_MJTF_CO.paa","\ef\ef_ch67\data\Heli_Transport_03_ext_02_MJTF_CO.paa"};
+    };
+    class a3a_wdl_camo_unarmed_ch67_EF : B_Heli_Transport_03_unarmed_F {
+        textureList[] = {"MJTF Camo",1};
+        hiddenSelectionsTextures[] = {"\ef\ef_ch67\data\Heli_Transport_03_ext_01_MJTF_camo_CO.paa","\ef\ef_ch67\data\Heli_Transport_03_ext_02_MJTF_camo_CO.paa"};
+    };
+    class a3a_wdl_camo_armed_ch67_EF : B_Heli_Transport_03_F {
+        textureList[] = {"MJTF Camo",1};
+        hiddenSelectionsTextures[] = {"\ef\ef_ch67\data\Heli_Transport_03_ext_01_MJTF_camo_CO.paa","\ef\ef_ch67\data\Heli_Transport_03_ext_02_MJTF_camo_CO.paa"};
+    };
+    class a3a_wdl_camo_v44x_EF : B_T_VTOL_01_infantry_F {
+        textureList[] = {"MJTF Camo",1};
+        hiddenSelectionsTextures[] = {"\ef\ef_v44x\Data\VTOL_01_EXT_01_camo_CO.paa","\ef\ef_v44x\Data\VTOL_01_EXT_02_camo_CO.paa","\ef\ef_v44x\Data\VTOL_01_EXT_03_camo_CO.paa","\ef\ef_v44x\Data\VTOL_01_EXT_04_camo_CO.paa","\A3\Air_F_Exp\VTOL_01\Data\VTOL_01_signs_CA.paa"};
+    };
+};

A3A/addons/config_fixes/EF/config.cpp

@@ -0,0 +1,25 @@
+//EF - config.cpp
+
+#include "..\script_component.hpp"
+
+class CfgPatches 
+{
+    class PATCHNAME(EF) 
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","EF_Data"};
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
+    };
+};
+
+// Uncomment when needed
+#include "CfgVehicles.hpp"
+//#include "CfgMarkers.hpp"
+//#include "CfgWeapons.hpp"

A3A/addons/config_fixes/RF/CfgVehicles.hpp

@@ -66,7 +66,7 @@ class CfgVehicles
     };
     class a3a_ION_Pickup_AAT_rf : I_Pickup_aat_rf {
         textureList[] = {};
-        hiddenSelectionTextures[] = {"\lxRF\vehicles_rf\pickup_01\Data\pickup_01_ext_ion_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_adds_black_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_AAT_olive_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_Launcher_black_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_service_black_co.paa"};
+        hiddenSelectionsTextures[] = {"\lxRF\vehicles_rf\pickup_01\Data\pickup_01_ext_ion_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_adds_black_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_AAT_olive_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_Launcher_black_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_service_black_co.paa"};
         animationList[] = {"hide_frame",0,"hide_frame_full",1,"hide_bullbar",0,"hide_snorkel",0,"hide_antenna",1,"hide_trunk_door",0,"trunk_door_open",0,"hide_armor_window_armor_top",0,"window_armor_hatch_L_rot",1,"window_armor_hatch_R_rot",0,"door_F_L_open",0,"door_F_R_open",0,"door_R_L_open",0,"door_R_R_open",0,"hide_rack",0,"hide_rack_spotlights",0,"hide_sidesteps",0};
     };
     class a3a_black_Pickup_rf : a3a_FIA_Pickup_rf

A3A/addons/config_fixes/WS/CfgVehicles.hpp

@@ -121,6 +121,6 @@ class CfgVehicles
 
     //Tan-Camo
     class a3a_Heli_Attack_01_pylons_dynamicLoadout_sand_F : B_Heli_Attack_01_pylons_dynamicLoadout_F {
-        hiddenSelectionTextures[] = {"\lxWS\air_f_lxWS\Data\NATO\lxWS_Heli_Attack_01_sand_CO.paa"};
+        hiddenSelectionsTextures[] = {"\lxWS\air_f_lxWS\Data\NATO\lxWS_Heli_Attack_01_sand_CO.paa"};
     };
 };

A3A/addons/core/CfgFunctions.hpp

@@ -584,6 +584,7 @@ class CfgFunctions
         class REINF {
             file = QPATHTOFOLDER(functions\REINF);
             class addBombRun {};
+            class addBombRunServer {};
             class addFIAsquadHC {};
             class addFIAveh {};
             class addSquadVeh {};

A3A/addons/core/Includes/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 3
 #define MINOR 10
-#define PATCHLVL 1
+#define PATCHLVL 2
 #define BUILD 0

A3A/addons/core/Stringtable.xml

@@ -500,7 +500,7 @@
         <Chinesesimp>同志,这里是 %1. 我受伤了！</Chinesesimp>
       </Key>
       <Key ID="STR_A3A_fn_ai_heal_ready">
-        <Original>You are ready %1.</Original>
+        <Original>You are ready, %1.</Original>
         <Korean>치료가 끝났다, %1.</Korean>
         <Russian>Вы готовы %1.</Russian>
         <Chinesesimp>你已经痊愈了%1</Chinesesimp>
@@ -1123,6 +1123,9 @@
         <Turkish>Savaş Seviyesi Değişti&lt;br/&gt;&lt;br/&gt;Şu anki Seviye: %1</Turkish>
         <Chinesesimp>战争等级变动&lt;br/&gt;&lt;br/&gt;当前等级为: %1</Chinesesimp>
       </Key>
+      <Key ID="STR_A3A_fn_base_createoutpfia_alreadynear">
+        <Original>There's already a rebel outpost near that position</Original>
+      </Key>
       <Key ID="STR_A3A_fn_base_createoutpfia_create">
         <Original>Create Outpost</Original>
         <German>Aussenposten erstellen</German>
@@ -2896,9 +2899,7 @@
         <Chinesesimp>清除树林</Chinesesimp>
       </Key>
       <Key ID="STR_A3A_fn_dialogs_createDialog_SLPS_line1">
-        <Original>Antistasi has a custom save system similar to other CTIs.&lt;br/&gt;&lt;br/&gt;To Save: Your commander needs to go to the &lt;t color='#f0d498'&gt;Map Board&lt;/t&gt;, scroll-select &lt;t color='#f0d498'&gt;""Game Options""&lt;/t&gt; and click on the &lt;t color='#f0d498'&gt;""Persistent Save""&lt;/t&gt; button.</Original>
-        <Korean>안티스타시에는 다른 CTI 모드와 유사한 사용자 정의 저장 시스템이 있습니다.&lt;br/&gt;&lt;br/&gt;저장 방법: 지휘관은 &lt;t color='#f0d498'&gt;지도 화이트보드&lt;/t&gt;로 이동하여 스크롤 선택으로&lt;t color='#f0d498'&gt;""게임 설정""&lt;/t&gt;을 선택하고 &lt;t color='#f0d498'&gt;""영구 저장""&lt;/t&gt; 버튼을 누르십시오.</Korean>
-        <Russian>В Antistasi есть собственная система сохранения, похожая на другие CTI.&lt;br/&gt;&lt;br/&gt; Чтобы сохранить: Ваш командир должен подойти к &lt;t color='#f0d498'&gt;Карте&lt;/t&gt;, открыть &lt;t color='#f0d498'&gt;""Параметры""&lt;/t&gt; и нажать на кнопку &lt;t color='#f0d498'&gt;""Сохранение""&lt;/t&gt;.</Russian>
+        <Original>Antistasi has a custom save system similar to other CTIs.&lt;br/&gt;&lt;br/&gt;To Save: Go to the &lt;t color='#f0d498'&gt;Battle Menu (%1)&lt;/t&gt;, select the Commander or Admin tab and then click the &lt;t color='#f0d498'&gt;"Persistent Save"&lt;/t&gt; button.</Original>
       </Key>
       <Key ID="STR_A3A_fn_dialogs_createDialog_SLPS_line2">
         <Original>Current parameters are configured to auto-save every %1 minutes.</Original>
@@ -5369,7 +5370,7 @@
         <Chinesesimp>战俘</Chinesesimp>
       </Key>
       <Key ID="STR_A3A_fn_mission_res_refu_text1">
-        <Original>A group of smugglers have been arrested in %1 and they are about to be sent to prison. Go there and free them in order to make them join our cause. Do this before %2.</Original>
+        <Original>A group of smugglers have been arrested in %1 and they are about to be sent to prison. Go there, free them, and bring them back to HQ in order to make them join our cause. Do this before %2.</Original>
         <Italian>Un gruppo di contrabbandieri è stato arrestato a %1 e stanno per essere incarcerati. Recati sul posto e liberali per reclutarli. Fallo entro %2.</Italian>
         <Spanish>Un grupo de contrabandistas ha sido arrestado en %1 y están a punto de ser enviados a prisión. Ve allí y libéralos para que se unan a nuestra causa. Hazlo antes de las %2.</Spanish>
         <French>Un groupe de contrebandiers a été arrêté à %1 et sont sur le point d'être envoyés en prison. Allez là bas et liberez-les afin de les faire rejoindre notre cause. Faites le avant %2.</French>
@@ -15797,7 +15798,7 @@
         <Chinesesimp>服务器加载完毕</Chinesesimp>
       </Key>
       <Key ID="STR_A3A_feedback_serverinfo_mismatch">
-        <Original>Version mismatch error:&lt;br/&gt;&lt;br/&gt;Server: %1&lt;br/&gt;Client: %2</Original>
+        <Original>Error: Version mismatch on client and server:&lt;br/&gt;&lt;br/&gt;Server: %1&lt;br/&gt;&lt;br/&gt;Client: %2&lt;br/&gt;&lt;br/&gt;Ensure you are running the most recent version of Antistasi - The Mod on the server and your computer.</Original>
         <Italian>Errore, versione non corrispondente:&lt;br/&gt;&lt;br/&gt;Server: %1&lt;br/&gt;Client: %2</Italian>
         <Spanish>Error de discordancia de versión:&lt;br&gt;&lt;br/&gt;Servidor: %1&lt;br/&gt;Cliente: %2</Spanish>
         <French>Erreur d'incohérence de version :&lt;br/&gt;&lt;br/&gt;Serveur : %1&lt;br/&gt;Client : %2</French>
@@ -16675,5 +16676,19 @@
         <Original>Rebel</Original>
       </Key>
     </Container>
+    <Container name="mod_blacklist">
+      <Key ID="STR_A3A_mod_blacklist_title">
+        <Original>Blacklisted Mod Detected!</Original>
+      </Key>
+      <Key ID="STR_A3A_mod_blacklist_titleServer">
+        <Original>Blacklisted Mod On Server!</Original>
+      </Key>
+      <Key ID="STR_A3A_mod_blacklist_text">
+        <Original>Antistasi has detected a blacklisted mod on your client:&lt;br/&gt;&lt;br/&gt;%1&lt;br/&gt;&lt;br/&gt;It is highly recommended that you remove this mod; it may break the gamemode in unpredictable ways.&lt;br/&gt;&lt;br/&gt;Dev comment: %2</Original>
+      </Key>
+      <Key ID="STR_A3A_mod_blacklist_textServer">
+        <Original>Antistasi has detected a blacklisted mod on your server:&lt;br/&gt;&lt;br/&gt;%1&lt;br/&gt;&lt;br/&gt;It is highly recommended that you remove this mod; it may break the gamemode in unpredictable ways.&lt;br/&gt;&lt;br/&gt;Dev comment: %2</Original>
+      </Key>
+    </Container>
   </Package>
 </Project>

A3A/addons/core/Templates/AircraftLoadouts/EF/config.cpp

@@ -8,7 +8,7 @@ class CfgPatches
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"EF_Data"};
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","EF_Data"};
         skipWhenMissingDependencies = 1;
         author = AUTHOR;
         authors[] = { AUTHORS };
@@ -20,14 +20,21 @@ class CfgPatches
 class A3A {
     class Loadouts
     {
+        class CAPPlane
+        {
+            class B_Plane_Fighter_01_F;
+            class a3a_wdl_camo_FA181_EF : B_Plane_Fighter_01_F {};
+        };
         class Helicopter
         {
             class baseHelicopter;
-            class EF_B_AH99J_NATO : baseHelicopter{
+            class B_Heli_Attack_01_dynamicLoadout_F;
+            class EF_B_AH99J_NATO : baseHelicopter {
                 loadout[] = { "PylonRack_12Rnd_missiles","PylonMissile_1Rnd_LG_scalpel","PylonRack_12Rnd_missiles","PylonRack_12Rnd_missiles","PylonMissile_1Rnd_LG_scalpel","PylonRack_12Rnd_missiles","EF_PylonMissile_Missile_Sidearm_x1","EF_PylonMissile_Titan_NLOS_2Rnd","EF_PylonMissile_Titan_NLOS_2Rnd","EF_PylonMissile_Missile_Sidearm_x1" };
             };
             class EF_B_AH99J_MJTF_Wdl : EF_B_AH99J_NATO {};
             class EF_B_AH99J_MJTF_Des : EF_B_AH99J_NATO {};
+            class EF_B_Heli_Attack_01_dynamicLoadout_MJTF_Wdl : B_Heli_Attack_01_dynamicLoadout_F {};
         };
     };
 };

A3A/addons/core/Templates/Templates/3CB/3CB_Civ_ADC.sqf

@@ -181,8 +181,8 @@ private _pressTemplate = {
 private _prefix = "militia";
 private _unitTypes = [
     ["Press", _pressTemplate],
-    ["Worker", _workerTemplate],
-    ["Man", _manTemplate]
+    ["Worker", _workerTemplate, nil, 10],
+    ["Man", _manTemplate, nil, 10]
 ];
 
 [_prefix, _unitTypes, _loadoutData] call _fnc_generateAndSaveUnitsToTemplate;

A3A/addons/core/Templates/Templates/3CB/3CB_Civ_CHC.sqf

@@ -191,8 +191,8 @@ private _pressTemplate = {
 private _prefix = "militia";
 private _unitTypes = [
     ["Press", _pressTemplate],
-    ["Worker", _workerTemplate],
-    ["Man", _manTemplate]
+    ["Worker", _workerTemplate, nil, 10],
+    ["Man", _manTemplate, nil, 10]
 ];
 
 [_prefix, _unitTypes, _loadoutData] call _fnc_generateAndSaveUnitsToTemplate;