Erliens 3 年 前
コミット
f256e74c6b

BIN
addons - Copy/RD501_Helmets/_textures/Airborne/Aedan.paa


BIN
addons - Copy/RD501_Helmets/_textures/Infantry/Araxis.paa


BIN
addons - Copy/RD501_Helmets/_textures/Infantry/Checkers.paa


BIN
addons - Copy/RD501_Helmets/_textures/Infantry/Clover.paa


BIN
addons - Copy/RD501_Helmets/_textures/Infantry/Klinger.paa


+ 1 - 0
addons - Copy/RD501_Helmets/airborne/config.cpp

@@ -41,6 +41,7 @@ class CfgWeapons
 	NEW_501_AB_HELM_JLTS(501st_Sparrow_helmet,Sparrow,Sparrow.paa)
 	NEW_501_AB_HELM_JLTS(501st_Omen_helmet,Omen,Omen.paa)
 	NEW_501_AB_HELM_JLTS(501st_Nuclear_helmet,Nuclear,Nuclear.paa)
+	NEW_501_AB_HELM_JLTS(501st_Aedan_helmet,Aedan,Aedan.paa)
 
 	
 

+ 3 - 0
addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -171,6 +171,9 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Anta,Anta,Anta.paa)
 	NEW_501_Inf_Helm_JLTS(Neta,Neta,Neta.paa)
 	NEW_501_Inf_Helm_JLTS(Spud,Spud,Spud.paa)
+	NEW_501_Inf_Helm_JLTS(Checkers,Checkers,Checkers.paa)
+	NEW_501_Inf_Helm_JLTS(Araxis,Araxis,Araxis.paa)
+	NEW_501_Inf_Helm_JLTS(Clover,Clover,Clover.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_ARC_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)

+ 6 - 106
addons - Copy/RD501_Main/config.cpp

@@ -139,86 +139,6 @@ class Extended_PostInit_EventHandlers {
     };
 };
 
-// class CfgMagazines
-// {
-// 	class CA_Magazine;
-// 	class 2Rnd_12Gauge_Pellets:CA_Magazine
-// 	{
-// 		displayName = "120 Gauge 2Rnd Pellets";
-// 		count = 200;
-// 	};
-// };
-
-// class CfgAmmo
-// {
-// 	class BulletBase;
-// 	class B_12Gauge_Pellets_Submunition:BulletBase
-// 	{
-// 		//model = "\SWOP_Main\Effects\Tracer\LaserRed";
-// 		model = "\A3\Weapons_f\Data\bullettracer\tracer_red";
-// 		effectFly = "SWOP_BlueLaserEffect";
-// 		CraterEffects = "ExploAmmoLaserCrater";
-// 		explosionEffects = "SWOP_LaserExploSmall";
-// 		triggerTime = .2;
-// 		submunitionAmmo = "G_40mm_HEDP";//G_40mm_HEDP
-// 		submunitionConeType[] = {"poissondisc", 80};
-// 		submunitionConeAngle = 90.8;
-// 		triggerSpeedCoef[] = {0.01, .1};
-		
-// 	};
-
-// 	class G_40mm_HE;
-// 	class G_40mm_HEDP:G_40mm_HE
-// 	{
-// 		model = "\SWOP_Main\Effects\Tracer\LaserBlue";
-// 		effectFly = "SWOP_BlueLaserEffect";
-// 		timeToLive = 30.15;
-// 	};
-
-// 	class B_12Gauge_Pellets_Submunition_Deploy: BulletBase
-// 	{
-// 		//model = "\SWOP_Main\Effects\Tracer\LaserRed";
-// 		model = "\A3\Weapons_f\Data\bullettracer\tracer_red";
-// 		effectFly = "SWOP_RedLaserEffect";
-// 		CraterEffects = "ExploAmmoLaserCrater";
-// 		explosionEffects = "SWOP_LaserExploSmall";
-		
-// 	};
-// };
-// class cfgFactionClasses
-// {
-	
-// 	class RD_Op_Fac
-// 	{
-// 		displayName="RD501 OPFOR Faction";
-// 		priority=3;
-// 		side=0;
-// 	};
-// 	class RD_Blu_Fac
-// 	{
-// 		displayName="RD501 BLUFOR Faction";
-// 		priority= 3;
-// 		side=1;
-// 	};
-// 	class RD_Ind_Fac
-// 	{
-// 		displayName="RD501 Independent Faction";
-// 		priority=3;
-// 		side= 2;
-// 	};
-// 	class RD_Civ_Fac
-// 	{
-// 		displayName="RD501 Star Wars Civ";
-// 		priority=3;
-// 		side= 3;
-// 	};
-// 	class RD501_Faction_LPB1
-// 	{
-// 		displayName="Low Poly Assets";
-// 		priority=3;
-// 		side=0;
-// 	};
-// };
 
 class cfgFactionClasses
 {
@@ -228,18 +148,6 @@ class cfgFactionClasses
 		priority=3;
 		side=0;
 	};
