Merge remote-tracking branch 'origin/master' into add-unpackable-medical-tent

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -77,6 +77,8 @@ class CfgWeapons
 	NEW_501_Pilot_HELM(Legal,Legal,pilots\Legal.paa)
 	NEW_501_Pilot_HELM(Ethan,Ethan,pilots\Ethan.paa)
 	NEW_501_Pilot_HELM(Blast,Blast,pilots\Blast.paa)
+	NEW_501_Pilot_HELM(Duncan,Duncan,pilots\Duncan.paa)
+	NEW_501_Pilot_HELM(Neb,Neb,pilots\Neb.paa)
 
 	class macro_new_helmet(pilot,scuba): macro_new_helmet(pilot,base)
 	{

addons - Copy/RD501_Helmets/config.cpp

@@ -263,16 +263,53 @@ class CfgWeapons
 		ace_hearing_lowerVolume = 0;    
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
 		displayName = "[501st] ARC HELM (Base)";
-		picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
-		model = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
+		picture="\MRC\JLTS\characters\CloneArmor2\data\ui\CloneHelmetARC_ui_ca.paa";
+		model = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetARC.p3d";
 		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {"RD501_Units\textures\republic\clones\arc\arc_helmet.paa"};
-		hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\clone_helmet_p2.rvmat"};
+		hiddenSelectionsTextures[] = {"RD501_Helmets\_textures\ARC\ARC.paa"};
+		hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\Clone_helmet_ARC"};
 		class ItemInfo: HeadgearItem
 		{
 			mass = 30;
-			uniformmodel = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
-			hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\clone_helmet_p2.rvmat"};
+			uniformmodel = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetARC.p3d";
+			hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\Clone_helmet_ARC.rvmat"};
+			modelSides[] = {6};
+			hiddenSelections[] = {"Camo1"};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+	};
+	class macro_new_helmet(arc,sgt_jlts) : itemCore
+	{
+		scope = 2;
+		author = "RD501";
+		weaponPoolAvailable = 1;       
+		subItems[] = {"G_B_Diving"};
+		ace_hearing_protection = 0.85; 		
+		ace_hearing_lowerVolume = 0;    
+		subItems[] = {"G_B_Diving","ItemcTabHCam"};
+		displayName = "[501st] ARC HELM (Sergeant)";
+		picture="\MRC\JLTS\characters\CloneArmor2\data\ui\CloneHelmetARC_ui_ca.paa";
+		model = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetARC.p3d";
+		hiddenSelections[] = {"Camo1"};
+		hiddenSelectionsTextures[] = {"RD501_Helmets\_textures\ARC\ARC_CS.paa"};
+		hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\Clone_helmet_ARC"};
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformmodel = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetARC.p3d";
+			hiddenSelectionsMaterials[]= {"RD501_Helmets\_materials\Clone_helmet_ARC.rvmat"};
 			modelSides[] = {6};
 			hiddenSelections[] = {"Camo1"};
 			material = -1;

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -25,6 +25,7 @@ class CfgWeapons
 	class macro_new_helmet(infantry,base);
 	class macro_new_helmet(infantry,lum_base);
 	class macro_new_helmet_jlts(infantry,jlts_recruit);
+	class macro_new_helmet(arc,base_jlts);
 
 	NEW_501_Inf_Helm_JLTS(Pilot,Pilot,Pilot.paa)
 	
@@ -144,15 +145,8 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Power,Power,Power.paa)
 	NEW_501_Inf_Helm_JLTS(Vulpes,Vulpes,Vulpes.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
-	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
-	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
-	NEW_501_ARC_Helm_JLTS(Halo,Halo,Halo.paa)
-	NEW_501_ARC_Helm_JLTS(Habivi,Habivi,Habivi.paa)
 	NEW_501_ARC_Helm_JLTS(Jink,Jink,Jink.paa)
 	NEW_501_ARC_Helm_JLTS(Brennan,Brennan,Brennan.paa)
-	NEW_501_ARC_Helm_JLTS(Korvus,Korvus,Korvus.paa)
+	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 	NEW_501_ARC_Helm_JLTS(Darkstar,Darkstar,Darkstar.paa)
-	NEW_501_ARC_Helm_JLTS(Train,Train,Train.paa)
-	NEW_501_ARC_Helm_JLTS(Hook,Hook,Hook.paa)
-	NEW_501_ARC_Helm_JLTS(Odd,Odd,Odd.paa)
 };

addons - Copy/RD501_Helmets/infantry/config_macros.cpp

@@ -9,7 +9,7 @@
 
 //ARC
 	#define NEW_501_ARC_Helm(classname,displayname,texture)\
-		class macro_new_helmet(arc,classname) : macro_new_helmet(infantry,base)\
+		class macro_new_helmet(arc,classname) : macro_new_helmet(arc,base_jlts)\
 		{\
 			scope = 2;\
 			displayName = Clonetrooper helmet (501st '##displayname##');\
@@ -36,7 +36,7 @@
 
 //ARC JLTS
 	#define NEW_501_ARC_Helm_JLTS(classname,displayname,texture)\
-		class macro_new_helmet(arc,classname) : macro_new_helmet(infantry,jlts_recruit)\
+		class macro_new_helmet(arc,classname) : macro_new_helmet(arc,base_jlts)\
 		{\
 			scope = 2;\
 			displayName = [501st] ARC HELM ('##displayname##');\

addons - Copy/RD501_Main/XEH_postinit.sqf

@@ -57,4 +57,7 @@ rd501_medical_ccp_classes = ["Land_Medevac_house_V1_F"];
 
 ["rd501_medical_ccp_deployCCPServer", {
 	_this call rd501_fnc_deployCCPServer;
-}] call CBA_fnc_addEventHandler;
+}] call CBA_fnc_addEventHandler;
+
+// Surrender stun
+call macro_fnc_name(stun);

addons - Copy/RD501_Main/XEH_preInit.sqf

@@ -115,6 +115,12 @@ macro_prep_xeh(external_reload\fnc_canReloadExternal.sqf,canReloadExternal)
 macro_prep_xeh(external_reload\fnc_reloadExternal.sqf,reloadExternal)
 macro_prep_xeh(external_reload\fnc_onReloadExternalHandler.sqf,onReloadExternalHandler)
 
+// Heal Nearby
+macro_prep_xeh(heal_nearby\fnc_healAllNearby.sqf,healAllNearby)
+
+// stun
+macro_prep_xeh(stun\stun.sqf,stun)
+
 // Medical CCP
 macro_prep_xeh(medical_ccp\fnc_stitchAllWounds.sqf,stitchAllWounds)
 macro_prep_xeh(medical_ccp\fnc_bandageAllWounds.sqf,bandageAllWounds)

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_Main/functions/heal_nearby/fnc_healAllNearby.sqf

@@ -0,0 +1,7 @@
+params["_healer", "_origin", "_radius"];
+
+{ 
+    if(_x isKindOf "Man") then {
+        [_x, _x] call ace_medical_treatment_fnc_fullHeal; 
+    };
+} forEach (_origin nearEntities _radius);

addons - Copy/RD501_Main/functions/medical_notification/add_med_notification.sqf

@@ -1,36 +1,40 @@
-if(isServer || isDedicated || (!local this)) exitWith { };
-if(hasInterface && ACE_Player == this)then {
-        RD501_MedNotif_lastMessageTime = 0;
-        _id = ["ace_medicalMenuOpened", {
-                        params["_player", "_target", ""];
-                        //if(_player == _target) exitWith {};
-                        if(time - RD501_MedNotif_lastMessageTime < 1) exitWith {
+if(!isPlayer this) exitWith { 
+        diag_log format["RD501_MedNotif[DEBUG]: %1", "Current instance is not a player"]
+};
+RD501_MedNotif_lastMessageTime = 0;
+_id = ["ace_medicalMenuOpened", {
+                params["_player", "_target", ""];
+                if(ace_medical_gui_pendingReopen) exitWith
+                {
+                        // Already showed message, skip
+                        diag_log format["RD501_MedNotif[DEBUG]: %1", "Pending Reopen, not displaying"]
+                };
+                //if(_player == _target) exitWith {};
+                if(time - RD501_MedNotif_lastMessageTime < 1) exitWith {
 
-                        };
-                        // if("ace_medical_pendingReopen") exitWith {diag_log format["RD501_MedNotif[DEBUG]: %1", "Pending Reopen, not displaying"]};
-                        if(isNil "RD501_MedNotif_Message" || RD501_MedNotif_Message == "") then {
-                                diag_log format["RD501_MedNotif[DEBUG]: %1", format["Message not initialised, setting to default ('%1')", "%1 is asking that you kindly hold still."]];
-                                RD501_MedNotif_Message = "%1 is asking that you kindly hold still.";
-                        };
-                        _name = [_player] call ace_common_fnc_getName;
-                        _targetName = [_target] call ace_common_fnc_getName;
-                        if(_target getVariable["ACE_Unconscious", false]) exitWith {
-                                diag_log format["RD501_MedNotif[DEBUG]: %1", format["%1 is unconscious, ignoring", _targetName]];
-                        };
-                        if([_target] call ace_common_fnc_isMedic) then
-                        {
-                                diag_log format["RD501_MedNotif[DEBUG]: %1", format["Displaying Medic Message to %1", _targetName]];
-                                _text = format[RD501_MedNotif_Message, _name];
-                                _image = "RD501_Main\ui_icons\medical_emblem.paa";
-                                _textHTML = format["<t align='center'>%1</t>", _text];
-                                _result = composeText [parseText format["<img size='2' align='center' color='%2' image='%1'/>", _image, [1,1,1] call BIS_fnc_colorRGBtoHTML], lineBreak, _text];
-                                ["ace_common_displayTextStructured", [_result, 2, _target], [_target]] call CBA_fnc_targetEvent;
-                        }else
-                        {
-                                diag_log format["RD501_MedNotif[DEBUG]: %1", format["Displaying Non Medic Message to %1", _targetName]];
-                                ["ace_common_displayTextStructured", [format[RD501_MedNotif_Message, _name], 2, _target], [_target]] call CBA_fnc_targetEvent;
-                        };
-                        RD501_MedNotif_lastMessageTime = time;
-                }] call CBA_fnc_addEventHandler;
-        diag_log format["RD501_MedNotif[DEBUG]: %1", format["Registered and loaded for '%1'", this call ace_common_fnc_getName]];
-};
+                };
+                if(isNil "RD501_MedNotif_Message" || RD501_MedNotif_Message == "") then {
+                        diag_log format["RD501_MedNotif[DEBUG]: %1", format["Message not initialised, setting to default ('%1')", "%1 is asking that you kindly hold still."]];
+                        RD501_MedNotif_Message = "%1 is asking that you kindly hold still.";
+                };
+                _name = [_player] call ace_common_fnc_getName;
+                _targetName = [_target] call ace_common_fnc_getName;
+                if(_target getVariable["ACE_Unconscious", false]) exitWith {
+                        diag_log format["RD501_MedNotif[DEBUG]: %1", format["%1 is unconscious, ignoring", _targetName]];
+                };
+                if([_target] call ace_medical_treatment_fnc_isMedic) then
+                {
+                        diag_log format["RD501_MedNotif[DEBUG]: %1", format["Displaying Medic Message to %1", _targetName]];
+                        _text = format[RD501_MedNotif_Message, _name];
+                        _image = "RD501_Main\ui_icons\medical_emblem.paa";
+                        _textHTML = format["<t align='center'>%1</t>", _text];
+                        _result = composeText [parseText format["<img size='2' align='center' color='%2' image='%1'/>", _image, [1,1,1] call BIS_fnc_colorRGBtoHTML], lineBreak, _text];
+                        ["ace_common_displayTextStructured", [_result, 2, _target], [_target]] call CBA_fnc_targetEvent;
+                }else
+                {
+                        diag_log format["RD501_MedNotif[DEBUG]: %1", format["Displaying Non Medic Message to %1", _targetName]];
+                        ["ace_common_displayTextStructured", [format[RD501_MedNotif_Message, _name], 2, _target], [_target]] call CBA_fnc_targetEvent;
+                };
+                RD501_MedNotif_lastMessageTime = time;
+        }] call CBA_fnc_addEventHandler;
+diag_log format["RD501_MedNotif[DEBUG]: %1", format["Registered and loaded for '%1' (%2)", this call ace_common_fnc_getName, this]];

addons - Copy/RD501_Main/functions/stun/readme.md

@@ -0,0 +1,14 @@
+RD501 Surrender Stun Mod
+======
+
+Explanation
+------
+This system makes it possible to create ammo that 'stuns' the target for a given amount of time. The 'stun' is simulated by making the target surrender for that period.
+
+Config
+------
+ammo can be set to be stun ammo using the following value:<br>
+
+**RD501_stunDuration**<br>
+*float*<br>
+number of seconds the stun should last for

addons - Copy/RD501_Main/functions/stun/stun.sqf

@@ -0,0 +1,26 @@
+
+// Runs only on the machine where the hit unit is local
+_fnc_onHit = {
+	params ["_unit", "_source", "_damage", "_instigator"];
+	["rd501_stun_onHit", [_unit, _source]] call CBA_fnc_globalEvent;
+};
+
+// Runs on the person who shot
+_fnc_stun = {
+	params["_unit", "_source"];
+
+	private _mag = currentMagazine _source;
+	private _ammo = (configFile >> "CfgMagazines" >> _mag >> "ammo") call BIS_fnc_getCfgData;
+	private _stunDuration = (configFile >> "CfgAmmo" >> _ammo >> "RD501_stunDuration") call BIS_fnc_getCfgData;
+
+	if (_stunDuration > 0.0) then
+	{
+		["ace_captives_setSurrendered" ,[_unit, true]] call CBA_fnc_globalEvent;
+		[{
+			["ace_captives_setSurrendered", [_this select 0, false]] call CBA_fnc_globalEvent;
+		}, [_unit], _stunDuration] call CBA_fnc_waitAndExecute;
+	};
+};
+
+["CAManBase", "Hit", _fnc_onHit] call CBA_fnc_addClassEventHandler;
+["rd501_stun_onHit", _fnc_stun] call CBA_fnc_addEventHandler;

addons - Copy/RD501_Units/blufor/clones/config.cpp

@@ -369,6 +369,26 @@ class cfgWeapons
 			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestCommander.p3d";
 		};
 	};	
