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

Update Branch GM-Templates-Desert-Prep

.github/workflows/syncStringtables.yml

@@ -0,0 +1,54 @@
+name: sync-stringtables
+on: [workflow_dispatch]
+
+
+env:
+    CORE_TOLGEE_API_TOKEN: ${{ secrets.CORE_TOLGEE_API_TOKEN }}
+    CONFIG_FIXES_TOLGEE_API_TOKEN: ${{ secrets.CONFIG_FIXES_TOLGEE_API_TOKEN }}
+    EVENTS_TOLGEE_API_TOKEN: ${{ secrets.EVENTS_TOLGEE_API_TOKEN }}
+    GARAGE_TOLGEE_API_TOKEN: ${{ secrets.GARAGE_TOLGEE_API_TOKEN }}
+    GEAR_TOLGEE_API_TOKEN: ${{ secrets.GEAR_TOLGEE_API_TOKEN }}
+    JEROEN_ARSENAL_TOLGEE_API_TOKEN: ${{ secrets.JEROEN_ARSENAL_TOLGEE_API_TOKEN }}
+    GUI_TOLGEE_API_TOKEN: ${{ secrets.GUI_TOLGEE_API_TOKEN }}
+    LOGISTICS_TOLGEE_API_TOKEN: ${{ secrets.LOGISTICS_TOLGEE_API_TOKEN }}
+    MAPS_TOLGEE_API_TOKEN: ${{ secrets.MAPS_TOLGEE_API_TOKEN }}
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: Install antistasi_translation_sync package
+        run: pip install "Tools/antistasi_translation_sync-0.5.0-py3-none-any.whl"
+
+
+      - name: actual syncing
+        run: antistasi-translation-sync -u "https://tolgee.targetingsnake.de" AUTO_ALL
+
+
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Automated Tolgee Update
+          branch: tolgee-update
+          branch-suffix: timestamp
+          delete-branch: false
+          title: 'Updated Stringtable files'
+          body: |
+            Automated Tolgee Update
+          labels: |
+            localisation
+            Automated PR
+          assignees: Bob-Murphy
+          reviewers: Bob-Murphy

A3A/addons/config_fixes/3CB/CfgVehicles.hpp

@@ -0,0 +1,7 @@
+//3CB - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+	#include "tan_air_3cb.hpp"
+};
+

A3A/addons/config_fixes/3CB/config.cpp

@@ -0,0 +1,23 @@
+//3CB - config.cpp
+
+#include "..\script_component.hpp"
+
+
+class CfgPatches 
+{
+    class PATCHNAME(3CB) 
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV"};
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
+    };
+};
+
+#include "CfgVehicles.hpp"

A3A/addons/config_fixes/3CB/tan_air_3cb.hpp

@@ -0,0 +1,37 @@
+class UK3CB_AAF_B_UH1H;
+class UK3CB_AAF_B_UH1H_M240;
+class UK3CB_AAF_B_UH1H_GUNSHIP;
+class UK3CB_AAF_B_Bell412_Utility;
+class UK3CB_AAF_B_Bell412_Armed;
+class UK3CB_AAF_B_Bell412_Armed_AT;
+
+class a3a_3CB_UH1H_tan : UK3CB_AAF_B_UH1H
+{
+    textureList[] = {"Tan",1};
+	hiddenSelectionsTextures[] ={"rhsgref\addons\rhsgref_air\uh1h\data\uh1h_tan_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\uh1h_tan_in_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\mlod_tan_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\decals\blank_ca.paa"};
+};
+class a3a_3CB_UH1H_M240_tan : UK3CB_AAF_B_UH1H_M240
+{
+    textureList[] = {"Tan",1};
+	hiddenSelectionsTextures[] ={"rhsgref\addons\rhsgref_air\uh1h\data\uh1h_tan_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\uh1h_tan_in_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\mlod_tan_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\decals\blank_ca.paa"};
+};
+class a3a_3CB_UH1H_GUNSHIP_tan : UK3CB_AAF_B_UH1H_GUNSHIP
+{
+    textureList[] = {"Tan",1};
+	hiddenSelectionsTextures[] ={"rhsgref\addons\rhsgref_air\uh1h\data\uh1h_tan_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\uh1h_tan_in_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\mlod_tan_co.paa","rhsgref\addons\rhsgref_air\uh1h\data\decals\blank_ca.paa"};
+};
+class a3a_3CB_Bell412_Utility_tan : UK3CB_AAF_B_Bell412_Utility
+{
+    textureList[] = {"Des",1};
+	hiddenSelectionsTextures[] ={"UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_main_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_ext_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_ext1_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\decals\heli_medium01_stickers_blank_ca.paa"};
+};
+class a3a_3CB_Bell412_Armed_tan : UK3CB_AAF_B_Bell412_Armed
+{
+    textureList[] = {"Des",1};
+	hiddenSelectionsTextures[] ={"UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_main_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_ext_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_ext1_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\decals\heli_medium01_stickers_blank_ca.paa"};
+};
+class a3a_3CB_Bell412_Armed_AT_tan : UK3CB_AAF_B_Bell412_Armed_AT
+{
+    textureList[] = {"Des",1};
+	hiddenSelectionsTextures[] ={"UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_main_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_ext_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\heli_medium01_ext1_tan_co.paa","UK3CB_Factions\addons\UK3CB_Factions_Vehicles\air\UK3CB_Factions_Vehicles_Bell412\data\decals\heli_medium01_stickers_blank_ca.paa"};
+};