-	class macro_empire_faction
-	{
-		displayName="RD501 Empire Faction";
-		priority=3;
-		side=0;
-	};
-	class macro_first_order_faction
-	{
-		displayName="RD501 First Order Faction";
-		priority=3;
-		side=0;
-	};
 
 	class macro_republic_faction
 	{
@@ -247,18 +155,6 @@ class cfgFactionClasses
 		priority= 3;
 		side=1;
 	};
-	class macro_rebel_faction
-	{
-		displayName="RD501 Rebel Faction";
-		priority= 3;
-		side=1;
-	};
-	class macro_resistance_faction
-	{
-		displayName="RD501 Resistance Faction";
-		priority= 3;
-		side=1;
-	};
 	class macro_ind_faction
 	{
 		displayName="RD501 Independent Faction";
@@ -367,9 +263,13 @@ class CfgEditorSubcategories
 	{
 		displayName = "Heavy Armored Infantry";
 	};
-	class macro_editor_cat(doggo)
+	class macro_editor_cat(bounty_hunters)
+	{
+		displayName = "Bounty Hunters";
+	};
+	class macro_editor_cat(syndicate)
 	{
-		displayName = "Doge Squadron";
+		displayName = "Syndicate";
 	};
 	class macro_editor_cat(arty)
 	{

+ 4 - 2
addons - Copy/RD501_Main/functions/AutoCrate/autocrate.sqf

@@ -2,5 +2,7 @@ params ["_this"];
  
 ["rd501_resuppy_box_small_medical", _this, true] call ace_cargo_fnc_loadItem; 
 ["rd501_resuppy_box_small_ammo", _this, true] call ace_cargo_fnc_loadItem;  
-["rd501_sw_barc", _this, true] call ace_cargo_fnc_loadItem;
-["rd501_sw_barc", _this, true] call ace_cargo_fnc_loadItem;
+["rd501_stat_reweb", _this, true] call ace_cargo_fnc_loadItem;
+["rd501_stat_Striker", _this, true] call ace_cargo_fnc_loadItem;
+["rd501_stat_Railgun", _this, true] call ace_cargo_fnc_loadItem;
+["rd501_stat_ragl40", _this, true] call ace_cargo_fnc_loadItem;

+ 261 - 0
addons - Copy/RD501_Units/independent/Bounty Hunters/config.cpp

@@ -0,0 +1,261 @@
+#include "../../config_macros.hpp"
+
+#include "../../../RD501_main/config_macros.hpp"
+
+class CfgPatches
+{
+	class macro_patch_name(bountyhunters)
+	{
+		addonRootClass=macro_patch_name(units);
+		requiredAddons[]=
+		{
+			macro_patch_name(units)
+		};
+		requiredVersion=0.1;
+		units[]={
+			macro_new_unit_class(independent,suttonrand),
+			macro_new_unit_class(independent,headshot),
+			"rd501_backpack_headshot"
+		
+		};
+		weapons[]=
+		{			
+			macro_new_uniform_class(independent,headshot)
+		};
+	};
+};
+
+class Extended_Init_EventHandlers
+{
+	class macro_new_unit_class(independent,suttonrand)
+	{
+		class apply_skills
+		{
+			init = [_this select 0]	spawn macro_fnc_name(b1_specop_apply_skill);
+		};
+	};
+	class macro_new_unit_class(independent,headshot)
+	{
+		class apply_skills
+		{
+			init = [_this select 0]	spawn macro_fnc_name(b1_specop_apply_skill);
+		};
+	};
+};
+class CfgVehicles
+{
+    class B_T_Recon_TL_F;
+	class OPTRE_UNSC_ONI_Soldier_Naval;
+	class B_ViperHarness_blk_F;
+    class macro_new_unit_class(independent,suttonrand): B_T_Recon_TL_F
+    {
+        displayName = "Sutton Rand";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="JLTS_Clone_jumppack_Chicken";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(bounty_hunters)
+		uniformClass="U_O_R_Gorka_01_black_F";
+		cost = 4
+
+		weapons[]=
+		{
+			macro_new_weapon_nofam(Devastator),
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			macro_new_weapon_nofam(Devastator),
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,2),
+			macro_new_mag(Devastator,2),
+			macro_new_mag(Devastator,2),
+			macro_new_mag(Devastator_dioxis,1),
+			macro_new_mag(Devastator_dioxis,1),
+			macro_new_mag(Devastator_stun,1),
+			macro_new_mag(Devastator_stun,1)
+			
+		};
+		respawnMagazines[]=
+		{
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,2),
+			macro_new_mag(Devastator,2),
+			macro_new_mag(Devastator,2),
+			macro_new_mag(Devastator_dioxis,1),
+			macro_new_mag(Devastator_dioxis,1),
+			macro_new_mag(Devastator_stun,1),
+			macro_new_mag(Devastator_stun,1)
+		};
+		linkeditems[]=
+		{
+			"OPTRE_UNSC_M52A_Armor1_SNO",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"k_wrecker_Helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"OPTRE_UNSC_M52A_Armor_Sniper_WDL",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"k_scout_helmet_camo",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+    };
+class macro_new_unit_class(independent,headshot): OPTRE_UNSC_ONI_Soldier_Naval
+    {
+        displayName = "Headshot";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="rd501_backpack_headshot";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(bounty_hunters)
+		uniformClass = macro_new_uniform_class(independent,headshot)
+		cost = 4
+
+		weapons[]=
+		{
+			macro_new_weapon_nofam(viper),
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			macro_new_weapon_nofam(viper),
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5)
+		};
+		respawnMagazines[]=
+		{
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5),
+			macro_new_mag(viper,5)
+		};
+		linkeditems[]=
+		{
+			"H_HelmetSpecO_blk",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"H_HelmetSpecO_blk",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller",
+			"ACE_Clacker"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller",
+			"ACE_Clacker"
+		};
+    };
+	class rd501_backpack_headshot:B_ViperHarness_blk_F
+	{
+		scope=1;
+		class TransportMagazines
+		{
+			class _xx_APERSBoundingMine_Range_Mag
+			{
+				magazine="ClaymoreDirectionalMine_Remote_Mag";
+				count=3;
+			};
+			class _xx_ClaymoreDirectionalMine_Remote_Mag
+			{
+				magazine="APERSMineDispenser_Mag";
+				count=3;
+			};
+		};
+	};
+};
+class CfgWeapons
+{
+	class UniformItem;
+	class OPTRE_UNSC_Navy_Uniform_ONI;
+	class macro_new_uniform_class(independent,headshot): OPTRE_UNSC_Navy_Uniform_ONI
+	{
+		scope=1;
+		displayName="Headshot Uniform";
+		class ItemInfo: UniformItem
+		{
+			uniformModel="-";
+			uniformClass=macro_new_unit_class(independent,headshot)
+			containerClass="Supply40";
+			mass=80;
+		};
+	};
+};