+	class macro_new_vest_class(501_inf,acc_7_v3): macro_new_vest_class(501_inf,acc_7)
+	{
+		displayName = "[501st] INF ACC 07 (Sgt. Major (B) RTO)";
+		model="\MRC\JLTS\characters\CloneArmor\CloneVestCommander.p3d";
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\bn_rto_pauldron.paa};
+		class ItemInfo: ItemInfo
+		{
+			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestCommander.p3d";
+		};
+	};	
+	class macro_new_vest_class(501_inf,acc_7_v4): macro_new_vest_class(501_inf,acc_7)
+	{
+		displayName = "[501st] INF ACC 07 (Sgt. Major (B) Medic)";
+		model="\MRC\JLTS\characters\CloneArmor\CloneVestCommander.p3d";
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\bn_medic_pauldron.paa};
+		class ItemInfo: ItemInfo
+		{
+			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestCommander.p3d";
+		};
+	};	
 	class macro_new_vest_class(501_inf,acc_10): macro_new_vest_class(501_inf,acc_9)
 	{
 		displayName = "[501st] INF ACC 10 (Captain)";

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/air/ARC_170X/arc170_inheritance.hpp

@@ -1,6 +1,6 @@
 class 3as_arc_170_base;
 class Turrets;
-class 3as_arc_170_razor: 3as_arc_170_base
+/*class 3as_arc_170_razor: 3as_arc_170_base
 {
 	class Components;
 	class Turrets: Turrets
@@ -8,17 +8,17 @@ class 3as_arc_170_razor: 3as_arc_170_base
 		class LaserPilot;
 		class Reargun;
 	};
-};
-class 3as_arc_170_blue: 3as_arc_170_razor
+};*/
+class 3as_arc_170_blue: 3as_arc_170_base
 {
-	class Components:Components{};
+	class Components;
 	class Turrets: Turrets
 	{
 		class LaserPilot;
 		class Reargun;
 	};
 };
-class 3as_arc_170_green: 3as_arc_170_razor
+class 3as_arc_170_green: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets
@@ -27,7 +27,7 @@ class 3as_arc_170_green: 3as_arc_170_razor
 		class Reargun;
 	};
 };
