From 4e2ac89c09bf3a27fc4598b64e6c456b97be9b6e Mon Sep 17 00:00:00 2001
From: ante <49555217+ante185@users.noreply.github.com>
Date: Mon, 1 Jan 2024 22:26:17 +0100
Subject: [PATCH] winter/desert rebel vehicles

---
 .../Templates/Templates/IFA/IFA_REB_AK.sqf    | 20 ++++++++++++++++-
 .../Templates/Templates/IFA/IFA_REB_FFI.sqf   | 22 ++++++++++++++++++-
 .../IFA/IFA_Reb_Vehicle_Attributes.sqf        |  6 +++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf
index d2640b98a7..2ef524b6db 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf
@@ -24,7 +24,7 @@
 //////////////////////////
 
 ["vehiclesBasic", ["LIB_Willys_MB"]] call _fnc_saveToTemplate;
-["vehiclesLightUnarmed", ["LIB_GazM1_SOV"]] call _fnc_saveToTemplate;
+["vehiclesLightUnarmed", ["LIB_GazM1_SOV", "LIB_Willys_MB_Hood"]] call _fnc_saveToTemplate;
 ["vehiclesLightArmed", ["LIB_UK_Willys_MB_M1919"]] call _fnc_saveToTemplate;  //replace with a version in plain green
 ["vehiclesTruck", ["LIB_Zis5v"]] call _fnc_saveToTemplate;
 ["vehiclesAT", []] call _fnc_saveToTemplate;
@@ -54,6 +54,24 @@
 ["breachingExplosivesAPC", [["LIB_Ladung_Big_MINE_mag", 1], ["LIB_Ladung_Small_MINE_mag", 1]]] call _fnc_saveToTemplate;
 ["breachingExplosivesTank", [["LIB_US_TNT_4pound_mag", 1], ["LIB_Ladung_Big_MINE_mag", 2]]] call _fnc_saveToTemplate;
 
+switch (A3A_climate) do
+{
+	case "arid": { 
+        ["vehiclesBasic", ["LIB_US_NAC_Willys_MB"]] call _fnc_saveToTemplate;
+        ["vehiclesLightUnarmed", ["LIB_GazM1_SOV_camo_sand", "LIB_US_NAC_Willys_MB_Hood"]] call _fnc_saveToTemplate;
+        ["vehiclesLightArmed", ["LIB_US_NAC_Willys_MB_M1919"]] call _fnc_saveToTemplate;
+    };
+	case "arctic": { 
+        ["vehiclesBasic", ["LIB_Willys_MB_w"]] call _fnc_saveToTemplate;
+        ["vehiclesLightUnarmed", ["LIB_GazM1_SOV", "LIB_Willys_MB_Hood_w"]] call _fnc_saveToTemplate;
+        ["vehiclesLightArmed", ["LIB_US_Willys_MB_M1919_w"]] call _fnc_saveToTemplate;
+        ["vehiclesTruck", ["LIB_Zis5v_w"]] call _fnc_saveToTemplate;
+        ["vehiclesMedical", ["LIB_Zis5v_med_w"]] call _fnc_saveToTemplate;
+        
+        ["staticAT", ["LIB_Zis3_w"]] call _fnc_saveToTemplate;
+    };
+};
+
 #include "IFA_Reb_Vehicle_Attributes.sqf"
 
 ///////////////////////////
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf
index a6f0f8d1da..90cacd92d4 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf
@@ -24,7 +24,7 @@
 //////////////////////////
 
 ["vehiclesBasic", ["LIB_Willys_MB"]] call _fnc_saveToTemplate;
-["vehiclesLightUnarmed", ["LIB_GazM1_FFI"]] call _fnc_saveToTemplate;
+["vehiclesLightUnarmed", ["LIB_GazM1_FFI", "LIB_Willys_MB_Hood"]] call _fnc_saveToTemplate;
 ["vehiclesLightArmed", ["LIB_UK_Willys_MB_M1919"]] call _fnc_saveToTemplate;  //replace with a version in plain green
 ["vehiclesTruck", ["LIB_CIV_FFI_CitC4_5"]] call _fnc_saveToTemplate;
 ["vehiclesAT", ["LIB_Zis5v_61K"]] call _fnc_saveToTemplate; //Remove maybe
@@ -54,6 +54,26 @@
 ["breachingExplosivesAPC", [["LIB_Ladung_Big_MINE_mag", 1], ["LIB_Ladung_Small_MINE_mag", 1]]] call _fnc_saveToTemplate;
 ["breachingExplosivesTank", [["LIB_US_TNT_4pound_mag", 1], ["LIB_Ladung_Big_MINE_mag", 2]]] call _fnc_saveToTemplate;
 
+switch (A3A_climate) do
+{
+	case "arid": { 
+        ["vehiclesBasic", ["LIB_US_NAC_Willys_MB"]] call _fnc_saveToTemplate;
+        ["vehiclesLightUnarmed", ["LIB_GazM1_FFI_sand", "LIB_US_NAC_Willys_MB_Hood"]] call _fnc_saveToTemplate;
+        ["vehiclesLightArmed", ["LIB_US_NAC_Willys_MB_M1919"]] call _fnc_saveToTemplate;
+    };
+	case "arctic": { 
+        ["vehiclesBasic", ["LIB_Willys_MB_w"]] call _fnc_saveToTemplate;
+        ["vehiclesLightUnarmed", ["LIB_GazM1_FFI", "LIB_Willys_MB_Hood_w"]] call _fnc_saveToTemplate;
+        ["vehiclesLightArmed", ["LIB_US_Willys_MB_M1919_w"]] call _fnc_saveToTemplate;
+        
+        ["staticAT", ["LIB_Zis3_w"]] call _fnc_saveToTemplate;
+        ["staticAA", ["LIB_FlaK_30_w"]] call _fnc_saveToTemplate;
+    };
+	case "tropical": { 
+        ["vehiclesLightUnarmed", ["LIB_GazM1_FFI_camo", "LIB_Willys_MB_Hood"]] call _fnc_saveToTemplate;
+    };
+};
+
 #include "IFA_Reb_Vehicle_Attributes.sqf"
 
 ///////////////////////////
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf
index eb966dd265..b9beca2f2e 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf
@@ -2,7 +2,11 @@
     //Everything is a touch more expensive to encourage theft.
     //Cars
     ["LIB_Willys_MB", ["rebCost", 200]],
+    ["LIB_Willys_MB_w", ["rebCost", 200]],
+    ["LIB_US_NAC_Willys_MB", ["rebCost", 200]],
     ["LIB_UK_Willys_MB_M1919", ["rebCost", 1000]],
+    ["LIB_US_Willys_MB_M1919_w", ["rebCost", 1000]],
+    ["LIB_US_NAC_Willys_MB_M1919", ["rebCost", 1000]],
     ["LIB_GazM1", ["rebCost", 400]],
     ["LIB_GazM1_dirty", ["rebCost", 400]],
     ["LIB_Zis5v_61K", ["rebCost", 2000]], //Alternatively we'd make this not purchable?
@@ -10,7 +14,9 @@
     //Statics
     ["LIB_M1919_M2", ["rebCost", 800]],
     ["LIB_Zis3", ["rebCost", 2000]],
+    ["LIB_Zis3_w", ["rebCost", 2000]],
     ["LIB_M2_60", ["rebCost", 2000]],
     ["LIB_FlaK_30", ["rebCost", 1200]],
+    ["LIB_FlaK_30_w", ["rebCost", 1200]],
     ["LIB_61k", ["rebCost", 1700]]
 ]] call _fnc_saveToTemplate;