+ 739 - 0
addons - Copy/RD501_Units/independent/Syndicate/config.cpp

@@ -0,0 +1,739 @@
+#include "../../config_macros.hpp"
+
+#include "../../../RD501_main/config_macros.hpp"
+
+class CfgPatches
+{
+	class macro_patch_name(syndicate)
+	{
+		addonRootClass=macro_patch_name(units);
+		requiredAddons[]=
+		{
+			macro_patch_name(units)
+		};
+		requiredVersion=0.1;
+		units[]={
+			macro_new_unit_class(syndicate,rifleman),
+			macro_new_unit_class(syndicate,heavy),
+			macro_new_unit_class(syndicate,grenadier),
+			macro_new_unit_class(syndicate,at),
+			macro_new_unit_class(syndicate,marksman),
+			macro_new_unit_class(syndicate,medic),
+			macro_new_unit_class(syndicate,commander)
+		
+		};
+		weapons[]=
+		{			
+		};
+	};
+};
+class CfgVehicles
+{
+    class B_GEN_Soldier_F;
+	class B_GEN_Commander_F;
+    class macro_new_unit_class(syndicate,rifleman): B_GEN_Soldier_F
+    {
+        displayName = "Syndicate Rifleman";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="OPTRE_ILCS_Rucksack_Black";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Soldier_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"RD501_DC_15c",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"RD501_DC_15c",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag"
+		};
+		respawnMagazines[]=
+		{
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+    };
+class macro_new_unit_class(syndicate,heavy): B_GEN_Soldier_F
+    {
+        displayName = "Syndicate Heavy";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="OPTRE_ILCS_Rucksack_Black";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Soldier_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"JLTS_E5C",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"JLTS_E5C",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag"
+		};
+		respawnMagazines[]=
+		{
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag",
+			"JLTS_E5C_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+    };
+class macro_new_unit_class(syndicate,at): B_GEN_Soldier_F
+    {
+        displayName = "Syndicate Anti-Tank";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="OPTRE_ILCS_Rucksack_Black";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Soldier_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"JLTS_E5",
+			"RD501_launcher_RPS4",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"JLTS_E5",
+			"RD501_launcher_RPS4",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"RD501_rps4he_x1_mag",
+			"RD501_rps4he_x1_mag",
+			"RD501_rps4he_x1_mag",
+			"RD501_rps4heat_x1_mag"
+		};
+		respawnMagazines[]=
+		{
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"RD501_rps4he_x1_mag",
+			"RD501_rps4he_x1_mag",
+			"RD501_rps4he_x1_mag",
+			"RD501_rps4heat_x1_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+    };
+class macro_new_unit_class(syndicate,grenadier): B_GEN_Soldier_F
+    {
+        displayName = "Syndicate Grenadier";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="OPTRE_ILCS_Rucksack_Black";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Soldier_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"RD501_DC_r15gl",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"RD501_DC_r15gl",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_UGL_HE_x3_mag",
+			"RD501_UGL_HE_x3_mag"
+		};
+		respawnMagazines[]=
+		{
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_10mw_x30_mag",
+			"RD501_UGL_HE_x3_mag",
+			"RD501_UGL_HE_x3_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Light_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+	};
+class macro_new_unit_class(syndicate,marksman): B_GEN_Commander_F
+    {
+        displayName = "Syndicate Marksman";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="RD501_JLTS_Clone__invis_LR_attachment";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Commander_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"RD501_valken38x",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"RD501_valken38x",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag"
+		};
+		respawnMagazines[]=
+		{
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag",
+			"RD501_30mw_x10_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"H_Watchcap_blk",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"H_Watchcap_blk",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+    };
+class macro_new_unit_class(syndicate,medic): B_GEN_Soldier_F
+    {
+        displayName = "Syndicate Medic";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="OPTRE_ILCS_Rucksack_Medical";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Soldier_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"RD501_DC_r15s",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"RD501_DC_r15s",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag"
+		};
+		respawnMagazines[]=
+		{
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag",
+			"RD501_5mw_x60_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Medic_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"3as_CIS_Medic_helmet",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"ACE_splint",
+			"ACE_splint",
+			"ACE_splint",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_quikclot",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"ACE_splint",
+			"ACE_splint",
+			"ACE_splint",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"RD501_Painkiller",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV",
+			"ACE_plasmaIV"
+		};
+    };
+class macro_new_unit_class(syndicate,commander): B_GEN_Commander_F
+    {
+        displayName = "Syndicate Commander";
+		author = "RD501";
+		scope = 2;
+		side=2;
+		backpack="RD501_JLTS_Clone__invis_LR_attachment";
+		faction = macro_ind_faction
+		editorSubcategory = macro_editor_cat(syndicate)
+		uniformClass="U_B_GEN_Commander_F";
+		cost = 4
+
+		weapons[]=
+		{
+			"RD501_DC_15a",
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			"RD501_DC_15a",
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag"
+		};
+		respawnMagazines[]=
+		{
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag",
+			"RD501_20mwdp_x20_mag"
+		};
+		linkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"H_Beret_gen_F",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		respawnlinkeditems[]=
+		{
+			"V_TacVest_gen_F",
+			//"H_HelmetO_ViperSP_ghex_F",
+			"H_Beret_gen_F",
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink",
+		};
+		items[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+		respawnItems[]={
+			"ACE_elasticBandage",
+			"ACE_elasticBandage",
+			"ACE_packingBandage",
+			"ACE_packingBandage",
+			"ACE_tourniquet",
+			"ACE_splint",
+			"RD501_Painkiller"
+		};
+    };
+};

+ 3 - 3
addons - Copy/RD501_Units/opfor/B2/config.cpp

@@ -464,12 +464,12 @@ class CfgWeapons
 	{
 		scope=2;
 		displayName="RD501 B2";
-		picture = "\SWOP_droids\data\ico\B2ico.paa"
+		//picture = "\SWOP_droids\data\ico\B2ico.paa" - Replace with proper one
 		model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
 		class ItemInfo: UniformItem
 		{
 			uniformModel="-";
-			uniformClass=macro_new_unit_class(opfor,B2_droid_Standard_mk2)
+			uniformClass=macro_new_unit_class(opfor,B2_droid_Standard)
 			containerClass="Supply40";
 			mass=80;
 		};
@@ -482,7 +482,7 @@ class CfgWeapons
 	{
 		scope=2;
 		displayName="RD501 Super B2";
-		picture = "\SWOP_droids\data\ico\B2ico.paa"
+		//picture = "\SWOP_droids\data\ico\B2ico.paa" - Replace with proper one
 		model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
 		class ItemInfo: UniformItem
 		{

+ 0 - 218
addons - Copy/RD501_Units/opfor/B2/config.cpp.old

@@ -1,218 +0,0 @@
-#include "../../config_macros.hpp"
-
-#include "../../../RD501_main/config_macros.hpp"
-
-#include "../../../RD501_main/config_macros.hpp"
-
-#define unit_addon B2
-#define patch_name MODNAME##unit_addon##_Patches
-#define unit_classname MODNAME##_##unit_addon
-
-
-class CfgPatches
-{
-	class macro_patch_name(b2_units)
-	{
-		addonRootClass=macro_patch_name(units);
-		requiredAddons[]=
-		{
-			macro_patch_name(units)
-		};
-		requiredVersion=0.1;
-		units[]={
-			"SWOP_CIS_superdroid_B2",
-			macro_new_unit_class(opfor,B2_droid_Standard),
-			macro_new_unit_class(opfor,B2_droid_Rocket),
-			macro_new_unit_class(opfor,B2_super_droid_Rocket),
-			macro_new_unit_class(opfor,B2_aqua),
-			macro_new_unit_class(opfor,B2_droid_Test),
-
-			macro_new_uniform_class(opfor,B2_Armor),
-			macro_new_uniform_class(opfor,B2_Aqua),
-			macro_new_uniform_class(opfor,B2_Armor_Test),
-
-			macro_new_uniform_skin_class(opfor,B2_Rocket),
-			macro_new_uniform_skin_class(opfor,B2_Aqua),
-			macro_new_uniform_skin_class(opfor,B2_Test)
-			
-		};
-		weapons[]=
-		{
-			
-		};
-	};
-};
-
-class cfgWeapons
-{
-	/**
-	 * UNIFORMS
-	 * the item the unit wears in the uniform slot
-	 */
-	class ItemCore;
-	class Uniform_Base: ItemCore
-	{
-		class ItemInfo;
-	};
-	class VestItem;
-	class UniformItem;
-	class SWOP_B2_superdroid_F_Spec;
-	class macro_new_uniform_class(opfor,B2_Armor): SWOP_B2_superdroid_F_Spec
-	{
-		author = "SWOP";
-		scope = 2;
-		displayName = "B2 battledroid (Rocket)";
-		picture = "\SWOP_droids\data\ico\B2ico.paa";
-		nakedUniform = "U_BasicBody";
-		model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-		JLTS_isDroid = 1; 
-        JLTS_hasEMPProtection = 0; 
-        JLTS_deathSounds = "DeathDroid";
-		JLTS_isDroid = 1; 
-		JLTS_hasEMPProtection = 0; 
-		JLTS_deathSounds = "DeathDroid";
-		class ItemInfo: UniformItem
-		{
-			uniformModel = "-";
-			uniformClass = macro_new_unit_class(opfor,B2_droid_Standard);
-			modelSides[] = {6};
-			containerClass = "Supply100";
-			mass = 400;
-		};
-	};
-
-	class macro_new_uniform_class(opfor,B2_Armor_Test): Uniform_Base
-	{
-		author = "SWOP";
-		scope = 2;
-		displayName = "B2 battledroid (TEST B2)";
-		picture = "\SWOP_droids\data\ico\B2ico.paa";
-		nakedUniform = "U_BasicBody";
-		model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-		JLTS_isDroid = 1; 
-        JLTS_hasEMPProtection = 0; 
-        JLTS_deathSounds = "DeathDroid";
-		class ItemInfo: UniformItem
-		{
-			uniformModel = "-";
-			uniformClass = macro_new_uniform_skin_class(opfor,B2_Test); //ties to @2
-			armor = 100;
-			armorStructural = 20;//30;//20;
-			explosionShielding = 0.001;
-			impactDamageMultiplier = 0.001;
-			modelSides[] = {6};
-			containerClass = "Supply100";
-			mass = 400;
-		};
-	};
-
-	class macro_new_uniform_class(opfor,B2_Aqua):SWOP_B2_superdroid_F_Spec
-	{
-		scope=2;
-		author= "RD501";
-		displayname = "B2 Aqua Suit (Waterbound Enforcement Technician)";
-		picture = "\SWOP_droids\data\ico\B2ico.paa";
-		nakedUniform = "U_BasicBody";
-		hiddenSelections[] = {"Camo1","Camo2","Camo3"};
-		hiddenSelectionsMaterials[] = {};
-		hiddenUnderwaterSelections[] = {};
-		hiddenUnderwaterSelectionsTextures[] = {};
-		JLTS_isDroid = 1; 
-        JLTS_hasEMPProtection = 0; 
-        JLTS_deathSounds = "DeathDroid";
-		class ItemInfo: UniformItem
-		{
-				uniformModel = "-";
-				uniformClass = macro_new_uniform_skin_class(opfor,B2_Aqua);
-				Armor = .1;
-				modelSides[] = {6};
-				uniformType = "Neopren";
-				containerClass = "Supply100";
-				mass = 40;
-				armorStructural = 1;
-		};
-	};
-};
-
-class DefaultEventhandlers;
-class CfgVehicles
-{
-	class O_Soldier_base_F;
-	class SWOP_CIS_Base: O_Soldier_base_F
-	{
-		class HitPoints;
-	};
-
-	/**
-	 * UNIFORM SKINS
-	 * units that only act as skins for the uniform
-	 */
-	class SWOP_B2_superdroid: SWOP_CIS_Base
-	{
-		#include "armor_uniform.hpp"
-	};
-	#include "B2_Reskins.hpp"
-
-	/**
-	 * UNITS
-	 * the actual unit running around under the uniform
-	 */
-	class SWOP_CIS_superdroid_B2: SWOP_CIS_Base
-	{
-		class EventHandlers : DefaultEventhandlers {};
-	};
-	class macro_new_unit_class(opfor,B2_droid_Standard): SWOP_CIS_superdroid_B2
-	{
-		scope=2;
-		author= "RD501";
-		faction= macro_cis_faction
-		editorSubcategory = macro_editor_cat(B2)
-		uniformClass = macro_new_uniform_class(opfor,B2_Armor)
-		displayname = "B2 (Blaster)";
-		class EventHandlers : DefaultEventhandlers {};
-		armor=2;
-		armorStructural=1;
-		#include "armor_unit.hpp"
-	};
-	class  macro_new_unit_class(opfor,B2_droid_Rocket): macro_new_unit_class(opfor,B2_droid_Standard)
-	{
-		displayname = "B2 (Rocket)";
-		author= "RD501";
-		magazines[] = {"SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag"};
-		respawnMagazines[] = {"SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag"};
-		uniformClass = macro_new_uniform_class(opfor,B2_Armor);
-	};
-	class macro_new_unit_class(opfor,B2_super_droid_Rocket) : macro_new_unit_class(opfor,B2_droid_Rocket)
-	{
-		scope=2;
-		displayname = "Super B2 (Rocket)";
-	};
-
-	class  macro_new_unit_class(opfor,B2_droid_Test): macro_new_unit_class(opfor,B2_droid_Standard)
-	{
-		displayname = "B2 (TEST)";
-		author= "RD501";
-		magazines[] = {"SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag"};
-		respawnMagazines[] = {"SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag", "SWOP_B2rocket_Mag"};
-		uniformClass = macro_new_uniform_class(opfor,B2_Armor_Test);
-	};
-
-	class  macro_new_unit_class(opfor,B2_aqua): macro_new_unit_class(opfor,B2_droid_Standard)
-	{
-		displayname = "B2 (Water Enforcement Technician)";
-		side=0;
-		scope=2;
-		scopeCurator=2;
-		scopeArsenal=2;
-		author= "RD501";
-
-		faction= macro_cis_faction
-		editorSubcategory = macro_editor_cat(aqua)
-
-		respawnWeapons[] = {"SWOP_B2gun_Aqua","Throw","Put"};
-		uniformClass = macro_new_uniform_class(opfor,B2_Aqua);
-		magazines[] = {"SWOP_b2gun_Mag","SWOP_b2gun_Mag","SWOP_b2gun_Mag","SWOP_b2gun_Mag"};
-		weapons[] = {macro_new_weapon(b2,aqua_gun),"Throw","Put"};
-		linkedItems[] = {macro_new_weapon(equipment,Water_Filtration),"ItemMap","ItemCompass","ItemWatch","ItemRadio","NVGoggles"};
-	};
-};

+ 44 - 15
addons - Copy/RD501_Vehicles/air/drones/config.cpp

@@ -39,7 +39,8 @@ class CfgPatches
 			macro_new_vehicle(drone,Clone_Recon_bag),
 			macro_new_vehicle(drone,razor_medical),
 			macro_new_vehicle(drone,razor_ammo),
-			macro_new_vehicle(blufor,eweb_bag)
+			macro_new_vehicle(blufor,eweb_bag),
+			macro_new_vehicle(drone,razor_turret)
 		};
 		weapons[]=
 		{
@@ -130,20 +131,6 @@ class CfgVehicles
 			};
 		};
 	};
-	
-	class macro_new_vehicle(drone,Clone_Recon_Droid_ATTE):swclonerecondroid
-	{
-		displayname = "AT-TE Commander Camera";
-		scope=2
-		forceInGarage = 1;
-		author = "RD501";
-		faction = macro_republic_faction
-		class EventHandlers {
-            
-            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-        };
-	};
-
 	class macro_new_vehicle(drone,rep_stealth_fixedwing):B_UAV_05_F
 	{
 		displayname = "GAR Phantom";
@@ -414,4 +401,46 @@ class CfgVehicles
 			#include"ammo_drone_mag.hpp"
 		};
 	};
+	class macro_new_vehicle(drone,razor_turret): B_UAV_06_F
+	{
+		displayName = "Prime Turret Drone"
+		faction = macro_republic_faction
+		scope=2;
+		forceInGarage = 1;
+		altFullForce = 1000;
+		altNoForce = 1100;
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Vehicles\air\drones\data\b_uav_06_ammo_co.paa"
+		};
+		typicalCargo[]=
+		{
+			""
+		};
+		class TransportItems{};
+		class TransportMagazines{};
+		class TransportBackpacks
+		{
+			class _transport_ewebbag
+				{
+					backpack=macro_new_vehicle(stat,reweb_bag);
+					count=1;
+				};
+			class _transport_raglbag
+				{
+					backpack=macro_new_vehicle(stat,ragl40_bag);
+					count=1;
+				};
+			class _transport_strikbag
+				{
+					backpack=macro_new_vehicle(stat,Striker_bag);
+					count=1;
+				};
+			class _transport_railbag
+				{
+					backpack=macro_new_vehicle(stat,Railgun_bag);
+					count=1;
+				};
+		};
+	};
 };

+ 10 - 0
addons - Copy/RD501_Vehicles/land/resupply_box/ammo_small_mag.hpp

@@ -103,6 +103,16 @@ class _transport_ap2
 	magazine = macro_new_mag(UGL_AP,2);
 	count = 15;
 };		