-class 3as_arc_170_Orange: 3as_arc_170_razor
+class 3as_arc_170_Orange: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets
@@ -36,7 +36,7 @@ class 3as_arc_170_Orange: 3as_arc_170_razor
 		class Reargun;
 	};
 };
-class 3as_arc_170_yellow: 3as_arc_170_razor
+class 3as_arc_170_yellow: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets
@@ -45,7 +45,7 @@ class 3as_arc_170_yellow: 3as_arc_170_razor
 		class Reargun;
 	};
 };
-class 3as_arc_170_red: 3as_arc_170_razor
+class 3as_arc_170_red: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets

addons - Copy/RD501_Vehicles/air/ARC_170X/config.cpp

@@ -26,12 +26,12 @@ class CfgVehicles
 {
 	#include "arc170_inheritance.hpp"
 
-	class macro_new_vehicle(arc_170,razor): 3as_arc_170_razor
+	/*class macro_new_vehicle(arc_170,razor): 3as_arc_170_razor
 	{
 		displayName="ARC-170 (Razor)";
 		#include "../../common/universal_mfd.hpp"
 		#include "arc170_common.hpp"
-	};
+	};*/
 	class macro_new_vehicle(arc_170,blue): 3as_arc_170_blue
 	{
 		displayName="ARC-170 (Blue)";

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

@@ -75,12 +75,12 @@ class _transport_launcher_AA_mags
 };
 class _transport_launcher_PLXAT_mags
 {
-	magazine =  "JLTS_PLX1_AT_Missile"
+	magazine =  "JLTS_PLX1_AT_mag"
 	count = 10;
 };
 class _transport_launcher_PLXAP_mags
 {
-	magazine =  "JLTS_PLX1_AP_Missile"
+	magazine =  "JLTS_PLX1_AP_mag"
 	count = 10;
 };
 class _transport_he3
@@ -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

@@ -140,48 +140,83 @@ class CfgVehicles
 	//O_JM_TX130_1  empire command
 	//O_JM_TX130m1_1 normal
 	//O_JM_TX130m2_1 super
-	class Tank_F;
+class LandVehicle;
+	class Tank: LandVehicle
+	{
+		class NewTurret;
+		class Sounds;
+		class HitPoints;
+	};
+	class Tank_F: Tank
+	{
+		class Turrets
+		{
+			class MainTurret: NewTurret
+			{
+				class Turrets
+				{
+					class CommanderOptics;
+				};
+			};
+		};
+	};
 	class 3as_saber_01_Base: Tank_F
 	{
 		RD501_magclamp_small_offset[] = {0.0,0.0,-3.0};
 		RD501_magclamp_large_offset[] = {0.0,0.0,-3.0};
-		class Turrets;
+		class Turrets:Turrets
+		{
+			class MainTurret_bottom: NewTurret{};
+			class Mainturret_top:MainTurret_bottom{};
+		};
 	};
 
 	 #include "inheritance.hpp"
-	class 3as_saber_Base:3as_saber_01_Base{};
+	class 3as_saber_Base:3as_saber_01_Base
+	{
+		class Turrets:Turrets
+		{
+			class MainTurret_bottom:MainTurret_bottom{};
+			class Mainturret_top:Mainturret_top{};
+		};
+	};
 	class 3as_saber_m1:3as_saber_Base
 	{
 		class Turrets: Turrets
 		{
-			class MainTurret_bottom;
-			class Mainturret_top;
+			class MainTurret_bottom:MainTurret_bottom{};
+			class Mainturret_top:Mainturret_top{};
 		};
 	};
-	class 3as_saber_02_Base:3as_saber_01_Base{};
-	class 3as_saber_m1G:3as_saber_02_Base
+	class 3as_saber_m1G;
+	class 3as_saber_super_base:3as_saber_01_Base
 	{
-		class Turrets: Turrets
+		class Turrets:Turrets
 		{
-			class MainTurret_bottom;
-			class MainTurret_top;
-		}
+			class Mainturret_super: MainTurret_bottom{};
+		};
 	};
