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

GM-Termplate_desert-prep update
official-antistasi-community · Aug 12, 2023 · a7b0be5 · a7b0be5
2 parents 2e820a3 + c64f9f3
commit a7b0be5
Show file tree

Hide file tree

Showing 136 changed files with 145,391 additions and 478 deletions.
diff --git a/A3A/addons/core/CfgFunctions.hpp b/A3A/addons/core/CfgFunctions.hpp
@@ -360,6 +360,7 @@ class CfgFunctions
 
             class initVehClassToCrew {};
             class initZones {};
+            class initZeusLogging {};
             class modBlacklist {};
             class playerMarkers {};
             class prepareMarkerArrays {};

diff --git a/A3A/addons/core/CfgMarkers.hpp b/A3A/addons/core/CfgMarkers.hpp
@@ -0,0 +1,26 @@
+class CfgMarkers {
+	class flag_NATO;
+
+	class a3a_flag_cdf: flag_NATO {
+		name = "CDF";
+		icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
+		texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
+	};
+
+	class a3a_flag_napa: flag_NATO {
+		name = "NAPA";
+		icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
+		texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
+	};
+
+	class a3a_flag_serbia: flag_NATO {
+		name = "Serbia";
+		icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
+		texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
+	};
+	class a3a_flag_chdkz: flag_NATO {
+		name = "ChDKZ";
+		icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
+		texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
+	};
+};
diff --git a/A3A/addons/core/Includes/script_version.hpp b/A3A/addons/core/Includes/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 3
-#define MINOR 2
-#define PATCHLVL 0
+#define MINOR 3
+#define PATCHLVL 3
 #define BUILD 0
diff --git a/A3A/addons/core/Params.hpp b/A3A/addons/core/Params.hpp
@@ -187,16 +187,16 @@ class Params
     class A3A_enemyBalanceMul
     {
         title = "Overall enemy resource balance";
-        values[] = {3,5,7,10,14,20,28};
-        texts[] =  {"Trivial","Very Easy","Easy","Normal","Hard","Very Hard","Extreme"};
+        values[] = {4,6,8,10,12,14,17,20,24,28};
+        texts[] =  {"0.4x","0.6x","0.8x","1.0x","1.2x","1.4x","1.7x","2.0x","2.4x","2.8x"};
         default = 10;
     };
     class A3A_enemyAttackMul
     {
         attr[] = {"server"};
         title = "Enemy attack resource balance (relative to overall balance)";
-        values[] = {3,5,7,10,14,20,28};
-        texts[] =  {"Trivial","Very Easy","Easy","Normal","Hard","Very Hard","Extreme"};
+        values[] = {4,6,8,10,12,14,17,20,24,28};
+        texts[] =  {"0.4x","0.6x","0.8x","1.0x","1.2x","1.4x","1.7x","2.0x","2.4x","2.8x"};
         default = 10;
     };
     class A3A_invaderBalanceMul
@@ -335,12 +335,12 @@ class Params
         texts[] = {"Never","Sometimes","Often","Always"};
         default = 33;
     };