+class _transport_he3_lr
+{
+	magazine = macro_new_mag(HE_GL,3);
+	count = 15;
+};
+class _transport_ap2_lr
+{
+	magazine = macro_new_mag(AT_GL,2);
+	count = 15;
+};
 class _transport_emp1
 {
 	magazine = macro_new_mag(UGL_EMP,1);

+ 0 - 45
addons - Copy/RD501_Weapons/B2/config.cpp

@@ -1,45 +0,0 @@
-#include "../../RD501_main/config_macros.hpp"
-#include "../_common/common.hpp"
-
-
-class CfgPatches
-{
-	class macro_patch_name(b2_gun)
-	{
-		author=DANKAUTHORS;
-		addonRootClass= macro_patch_name(weapons);
-		requiredAddons[]=
-		{
-			macro_patch_name(weapons)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			SWOP_B2gun
-		};
-	};
-};
-
-class cfgWeapons 
-{
-	class SWOP_BlasterRifle_Base;
-	class SWOP_B2gun:SWOP_BlasterRifle_Base
-	{
-		canShootInWater = 1;
-		class Single;
-		class FullAuto;
-	};
-
-	class macro_new_weapon(b2,aqua_gun):SWOP_B2gun
-	{
-		class Single:Single
-		{
-			dispersion = B2_accuracy;
-		};
-		class FullAuto:FullAuto
-		{
-			dispersion = B2_accuracy;
-		};
-	};
-};
-

+ 93 - 0
addons - Copy/RD501_Weapons/Bounty Hunters/config.cpp

@@ -0,0 +1,93 @@
+#include "../../RD501_main/config_macros.hpp"
+#include "../_common/common.hpp"
+class CfgPatches
+{
+	class RD501_patch_bountyhunter_eapons
+	{
+		author="RD501";
+		addonRootClass="RD501_patch_weapons";
+		requiredAddons[]=
+		{
+			"RD501_patch_weapons"
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]=
+		{
+			macro_new_weapon_nofam(Devastator),
+			macro_new_weapon_nofam(viper)
+		};
+	};
+};
+class cfgWeapons
+{
+	class arifle_MSBS65_GL_black_F;
+	class srifle_DMR_04_F;
+	class Mode_SemiAuto;
+	class UGL_F;
+	class macro_new_weapon_nofam(Devastator):arifle_MSBS65_GL_black_F
+	{
+		scope=2;
+		displayname="Devastator"
+		ACE_Overheating_mrbs = 300000;
+		ace_overheating_allowSwapBarrel = 1;
+		magazines[]=
+		{
+			macro_new_mag(Devastator,50),
+			macro_new_mag(Devastator,2)
+		};
+		class UGL : UGL_F
+		{
+			magazines[]=
+			{
+				macro_new_mag(Devastator_stun,1),
+				macro_new_mag(Devastator_dioxis,1)
+			};
+		};
+		class LinkedItems
+		{
+			class LinkedItemsOptic
+			{
+				slot="CowsSlot";
+				item="optic_ico_01_black_f";
+			};
+		};
+	};
+	class macro_new_weapon_nofam(viper):srifle_DMR_04_F
+	{
+		scope=2;
+		displayname="Viper"
+		ACE_Overheating_mrbs = 300000;
+		ace_overheating_allowSwapBarrel = 1;
+		magazines[]=
+		{
+			macro_new_mag(viper,5)
+		};
+		class LinkedItems
+		{
+			class LinkedItemsOptic
+			{
+				slot="CowsSlot";
+				item="optic_KHS_old";
+			};
+		};
+		/*class Single: Mode_SemiAuto
+		{
+			sounds[]=
+			{
+				"StandardSound",
+				"StandardSound"
+			};
+			reloadTime=0.1;
+			dispersion=0.000001;
+			recoil="recoil_single_dmr";
+			recoilProne="recoil_single_prone_dmr";
+			minRange=2;
+			minRangeProbab=0.30000001;
+			midRange=250;
+			midRangeProbab=0.69999999;
+			maxRange=450;
+			maxRangeProbab=0.050000001;
+		};*/
+	};
+};

+ 1 - 1
addons - Copy/RD501_Weapons/DC_Family/DC_15ss/config.cpp

@@ -25,7 +25,7 @@ class CfgWeapons
 	{
 		scope=2;
 		author = "RD501";
-		displayname = "Republic DC-15SA Sidearm";
+		displayname = "Republic DC-15SA 'Razorblade'";
 		descriptionShort = "Heavy Caliber Sidearm";
 		reloadTime=0.75;
 		dispersion=0.00145;

+ 73 - 0
addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -27,6 +27,7 @@ class CfgAmmo
 	class 3AS_EC80_BluePlasma;
 	class JLTS_bullet_carbine_red;
 	class G_40mm_HE;
+	class G_40mm_Smoke;
 	class 3AS_CoreDetonator_1RND;
 	class 3AS_Detonator_1RND;
 	class B_12Gauge_Pellets_Submunition;
@@ -35,6 +36,8 @@ class CfgAmmo
 	class SmokeShell;
 	class JLTS_bullet_stun;
 	class 442_thermal_det;
+	class JLTS_bullet_carbine_orange;
+	class JLTS_bullet_carbine_yellow;
 	class macro_new_ammo(surrender_stun): JLTS_bullet_stun
 	{
 		model="\MRC\JLTS\weapons\Core\effects\stun.p3d";
@@ -196,6 +199,53 @@ class CfgAmmo
 		caliber=50;
 		airFriction=0;
 	};
+	class macro_new_ammo(devastator_small):JLTS_bullet_carbine_orange
+	{
+		hit=25;
+		airLock=1;
+		typicalSpeed=1000;
+		caliber=2.4;
+		airFriction=0;
+		waterFriction=-0.009;
+		explosive = 0;
+	};
+	class macro_new_ammo(devastator_large):JLTS_bullet_carbine_orange
+	{
+		cost=50;
+		caliber=3;
+		dangerRadiusBulletClose=16;
+		dangerRadiusHit=40;
+		explosionAngle=60;
+		explosive=0.80000001;
+		hit=100;
+		effectFlare="FlareShell";
+		effectsFire="CannonFire";
+		explosionDir="explosionDir";
+		explosionEffects="ATMissileExplosion";
+		explosionEffectsDir="explosionDir";
+		explosionPos="explosionPos";
+		explosionType="explosive";
+		indirectHit=5;
+		indirectHitRange=3;
+		muzzleEffect="BIS_fnc_effectFiredRocket";
+		tracerScale=3;
+	};
+	class macro_new_ammo(viper) : 3AS_EC80_BluePlasma
+	{
+		hit=100;
+		thrust=210;
+		explosive=0.4;
+		thrustTime=1.5;
+		airLock=1;
+		typicalSpeed=1100;
+		caliber=5;
+		airFriction=0;
+		tracersevery=1;
+		tracerScale=1;
+		tracerStartTime=0;
+		tracerEndTime=10;
+		model = "\MRC\JLTS\weapons\Core\effects\laser_orange.p3d";
+	};
 ///////////////////////////////////////////////////////////////////////
 ///////////////////////////UGL////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
@@ -278,6 +328,29 @@ class CfgAmmo
 			power=0;
 		};
     };