-	class 3as_saber_super_base:3as_saber_01_Base{};
 	class 3as_saber_super:3as_saber_super_base
 	{
 		class Turrets: Turrets
 		{
-			class Mainturret_super;
+			class Mainturret_super: Mainturret_super{};
+		};
+	};
+	class 3as_saber_03_Base:3as_saber_01_Base
+	{
+		class Turrets:Turrets
+		{
+			class MainTurret_top: Mainturret_top{};
+			class MainTurret_bottom: MainTurret_bottom{};
 		};
 	};
-	class 3as_saber_03_Base:3as_saber_01_Base{};
 	class 3as_saber_m1Recon:3as_saber_03_Base
 	{
 		class Turrets: Turrets
 		{
-			class MainTurret_top;
-			class MainTurret_bottom;
+			class MainTurret_top: Mainturret_top{};
+			class MainTurret_bottom: MainTurret_bottom{};
 		};
 	};
 	class macro_new_vehicle(saber,republic_tx130_MkII):3as_saber_m1
@@ -193,6 +228,7 @@ class CfgVehicles
 		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{};
@@ -226,18 +262,7 @@ class CfgVehicles
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
-		class Turrets: Turrets
-		{
-			class MainTurret_bottom:MainTurret_bottom{};
-			class MainTurret_top: Mainturret_top
-			{
-				weapons[]=
-				{
-					macro_new_weapon(saber_gl,40mm),
-					"SmokeLauncher"
-				};
-			};
-		};
+		#include "../../common/smallvehiclekit.hpp"
 	};
 	class macro_new_vehicle(saber,republic_tx130_super_MkII):3as_saber_super
 	{
@@ -248,6 +273,7 @@ class CfgVehicles
 		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
@@ -286,6 +312,7 @@ class CfgVehicles
 		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{};
@@ -293,7 +320,7 @@ class CfgVehicles
 			{
 				weapons[]=
 				{
-					macro_new_weapon(saber_gl,40mm),
+					macro_new_weapon(saber_cannon,recon),
 					macro_new_weapon(saber_mg,50cal),
 					"SmokeLauncher",
 					"missiles_DAGR"
@@ -317,243 +344,16 @@ class CfgVehicles
 			};
 		};
 	};
-	//empire
-	/*class macro_new_vehicle(saber,empire_super_saber_MkII):O_JM_TX130m2_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "Super Saber Mk.II (Empire)";
-		macro_saber_smoke
-		macro_saber_driver
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		side=0;
-
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				
-				weapons[] = {
-					macro_super_saber_weap
-				};
-				magazines[] = {
-					macro_super_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,empire_saber_MkII):O_JM_TX130m1_1
-	{
-		scope=2
-		scopeCurator=2;
-		
-		forceInGarage = 1;
-		displayName = "Saber Mk.II (Empire)";
-		macro_saber_smoke
-		armor =1100;
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-		
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		side=0;
-		weapons[] = {
-			macro_saber_main_weap
-		};
-		magazines[] = {
-			macro_saber_main_mag
-		};
-		side=0;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				
-				weapons[] = {
-					macro_saber_weap_imperial
-				};
-				magazines[] = {
-					macro_saber_mag_imperial
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,empire_command_saber_MkII):O_JM_TX130_1//O_JM_TX130r_1
-	{
-		scope=2
-		scopeCurator=2;
-		forceInGarage = 1;
-		displayName = "Saber (Command) Mk.II (Empire)";
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		armor = 750;
-		macro_command_saber_smoke
-		macro_saber_driver
-		side=0;
-		faction = macro_empire_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-	
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_saber_weap_imperial
-				};
-				magazines[] = {
-					macro_saber_mag_imperial
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	//republic
-	class macro_new_vehicle(saber,republic_super_saber_MkII):O_JM_TX130m2_1
-	{
-		scope=2
-		side=1;
-		forceInGarage = 1;
-		displayName = "Super Saber Mk.II (Republic)";
-		macro_republic_skin
-		crew = "SWOP_Clonetrooper_P1";
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-
-		macro_saber_driver
-		macro_saber_smoke
-		armor = 600;
-
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_super_saber_weap
-				};
-				magazines[] = {
-					macro_super_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,republic_saber_MkII):O_JM_TX130m1_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "Saber Mk.II (Republic)";
-		macro_republic_skin
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		
-		crew = "SWOP_Clonetrooper_P1";
-		armor =1100;
-		macro_saber_smoke
-		weapons[] = {
-			macro_saber_main_weap
-		};
-		magazines[] = {
-			macro_saber_main_mag
-		};
-
-
-		side=1;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_saber_weap
-				};
-				magazines[] = {
-					macro_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(saber,republic_command_saber_MkII):O_JM_TX130_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "Saber (Command) Mk.II (Republic)";
-		macro_republic_skin
-
-		macro_saber_driver
-		macro_command_saber_smoke
-		armor = 750;
-
-		RD501_magclamp_small_offset[] = {0.0,2.0,-3.0};
-		RD501_magclamp_large_offset[] = {0.0,2.0,-3.0};
-
-		crew = "SWOP_Clonetrooper_P1";
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		side=1;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {
-					macro_saber_weap
-				};
-				magazines[] = {
-					macro_saber_mag
-				};
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};*/
-
-
-
 };
 
 class CfgWeapons
 {
 	class 3AS_Sabre_MG;
-	class 3as_saber_gmg_40mm;
 	class 3AS_Sabre_Cannons_Super;
 	class LMG_M200;
-	class autocannon_Base_F
-	{
-		class player;
-	};
 	class 3as_saber_autocannon_30mm:LMG_M200
 	{
-		class HE: autocannon_Base_F
-		{
-			class player:player{};
-		};
+		class HE;
 	};
 	class macro_new_weapon(saber_mg,50cal):3AS_Sabre_MG
 	{
@@ -563,21 +363,13 @@ class CfgWeapons
 			macro_new_mag(saber_mg,300)
 		};
 	};
-	class macro_new_weapon(saber_gl,40mm):3as_saber_gmg_40mm
-	{
-		magazineReloadTime=3;
-		magazines[]=
-		{
-			macro_new_mag(saber_recon,100)
-		};
-	};
 	class macro_new_weapon(saber_cannon,supermkii):3AS_Sabre_Cannons_Super
 	{
 		magazineReloadTime=6;
 	};
