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

Unstable to Master for 3.3.1 hotfix release

Author: Bob-Murphy

A3A/addons/core/Includes/script_version.hpp

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

A3A/addons/core/Templates/Templates/SPE_IFA/SPE_IFA_AI_WEH.sqf

@@ -56,11 +56,11 @@
 ["uavsPortable", []] call _fnc_saveToTemplate;
 
 //Config special vehicles
-["vehiclesMilitiaLightArmed", ["SPE_US_M3_Halftrack"]] call _fnc_saveToTemplate;
+["vehiclesMilitiaLightArmed", ["LIB_Kfz1_MG42_sernyt"]] call _fnc_saveToTemplate;
 ["vehiclesMilitiaTrucks", ["SPE_ST_OpelBlitz_Open"]] call _fnc_saveToTemplate;
-["vehiclesMilitiaCars", ["SPE_ST_OpelBlitz"]] call _fnc_saveToTemplate;
+["vehiclesMilitiaCars", ["LIB_Kfz1_sernyt"]] call _fnc_saveToTemplate;
 
-["vehiclesPolice", ["SPE_ST_OpelBlitz_Open"]] call _fnc_saveToTemplate;
+["vehiclesPolice", ["LIB_Kfz1_sernyt"]] call _fnc_saveToTemplate;
 
 ["staticMGs", ["SPE_MG42_Lafette_Deployed", "SPE_MG34_Lafette_Deployed"]] call _fnc_saveToTemplate;
 ["staticAT", ["SPE_leFH18_AT", "SPE_Pak40"]] call _fnc_saveToTemplate;

A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf

@@ -101,6 +101,7 @@ else            // ground vehicle
         // Vehicle has no weapons(?) and small cargo, merge crew group into cargo group
         (units _crewGroup) joinSilent _cargoGroup;
         deleteGroup _crewGroup;
+        _cargoGroup selectLeader driver _vehicle;
 
         //Create the path waypoints
         private _landPos = [_posDestination, getPosATL _vehicle, false, _landPosBlacklist] call A3A_fnc_findSafeRoadToUnload;

A3A/addons/jeroen_arsenal/JNA/fn_arsenal_itemType.sqf

@@ -181,7 +181,7 @@ private _itemCategory = switch true do {
 			// Everything else
 			default {
 				// haaaaack
-				if (_item isKindOf ["SPE_MUZZLE_FAKEMAG", configFile >> "CfgMagazines"]) exitWith {"junk"};
+				if (_item isKindOf ["SPE_MUZZLE_FAKEMAG", configFile >> "CfgMagazines"]) exitWith {"Junk"};
 				"Magazine";
 			};
 		};
@@ -195,9 +195,10 @@ private _itemCategory = switch true do {
 	case (isClass (configFile >> "CfgGlasses" >> _item)): {
 		"Glasses";
 	};
+	default { "Junk" };			// Loadout code can send empty strings. Possibly other rubbish.
 };
 
-if (_itemCategory == "junk") exitWith {-1};
+if (_itemCategory == "Junk") exitWith {-1};
 
 INITTYPES
 

changelog.rst

@@ -2,6 +2,30 @@
 Changelog
 ==========
 
+
+Version 3.3.1
+===============
+
+.. note::
+   25th July 2023
+
+.. admonition:: Bugfixes
+
+   * :issue:`2853` Changed SPE-IFA militia cars to kubelwagens, fix unarmed car navigation bug
+   * :issue:`2852` Fixed arsenal loadout loading broken by SPE fakemag check
+
+.. warning::
+
+   * Please note that this changelog may contain both spelling/grammatical errors and/or factual errors. Should any factual errors exist, we apologise but with the sheer number of changes made per version it can be easy to lose or mistake a change when writing up the changelog.
+
+|
+
+-----
+
+|
+
+
+
 Version 3.3.0
 ===============