+	class macro_new_ammo(Devastator_dioxis) :G_40mm_Smoke
+	{
+		hit = 2;
+		indirectHit = 1;
+		indirectHitRange = 1;
+		timeToLive =30;
+		model="\3AS\3AS_Equipment\model\3AS_thermaldet.p3d";
+		effectsSmoke="RD501_DioxisSmokeShellEffect";
+		smokeColor[]={0.21250001,0.75580001,0.35909998,1};
+	};
+	class macro_new_ammo(Devastator_stun) :G_40mm_HE
+	{
+		hit = 1;
+		indirectHit = 1;
+		indirectHitRange = 6;
+		timeToLive =30;
+		explosionEffects="JLTS_fx_exp_EMP";
+		model="\3AS\3AS_Equipment\model\3AS_thermaldet.p3d";
+		RD501_stunDuration=30;
+	};
+///////////////////////////////////////////////////////////////////////
+///////////////////////////Grenades///////////////////////////////////
+//////////////////////////////////////////////////////////////////////
 	class macro_new_ammo(imploder) : 3AS_CoreDetonator_1RND
 	{
 		hit=50;

+ 44 - 0
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -200,6 +200,33 @@ class CfgMagazines
 		initSpeed=1100;
 		descriptionShort="High power magazine";
 	};
