Patch 3.21

addons - Copy/RD501_Main/config.cpp

@@ -296,10 +296,6 @@ class CfgEditorCategories
 	{
 		displayName = "Speeders";
 	};
-	class kobra
-	{
-		displayname = "[K] Kobra";
-	};
 	
 };
 
@@ -410,12 +406,12 @@ class CfgEditorSubcategories
 
 	class macro_editor_cat(wall)
 	{
-		displayName = "sheild walls";
+		displayName = "Shield Walls";
 	};
 
 	class macro_editor_cat(static_msc)
 	{
-		displayName = "static stuff";
+		displayName = "Bacta Tanks";
 	};
 	class macro_editor_cat(turrets)
 	{
@@ -473,18 +469,6 @@ class CfgEditorSubcategories
 	{
 		displayName = "Starfighter";
 	};
-	class 442_ships
-	{
-		displayname = "Static Ship";
-	};
-	class 442_ships_parts
-	{
-		displayname = "Static Ship Parts";
-	};
-	class 442_hallway
-	{
-		displayname = "Hallways";
-	};
 
 };
 

addons - Copy/RD501_Vehicle_Weapons/_ammo/missiles.hpp

@@ -75,6 +75,44 @@
 		indirectHitRange = 15;
 		cameraViewAvailable = 1; 
 	};