-	class macro_new_weapon(saber_cannon,super):3as_saber_autocannon_30mm
+	class macro_new_weapon(saber_cannon,recon):3as_saber_autocannon_30mm
 	{
-		class HE: autocannon_Base_F
+		class HE: HE
 		{
 			magazines[]=
 			{
@@ -591,14 +383,14 @@ class CfgWeapons
 class CfgMagazines
 {
 	class 3AS_300Rnd_SabreMG_Mag;
-	class 3as_saber_200Rnd_autocannon_30mm_mag;
+	class 3as_saber_80Rnd_autocannon_30mm_mag;
 	class macro_new_mag(saber_mg,300):3AS_300Rnd_SabreMG_Mag
 	{
 		displayName="300 Rnd Heavy MG Ammo";
 		displayNameShort="Heavy MG";
 		ammo=macro_new_ammo(saber_mg)
 	};
-	class macro_new_mag(saber_recon,100):3as_saber_200Rnd_autocannon_30mm_mag
+	class macro_new_mag(saber_recon,100):3as_saber_80Rnd_autocannon_30mm_mag
 	{
 		count=100;
 	};

addons - Copy/RD501_Vehicles/static/bacta/config.cpp

@@ -58,6 +58,26 @@ class CfgVehicles
 	
 		editorSubcategory = macro_editor_cat(static_msc)
 		class EventHandlers:DefaultEventhandlers {}; 
+         class ACE_Actions {
+            class ACE_MainActions {
+				displayName = "Bacta Tank";
+                selection = "";
+                distance = 4;
+                condition = "true";
+                class RD501_Heal_All_Nearby
+                {
+                    displayName = "Heal Nearby";
+                    statement = "[_player, _target, 10] call rd501_fnc_healAllNearby";
+                    condition = "true";
+                };
+				class RD501_Heal_Self
+				{
+					displayName = "Heal";
+					statement = "[_player, _player] call ace_medical_treatment_fnc_fullHeal";
+					condition = "true";
+				};
+            };
+        };
 		
 	};
 	

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_15a/config.cpp

@@ -29,90 +29,13 @@ class CfgPatches
 
 class cfgWeapons 
 {
-	/*class Rifle_Long_Base_F;
-	class SWOP_BlasterRifle_Base:Rifle_Long_Base_F
-	{
-		class WeaponSlotsInfo;
-	};
-
-	class SWOP_DC15ABlasterRifle:SWOP_BlasterRifle_Base
-	{
-		
-		class FlashLight;
-		class Single;
-		class Burst;
-		class FullAuto;
-		class Secondary;
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	};
-
-	class SWOP_DC15ABlasterRifle_mod0:SWOP_DC15ABlasterRifle
-	{
-		
-		class FullAuto:FullAuto
-		{
-
-		};
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	};
-	
-	class SWOP_DC15AGL:SWOP_DC15ABlasterRifle
-	{
-	
-		class Single:Single
-		{
-
-		};
-		class Burst:Burst
-		{
-
-		};
-		class FullAuto:FullAuto
-		{
-
-		};
-
-		class EGLM;
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-
-	};
-
-	class SWOP_DC15ABlasterRifle_mod1: SWOP_DC15ABlasterRifle
-	{
-		class Single:Single
-		{
-
-		};
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	}*/
 	class 3AS_DC15A_Base_F;
 	class RD501_stun_muzzle;
 	class 3AS_DC15A_F:3AS_DC15A_Base_F
 	{
 		class Single;
 		class Burst;
-		class WeaponSlotsInfo
-		{
-			class CowsSlot;
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15a):3AS_DC15A_F
 	{
@@ -147,16 +70,34 @@ class cfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
-				access = 1;
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\a3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,dc_r15a_acog)
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -167,7 +108,7 @@ class cfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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

@@ -28,12 +28,7 @@ class CfgWeapons
 	{
 		class FullAuto;
 		class Single;
-		class WeaponSlotsInfo
-			{
-			class CowsSlot;	
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15c):3AS_DC15C_F
 	{
@@ -67,7 +62,7 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -80,10 +75,20 @@ class CfgWeapons
 				{
 					"RD501_RCO",
 					"RD501_RCO_2",
-					"RD501_RCO_3"
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -94,7 +99,7 @@ class CfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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

@@ -94,16 +94,19 @@ class CfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
-					//macro_new_weapon(scope,dc_15a_acog),
-					//"RD501_RCO",
-					//"RD501_RCO_2",
-					//"RD501_RCO_3",
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
 					"RD501_MRCO",
 					"RD501_MRCO_2",
 					"RD501_MRCO_3"
-					//"RD501_Holosight",
-					//"RD501_Holosight_2",
-					//"RD501_Holosight_3"
 				};
 
 			};
@@ -164,20 +167,58 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass=80;
+			class CowsSlot
+			{
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\a3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
+				compatibleItems[] = 
+				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
+				};
+			};
+			class MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+			class PointerSlot
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
+			};
 		};
 	};
-	class 3AS_DC15C_Base_GL;
-	class 3AS_DC15C_GL: 3AS_DC15C_Base_GL
+	class 3AS_DC15C_Base_F;
+	class 3AS_DC15C_GL: 3AS_DC15C_Base_F
 	{
 		class 3AS_15CGL;
 		class FullAuto;
 		class Single;
-		class WeaponSlotsInfo
-			{
-			class CowsSlot;	
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15cgl):3AS_DC15C_GL
 	{
@@ -185,6 +226,7 @@ class CfgWeapons
 		dispersion=0.00116;
 		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mxc";
+		scope = 2;
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)
@@ -224,7 +266,7 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -235,12 +277,22 @@ class CfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
-					/*"RD501_RCO",
+					"RD501_RCO",
 					"RD501_RCO_2",
-					"RD501_RCO_3"*/
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -251,7 +303,7 @@ class CfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot 
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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

@@ -29,12 +29,7 @@ class CfgWeapons
 	{
 		class FullAuto;
 		class Single;
-		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
-		class MuzzleSlot;
-		class UnderBarrelSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15l):3AS_DC15L_F
 	{
@@ -59,16 +54,34 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
-				access = 1;
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\a3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,dc_15a_acogtcw)
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 
 			};
-		class UnderBarrelSlot:UnderBarrelSlot
+		class UnderBarrelSlot
 			{
 			linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
 			compatibleItems[]=
@@ -78,7 +91,7 @@ class CfgWeapons
 			iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
 			iconPinpoint="Bottom";
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";

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

@@ -182,12 +182,7 @@ class cfgWeapons
 	{
 		class Single;
 		class FullAuto;
-		class WeaponSlotsInfo
-		{
-			class CowsSlot;
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,r15s):3AS_DC15S_F
 	{
@@ -220,7 +215,7 @@ class cfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -231,12 +226,22 @@ class cfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
 					"RD501_Holosight",
 					"RD501_Holosight_2",
-					"RD501_Holosight_3"
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -247,7 +252,7 @@ class cfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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/DC_Family/DC_17/config.cpp

@@ -21,7 +21,9 @@ class CfgPatches
 			macro_new_weapon(DC,17a),
 			macro_new_weapon(DC,r17),
 			macro_new_weapon(DC,r17a),
-			macro_new_weapon(DC,17sig)
+			macro_new_weapon(DC,17sig),
+			macro_new_weapon(DC,r17_shield),
+			macro_new_weapon(DC,r17a_shield)
 			
 		};
 	};
@@ -119,6 +121,8 @@ class cfgWeapons
 		reloadAction="GestureReloadPistol";
 		baseWeapon=macro_new_weapon(DC,r17)
 		JLTS_hasElectronics=0;
+		JLTS_canHaveShield=1;
+		JLTS_shieldedWeapon=macro_new_weapon(DC,r17_shield)
 		magazines[]=
 		{
 			macro_new_mag(5mw,10)
@@ -163,11 +167,49 @@ class cfgWeapons
 			};
 		};
 	};
+	class macro_new_weapon(DC,r17_shield): macro_new_weapon(DC,r17)
+	{
+		displayName="Republic DC-17 Shield";
+		baseWeapon=macro_new_weapon(DC,r17_shield)
+		scope=1;
+		JLTS_isShielded=1;
+		JLTS_baseWeapon=macro_new_weapon(DC,r17)
+		model="\MRC\JLTS\weapons\DC17SA\DC17SA_shielded.p3d";
+		handAnim[]=
+		{
+			"OFP2_ManSkeleton",
+			"\MRC\JLTS\weapons\DC17SA\anims\DC17SA_shielded_handanim.rtm"
+		};
+		inertia=0.80000001;
+		recoil="recoil_pdw";
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass=110;
+			class UnderBarrelSlot
+			{
+				linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
+				iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
+				iconPinpoint="Bottom";
+				compatibleItems[]=
+				{
+					"JLTS_riot_shield_attachment",
+					"JLTS_riot_shield_212_attachment",
+					"JLTS_riot_shield_501_attachment",
+					"JLTS_riot_shield_101_attachment",
+					"JLTS_riot_shield_CG_attachment",
+					"JLTS_riot_shield_GD_attachment",
+					"JLTS_riot_shield_droid_attachment"
+				};
+			};
+		};
+	};
 	class macro_new_weapon(DC,r17a):JLTS_DC17SA
 	{
 		displayName="Republic DC-17A";
 		baseWeapon=macro_new_weapon(DC,r17a)
 		JLTS_hasElectronics=0;
+		JLTS_canHaveShield=1;
+		JLTS_shieldedWeapon=macro_new_weapon(DC,r17a_shield)
 		magazines[]=
 		{
 			macro_new_mag(2mw,30)
@@ -221,6 +263,42 @@ class cfgWeapons
 			};
 		};
 	};
