Merge branch 'TestingBranch' into CUP_FFP

A3A/addons/core/CfgMarkers.hpp

@@ -108,12 +108,18 @@ class CfgMarkers
 		texture = QPATHTOFOLDER(Pictures\Markers\CSAT_SFIA_Marker.paa);
 	};
 
+	class a3a_flag_FIN: flag_NATO 
+	{
+		name = "Finland";
+		icon = QPATHTOFOLDER(Pictures\Markers\marker_fin_co.paa); 
+		texture = QPATHTOFOLDER(Pictures\Markers\marker_fin_co.paa);
+	};
+
 	class a3a_flag_LRI: flag_NATO 
 	{
 		name = "LRI";
 		icon = QPATHTOFOLDER(Pictures\Markers\marker_lri_co.paa); 
 		texture = QPATHTOFOLDER(Pictures\Markers\marker_lri_co.paa);
-
 	};
 
 	class a3a_flag_cdf: flag_NATO 

A3A/addons/core/Templates/Templates/CUP/templates.hpp

@@ -258,4 +258,37 @@
         flagTexture = "a3\data_f_enoch\flags\flag_enoch_co.paa";
         name = "CUP LDF";
         file = "CUP_AI_LDF";
+    };
+
+    class HAFM_Base : CUP_Base
+    {
+        requiredAddons[] = {"CUP_Creatures_People_Civil_Russia", "CUP_BaseConfigs", "CUP_AirVehicles_Core", "HAFM_Acc"};        // units, weapons, vehicles
+    //CUP NorAF
+    class NorAF_Base : CUP_Base
+    {
+        requiredAddons[] = {"CUP_Creatures_People_Civil_Russia", "CUP_BaseConfigs", "CUP_AirVehicles_Core", "Flex_CUP_NOR_Faction"};        // units, weapons, vehicles
+        //requiredAddons[] = {"CUP_AirVehicles_Core"};        // vehicles requires units & weapons
+        priority = 61;
+    };
+
+    class CUP_HAFM : HAFM_Base
+    {
+        side = "Occ";
+        flagTexture = "\A3\ui_f\data\map\markers\flags\Greece_ca.paa";
+        name = "CUP HAFM";
+        file = "CUP_AI_HAFM";
+    class CUP_NorAF_Temperate : NorAF_Base
+    {
+        side = "Occ";
+        flagTexture = "\A3\ui_f\data\map\markers\flags\Norway_ca.paa";
+        name = "CUP NorAF Temperate";
+        file = "CUP_AI_NorAF_Temperate";
+        climate[] = {"temperate","tropical"};
+    };
+
+    class CUP_NorAF_Arctic : CUP_NorAF_Temperate
+    {
+        name = "CUP NorAF Arctic";
+        file = "CUP_AI_NorAF_Arctic";
+        climate[] = {"arctic"};
     };

A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_FIN_Arctic.sqf

@@ -8,7 +8,7 @@
 
 ["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
 ["flagTexture", QPATHTOFOLDER(Templates\Templates\NFtS\flag_finland.paa)] call _fnc_saveToTemplate;
-["flagMarkerType", "NORTH_Flag_FIN"] call _fnc_saveToTemplate;
+["flagMarkerType", "a3a_flag_FIN"] call _fnc_saveToTemplate;
 
 ["vehiclesBasic", ["NORTH_FIN_41_R75"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["LIB_Kfz1_w"]] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_FIN_Temperate.sqf

@@ -8,7 +8,7 @@
 
 ["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
 ["flagTexture", QPATHTOFOLDER(Templates\Templates\NFtS\flag_finland.paa)] call _fnc_saveToTemplate;
-["flagMarkerType", "NORTH_Flag_FIN"] call _fnc_saveToTemplate;
+["flagMarkerType", "a3a_flag_FIN"] call _fnc_saveToTemplate;
 
 ["vehiclesBasic", ["NORTH_FIN_41_R75"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["LIB_Kfz1_sernyt"]] call _fnc_saveToTemplate;

A3A/addons/core/Templates/script_component.hpp

@@ -0,0 +1,2 @@
+#define COMPONENT templates
+#include "\x\A3A\addons\core\Includes\script_mod.hpp"

A3A/addons/core/functions/Ammunition/fn_equipmentClassToCategories.sqf

@@ -127,7 +127,7 @@ call {
     };
 
     if (_basecategory isEqualTo "Headgear") exitWith {
-        if (getNumber (configfile >> "CfgWeapons" >> _className >> "ItemInfo" >> "HitpointsProtectionInfo" >> "Head" >> "armor") > 5) then {
+        if (getNumber (configfile >> "CfgWeapons" >> _className >> "ItemInfo" >> "HitpointsProtectionInfo" >> "Head" >> "armor") > 0) then {
             _categories pushBack "ArmoredHeadgear";
         };
     };

A3A/addons/core/functions/init/fn_initClient.sqf

@@ -666,4 +666,4 @@ if (staminaEnabled isEqualTo false) then {
 }; 
 
 private _newWeaponSway = swayEnabled / 100;
-player setCustomAimCoef _newWeaponSway;
+player setCustomAimCoef _newWeaponSway;

A3A/addons/core/functions/init/fn_initVarServer.sqf

@@ -541,8 +541,8 @@ private _vehicleResourceCosts = createHashMap;
 { _vehicleResourceCosts set [_x, 150] } forEach FactionGet(all, "vehiclesDropPod") + FactionGet(all, "uavsAttack");
 { _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesPlanesCAS") + FactionGet(all, "vehiclesPlanesAA");
 { _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesHelisAttack");
-{ _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesPlanesCAS") + FactionGet(all, "vehiclesPlanesAA");
 { _vehicleResourceCosts set [_x, 275] } forEach FactionGet(all, "vehiclesPlanesGunship");
+{ _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesPlanesLargeCAS") + FactionGet(all, "vehiclesPlanesLargeAA");
 
 // Threat table
 private _groundVehicleThreat = createHashMap;

A3A/addons/core/functions/proxy/fn_onPlayerRespawn.sqf

@@ -279,4 +279,4 @@ if (staminaEnabled isEqualTo false) then {
 }; 
 
 private _newWeaponSway = swayEnabled / 100;
-player setCustomAimCoef _newWeaponSway;
+player setCustomAimCoef _newWeaponSway;

A3A/addons/hals/Addons/store/config.hpp

@@ -75,6 +75,8 @@ class cfgHALsStore
 		#include "config\eaw.hpp"
 		#include "config\cwr.hpp"
 		#include "config\ffp.hpp"
+		#include "config\ProjInfAD.hpp"
+		#include "config\JCAArsenal.hpp"
 	};
 
 	class stores 
@@ -843,6 +845,47 @@ class cfgHALsStore
 				"launchermagazinesffp",
 				"magazinesffp", 
 				"opticsffp"
+		class hafmstock		
+		{
+			displayName = $STR_ARMS_DEALER_STORE;
+			categories[] = {
+				"handgunsHAFM", 
+				"smgHAFM", 
+				"mgHAFM", 
+				"riflesHAFM",
+				"sniperriflesHAFM", 
+				"launchersHAFM", 
+				"launchermagazinesHAFM", 
+				"muzzlesHAFM", 
+				"magazinesHAFM", 
+				"pointersHAFM",
+				"specialweaponsHAFM",
+				"opticsHAFM",
+				"underbarrelHAFM"
+		class projinf_stock
+		{
+			displayName = $STR_ARMS_DEALER_STORE;
+			categories[] = {
+				"handgunsProjInfAD",
+				"riflesProjInfAD", 
+				"sniperRiflesProjInfAD",
+				"muzzlesProjInfAD",
+				"opticsProjInfAD",
+				"magazinesProjInfAD",
+				"underbarrelProjInfAD"
+		class jca_stock
+		{
+			displayName = $STR_ARMS_DEALER_STORE;
+			categories[] = {
+				"handgunsJCA",
+				"riflesJCA", 
+				"sniperRiflesJCA", 
+				"smgJCA",
+				"underbarrelJCA",
+				"pointersJCA",
+				"muzzlesJCA",
+				"opticsJCA",
+				"magazinesJCA"
 			};
 		};
 	};