+	class macro_new_ammo(spark) : Rocket_04_AP_F
+	{
+		displayName = "Spark UGM";	
+		displayNameShort = "Spark UGM";
+		effectFly = "RD501_Effect_Violet";
+		effectsFire = "RD501_Effect_Violet";
+		effectsMissileInit = "RD501_laat_PylonBackEffectsFFAR";
+		effectsMissile = "RD501_FX_Missile_AA_Violet";
+		explosionEffects="JLTS_fx_exp_EMP";
+		SoundSetExplosion[]=
+		{
+			"JLTS_GrenadeEMP_Exp_SoundSet",
+			"JLTS_GrenadeEMP_Tail_SoundSet",
+			"Explosion_Debris_SoundSet"
+		};
+		muzzleEffect = "";
+		effectsSmoke = "RD501_Effect_Violet";
+		soundfly[] = {"\xt\SWionrocketloop.ogg",3,1,800};
+		model = "\SWOP_Main\Effects\Tracer\laserred";
+		tracerColor[] = {"blue"};
+		brightness = 20000;
+		lightColor[] = {0, 0, 1, 1};
+		triggerTime = 0.1;
+		hit = 0.1;
+		indirectHit = 0.1;
+		indirectHitRange = 40;
+		cameraViewAvailable = 1;	
+		JLTS_isEMPAmmo=1;	
+		submunitionAmmo=macro_new_ammo(spark_sub)
+	};
+	class ammo_Penetrator_Rocket_04_AP;
+	class macro_new_ammo(spark_sub) :ammo_Penetrator_Rocket_04_AP
+	{
+		hit = 0.1;
+		indirectHit = 0.1;
+		indirectHitRange = 40;
+		JLTS_isEMPAmmo=1;	
+	}
 	
 	class macro_new_ammo(lgm) : M_Jian_AT
 	{

addons - Copy/RD501_Vehicle_Weapons/_mags/missiles.hpp

@@ -38,7 +38,7 @@
 	class macro_new_mag(pylon_agm,6):PylonRack_1Rnd_Missile_AGM_01_F
 	{
 		ammo = macro_new_ammo(agm)
-		count = 6;
+		count = 3;
 		displayName = "Torrent AGM";	
 		displayNameShort = "Torrent AGM";
 		tracersEvery=1;
@@ -51,7 +51,7 @@
 	class macro_new_mag(pylon_aa,4):4Rnd_AAA_missiles
 	{
 		ammo = macro_new_ammo(a2a)
-		count = 4;
+		count = 2;
 		displayName = "Zephyr A2A";
 		displayNameShort = "Zephyr A2A";
 		tracersEvery=1;
@@ -64,6 +64,7 @@
 	class macro_new_mag(pylon_lgm,4):4Rnd_LG_Jian
 	{
 		ammo = macro_new_ammo(lgm)
+		count=2;
 		displayName = "Flashfire WGM";	
 		displayNameShort = "Flashfire WGM";
 		hardpoints[]=
@@ -84,4 +85,17 @@
 			"RD501_Universal_rail"
 		};
 		pylonWeapon=macro_new_weapon(pylon,ugm)
+	};
+	class macro_new_mag(pylon_spark,6):7Rnd_Rocket_04_AP_F
+	{
+		ammo = macro_new_ammo(spark)
+		count = 6;
+		displayName = "Spark UGM";	
+		displayNameShort = "Spark UGM";
+		tracersEvery=1;
+		hardpoints[]=
+		{
+			"RD501_Universal_rail"
+		};
+		pylonWeapon=macro_new_weapon(pylon,spark)
 	};

addons - Copy/RD501_Vehicle_Weapons/misc/missiles/config.cpp

@@ -104,6 +104,14 @@ class CfgWeapons
 		magazines[] = {macro_new_mag(pylon_ugm,10)};
 		autoFire=true;
 	};
+	class macro_new_weapon(pylon,spark) : Rocket_04_AP_Plane_CAS_01_F
+	{
+		displayName = "Spark(Pylon)";
+		displayNameShort = "Spark";
+		soundfly[] = {"\xt\SWionrocketloop.ogg",3,1,800};
+		magazines[] = {macro_new_mag(pylon_spark,6)};
+		autoFire=true;
+	};
 	class macro_new_weapon(pylon,lgm) : missiles_Jian
 	{
 		displayName = "Flashfire (Pylon)";

addons - Copy/RD501_Vehicles/air/ARC_170X/arc170_common.hpp

@@ -9,20 +9,14 @@ weapons[]=
 	"Laserdesignator_pilotCamera",
 	"CMFlareLauncher",
 	macro_new_weapon(generic,republic_aircraft_cannon),
-	macro_new_weapon(generic,kannon),
-	macro_new_weapon(wynd,a2a),
-	macro_new_weapon(wynd,agm),
-	macro_new_weapon(wynd,ugm)
+	macro_new_weapon(generic,kannon)
 };
 magazines[]=
 {
 	macro_new_mag(generic_aircraft_cannon_green,1000),
-	macro_new_mag(a2a,4),
-	macro_new_mag(agm,6),
-	macro_new_mag(ugm,10),
 	macro_basic_air_mags,
 	macro_new_mag(Kannon,100),
-	macro_new_mag(Kannon,100),
+	macro_new_mag(Kannon,100)
 };
 class Components: Components
 {
@@ -32,54 +26,68 @@ class Components: Components
 
 		class Pylons
 		{
-			class Pylons1
-			{
-				attachment = "empty";
-				priority = 5;
-				maxweight = 2000;
-				UIposition[]={ 0.34999999, 0 };
-			};
-
-			class Pylons2 : Pylons1
-			{
-				attachment = "empty";
-				UIposition[]={ 0.34999999, 0.5 };
-				mirroredMissilePos = 1;
-			};
-
-			class Pylons3
-			{
-				hardpoints[]=
-				{
-					"ARC_BOMB_PYLON"
-				};
-				attachment = "empty";
-				priority = 3;
-				maxweight = 4000;
-				UIposition[]={ 0.34999999, 0.1 };
-			};
-
-			class Pylons4 : Pylons3
-			{
-				attachment = "empty";
-				UIposition[]={ 0.34999999, 0.40000001 };
-				mirroredMissilePos = 4;
-			};
-
-			class Pylons5
-			{
-				attachment = "empty";
-				priority = 4;
-				maxweight = 100000;
-				UIposition[]={ 0.34999999, 0.2 };
-			};
-
-			class Pylons6 : Pylons5
-			{
-				attachment = "empty";
-				UIposition[]={ 0.34999999, 0.30000001 };
-				mirroredMissilePos = 5;
-			};
+			class pylons1
+					{
+						hardpoints[]=
+						{
+							"RD501_Universal_rail"
+						};
+						attachment=macro_new_mag(pylon_agm,6)
+						priority=10;
+						maxweight=300;
+						UIposition[]={0.60000002,0.44999999};
+					};
+					class pylons2: pylons1
+					{
+						UIposition[]={0.050000001,0.44999999};
+						mirroredMissilePos=1;
+					};
+					class pylons3: pylons1
+					{
+						hardpoints[]=
+						{
+							"RD501_Universal_rail"
+						};
+						attachment=macro_new_mag(pylon_agm,6)
+						priority=9;
+						maxweight=2500;
+						UIposition[]={0.55000001,0.34999999};
+					};
+					class pylons4: pylons3
+					{
+						hardpoints[]=
+						{
+							"RD501_Universal_rail"
+						};
+						attachment=macro_new_mag(pylon_agm,6)
+						priority=13;
+						maxweight=5000;
+						UIposition[]={0.1,0.34999999};
+						mirroredMissilePos=3;
+					};
+					class pylons5: pylons1
+					{
+						hardpoints[]=
+						{
+							"RD501_Universal_rail"
+						};
+						attachment=macro_new_mag(pylon_agm,6)
+						priority=7;
+						maxweight=5000;
+						UIposition[]={0.5,0.25};
+					};
+					class pylons6: pylons5
+					{
+						hardpoints[]=
+						{
+							"RD501_Universal_rail"
+						};
+						attachment=macro_new_mag(pylon_agm,6)
+						priority=12;
+						maxweight=5000;
+						UIposition[]={0.15000001,0.25};
+						mirroredMissilePos=5;
+					};
 
 			class Pylons7
 			{

addons - Copy/RD501_Vehicles/common/smallvehiclekit.hpp

@@ -5,9 +5,9 @@ class TransportItems
 			name = "ToolKit";
 			count = 2;
 		};
-		class _transport_ACE_morphine
+		class _transport_ACE_painkiller
 		{
-			name = "ACE_morphine";
+			name = "RD501_Painkiller";
 			count = 10;
 		};	
 		class _transport_ACE_epinephrine

addons - Copy/RD501_Vehicles/land/resupply_box/ammo_small_mag.hpp

@@ -107,4 +107,54 @@ class _transport_C12_Remote_Mag
 {
 	magazine = "C12_Remote_Mag";
 	count = 2;
+};
+class _transport_RGLHE
+{
+	magazine = macro_new_mag(UGL_HE,6)
+	count = 10;
+};
+class _transport_RGLAP
+{
+	magazine = macro_new_mag(UGL_AP,6)
+	count = 10;
+};
+class _transport_RGPEMP
+{
+	magazine = macro_new_mag(UGL_EMP,6)
+	count = 5;
+};
+class _transport_ShotgunSP
+{
+	magazine = macro_new_mag(shotgun_scatter,6)
+	count = 20;
+};
+class _transport_ShotgunUO
+{
+	magazine = macro_new_mag(shotgun_HE,6)
+	count = 20;
+};
+class _transport_ShotgunEMP
+{
+	magazine = macro_new_mag(shotgun_EMP,2)
+	count = 10;
+};
+class _transport_StaticEweb
+{
+	magazine = macro_new_mag(eweb,600)
+	count = 10;
+};
+class _transport_StaticStriker
+{
+	magazine = macro_new_mag(ragl40he,40)
+	count = 10;
+};
+class _transport_StaticBoomer
+{
+	magazine = macro_new_mag(aap,4)
+	count = 10;
+};
+class _transport_StaticDriver
+{
+	magazine = macro_new_mag(mar,1)
+	count = 10;
 };

addons - Copy/RD501_Vehicles/land/resupply_box/medical_small_items.hpp

@@ -37,7 +37,12 @@ class _xx_ACE_morphine
 {
     name = "ACE_morphine";
     count = 30;
-};									
+};		
+class _xx_ACE_painkiller
+{
+    name = "RD501_Painkiller";
+    count = 30;
+};								
 class _xx_ACE_epinephrine
 {
     name = "ACE_epinephrine";

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

@@ -228,6 +228,7 @@ class LandVehicle;
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
+		#include "../../common/smallvehiclekit.hpp"
 		class Turrets: Turrets
 		{
 			class MainTurret_bottom : MainTurret_bottom{};
@@ -261,6 +262,7 @@ class LandVehicle;
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
+		#include "../../common/smallvehiclekit.hpp"
 	};
 	class macro_new_vehicle(saber,republic_tx130_super_MkII):3as_saber_super
 	{
@@ -271,6 +273,7 @@ class LandVehicle;
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
+		#include "../../common/smallvehiclekit.hpp"
 		class Turrets: Turrets
 		{
 			class Mainturret_super: Mainturret_super
@@ -309,6 +312,7 @@ class LandVehicle;
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
+		#include "../../common/smallvehiclekit.hpp"
 		class Turrets: Turrets
 		{
 			class MainTurret_top: Mainturret_top{};

addons - Copy/RD501_Weapons/Consumables/config.cpp

@@ -17,7 +17,7 @@ class CfgWeapons
 		displayName = "Painkiller Autoinjector";
 		picture = "\z\ace\addons\medical_treatment\ui\morphine_ca.paa";
 		model = "\z\ace\addons\medical_treatment\data\morphine.p3d";
-		descriptionShort = "Drink some water and Rest";
+		descriptionShort = "Painkillers";
 		descriptionUse = "Inbuilt Clone Armor injector for easy pain relief";
 		class ItemInfo: CBA_MiscItem_ItemInfo
 		{

addons - Copy/RD501_Weapons/DC_Family/DC_15x/config.cpp

@@ -60,6 +60,14 @@ class cfgWeapons
 					"RD501_LRPS"
 				};
 			};
+		class UnderBarrelSlot
+			{
+			linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
+			compatibleItems[]=
+				{
+				"bipod_01_F_blk",
+				};
+			};
 		};
 	};
 };

addons - Copy/RD501_Weapons/_acc/config.cpp

@@ -78,7 +78,7 @@ class CfgWeapons
 ////////////////////////////Optics///////////////////////////////
 /////////////////////////////////////////////////////////////////
 	class ItemCore;
-	class optic_LRPS:ItemCore
+	class optic_DMS:ItemCore
 	{
 		class ItemInfo;
 	}
@@ -462,7 +462,7 @@ class CfgWeapons
 		model="RD501_Weapons\_acc\data\rd501_pistol_3.p3d";
 		displayName="Pistol Holo B";
 	};
-	class RD501_LRPS : optic_LRPS
+	class RD501_LRPS : optic_DMS
 	{
 		author="RD501";
 		scope=2;
@@ -512,6 +512,28 @@ class CfgWeapons
                     opticsDisablePeripherialVision=1;
                     cameraDir="";
                 };
+			class Iron: Snip
+				{
+					opticsID=2;
+					useModelOptics=0;
+					opticsPPEffects[]=
+					{
+						"",
+						""
+					};
+					opticsFlare=0;
+					opticsDisablePeripherialVision=0;
+					opticsZoomMin=0.25;
+					opticsZoomMax=1.25;
+					opticsZoomInit=0.75;
+					memoryPointCamera="eye";
+					visionMode[]={};
+					discretefov[]={};
+					distanceZoomMin=200;
+					distanceZoomMax=200;
+					discreteDistance[]={200};
+					discreteDistanceInitIndex=0;
+				};
             };
 		};
 	};

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -184,6 +184,7 @@ class CfgMagazines
 	{
 		displayName="8 Round 50MW Cell";
 		count = 8;
+		mass=4;
 		ammo=macro_new_ammo(50mw)
 		typicalSpeed=1100;
 		descriptionShort="High power magazine";