+	class macro_new_weapon(DC,r17a_shield): macro_new_weapon(DC,r17a)
+	{
+		displayName="Republic DC-17A Shield";
+		baseWeapon=macro_new_weapon(DC,r17a_shield)
+		scope=1;
+		JLTS_isShielded=1;
+		JLTS_baseWeapon=macro_new_weapon(DC,r17a)
+		model="\MRC\JLTS\weapons\DC17SA\DC17SA_shielded.p3d";
+		handAnim[]=
+		{
+			"OFP2_ManSkeleton",
+			"\MRC\JLTS\weapons\DC17SA\anims\DC17SA_shielded_handanim.rtm"
+		};
+		inertia=0.80000001;
+		recoil="recoil_pdw";
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass=110;
+			class UnderBarrelSlot
+			{
+				linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
+				iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
+				iconPinpoint="Bottom";
+				compatibleItems[]=
+				{
+					"JLTS_riot_shield_attachment",
+					"JLTS_riot_shield_212_attachment",
+					"JLTS_riot_shield_501_attachment",
+					"JLTS_riot_shield_101_attachment",
+					"JLTS_riot_shield_CG_attachment",
+					"JLTS_riot_shield_GD_attachment",
+					"JLTS_riot_shield_droid_attachment"
+				};
+			};
+		};
+	};
 	class macro_new_weapon(DC,17sig):JLTS_DC17SA
 		{
 			scope=2;

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -28,11 +28,7 @@ class CfgWeapons
 	class 3AS_Valken38X_F:3AS_Valken38X_Base_F
 	{
 		class Single;
-		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
-		class MuzzleSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon_nofam(valken38x):3AS_Valken38X_F
 	{
@@ -52,15 +48,34 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 80;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
-				access = 1;
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\A3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
+				access=1;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,valken_6_12x)
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -77,11 +92,7 @@ class CfgWeapons
 	class JLTS_DW32S:arifle_MX_Base_F
 	{
 		class Single;
-		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
-		class MuzzleSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon_nofam(valken38y):JLTS_DW32S
 	{
@@ -102,7 +113,7 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 80;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -114,13 +125,22 @@ class CfgWeapons
 				access=1;
 				compatibleItems[] = 
 				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
 					"RD501_DMS",
 					"RD501_DMS_2",
 					"RD501_DMS_3",
-					"RD501_DMS_4"
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";

addons - Copy/RD501_Weapons/Westar/config.cpp

@@ -68,6 +68,7 @@ class cfgWeapons
 	{
 		class Single;
 		class FullAuto;
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(westar,rm5):3AS_WestarM5_F
 	{
@@ -87,6 +88,53 @@ class cfgWeapons
 		{
 			reloadTime=0.1;
 		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot
+			{
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\a3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
+				compatibleItems[] = 
+				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
+				};
+			};
+			class MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+			class PointerSlot
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
+			};
+		};
 	};
 };
 

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/_ammo/40mm_flare.hpp

@@ -1,69 +0,0 @@
-    class macro_new_ammo(40mm_white): FlareBase
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	
-		lightColor[] = {1, 1, 1 ,1};
-		useFlare = 1;
-		deflecting = 30;
-		smokeColor[] = {1, 1, 1, 1};
-
-		brightness = 1200;
-		size = 3;//1
-		triggerTime = 3;
-		triggerSpeedCoef = 1;
-		audibleFire = 20;
-		
-		intensity  = 1000000;
-		flareSize = 3;//1
-		timeToLive = 120;
-        flareMaxDistance = 300;
-		
-	};
-
-
-	class macro_new_ammo(40mm_green): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {0, 1, 0, 0};
-	};
-	class macro_new_ammo(40mm_red): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {1, 0, 0, 0};
-	};
-	class macro_new_ammo(40mm_yellow): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {1, 1, 0, 0};
-	};
-	class macro_new_ammo(40mm_CIR): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		lightColor[] = {0.5, 0.5, 0.25, 0};
-	};
-
-	class macro_new_ammo(40mm_blue): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	
-		lightColor[] = {0, 0, 1, 0};
-	};
-
-	class macro_new_ammo(40mm_cyan): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	
-		lightColor[] = {0, 1, 1, 0};
-	};
-
-	class macro_new_ammo(40mm_purple): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {.7, 0, 1, 0};
-	};
-
-	

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -31,6 +31,18 @@ class CfgAmmo
 	class SWOP_termDet;
 	class B_12Gauge_Pellets_Submunition;
 	class  B_12Gauge_Pellets_Submunition_Deploy;
