Revert "Merge pull request #341 from Azodion/CUP_FFP"

This reverts commit 9971e7b, reversing
changes made to dcbc50f.

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

@@ -260,23 +260,15 @@
         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";

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

@@ -31,28 +31,4 @@
         name = "SFP Sweden Winter";
         file = "SFP_AI_SWE_Arctic";
         climate[] = {"arctic"};
-    };
-
-    class FFP_Base : SFP_Base
-    {
-        requiredAddons[] = {"CUP_Creatures_People_Civil_Russia", "CUP_BaseConfigs", "CUP_AirVehicles_Core", "sfp_soldiers", "Finnish_Forces_Pack"};        // units, weapons, vehicles
-        basepath = QPATHTOFOLDER(Templates\Templates\SWE);
-        logo = "\ffp_config\data\flag\fin_flag_map_ca.paa";
-        priority = 90;
-    };
-
-    class FFP_Fin_Temperate : FFP_Base
-    {
-        side = "Occ";
-        flagTexture = "\ffp_config\data\flag\fin_flag_ca.paa";
-        name = "FFP Finland Temperate";
-        file = "FFP_AI_FIN_Temperate";
-        climate[] = {"temperate","tropical"};
-    };
-
-    class FFP_Fin_Arctic : FFP_Fin_Temperate
-    {
-        name = "FFP Finland Winter";
-        file = "FFP_AI_FIN_Arctic";
-        climate[] = {"arctic"};
     };

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

@@ -74,7 +74,6 @@ class cfgHALsStore
 		#include "config\fow.hpp"
 		#include "config\eaw.hpp"
 		#include "config\cwr.hpp"
-		#include "config\ffp.hpp"
 		#include "config\ylarms.hpp"
 		#include "config\ProjInfAD.hpp"
 		#include "config\JCAArsenal.hpp"
@@ -834,39 +833,6 @@ class cfgHALsStore
 				"opticsCWR"
 			};
 		};
-		class ffpstock		
-		{
-			displayName = $STR_ARMS_DEALER_STORE;
-			categories[] = {
-				"handgunsffp", 
-				"mgffp", 
-				"riflesffp", 
-				"sniperriflesffp",
-				"launchersffp", 
-				"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 ylarmsstock		
 		{
 			displayName = $STR_ARMS_DEALER_STORE;
@@ -882,8 +848,6 @@ class cfgHALsStore
 				"magazinesYLA",
 				"underbarrelYLA",
 				"specialWeaponsYLA"
-        };
-    };
 		class projinf_stock
 		{
 			displayName = $STR_ARMS_DEALER_STORE;
@@ -895,8 +859,6 @@ class cfgHALsStore
 				"opticsProjInfAD",
 				"magazinesProjInfAD",
 				"underbarrelProjInfAD"
-        };
-    };
 		class jca_stock
 		{
 			displayName = $STR_ARMS_DEALER_STORE;

A3A/addons/hals/Stringtable.xml

@@ -861,19 +861,6 @@
                 <Korean>Cold War ReArmed</Korean>
                 <French>Cold War ReArmed</French>
             </Key>
-            <Key ID="STR_A3AU_ffp">
-                <Original>FFP</Original>
-                <English>FFP</English>
-                <Russian>FFP</Russian>
-                <Korean>FFP</Korean>
-                <French>FFP</French>
-            </Key>
-            <Key ID="STR_A3AU_hafm">
-                <Original>HAFM</Original>
-                <English>HAFM</English>
-                <Russian>HAFM</Russian>
-                <Korean>HAFM</Korean>
-                <French>HAFM</French>
             <Key ID="STR_A3AU_ylarms">
                 <Original>YLArms</Original>
                 <English>YLArms</English>

A3A/addons/logistics/CfgLogistics.hpp

@@ -39,7 +39,6 @@ class DOUBLES(ADDON,Nodes)
 	#include "Nodes\EAW.hpp"
 	#include "Nodes\FOW.hpp"
 	#include "Nodes\CWR.hpp"
-    #include "Nodes\HAFM.hpp"
 };
 
 class DOUBLES(ADDON,Cargo)