Merge remote-tracking branch 'origin/master' into add-radio-jammer

addons - Copy/RD501_Droids/B1/config.cpp

@@ -40,6 +40,25 @@ class CfgPatches
 	};
 };
 
+class CfgWeapons
+{
+	class UniformItem;
+	class JLTS_DroidB1;
+
+	// custom uniforms
+	class macro_new_uniform_class(opfor,B1_jammer): JLTS_DroidB1
+	{
+		displayName="RD501 B1 (Jammer)";
+		class ItemInfo: UniformItem
+		{
+			uniformModel="-";
+			uniformClass=macro_new_unit_class(opfor,B1_jammer);
+			containerClass="Supply150";
+			mass=40;
+		};
+	};
+};
+
 class CfgVehicles
 {
 	#include "backpacks.hpp"
@@ -351,7 +370,12 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_jammer): macro_new_unit_class(opfor,B1)
 	{
 		displayName="B1 Battledroid (Jammer)";
-		backpack=macro_backpack_jammer;
+		backpack="tf_rt1523g_big_bwmod_tropen";
+		uniformClass=macro_new_uniform_class(opfor,B1_jammer);
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Droids\data\b1_jammer.paa"
+		};
 		cost=3;
 	}
 	class macro_new_unit_class(opfor,B1_E_Web): macro_new_unit_class(opfor,B1)

addons - Copy/RD501_Vehicles/land/jammer_truck/config.cpp

@@ -0,0 +1,42 @@
+
+#include "../../../RD501_main/config_macros.hpp"
+
+class CfgPatches
+{
+	class macro_patch_name(jammer_truck)
+	{
+		addonRootClass=macro_patch_name(vehicles)
+
+		requiredAddons[]=
+		{
+			macro_patch_name(vehicles)
+		};
+		requiredVersion=0.1;
+		units[]=
+		{
+			macro_new_vehicle(cis,jammer_truck),
+		};
+		weapons[]=
+		{
+			
+		};
+	};
+};
+
+class CfgVehicles
+{
+    class I_Truck_02_ammo_F;
+
+	class macro_new_vehicle(cis,jammer_truck): I_Truck_02_ammo_F
+    {
+        displayName = "CIS Marille";
+        crew = macro_new_unit_class(opfor,B1_crew)
+        side = 0;
+        faction = macro_cis_faction
+        editorSubcategory = macro_editor_cat(car)
+        vehicleClass = macro_editor_vehicle_type(Car)
+        scope = 2;
+        scopeCurator = 2;
+        forceInGarage = 1;
+    };
+};

addons - Copy/RD501_Vehicles/land/light_infantry_transport/config.cpp

@@ -63,8 +63,8 @@ class CfgVehicles
 		};
 
 		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(Transport)
-		vehicleClass = macro_editor_vehicle_type(Transport)
+        editorSubcategory = macro_editor_cat(car)
+        vehicleClass = macro_editor_vehicle_type(Car)
 
 		class EventHandlers
 		{

addons - Copy/RD501_Vehicles/land/rocket_ordinance_tank/config.cpp

@@ -41,8 +41,11 @@ class CfgPatches
 class DefaultEventhandlers;
 class CfgVehicles
 {
-
-	#include "inheritance.hpp"
+	class B_MBT_01_mlrs_base_F;
+	class B_MBT_01_mlrs_F: B_MBT_01_mlrs_base_F
+	{
+		RD501_magclamp_small_offset[]={-0.7,0.0,-1.0};
+	};
 	class macro_new_vehicle(rocket_ordinance_tank,Mynock) : B_MBT_01_mlrs_F
 	{
 		displayName = "Republic Catapult (Mynock)";