A3A/addons/config_fixes/CUP/config.cpp

@@ -0,0 +1,28 @@
+//CUP - config.cpp
+
+#include "..\script_component.hpp"
+
+#if __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")
+
+class CfgPatches 
+{
+    class PATCHNAME(CUP) 
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","CUP_Vehicles_LoadOrder"};
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+    };
+};
+
+// Uncomment when needed
+//#include "CfgMagazines.hpp"
+//#include "CfgVehicles.hpp"
+//#include "CfgWeapons.hpp"
+
+#endif      // __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")

A3A/addons/config_fixes/CfgMagazines.hpp

@@ -1,3 +1,4 @@
-class CfgMagazines {
+class CfgMagazines 
+{
 
 };

A3A/addons/config_fixes/CfgVehicles.hpp

@@ -1,3 +1,5 @@
-class CfgVehicles {
+class CfgVehicles 
+{
+	#include "CfgVehicles\chdkz_rhs.hpp"
+};
 
-};

A3A/addons/config_fixes/CfgWeapons.hpp

@@ -1,4 +1,5 @@
 class Mode_SemiAuto;
-class CfgWeapons {
+class CfgWeapons 
+{
 	//#include "CfgWeapons\bomb_weapons.hpp"
 };

A3A/addons/config_fixes/IslaDuala3/config.cpp

@@ -0,0 +1,44 @@
+//IslaDuala3 - config.cpp
+
+#include "..\script_component.hpp"
+
+
+class CfgPatches 
+{
+    class PATCHNAME(IslaDuala3) 
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","A3_Map_IslaDuala3"};
+        skipWhenMissingDependencies = 1;
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+    };
+};
+class CfgWorlds {
+    class Stratis;
+    class IslaDuala3 : Stratis {
+        class Names {
+            class a3a_Obmeya {
+                angle = 0;
+                name = "Noord Obmeya";
+                position[] = {5056,5151};
+                radiusA = 300;
+                radiusB = 200;
+                type = "NameCity";
+            };
+            class imalia {
+                angle = 0;                          // never seen this non-zero
+                name = "Imalia";
+                position[] = {8942,620.74};     // 2d map coords
+                radiusA = 200;                      // I think these are supposed to be outer/inner radius but Antistasi uses them as X/Y. Probably a bug.
+                radiusB = 150;
+                type = "NameVillage";               // NameCity also works, I don't think Antistasi cares
+            };
+        };
+    };
+};

A3A/addons/config_fixes/RHS/CfgVehicles.hpp

@@ -0,0 +1,7 @@
+//RHS - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+	#include "chdkz_rhs.hpp"
+};
+

A3A/addons/config_fixes/RHS/chdkz_rhs.hpp

