Public config overhaul **Draft**

@twc_config/addons/twc_millennial/weapons.hpp

@@ -6,6 +6,7 @@ class UK3CB_BAF_L85A2_UGL_HWS;
 class UK3CB_BAF_L110A2RIS;
 class UK3CB_BAF_L22;
 class UK3CB_BAF_L22A2;
+class UK3CB_BAF_L115A3;
 
 class TWC_Weapon_L86A1: UK3CB_BAF_L86A2 {
 	displayName = "L86A1";
@@ -114,6 +115,64 @@ class TWC_Weapon_L110A2_SUSAT3D: UK3CB_BAF_L110A2RIS {
 
 	};
 };
+class TWC_L96_W_Base: UK3CB_BAF_L115A3 {
+	scope = 1;
+	displayname = "L96A1";
+	magazines[] = {"UK3CB_BAF_762_L42A1_10Rnd", "UK3CB_BAF_762_L42A1_10Rnd_T"};
+	class WeaponSlotsInfo {
+		class MuzzleSlot {
+			class compatibleItems {};
+			displayName = "Muzzle";
+			iconPicture = "a3\weapons_f\Data\ui\attachment_muzzle";
+			iconPinpoint = "Center";
+			iconPosition[] = {0,0};
+			iconScale = 0;
+			linkProxy = "\a3\data_f\proxies\weapon_slots\MUZZLE";
+			scope = 0;
+		};
+		class CowsSlot {
+			class compatibleItems {
+				CUP_optic_Leupold_VX3 = 1;
+				cup_optic_leupoldmk4 = 1;
+				cup_optic_leupoldmk4_10x40_lrt_woodland = 1;
+				cup_optic_leupoldm3lr = 1;
+				cup_optic_sb_3_12x50_pmii = 1;
+				cup_optic_an_pvs_4 = 1;
+			};
+			displayName = "Optics Slot";
+			iconPicture = "a3\weapons_f\Data\ui\attachment_top";
+			iconPinpoint = "Bottom";
+			iconPosition[] = {0,0};
+			iconScale = 0;
+			linkProxy = "\A3\data_f\proxies\weapon_slots\TOP";
+			scope = 0;
+		};
+		mass = 140;
+	};
+};
+
+class TWC_L96_D_base: TWC_L96_W_Base {
+	hiddenSelections[] = {"camo","camo2","camo3"};
+	hiddenSelectionsTextures[] = {"\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\awcstock_FDE_co.paa","\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\AWC_Scope_co.paa","\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\Magnumbits_ca.paa"};
+	picture = "\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\gear_awmFDE_ca.paa";
+};
+
+class TWC_Weapon_L96_Woodland: TWC_L96_W_Base {
+	class LinkedItems {
+		class LinkedItemsOptic {
+			slot="CowsSlot";
+			item="cup_optic_leupoldmk4_10x40_lrt_woodland";
+		};
+	};
+};
+class TWC_Weapon_L96_Desert: twc_l96_D_Base {
+	class LinkedItems {
+		class LinkedItemsOptic {
+			slot="CowsSlot";
+			item="cup_optic_leupoldmk4";
+		};
+	};
+};
 
 class UK3CB_BAF_U_Smock_DPMW;
 class UK3CB_BAF_U_Smock_DPMT;

@twc_config/addons/twc_modern/config.cpp

@@ -82,7 +82,7 @@ class CfgVehicles
 	class O_Soldier_base_F;
 	class I_Soldier_F;
 
-	#define MEDICAL_LOADOUT "ACRE_PRC343","ACE_EarPlugs","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_quikclot","ACE_quikclot","ACE_quikclot","ACE_quikclot","ACE_quikclot","ACE_splint","ACE_splint","ACE_morphine","ACE_morphine","ACE_epinephrine","ACE_tourniquet","ACE_tourniquet"
+	#define MEDICAL_LOADOUT "ACRE_PRC343","ACE_CableTie","ACE_CableTie","ACE_EarPlugs","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_fieldDressing","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_packingBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_elasticBandage","ACE_quikclot","ACE_quikclot","ACE_quikclot","ACE_quikclot","ACE_quikclot","ACE_splint","ACE_splint","ACE_morphine","ACE_morphine","ACE_epinephrine","ACE_tourniquet","ACE_tourniquet"
 	#define MAG_2(a) a, a
 	#define MAG_3(a) a, a, a
 	#define MAG_4(a) a, a, a, a