+	class FlareBase;
+	class JLTS_bullet_stun;
+	class macro_new_ammo(surrender_stun): JLTS_bullet_stun
+	{
+		model="\MRC\JLTS\weapons\Core\effects\stun.p3d";
+		hit=0.0099999998;
+		JLTS_isStunAmmo=0;
+		typicalSpeed=30;
+		timetolive=3;
+		aiAmmoUsageFlags=0;
+		RD501_stunDuration=30;
+	};
 	class macro_new_ammo(2mw):3AS_EC20_BluePlasma
 	{
 		hit=4;
@@ -260,7 +272,7 @@ class CfgAmmo
 	class macro_new_ammo(shotgun_scatter): B_12Gauge_Pellets_Submunition
 	{
 		hit=20;
-		submunitionConeAngle = 0.8;
+		submunitionConeAngle = 1;
 		submunitionAmmo=macro_new_ammo(shotgun_scatter_submunition)
 	};
 	class macro_new_ammo(shotgun_scatter_submunition) : B_12Gauge_Pellets_Submunition_Deploy
@@ -270,7 +282,7 @@ class CfgAmmo
 	class macro_new_ammo(shotgun_HE): B_12Gauge_Pellets_Submunition
 	{
 		hit=20;
-		submunitionConeAngle = 3;
+		submunitionConeAngle = 4;
 		submunitionAmmo=macro_new_ammo(shotgun_HE_submunition)
 	};
 	class macro_new_ammo(shotgun_HE_submunition) : B_12Gauge_Pellets_Submunition_Deploy
@@ -291,4 +303,75 @@ class CfgAmmo
 		timeToLive = 0.05;
 		JLTS_isEMPAmmo=1;
 	};
-};
+///////////////////////////////////////////////////////////////////////
+/////////////////////////Flares///////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+   class macro_new_ammo(40mm_white): FlareBase
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+	
+		lightColor[] = {1, 1, 1 ,1};
+		useFlare = 1;
+		deflecting = 30;
+		smokeColor[] = {1, 1, 1, 1};
+
+		brightness = 1200;
+		size = 3;//1
+		triggerTime = 3;
+		triggerSpeedCoef = 1;
+		audibleFire = 20;
+		
+		intensity  = 1000000;
+		flareSize = 3;//1
+		timeToLive = 120;
+        flareMaxDistance = 300;
+		
+	};
+
+
+	class macro_new_ammo(40mm_green): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+		
+		lightColor[] = {0, 1, 0, 0};
+	};
+	class macro_new_ammo(40mm_red): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+		
+		lightColor[] = {1, 0, 0, 0};
+	};
+	class macro_new_ammo(40mm_yellow): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+		
+		lightColor[] = {1, 1, 0, 0};
+	};
+	class macro_new_ammo(40mm_CIR): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+		lightColor[] = {0.5, 0.5, 0.25, 0};
+	};
+
+	class macro_new_ammo(40mm_blue): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+	
+		lightColor[] = {0, 0, 1, 0};
+	};
+
+	class macro_new_ammo(40mm_cyan): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+	
+		lightColor[] = {0, 1, 1, 0};
+	};
+
+	class macro_new_ammo(40mm_purple): macro_new_ammo(40mm_white)
+	{
+		model = "\A3\Weapons_F\Ammo\UGL_Flare";
+		
+		lightColor[] = {.7, 0, 1, 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";
@@ -195,6 +196,7 @@ class CfgMagazines
 		displayNameShort = "5 Round Stun Cell";
 		count=5;
 		picture="\MRC\JLTS\weapons\Core\data\ui\stun_mag_ui_ca";
+		ammo=macro_new_ammo(surrender_stun)
 	};
 
 	////////////////////////////////////////////////////
@@ -376,4 +378,160 @@ class CfgMagazines
 		ammo = macro_new_ammo(shotgun_EMP)
 		descriptionShort = "2 Rnd EMP";
 	};