@@ -0,0 +1,101 @@
+//RHS - chdkz_rhs.hpp
+
+//Armour
+class rhsgref_ins_t72ba;
+class rhsgref_ins_t72bb;
+class rhsgref_ins_t72bc;
+
+class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
+{
+
+#if __A3_DEBUG__
+    scope = 2;
+#else
+    scope = 1;
+#endif
+	class EventHandlers
+	{
+		fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
+		init = "";
+		killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
+	};
+};
+class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
+{
+#if __A3_DEBUG__
+    scope = 2;
+#else
+    scope = 1;
+#endif
+	class EventHandlers
+	{
+		fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
+		init = "";
+		killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
+	};
+};
+class a3a_rhs_chdkz_72c : rhsgref_ins_t72bc
+{
+#if __A3_DEBUG__
+    scope = 2;
+#else
+    scope = 1;
+#endif
+	hiddenSelectionsTextures[] =
+	{
+		"rhsafrf\addons\rhs_t72_camo\data\rhs_t72b_01a_chdkz_co.paa",
+		"rhsafrf\addons\rhs_t72_camo\data\rhs_t72b_02a_chdkz_co.paa",
+		"rhsafrf\addons\rhs_t72\data\rhs_t72b_03_co.paa",
+		"rhsafrf\addons\rhs_t72\data\rhs_t72b_04_co.paa",
+		"rhsafrf\addons\rhs_t72\data\rhs_t72b_05_co.paa"
+	};
+	class EventHandlers
+	{
+		fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
+		init = "";
+		killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
+	};
+};
+
+//Air
+class RHS_Mi8T_vvsc;
+class RHS_Mi8mt_vvsc;
+class RHS_Mi8MTV3_vvsc;
+class RHS_Mi8MTV3_heavy_vvsc;
+class RHS_Mi8AMTSh_vvsc;
+
+class a3a_rhs_Mi8T_chdkz : RHS_Mi8T_vvsc
+{
+	crew = "rhsgref_ins_pilot";
+	dlc = "RHS_GREF";
+	faction = "rhsgref_faction_chdkz";
+	hiddenSelectionsTextures[] ={"rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_body_g_chdkz_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_det_g_cdf_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8t\camo\mi8t_tv2_g_chdkz_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_decals_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\5_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\8_ca.paa","rhsafrf\addons\rhs_decals\data\labels\aviation\vvs_ca.paa"};
+};
+class a3a_rhs_Mi8mt_chdkz : RHS_Mi8mt_vvsc
+{
+	crew = "rhsgref_ins_pilot";
+	dlc = "RHS_GREF";
+	faction = "rhsgref_faction_chdkz";
+	hiddenSelectionsTextures[] ={"rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_body_g_chdkz_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_det_g_cdf_co.paa","a3\data_f\clear_empty.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_decals_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\4_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\9_ca.paa","rhsafrf\addons\rhs_decals\data\labels\aviation\vvs_ca.paa"};
+};
+class a3a_rhs_Mi8MTV3_chdkz : RHS_Mi8MTV3_vvsc
+{
+	crew = "rhsgref_ins_pilot";
+	dlc = "RHS_GREF";
+	faction = "rhsgref_faction_chdkz";
+	hiddenSelectionsTextures[] ={"rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_body_g_chdkz_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_det_g_cdf_co.paa","a3\data_f\clear_empty.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_decals_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\3_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\1_ca.paa","rhsafrf\addons\rhs_decals\data\labels\aviation\vvs_ca.paa"};
+};
+class a3a_rhs_Mi8MTV3_heavy_chdkz : RHS_Mi8MTV3_heavy_vvsc
+{
+	crew = "rhsgref_ins_pilot";
+	dlc = "RHS_GREF";
+	faction = "rhsgref_faction_chdkz";
+	hiddenSelectionsTextures[] ={"rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_body_g_chdkz_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_det_g_cdf_co.paa","a3\data_f\clear_empty.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_decals_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\7_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\2_ca.paa","rhsafrf\addons\rhs_decals\data\labels\aviation\vvs_ca.paa"};
+};
+class a3a_rhs_Mi8AMTSh_chdkz : RHS_Mi8AMTSh_vvsc
+{
+	crew = "rhsgref_ins_pilot";
+	dlc = "RHS_GREF";
+	faction = "rhsgref_faction_chdkz";
+	hiddenSelectionsTextures[] ={"rhsafrf\addons\rhs_a2port_air\mi17\data\camo\mi_171_chdkz_co.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_det_g_cdf_co.paa","a3\data_f\clear_empty.paa","rhsafrf\addons\rhs_a2port_air\mi17\data\mi8_decals_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\9_ca.paa","rhsafrf\addons\rhs_decals\data\numbers\aviared\7_ca.paa","rhsafrf\addons\rhs_decals\data\labels\aviation\vvs_ca.paa"};
+};

A3A/addons/config_fixes/RHS/config.cpp

@@ -0,0 +1,28 @@
+//RHS - config.cpp
+
+#include "..\script_component.hpp"
+
+#if __has_include("\rhsgref\addons\rhsgref_main\config.bin")
+
+class CfgPatches 
+{
+    class PATCHNAME(RHS) 
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","rhsgref_main_loadorder"};
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+    };
+};
+
+// Uncomment when needed
+//#include "CfgMagazines.hpp"
+#include "CfgVehicles.hpp"
+//#include "CfgWeapons.hpp"
+
+#endif      // __has_include("\rhsgref\addons\rhsgref_main\config.bin"

A3A/addons/config_fixes/Stringtable.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="A3-Antistasi">
-    <Package name="A3-Antistasi Mission">
-        <Container name="config_fixes">
-        </Container>
-    </Package>
-</Project>
+  <Package name="A3-Antistasi config_fixes">
+    <Container name="config_fixes">
+
+    </Container>
+  </Package>
+</Project>

A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp

@@ -0,0 +1,9 @@
+//Vanilla - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+#include "air.hpp"
+#include "armor.hpp"
+#include "sea.hpp"
+#include "soft.hpp"
+};