@twc_config_compatibility/addons/twc_gearFixes/CfgWeapons.hpp

@@ -139,94 +139,6 @@ class UK3CB_BAF_L115A3: UK3CB_BAF_L115_Base {
 	recoilProne = "twc_mg_prone";
 	magazines[] = {"ACE_10Rnd_338_300gr_HPBT_Mag", "ACE_10Rnd_338_API526_Mag","TWC_5Rnd_338_300gr_HPBT_Mag", "TWC_5Rnd_338_API526_Mag"};
 };
-class twc_l115a3_wd: UK3CB_BAF_L115A3 {
-	scope = 1;
-	author = "jayman";
-	class LinkedItems {
-		class LinkedItemsOptic {
-			slot = "CowsSlot";
-			item = "RKSL_optic_PMII_525";
-		};
-		class LinkedItemsMuzzle {
-			slot = "MuzzleSlot";
-			item= "UK3CB_BAF_Silencer_L115A3";
-		};
-	};
-};
-class UK3CB_BAF_L115A3_Ghillie;
-class twc_l115a3_gh: UK3CB_BAF_L115A3_Ghillie {
-	scope = 1;
-	author = "jayman";
-	class LinkedItems {
-		class LinkedItemsOptic {
-			slot = "CowsSlot";
-			item = "RKSL_optic_PMII_525";
-		};
-		class LinkedItemsMuzzle {
-			slot = "MuzzleSlot";
-			item= "UK3CB_BAF_Silencer_L115A3";
-		};
-	};
-};
-
-class twc_l96_w_base: UK3CB_BAF_L115A3 {
-	scope = 1;
-	displayname = "L96A1";
-	magazines[] = {"UK3CB_BAF_762_L42A1_10Rnd", "UK3CB_BAF_762_L42A1_10Rnd_T"};
-	class WeaponSlotsInfo {
-		class MuzzleSlot {
-			class compatibleItems {};
-			displayName = "Muzzle";
-			iconPicture = "a3\weapons_f\Data\ui\attachment_muzzle";
-			iconPinpoint = "Center";
-			iconPosition[] = {0,0};
-			iconScale = 0;
-			linkProxy = "\a3\data_f\proxies\weapon_slots\MUZZLE";
-			scope = 0;
-		};
-		class CowsSlot {
-			class compatibleItems {
-				CUP_optic_Leupold_VX3 = 1;
-				cup_optic_leupoldmk4 = 1;
-				cup_optic_leupoldmk4_10x40_lrt_woodland = 1;
-				cup_optic_leupoldm3lr = 1;
-				cup_optic_sb_3_12x50_pmii = 1;
-				cup_optic_an_pvs_4 = 1;
-			};
-			displayName = "Optics Slot";
-			iconPicture = "a3\weapons_f\Data\ui\attachment_top";
-			iconPinpoint = "Bottom";
-			iconPosition[] = {0,0};
-			iconScale = 0;
-			linkProxy = "\A3\data_f\proxies\weapon_slots\TOP";
-			scope = 0;
-		};
-		mass = 140;
-	};
-};
-
-class twc_l96_d_base: twc_l96_w_base {
-	hiddenSelections[] = {"camo","camo2","camo3"};
-	hiddenSelectionsTextures[] = {"\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\awcstock_FDE_co.paa","\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\AWC_Scope_co.paa","\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\Magnumbits_ca.paa"};
-	picture = "\UK3CB_BAF_Weapons\addons\UK3CB_BAF_Weapons_L115\data\gear_awmFDE_ca.paa";
-};
-
-class TWC_Weapon_L96_Woodland: twc_l96_w_base {
-	class LinkedItems {
-		class LinkedItemsOptic {
-			slot="CowsSlot";
-			item="cup_optic_leupoldmk4_10x40_lrt_woodland";
-		};
-	};
-};
-class TWC_Weapon_L96_Desert: twc_l96_d_base {
-	class LinkedItems {
-		class LinkedItemsOptic {
-			slot="CowsSlot";
-			item="cup_optic_leupoldmk4";
-		};
-	};
-};
 
 class CUP_arifle_AK_Base: Rifle_Base_F {
 	class Single;