+	////////////////////////////////////////////////////
+	/////////////Flare    Magazines/////////////////////
+	////////////////////////////////////////////////////
+class macro_new_mag(40mm_white,3): UGL_FlareWhite_F
+{
+	author = "RD501";
+	scope = 2;
+	type = 16;
+	displayName = "Flare 3 Rounds (White)";
+	displayNameShort = "White Flare";
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_CA.paa";
+	model = "\A3\Weapons_F\Ammo\UGL_Flare";
+	ammo = macro_new_ammo(40mm_white);
+	initSpeed = 80;
+	count = 3;
+	nameSound = "";
+	descriptionShort = "Type: Flare 3 Rounds - White <br />Rounds: 1<br />Used in: EGLM, 3GL";
+	weaponPoolAvailable = 1;
+	mass = 4;
+};
+
+class macro_new_mag(40mm_white,1):macro_new_mag(40mm_white,3)
+{
+	displayName = "Flare 1 Rounds (White)";
+	descriptionShort = "Type: Flare 1 Rounds - White";
+	mass = 1;
+    count = 1;
+};
+
+class macro_new_mag(40mm_CIR,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (IR)";
+	ammo = macro_new_ammo(40mm_cir);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_purple_CA.paa";
+	descriptionShort = "Type: Flare - IR<br />Rounds: 1<br />Used in: EGLM, 3GL";
+	displayNameShort = "IR";
+};
+
+class macro_new_mag(40mm_CIR,1):macro_new_mag(40mm_CIR,3)
+{
+	displayName = "Flare 1 Rounds (IR)";
+	descriptionShort = "Type: Flare 1 Rounds - IR";
+	mass = 1;
+    count = 1;
+};
+
+class macro_new_mag(40mm_Green,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (Green)";
+	displayNameShort = "Green Flare";
+	ammo = macro_new_ammo(40mm_green);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_Green_CA.paa";
+	descriptionShort = "Type: Flare - Green<br />Rounds: 1<br />Used in: EGLM, 3GL";
+};
+
+class macro_new_mag(40mm_Green,1):macro_new_mag(40mm_Green,3)
+{
+	displayName = "Flare 1 Rounds (Green)";
+	descriptionShort = "Type: Flare 1 Rounds - Green";
+	mass = 1;
+    count = 1;
+};
+
+class macro_new_mag(40mm_Red,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (Red)";
+	ammo = macro_new_ammo(40mm_red);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_Red_CA.paa";
+	descriptionShort = "Type: Flare - Red<br />Rounds: 1<br />Used in: EGLM, 3GL";
+	displayNameShort = "Red Flare";
+};
+
+
+class macro_new_mag(40mm_Red,1):macro_new_mag(40mm_Red,3)
+{
+	displayName = "Flare 1 Rounds (Red)";
+	descriptionShort = "Type: Flare 1 Rounds - Red";
+	mass = 1;
+    count = 1;
+};
+
+class macro_new_mag(40mm_Yellow,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (Yellow)";
+	ammo = macro_new_ammo(40mm_yellow);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
+	descriptionShort = "Type: Flare - Yellow<br />Rounds: 1<br />Used in: EGLM, 3GL";
+	displayNameShort = "Yellow Flare";
+};
+
+class macro_new_mag(40mm_Yellow,1):macro_new_mag(40mm_Yellow,3)
+{
+	displayName = "Flare 1 Rounds (Yellow)";
+	descriptionShort = "Type: Flare 1 Rounds - Yellow";
+	mass = 1;
+    count = 1;
+};
+
+class macro_new_mag(40mm_Blue,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (Blue)";
+	ammo = macro_new_ammo(40mm_blue);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
+	descriptionShort = "Type: Flare - Blue<br />Rounds: 1<br />Used in: EGLM, 3GL";
+	displayNameShort = "Blue Flare";
+};
+
+class macro_new_mag(40mm_Blue,1):macro_new_mag(40mm_Blue,3)
+{
+	displayName = "Flare 1 Rounds (Blue)";
+	descriptionShort = "Type: Flare 1 Rounds - Blue";
+	mass = 1;
+    count = 1;
+};
+
+
+class macro_new_mag(40mm_Cyan,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (Cyan)";
+	ammo = macro_new_ammo(40mm_cyan);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
+	descriptionShort = "Type: Flare - Cyan<br />Rounds: 1<br />Used in: EGLM, 3GL";
+	displayNameShort = "Cyan Flare";
+};
+
+class macro_new_mag(40mm_Cyan,1):macro_new_mag(40mm_Cyan,3)
+{
+	displayName = "Flare 1 Rounds (Cyan)";
+	descriptionShort = "Type: Flare 1 Rounds - Cyan";
+	mass = 1;
+    count = 1;
+};
+
+class macro_new_mag(40mm_Purple,3): macro_new_mag(40mm_white,3)
+{
+	author = "Bohemia Interactive";
+	displayName = "Flare 3 Rounds (Purple)";
+	ammo = macro_new_ammo(40mm_purple);
+	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
+	descriptionShort = "Type: Flare - Purple<br />Rounds: 1<br />Used in: EGLM, 3GL";
+	displayNameShort = "Purple Flare";
+};
+
+class macro_new_mag(40mm_Purple,1):macro_new_mag(40mm_Purple,3)
+{
+	displayName = "Flare 1 Rounds (Purple)";
+	descriptionShort = "Type: Flare 1 Rounds - Purple";
+	mass = 1;
+    count = 1;
+};
 };

addons - Copy/RD501_Weapons/_mag/flare_mag.hpp

@@ -1,153 +0,0 @@
-class macro_new_mag(40mm_white,3): UGL_FlareWhite_F
-{
-	author = "RD501";
-	scope = 2;
-	type = 16;
-	displayName = "Flare 3 Rounds (White)";
-	displayNameShort = "White Flare";
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_CA.paa";
-	model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	ammo = macro_new_ammo(40mm_white);
-	initSpeed = 80;
-	count = 3;
-	nameSound = "";
-	descriptionShort = "Type: Flare 3 Rounds - White <br />Rounds: 1<br />Used in: EGLM, 3GL";
-	weaponPoolAvailable = 1;
-	mass = 4;
-};
-
-class macro_new_mag(40mm_white,1):macro_new_mag(40mm_white,3)
-{
-	displayName = "Flare 1 Rounds (White)";
-	descriptionShort = "Type: Flare 1 Rounds - White";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_CIR,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (IR)";
-	ammo = macro_new_ammo(40mm_cir);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_purple_CA.paa";
-	descriptionShort = "Type: Flare - IR<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "IR";
-};
-
-class macro_new_mag(40mm_CIR,1):macro_new_mag(40mm_CIR,3)
-{
-	displayName = "Flare 1 Rounds (IR)";
-	descriptionShort = "Type: Flare 1 Rounds - IR";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Green,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Green)";
-	displayNameShort = "Green Flare";
-	ammo = macro_new_ammo(40mm_green);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_Green_CA.paa";
-	descriptionShort = "Type: Flare - Green<br />Rounds: 1<br />Used in: EGLM, 3GL";
-};
-
-class macro_new_mag(40mm_Green,1):macro_new_mag(40mm_Green,3)
-{
-	displayName = "Flare 1 Rounds (Green)";
-	descriptionShort = "Type: Flare 1 Rounds - Green";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Red,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Red)";
-	ammo = macro_new_ammo(40mm_red);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_Red_CA.paa";
-	descriptionShort = "Type: Flare - Red<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Red Flare";
-};
-
-
-class macro_new_mag(40mm_Red,1):macro_new_mag(40mm_Red,3)
-{
-	displayName = "Flare 1 Rounds (Red)";
-	descriptionShort = "Type: Flare 1 Rounds - Red";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Yellow,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Yellow)";
-	ammo = macro_new_ammo(40mm_yellow);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Yellow<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Yellow Flare";
-};
-
-class macro_new_mag(40mm_Yellow,1):macro_new_mag(40mm_Yellow,3)
-{
-	displayName = "Flare 1 Rounds (Yellow)";
-	descriptionShort = "Type: Flare 1 Rounds - Yellow";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Blue,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Blue)";
-	ammo = macro_new_ammo(40mm_blue);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Blue<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Blue Flare";
-};
-
-class macro_new_mag(40mm_Blue,1):macro_new_mag(40mm_Blue,3)
-{
-	displayName = "Flare 1 Rounds (Blue)";
-	descriptionShort = "Type: Flare 1 Rounds - Blue";
-	mass = 1;
-    count = 1;
-};
-
-
-class macro_new_mag(40mm_Cyan,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Cyan)";
-	ammo = macro_new_ammo(40mm_cyan);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Cyan<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Cyan Flare";
-};
-
-class macro_new_mag(40mm_Cyan,1):macro_new_mag(40mm_Cyan,3)
-{
-	displayName = "Flare 1 Rounds (Cyan)";
-	descriptionShort = "Type: Flare 1 Rounds - Cyan";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Purple,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Purple)";
-	ammo = macro_new_ammo(40mm_purple);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Purple<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Purple Flare";
-};
-
-class macro_new_mag(40mm_Purple,1):macro_new_mag(40mm_Purple,3)
-{
-	displayName = "Flare 1 Rounds (Purple)";
-	descriptionShort = "Type: Flare 1 Rounds - Purple";
-	mass = 1;
-    count = 1;
-};