-    class LootToCrateEnabled
+    class LootToCrateRadius
     {
-        title = "Enable Loot to crate";
-        values[] = {0, 1};
-        texts[] = {"Disabled", "Enabled"};
-        default = 1;
+        title = "Loot to crate radius";
+        values[] = {0,10,15,20};
+        texts[] = {"Disabled","10m","15m","20m"};
+        default = 10;
     };
     class LTCLootUnlocked
     {

diff --git a/A3A/addons/core/Pictures/Markers/cdf_ca.paa b/A3A/addons/core/Pictures/Markers/cdf_ca.paa
diff --git a/A3A/addons/core/Pictures/Markers/chdkz_co.paa b/A3A/addons/core/Pictures/Markers/chdkz_co.paa
diff --git a/A3A/addons/core/Pictures/Markers/napa_ca.paa b/A3A/addons/core/Pictures/Markers/napa_ca.paa
diff --git a/A3A/addons/core/Pictures/Markers/serbia_ca.paa b/A3A/addons/core/Pictures/Markers/serbia_ca.paa
diff --git a/A3A/addons/core/Scripts/fn_advancedTowingInit.sqf b/A3A/addons/core/Scripts/fn_advancedTowingInit.sqf
@@ -51,8 +51,6 @@ if( count (ropeAttachedObjects _vehicle) == 0 ) then { \
 	_cargo = ((ropeAttachedObjects _vehicle) select 0) getVariable ["SA_Cargo",objNull]; \
 };
 
-SA_Advanced_Towing_Install = {
-
 // Prevent advanced towing from installing twice
 if(!isNil "SA_TOW_INIT") exitWith {};
 scriptName "fn_advancedTowingInit.sqf";
@@ -393,7 +391,6 @@ SA_Attach_Tow_Ropes = {
 };
 
 SA_Take_Tow_Ropes = {
-	if (captive player) then {player setCaptive false};//by Barbolani to avoid undercover exploits
 	params ["_vehicle","_player"];
 	if(local _vehicle) then {
 		diag_log format ["Take Tow Ropes Called %1", _this];
@@ -836,49 +833,4 @@ SA_RemoteExecServer = {
 	};
 };
 
-if (isServer) then {
-
-	// Adds support for exile network calls (Only used when running exile) //
-
-	SA_SUPPORTED_REMOTEEXECSERVER_FUNCTIONS = ["SA_Set_Owner","SA_Hide_Object_Global"];
-
-	ExileServer_AdvancedTowing_network_AdvancedTowingRemoteExecServer = {
-		params ["_sessionId", "_messageParameters",["_isCall",false]];
-		_messageParameters params ["_params","_functionName"];
-		if (_functionName in SA_SUPPORTED_REMOTEEXECSERVER_FUNCTIONS) then {
-			if (_isCall) then {
-				_params call (missionNamespace getVariable [_functionName,{}]);
-			} else {
-				_params spawn (missionNamespace getVariable [_functionName,{}]);
-			};
-		};
-	};
-
-	SA_SUPPORTED_REMOTEEXECCLIENT_FUNCTIONS = ["SA_Simulate_Towing","SA_Attach_Tow_Ropes","SA_Take_Tow_Ropes","SA_Put_Away_Tow_Ropes","SA_Pickup_Tow_Ropes","SA_Drop_Tow_Ropes","SA_Hint"];
-
-	ExileServer_AdvancedTowing_network_AdvancedTowingRemoteExecClient = {
-		params ["_sessionId", "_messageParameters"];
-		_messageParameters params ["_params","_functionName","_target",["_isCall",false]];
-		if (_functionName in SA_SUPPORTED_REMOTEEXECCLIENT_FUNCTIONS) then {
-			if (_isCall) then {
-				_params remoteExecCall [_functionName, _target];
-			} else {
-				_params remoteExec [_functionName, _target];
-			};
-		};
-	};
-
-	// Install Advanced Towing on all clients (plus JIP) //
-
-	publicVariable "SA_Advanced_Towing_Install";
-	remoteExecCall ["SA_Advanced_Towing_Install", -2,true];
-
-};
-
 Info("Loaded advanced towing");
-
-};
-
-if (isServer) then {
-	[] call SA_Advanced_Towing_Install;
-};
diff --git a/A3A/addons/core/Stringtable.xml b/A3A/addons/core/Stringtable.xml
@@ -1744,7 +1744,7 @@
       <Key ID="STR_antistasi_journal_entry_text_Features_2">
         <Original>Add any vehicle near your personal Virtual Garage (or factions garage if you are the commander) and keep it safe for future use. Vehicle add option is under the Y menu. Garage management is in HQ options (Flag). Garage recovery capacities may depend on where you are: Air Units can be recovered only near Airbases, boats, near the shore etc.</Original>
         <French>Ajoute n'importe quel véhicule près de votre garage virtuel personnel (ou garage de la factions si vous êtes le commandant) et gardez-le en lieu sûr pour une utilisation future. L'option d'ajout de véhicule se trouve dans le menu Y. La gestion du garage est dans les options HQ (Flag). Les capacités de récupération du garage peuvent dépendre de l'endroit où vous vous trouvez: les unités aériennes ne peuvent être récupérées que près des bases aériennes, des bateaux, près du rivage, etc.</French>
-        <German>Du kannst jedes Fahrzeug in deinen persönlichen virtuellen Fuhrpark (oder dem der Fraktion, wenn du der Kommandant bist) hinzufügen, um es sicher zu verwahren. Diese Option findest du im Z-Menü. Die Verwaltung des Fuhrparks kann am Flaggenmast im HQ aufgerufen werden. Die Möglichkeit zur Bereitstellung eines Fahrzeugs aus dem Fuhrpark hängt dabei von deiner Umgebung ab: Luftfahrzeuge können nur in der Nähe von Flugplätzen bereitgestellt werden, Boote nur in der Nähe der Küste, usw. </German>
+        <German>Du kannst jedes Fahrzeug in deinen persönlichen virtuellen Fuhrpark (oder dem der Fraktion, wenn du der Kommandant bist) hinzufügen, um es sicher zu verwahren. Diese Option findest du im Z-Menü. Die Verwaltung des Fuhrparks kann am Flaggenmast im HQ aufgerufen werden. Die Möglichkeit zur Bereitstellung eines Fahrzeugs aus dem Fuhrpark hängt dabei von deiner Umgebung ab: Luftfahrzeuge können nur in der Nähe von Flugplätzen bereitgestellt werden, Boote nur in der Nähe der Küste, usw.</German>
         <Czech>Můžete přidat jakékoli vozidlo do svého osobního virtuálního vozového parku (nebo frakce, pokud jste velitel), aby bylo v bezpečí. Tuto možnost naleznete v nabídce Z. Vedení flotily může být povoláno na stožár u velitelství. Schopnost zajistit vozidlo z flotily závisí na vašem okolí: letadla mohou být poskytnuta pouze v blízkosti letišť,lodí pouze v blízkosti pobřeží atd.</Czech>
         <Chinesesimp>将载具添加至你的个人车库(或者阵营车库, 如果你是指挥官的话), 确保其安全以供将来使用。车辆添加选项位于Y键菜单下。车库管理功能在总部选项(旗帜)下。能否从车库中取出载具取决于你所在的位置: 如空中单位只能在空军基地恢复, 船只只能在靠近海岸线的敌方恢复等。</Chinesesimp>
         <Korean>개인용 차고(지휘관일 경우 팩션 차고) 근처에서 차량을 꺼내고 사용 후 안전하게 보관하십시오. 차량 추가 옵션은 Y 메뉴에 있습니다. 차고 관리는 본부 깃발에서 할 수 있습니다. 차고 저장 용량은 현재 위치에 따라 달라질 수 있습니다. 공중 장비는 공항에서, 보트는 해안에서 저장할 수 있습니다.</Korean>
@@ -5105,6 +5105,9 @@
         <Portuguese>Informaçao Servior</Portuguese>
         <Spanish>Información de Servidor</Spanish>
       </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>
+      </Key>
       <Key ID="STR_A3A_feedback_serverinfo_starting">
         <Original>Starting game...</Original>
         <Czech>Spouštím hru...</Czech>
@@ -5202,10 +5205,10 @@
         <Spanish>Misión desactualizada</Spanish>
       </Key>
       <Key ID="STR_A3A_missioncheck_oldmission">
-        <Original>"This mission is outdated and could lack important map details that may break your game. Inform your mission maker or update the extension to the latest version."</Original>
-        <Czech>"Tato mise je zastaralá a může postrádat důležité detaily mapy, které mohou narušit vaši hru. Informujte svého tvůrce mise nebo aktualizujte rozšíření na nejnovější verzi."</Czech>
-        <Korean>"이 임무는 구식이며 게임을 망칠 수 있는 중요한 지도의 세부 정보가 부족할 수 있습니다. 미션메이커에게 알리거나 확장 버전을 최신 버전으로 업데이트하십시오."</Korean>
-        <Spanish>"Esta misión esta desactualizada y puede faltarle detalles importantes del mapa que pueden romper la partida. Informa al editor de la misión o actualiza la extensión a la última versión."</Spanish>
+        <Original>This mission is outdated and could lack important map details that may break your game. Inform your mission maker or update the extension to the latest version.</Original>
+        <Czech>Tato mise je zastaralá a může postrádat důležité detaily mapy, které mohou narušit vaši hru. Informujte svého tvůrce mise nebo aktualizujte rozšíření na nejnovější verzi.</Czech>
+        <Korean>이 임무는 구식이며 게임을 망칠 수 있는 중요한 지도의 세부 정보가 부족할 수 있습니다. 미션메이커에게 알리거나 확장 버전을 최신 버전으로 업데이트하십시오.</Korean>
+        <Spanish>Esta misión esta desactualizada y puede faltarle detalles importantes del mapa que pueden romper la partida. Informa al editor de la misión o actualiza la extensión a la última versión.</Spanish>
       </Key>
     </Container>
     <Container name="A3A_garrisons">
@@ -5315,7 +5318,7 @@
         <Original>You don't have enough money for adding this kind of unit (%1€ needed).</Original>
         <Russian>У вас недостаточно денег для добавления такого юнита (необходимо %1€).</Russian>
         <Korean>이런 종류의 유닛을 추가할 충분한 비용이 없습니다 (%1€ 필요).</Korean>
-        Spanish>No tienes suficiente dinero para añadir este tipo de unidad (Necesitas %1€).</Spanish>
+        <Spanish>No tienes suficiente dinero para añadir este tipo de unidad (Necesitas %1€).</Spanish>
       </Key>
       <Key ID="STR_A3A_garrison_recruit_success">
         <Original>Unit has been recruited.%1</Original>
@@ -5354,9 +5357,9 @@
         <Spanish>La ultima Limpieza de Basura fue hace %1. Mantenlo supervisado.</Spanish>
       </Key>
       <Key ID="STR_A3A_GCTracker_tracker_ran_gc">
-        <Original>"Garbage Cleaner Tracker run a garbage clean because the time passed the threshold. Keep track of GC times."</Original>
-        <Korean>"쓰레기 청소 기록 프로그램이 임계값을 초과하여 쓰레기를 청소합니다. 쓰레기 청소 시간을 계속 기록합니다."</Korean>
-        <Spanish>"El Seguimiento del Limpiador de Basura llevó a cabo una limpieza porque el umbral de tiempo fue superado. Mantén supervisado el Limpiador de Basura."</Spanish>
+        <Original>Garbage Cleaner Tracker run a garbage clean because the time passed the threshold. Keep track of GC times.</Original>
+        <Korean>쓰레기 청소 기록 프로그램이 임계값을 초과하여 쓰레기를 청소합니다. 쓰레기 청소 시간을 계속 기록합니다.</Korean>
+        <Spanish>El Seguimiento del Limpiador de Basura llevó a cabo una limpieza porque el umbral de tiempo fue superado. Mantén supervisado el Limpiador de Basura.</Spanish>
       </Key>
     </Container>
     <Container name="A3A_customHint">

diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp
@@ -1,6 +1,7 @@
 
 class Templates
 {
+    // ***************************** Vanilla *****************************
     class Vanilla_Base
     {
         requiredAddons[] = {};
@@ -115,7 +116,7 @@ class Templates
         file = "Vanilla_Civ";
     };
 
-    //************* VN ********************************************************
+    // ***************************** VN *****************************
 
     class VN_Base
     {
@@ -159,7 +160,7 @@ class Templates
         file = "VN_Civ";
     };
 
-    //************* RHS ********************************************************
+    // ***************************** RHS *****************************
 
     class RHS_Base
     {
@@ -185,6 +186,16 @@ class Templates
         climate[] = {"temperate","tropical","arctic"};
     };
 
+    class RHS_CHDKZ : RHS_Base
+    {
+        side = "Inv";
+        flagTexture = "rhsgref\addons\rhsgref_main\data\flag_chdkz_co.paa";
+        name = "RHS ChDKZ";
+        file = "RHS_AI_ChDKZ";
+        maps[] = {"chernarus_summer","chernarus_winter","chernarus"};
+        logo = "\rhsgref\addons\rhsgref_main\data\rhs_logo_ca.paa";
+    };
+
     class RHS_CDF : RHS_Base
     {
         side = "Occ";
@@ -250,7 +261,7 @@ class Templates
         file = "RHS_AI_SAF";
     };
 
-    //************* 3CB Factions ***************************************************
+    // ***************************** 3CB Factions *****************************
 
     class 3CBF_Base
     {
@@ -434,7 +445,7 @@ class Templates
         maps[] = {"takistan","tem_anizay","kunduz"};
     };
 
-    // ***************************** 3CB BAF *************************************************
+    // ***************************** 3CB BAF *****************************
 
     class 3CBBAF_Base
     {
@@ -472,7 +483,7 @@ class Templates
         climate[] = {"tropical"};
     };
 
-    // ************************************** CUP *******************************************************
+    // ***************************** CUP *****************************
 
     class CUP_Base
     {
@@ -684,7 +695,7 @@ class Templates
         file = "CUP_Civ_CHC";
     };
 
-    // ************************************* Unsung *******************************************************
+    //***************************** Unsung *****************************
 
     class UNS_Base
     {
@@ -727,7 +738,7 @@ class Templates
         file = "UNS_Civ";
     };
 
-    // ********************************** Global Mobilization ************************************************
+    // ***************************** Global Mobilization *****************************
 
     class GM_Base
     {
@@ -800,7 +811,7 @@ class Templates
         file = "GM_Civ";
     };
 
-    // ***************************** BWA3 *************************************************
+    // ***************************** BWA3 *****************************
 
     class BWA3_Base
     {
@@ -825,4 +836,91 @@ class Templates
         climate[] = {"temperate","tropical","arctic"};
     };
 
+    // ***************************** Spe *****************************
+/*    //Commented out as no vehiclesPlanesTransport exist and the templates don't work without them
+    class SPE_Base
+    {
+        requiredAddons[] = {"ww2_spe_assets_c_characters_germans_c"};
+        basepath = QPATHTOFOLDER(Templates\Templates\SPE);
+        logo = QPATHTOFOLDER(Templates\Templates\SPE\spe_logo.paa);
+        priority = 80;
+        equipFlags[] = {"lowTech"};
+        forceDLC[] = {"spe"};
+    };
+
+    class SPE_US : SPE_Base
+    {
+        side = "Inv";
+        flagTexture = QPATHTOFOLDER(Templates\Templates\SPE\flag_us.paa);
+        name = "SPE US";
+        file = "SPE_AI_US";
+    };
+
+    class SPE_WEH : SPE_Base
+    {
+        side = "Occ";
+        flagTexture = QPATHTOFOLDER(Templates\Templates\SPE\flag_ger.paa);
+        name = "SPE WEH";
+        file = "SPE_AI_WEH";
+    };
+
+    class SPE_Reb : SPE_Base
+    {
+        side = "Reb";
+        flagTexture = "\WW2\SPE_Core_t\Data_t\Flags\flag_FFF_co.paa";
+        name = "SPE FFF";
+        file = "SPE_Reb_FFF";
+    };
+
+    class SPE_CIV : SPE_Base
+    {
+        side = "Civ";
+        flagTexture = QPATHTOFOLDER(Templates\Templates\SPE\flag_fr.paa);
+        name = "SPE Civs";
+        file = "SPE_CIV";
+    };
+*/
+    // ***************************** SPE with IFA *****************************
+
+    class SPE_IFA_Base
+    {
+        requiredAddons[] = {"ww2_spe_assets_c_characters_germans_c","IFA3_Core"};
+        basepath = QPATHTOFOLDER(Templates\Templates\SPE_IFA);
+        logo = QPATHTOFOLDER(Templates\Templates\SPE_IFA\spe_ifa_logo.paa);
+        priority = 80;
+        equipFlags[] = {"lowTech"};
+        forceDLC[] = {"spe"};
+    };
+
+    class SPE_IFA_US : SPE_IFA_Base
+    {
+        side = "Inv";
+        flagTexture = QPATHTOFOLDER(Templates\Templates\SPE_IFA\flag_us.paa);
+        name = "SPE_IFA US";
+        file = "SPE_IFA_AI_US";
+    };
+
+    class SPE_IFA_WEH : SPE_IFA_Base
+    {
+        side = "Occ";
+        flagTexture = QPATHTOFOLDER(Templates\Templates\SPE_IFA\flag_ger.paa);
+        name = "SPE_IFA WEH";
+        file = "SPE_IFA_AI_WEH";
+    };
+
+    class SPE_IFA_Reb : SPE_IFA_Base
+    {
+        side = "Reb";
+        flagTexture = "\WW2\SPE_Core_t\Data_t\Flags\flag_FFF_co.paa";
+        name = "SPE_IFA FFF";
+        file = "SPE_IFA_Reb_FFF";
+    };
+
+    class SPE_IFA_CIV : SPE_IFA_Base
+    {
+        side = "Civ";
+        flagTexture = QPATHTOFOLDER(Templates\Templates\SPE_IFA\flag_fr.paa);
+        name = "SPE_IFA Civs";
+        file = "SPE_IFA_CIV";
+    };
 };