+	class macro_new_mag(Devastator,50) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="Devastator Primary Magazine";
+		count = 50;
+		mass=4;
+		ammo=macro_new_ammo(devastator_small)
+		initSpeed=1100;
+		descriptionShort="High power magazine";
+	};
+	class macro_new_mag(Devastator,2) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="Devastator High Energy Magazine";
+		count = 2;
+		mass=4;
+		ammo=macro_new_ammo(devastator_large)
+		initSpeed=1100;
+		descriptionShort="High power magazine";
+	};
+	class macro_new_mag(viper,5) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="Viper Magazine";
+		count = 5;
+		mass=4;
+		ammo=macro_new_ammo(viper)
+		initSpeed=1100;
+		descriptionShort="High power magazine";
+	};
 	class macro_new_mag(stun,5):JLTS_stun_mag_long
 	{
 		displayName="5 Round Stun Cell";
@@ -328,6 +355,7 @@ class CfgMagazines
 		ammo = "G_40mm_Smoke";
 		descriptionShort = "6Rd White Smoke RGL6 Grenade";
 	};
+
 	class macro_new_mag(UGL_Flare,6):UGL_FlareWhite_F
 	{
 		displayName = "6 Rd White Flare RGL6 Grenades";
@@ -336,6 +364,22 @@ class CfgMagazines
 		ammo = "F_40mm_White";
 		descriptionShort = "6Rd White Flare RGL6 Grenade";
 	};
+	class macro_new_mag(Devastator_stun,1):1Rnd_HE_Grenade_shell
+	{
+		displayName = "1 Rd Devastator Stun Magazine";
+		displayNameShort = "1 Rnd Devastator Stun Magazine";
+		count=1;
+		ammo = macro_new_ammo(Devastator_stun)
+		descriptionShort = "1Rd Devastator Stun Magazine";
+	};
+	class macro_new_mag(Devastator_dioxis,1):1Rnd_Smoke_Grenade_shell
+	{
+		displayName = "1 Rd Devastator Dioxis Magazine";
+		displayNameShort = "1 Rnd Devastator Dioxis Magazine";
+		count=1;
+		ammo = macro_new_ammo(Devastator_dioxis)
+		descriptionShort = "1Rd Devastator Dioxis Magazine";
+	};
 
 	////////////////////////////////////////////////////
 	/////////////Grenades Magazines/////////////////////