Gm templates desert prep (#2802)

* started BW-Templates arctic * started nva winter template (currently copy of existing one) * added swaped stuff in nva template; corrected artillery part in bw arctiv template * finished winter * fixed errors * updated GM-Vehicle-Attributes * added BW desert Camo * commented BW Desert template out * changed east german helmets * updated the old perpared desert template with the current temeperate one * added changes in templates * started with desert vehicles in desert templates * Swaped BW weapons and vehicles in Desert Template to desert or Olive versions * swapped uniforms to desert ones, didn't find some for militia * prepared desert NVA template * added NVA desert vehicles, fixed issue with sg550 and sg551 magazines in BW template (Error only in Logiles, afaik no report) * fixed issues with wrong magazines for a certain weapon in the nva templates * added CUP rebel uniforms to template aswell * corrected config error * fixed issues with mounting weapons and loading crates on ammotruck of GM, also fixed #2761 * Name shortening and missing space * fixed issue --------- Co-authored-by: targetingsnake <targetingsnake@users.noreply.github.com> Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
official-antistasi-community · Jan 24, 2024 · 09e8625 · 09e8625
1 parent 530fefc
commit 09e8625
Show file tree

Hide file tree

Showing 9 changed files with 1,966 additions and 21 deletions.
diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp
@@ -832,38 +832,56 @@ class Templates
     {
         side = "Inv";
         flagTexture = "\gm\gm_core\data\flags\gm_flag_gc_co";
-        name = "GM Nationale Volksarmee Temperate";
+        name = "GM NVA Temperate";
         file = "GM_AI_NVA";
-        climate[] = {"temperate","tropical","arid"};
+        climate[] = {"temperate","tropical"};
     };
 
     class GM_NVA_Arctic : GM_Base
     {
         side = "Inv";
         flagTexture = "\gm\gm_core\data\flags\gm_flag_gc_co";
-        name = "GM Nationale Volksarmee Arctic";
+        name = "GM NVA Arctic";
         file = "GM_AI_NVA_arctic";
         climate[] = {"arctic"};
     };
 
+    class GM_NVA_Desert : GM_Base
+    {
+        side = "Inv";
+        flagTexture = "\gm\gm_core\data\flags\gm_flag_gc_co";
+        name = "GM NVA Desert";
+        file = "GM_AI_NVA_desert";
+        climate[] = {"arid"};
+    };
+
     class GM_BW : GM_Base
     {
         side = "Occ";
         flagTexture = "\gm\gm_core\data\flags\gm_flag_ge_co";
-        name = "GM Bundeswehr Temperate";
+        name = "GM BW Temperate";
         file = "GM_AI_BW";
-        climate[] = {"temperate","tropical","arid"};
+        climate[] = {"temperate","tropical"};
     };
 
     class GM_BW_Arctic : GM_Base
     {
         side = "Occ";
         flagTexture = "\gm\gm_core\data\flags\gm_flag_ge_co";
-        name = "GM Bundeswehr Arctic";
+        name = "GM BW Arctic";
         file = "GM_AI_BW_arctic";
         climate[] = {"arctic"};
     };
 
+    class GM_BW_Desert : GM_Base
+    {
+        side = "Occ";
+        flagTexture = "\gm\gm_core\data\flags\gm_flag_ge_co";
+        name = "GM BW Desert";
+        file = "GM_AI_BW_desert";
+        climate[] = {"arid"};
+    };
+
     class GM_Reb : GM_Base
     {
         side = "Reb";

diff --git a/A3A/addons/core/Templates/Templates/GM/GM_AI_BW.sqf b/A3A/addons/core/Templates/Templates/GM/GM_AI_BW.sqf
@@ -64,7 +64,7 @@
 
 //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example:
 ["vehiclesMilitiaLightArmed", ["gm_ge_army_iltis_mg3"]] call _fnc_saveToTemplate;
-["vehiclesMilitiaTrucks", ["gm_ge_army_u1300l_cargo"]] call _fnc_saveToTemplate;
+["vehiclesMilitiaTrucks", ["gm_ge_army_u1300l_cargo", "gm_ge_army_u1300l_container"]] call _fnc_saveToTemplate;
 ["vehiclesMilitiaCars", ["gm_ge_army_iltis_cargo"]] call _fnc_saveToTemplate;
 
 ["vehiclesPolice", ["gm_ge_pol_typ1200", "gm_ge_pol_w123", "gm_ge_pol_typ253"]] call _fnc_saveToTemplate;
@@ -291,7 +291,7 @@ _militaryLoadoutData set ["rifles", [
 ]];
 _militaryLoadoutData set ["carbines", [
     ["gm_g3a4_blk", "", "", "", ["gm_20Rnd_762x51mm_B_DM41_g3_blk", "gm_20Rnd_762x51mm_B_T_DM21A1_g3_blk"], [], ""],
-    ["gm_sg550_blk", "", "", "", ["gm_20Rnd_762x51mm_B_T_DM21_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk"], [], ""],
+    ["gm_sg550_blk", "", "", "", ["gm_30Rnd_556x45mm_B_T_DM21_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn"], [], ""],
     ["gm_hk33a3_blk", "", "", "", ["gm_30Rnd_556x45mm_B_DM11_hk33_blk", "gm_30Rnd_556x45mm_B_T_DM21_hk33_blk"], [], ""],
     ["gm_hk33ka3_blk", "", "", "", ["gm_30Rnd_556x45mm_B_DM11_hk33_blk", "gm_30Rnd_556x45mm_B_T_DM21_hk33_blk"], [], ""],
     ["gm_gvm75carb_oli", "", "", "", ["gm_20Rnd_762x51mm_B_DM41_g3_blk", "gm_20Rnd_762x51mm_B_T_DM21A1_g3_blk"], [], ""]
@@ -304,7 +304,7 @@ _militaryLoadoutData set ["SMGs", [
     ["gm_mp2a1_blk", "", "", "", ["gm_32Rnd_9x19mm_B_DM11_mp2_blk", "gm_32Rnd_9x19mm_B_DM51_mp2_blk", "gm_32Rnd_9x19mm_AP_DM91_mp2_blk"], [], ""],
     ["gm_mp5a2_blk", "", "", "", ["gm_30Rnd_9x19mm_AP_DM91_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM11_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM51_mp5a3_blk"], [], ""],
     ["gm_mp5a3_blk", "", "", "", ["gm_30Rnd_9x19mm_AP_DM91_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM11_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM51_mp5a3_blk"], [], ""],
-    ["gm_sg551_blk", "", "", "", ["gm_20Rnd_762x51mm_B_T_DM21_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk"], [], ""]
+    ["gm_sg551_blk", "", "", "", ["gm_30Rnd_556x45mm_B_T_DM21_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn"], [], ""]
 ]];
 _militaryLoadoutData set ["machineGuns", [
     ["gm_mg3_blk", "", "", "", ["gm_120Rnd_762x51mm_B_T_DM21A1_mg3_grn", "gm_120Rnd_762x51mm_B_T_DM21A2_mg3_grn", "gm_120Rnd_762x51mm_B_T_DM21_mg3_grn"], [], ""],

diff --git a/A3A/addons/core/Templates/Templates/GM/GM_AI_BW_arctic.sqf b/A3A/addons/core/Templates/Templates/GM/GM_AI_BW_arctic.sqf
@@ -297,7 +297,7 @@ _militaryLoadoutData set ["rifles", [
 ]];
 _militaryLoadoutData set ["carbines", [
     ["gm_g3a4_blk", "", "", "", ["gm_20Rnd_762x51mm_B_DM41_g3_blk", "gm_20Rnd_762x51mm_B_T_DM21A1_g3_blk"], [], ""],
-    ["gm_sg550_blk", "", "", "", ["gm_20Rnd_762x51mm_B_T_DM21_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk"], [], ""],
+    ["gm_sg550_blk", "", "", "", ["gm_30Rnd_556x45mm_B_T_DM21_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn"], [], ""],
     ["gm_hk33a3_blk", "", "", "", ["gm_30Rnd_556x45mm_B_DM11_hk33_blk", "gm_30Rnd_556x45mm_B_T_DM21_hk33_blk"], [], ""],
     ["gm_hk33ka3_blk", "", "", "", ["gm_30Rnd_556x45mm_B_DM11_hk33_blk", "gm_30Rnd_556x45mm_B_T_DM21_hk33_blk"], [], ""],
     ["gm_gvm75carb_oli", "", "", "", ["gm_20Rnd_762x51mm_B_DM41_g3_blk", "gm_20Rnd_762x51mm_B_T_DM21A1_g3_blk"], [], ""]
@@ -310,7 +310,7 @@ _militaryLoadoutData set ["SMGs", [
     ["gm_mp2a1_blk", "", "", "", ["gm_32Rnd_9x19mm_B_DM11_mp2_blk", "gm_32Rnd_9x19mm_B_DM51_mp2_blk", "gm_32Rnd_9x19mm_AP_DM91_mp2_blk"], [], ""],
     ["gm_mp5a2_blk", "", "", "", ["gm_30Rnd_9x19mm_AP_DM91_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM11_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM51_mp5a3_blk"], [], ""],
     ["gm_mp5a3_blk", "", "", "", ["gm_30Rnd_9x19mm_AP_DM91_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM11_mp5a3_blk", "gm_30Rnd_9x19mm_B_DM51_mp5a3_blk"], [], ""],
-    ["gm_sg551_blk", "", "", "", ["gm_20Rnd_762x51mm_B_T_DM21_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk", "gm_20Rnd_762x51mm_B_DM111_sg542_blk"], [], ""]
+    ["gm_sg551_blk", "", "", "", ["gm_30Rnd_556x45mm_B_T_DM21_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn", "gm_30Rnd_556x45mm_B_DM11_sg550_brn"], [], ""]
 ]];
 _militaryLoadoutData set ["machineGuns", [
     ["gm_mg3_blk", "", "", "", ["gm_120Rnd_762x51mm_B_T_DM21A1_mg3_grn", "gm_120Rnd_762x51mm_B_T_DM21A2_mg3_grn", "gm_120Rnd_762x51mm_B_T_DM21_mg3_grn"], [], ""],