Adjusted AAT/GAT/Vulture armor

Fixed gun sounds on repeaters
Reduced GL firing rate
Guns can now fire underwater

addons - Copy/RD501_Vehicle_Weapons/aircraft/generic/aircraft_laser_gun.hpp

@@ -16,30 +16,97 @@
 			displayName="Aircraft Laser Cannon";
 			sounds[]=
 			{
-				"StandardSound_1"
+				"StandardSound"
 			};
-			class StandardSound_1
+			class StandardSound
 			{
 				begin1[]=
 				{
-					"3as\3as_saber\sounds\wpn_saberTank_autocannon_fire",
-					1.99526,
+					"3AS\3AS_AAT\data\sounds\AAT_Cannon.wss",
+					1,
+					0.89999998,
+					6000
+				};
+				begin2[]=
+				{
+					"3AS\3AS_AAT\data\sounds\AAT_Cannon.wss",
 					1,
-					1500
+					0.89999998,
+					6000
 				};
 				soundBegin[]=
 				{
 					"begin1",
-					0.33000001
+					0.1,
+					"begin2",
+					0.5
 				};
-				soundsetshot[]=
+				class SoundTails
 				{
-					"Autocannon30mmTurret_Shot_SoundSet",
-					"Autocannon30mmBody_tail_SoundSet"
+					class TailForest
+					{
+						sound[]=
+						{
+							"A3\Sounds_F\arsenal\weapons\LongRangeRifles\GM6_Lynx\GM6_tail_forest",
+							1,
+							1,
+							2200
+						};
+						frequency=1;
+						volume="(1-interior/1.4)*forest";
+					};
+					class TailHouses
+					{
+						sound[]=
+						{
+							"A3\Sounds_F\arsenal\weapons\LongRangeRifles\GM6_Lynx\GM6_tail_houses",
+							1,
+							1,
+							2200
+						};
+						frequency=1;
+						volume="(1-interior/1.4)*houses";
+					};
+					class TailInterior
+					{
+						sound[]=
+						{
+							"A3\Sounds_F\arsenal\weapons\LongRangeRifles\GM6_Lynx\GM6_tail_interior",
+							1.99526,
+							1,
+							2200
+						};
+						frequency=1;
+						volume="interior";
+					};
+					class TailMeadows
+					{
+						sound[]=
+						{
+							"A3\Sounds_F\arsenal\weapons\LongRangeRifles\GM6_Lynx\GM6_tail_meadows",
+							1,
+							1,
+							2200
+						};
+						frequency=1;
+						volume="(1-interior/1.4)*(meadows/2 max sea/2)";
+					};
+					class TailTrees
+					{
+						sound[]=
+						{
+							"A3\Sounds_F\arsenal\weapons\LongRangeRifles\GM6_Lynx\GM6_tail_trees",
+							1,
+							1,
+							2200
+						};
+						frequency=1;
+						volume="(1-interior/1.4)*trees";
+					};
 				};
 			};
 			ballisticsComputer = 4;
-			soundContinuous=1;
+			soundContinuous=0;
 			autoFire=1;
 			multiplier=1;
 			flash="gunfire";

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

@@ -41,100 +41,97 @@ class CfgPatches
 
 class CfgVehicles
 {
-	class swop_vulture;
-
-	class macro_new_vehicle(vulture,MKII) : swop_vulture
+	class Air;
+	class Plane: Air
 	{
-		scope = 2;
-		scopeCurator=2;
-		displayName="Vulture Droid Mk.II";
-	    altFullForce = 6000;
-	    altNoForce = 9000;
-		armor = 500;
-		forceInGarage=1;
-
-		crew=macro_new_unit_class(opfor,B1_pilot)
-		
-		airBrakeFrictionCoef = 80.4;
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat_air(CIS)
-		vehicleClass = macro_editor_vehicle_type_air(CIS)
-
-		class EventHandlers{};
-
-		class UserActions
-		{
-			class AfterburnerOn
-			{
-				displayName = "<t color='#4C9900'>[Afterburner On]</t>";
-				shortcut = "";
-				condition = "speed this >50 and (!(this getVariable 'AfterBurnervulture'))";
-				statement = "this setVariable ['AfterBurnervulture',true];this spawn nes4day_afterburnervulture";
-				priority = 1e+011;
-				displayNameDefault = "";
-				position = "pilotview";
-				radius = 10;
-				onlyforplayer = 1;
-			};
-			class AfterburnerOff
-			{
-				displayName = "<t color='#FF9933'>[Afterburner Off]</t>";
-				shortcut = "";
-				condition = "(this getVariable 'AfterBurnervulture')";
-				statement = "this setVariable ['AfterBurnervulture',false]";
-				priority = 1e+011;
-				displayNameDefault = "";
-				position = "pilotview";
-				radius = 10;
-				onlyforplayer = 1;
-			};
-		};
-		
-		weapons[] = {
-			macro_basic_air_weapons,
-			macro_new_weapon(generic,cis_aircraft_cannon)
-		};
-		magazines[] = {
-			macro_basic_air_mags,
-			macro_new_mag(generic_aircraft_cannon_red,1000),
-			macro_new_mag(generic_aircraft_cannon_red,1000),
-		};
-		
+		class HitPoints;
 	};
-	class Plane;
 	class Plane_Base_F: Plane
 	{
 		class Components;
+		class HitPoints: HitPoints
+		{
+			class HitHull;
+		};
 	};
 	class Plane_Fighter_03_base_F: Plane_Base_F
 	{
 		class Components: Components{};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull
+			{
+			};
+		};
 	};
 	class Plane_Fighter_03_dynamicLoadout_base_F:Plane_Fighter_03_base_F
 	{
 		class Components: Components{};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull
+			{
+			};
+		};
 	};
 	class 3as_vulture_dynamicLoadout_base:Plane_Fighter_03_dynamicLoadout_base_F
 	{
 		class Components:Components{};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull
+			{
+			};
+		};
 	};
 	class 3as_Vulture_dynamicLoadout:3as_vulture_dynamicLoadout_base
 	{
 		class Components:Components{};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull
+			{
+			};
+		};
 	};
 	class macro_new_vehicle(cis,vulture_elite) : 3as_Vulture_dynamicLoadout
 	{
 		displayName="CIS Vulture Elite Droid"
-		maxSpeed=700;
+		maxSpeed=750;
 		airBrake=20;
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull
+			{
+				name="HitHull";
+				visual="Hit_Hull";
+				armor=7;
+				explosionShielding=3.5;
+				passThrough=1;
+				radius=0.5;
+				minimalHit=0.050000001;
+				depends="0";
+				material=-1;
+			};
+			class HitEngine: HitHull
+			{
+				name="HitEngine";
+				visual="Hit_Engine";
+				armor=4.5;
+				explosionShielding=4;
+				passThrough=1;
+				radius=0.60000002;
+				minimalHit=0.050000001;
+			};
+		};
 	};
 	class macro_new_vehicle(cis,vulture) : 3as_Vulture_dynamicLoadout
 	{
 		displayName="CIS Vulture Droid"
-		maxSpeed=700;
+		maxSpeed=750;
 		airBrake=20;
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
@@ -144,5 +141,30 @@ class CfgVehicles
 			class TransportPylonsComponent
 			{};
 		};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull
+			{
+				name="HitHull";
+				visual="Hit_Hull";
+				armor=7;
+				explosionShielding=3.5;
+				passThrough=1;
+				radius=0.5;
+				minimalHit=0.050000001;
+				depends="0";
+				material=-1;
+			};
+			class HitEngine: HitHull
+			{
+				name="HitEngine";
+				visual="Hit_Engine";
+				armor=4.5;
+				explosionShielding=4;
+				passThrough=1;
+				radius=0.60000002;
+				minimalHit=0.050000001;
+			};
+		};
 	};
 };

addons - Copy/RD501_Vehicles/land/AAT/3as_import.hpp

@@ -18,6 +18,14 @@ class Tank_F: Tank {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull;
+		class HitFuel;
+		class HitEngine;
+		class HitLTrack;
+		class HitRTrack;
+	};
 };
 
 class 3AS_AAT_base_F : Tank_F {
@@ -29,6 +37,14 @@ class 3AS_AAT_base_F : Tank_F {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_CIS_AAT_base_F : 3AS_AAT_base_F {
@@ -43,6 +59,14 @@ class 3AS_CIS_AAT_base_F : 3AS_AAT_base_F {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_CIS_AAT_F : 3AS_CIS_AAT_base_F {
@@ -57,6 +81,14 @@ class 3AS_CIS_AAT_F : 3AS_CIS_AAT_base_F {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_AAT : 3AS_CIS_AAT_F {
@@ -68,6 +100,14 @@ class 3AS_AAT : 3AS_CIS_AAT_F {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_AAT_snow : 3AS_AAT {
@@ -79,6 +119,14 @@ class 3AS_AAT_snow : 3AS_AAT {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_AAT_tan : 3AS_AAT {
@@ -90,6 +138,14 @@ class 3AS_AAT_tan : 3AS_AAT {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_AAT_urban : 3AS_AAT {
@@ -101,6 +157,14 @@ class 3AS_AAT_urban : 3AS_AAT {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };
 
 class 3AS_AAT_Tropic : 3AS_AAT {
@@ -112,4 +176,12 @@ class 3AS_AAT_Tropic : 3AS_AAT {
 			};
 		};
 	};
+	class HitPoints: HitPoints
+	{
+		class HitHull:HitHull{};
+		class HitFuel:HitFuel{};
+		class HitEngine:HitEngine{};
+		class HitLTrack:HitLTrack{};
+		class HitRTrack:HitRTrack{};
+	};
 };

addons - Copy/RD501_Vehicles/land/AAT/common.hpp

@@ -2,7 +2,7 @@
 		side=0;
 		scopeCurator=2;
 		forceInGarage = 1;
-		armor=300;
+		armor=200;
 
 		crew=macro_new_unit_class(opfor,B1_crew)
 		
@@ -23,4 +23,54 @@
 				weapons[] = {"SmokeLauncher",macro_new_weapon(generic,aircraft_laser),macro_new_weapon(aat_cannon,king)};
 				magazines[] = {"SmokeLauncherMag",macro_new_mag(aat_mbt,10), macro_new_mag(aat_mbt,10),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000)};
 			};
+		};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull {	// Handle internal damage
+				armor=4.5;
+				material=-1;
+				name="telo";
+				visual="zbytek";
+				passThrough=1;
+				minimalHit = 0.2;
+				explosionShielding = 0.2;
+				radius = 0.12;
+			};
+			class HitEngine: HitEngine {
+				armor=0.75;
+				material=-1;
+				name="motor";
+				passThrough=0.2;
+				minimalHit = 0.2;
+				explosionShielding = 0.2;
+				radius = 0.33;
+			};
+			class HitLTrack: HitLTrack {
+				armor=0.5;
+				material=-1;
+				name="track_l_hit";
+				passThrough=0;
+				minimalHit = 0.08;
+				explosionShielding = 1.44;
+				radius = 0.3;
+			};
+			class HitRTrack: HitRTrack {
+				armor=0.5;
+				material=-1;
+				name="track_r_hit";
+				passThrough=0;
+				minimalHit = 0.08;
+				explosionShielding = 1.44;
+				radius = 0.3;
+			};
+			class HitFuel: HitFuel
+			{
+				armor = 1.5;
+				material = -1;
+				name = "palivo";
+				passThrough = 0.1;
+				minimalHit = 0.1;
+				explosionShielding = 0.6;
+				radius = 0.25;
+			};
 		};

addons - Copy/RD501_Vehicles/land/AAT/inheritance.hpp

@@ -1,264 +0,0 @@
-class Car_F;
-class Wheeled_APC_F: Car_F
-{
-	class ViewOptics;
-	class ViewCargo;
-	class EventHandlers;
-	
-	class NewTurret;
-	class Turrets
-	{
-		class MainTurret: NewTurret
-		{
-			class ViewOptics;
-			class Turrets
-			{
-				class CommanderOptics;
-			};
-			class Components;
-		};
-	};
-
-	class Components;
-
-};
-class O_SWOP_AAT_base:Wheeled_APC_F
-{
-	class Turrets:Turrets
-	{
-		class MainTurret:MainTurret
-		{
-			class Components:Components
-			{
-				class VehicleSystemsDisplayManagerComponentLeft;
-				
-				class VehicleSystemsDisplayManagerComponentRight;
-				
-			};
-		};
-	};
-	class HitPoints;
-	class Components:Components
-	{
-		class AICarSteeringComponent;
-		class TransportCountermeasuresComponent;
-		class VehicleSystemsDisplayManagerComponentLeft;
-		
-		class VehicleSystemsDisplayManagerComponentRight;
-		
-
-	};
-};
-class O_O_SWOP_AAT_base:O_SWOP_AAT_base
-{
-	class Turrets:Turrets
-	{
-		class MainTurret:MainTurret
-		{
-			class Turrets;
-			class Components:Components
-			{
-				class VehicleSystemsDisplayManagerComponentLeft:VehicleSystemsDisplayManagerComponentLeft
-				{
-					class Components;
-					
-				};
-				class VehicleSystemsDisplayManagerComponentRight:VehicleSystemsDisplayManagerComponentRight
-				{
-					class Components;
-				};
-			};
-		};
-		
-	};
-	class HitPoints:HitPoints
-	{
-		class HitBody;
-		class HitEngine; 
-		class HitFuel; 
-		class HitLFWheel; 
-		class HitLMWheel; 
-		class HitLF2Wheel; 
-		class HitRFWheel; 
-		class HitRMWheel; 
-		class HitRF2Wheel; 
-	};
-	class Components:Components
-	{
-		class AICarSteeringComponent:AICarSteeringComponent
-		{
-
-		};
-		class TransportCountermeasuresComponent:TransportCountermeasuresComponent
-		{
-
-		};
-		class VehicleSystemsDisplayManagerComponentLeft:VehicleSystemsDisplayManagerComponentLeft
-		{
-			class Components;
-			
-		};
-		class VehicleSystemsDisplayManagerComponentRight:VehicleSystemsDisplayManagerComponentRight
-		{
-			class Components;
-			
-		};
-
-	};
-};
-
-
-class O_SWOP_AAT_1:O_O_SWOP_AAT_base
-{
-	scope=0;
-
-	class Turrets:Turrets
-	{
-		class MainTurret:MainTurret
-		{
-			class Turrets:Turrets
-			{
-				class CommanderOptics;
-			};
-			class Components:Components
-			{
-				class VehicleSystemsDisplayManagerComponentLeft:VehicleSystemsDisplayManagerComponentLeft
-				{
-					class Components:Components
-					{
-						class VehicleDriverDisplay;
-						
-						class VehiclePrimaryGunnerDisplay;
-						
-						class EmptyDisplay;
-						
-						class MinimapDisplay;
-						
-						class MineDetectorDisplay;
-						
-						class CrewDisplay;
-						
-						class UAVDisplay;
-						
-						class SlingLoadDisplay;
-						
-					};
-				};
-				class VehicleSystemsDisplayManagerComponentRight:VehicleSystemsDisplayManagerComponentRight
-				{
-					class Components:Components
-					{
-						class VehicleDriverDisplay;
-						
-						class VehiclePrimaryGunnerDisplay;
-						
-						class EmptyDisplay;
-						
-						class MinimapDisplay;
-						
-						class MineDetectorDisplay;
-						
-						class CrewDisplay;
-						
-						class UAVDisplay;
-						
-						class SlingLoadDisplay;
-						
-					};
-				};
-			};
-		};
-	};
-
-	class HitPoints:HitPoints
-	{
-		class HitBody: HitBody
-		{
-
-		};
-		class HitEngine: HitEngine
-		{
-
-		};
-		class HitFuel: HitFuel
-		{
-
-		};
-		class HitLFWheel: HitLFWheel
-		{
-
-		};
-		class HitLMWheel: HitLMWheel
-		{
-
-		};
-		class HitLF2Wheel: HitLF2Wheel
-		{
-
-		};
-		class HitRFWheel: HitRFWheel
-		{
-
-		};
-		class HitRMWheel: HitRMWheel
-		{
-
-		};
-		class HitRF2Wheel: HitRF2Wheel
-		{
-
-		};
-	};
-
-	//drivers comp
-	class Components:Components
-	{
-		
-		class VehicleSystemsDisplayManagerComponentLeft:VehicleSystemsDisplayManagerComponentLeft
-		{
-			class Components:Components
-			{
-				class CrewDisplay;
-				
-				class EmptyDisplay;
-				
-				class MineDetectorDisplay;
-				
-				class MinimapDisplay;
-				
-				class SlingLoadDisplay;
-				
-				class UAVDisplay;
-				
-				class VehicleCommanderDisplay;
-				
-				class VehiclePrimaryGunnerDisplay;
-				
-
-			};
-		};
-		class VehicleSystemsDisplayManagerComponentRight:VehicleSystemsDisplayManagerComponentRight
-		{
-			class Components:Components
-			{
-				class CrewDisplay;
-				
-				class EmptyDisplay;
-				
-				class MineDetectorDisplay;
-				
-				class MinimapDisplay;
-				
-				class SlingLoadDisplay;
-				
-				class UAVDisplay;
-				
-				class VehicleCommanderDisplay;
-				
-				class VehiclePrimaryGunnerDisplay;
-
-			};
-		};
-
-	};
-};

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

@@ -76,6 +76,7 @@ class CfgVehicles
 	class Tank: LandVehicle
 	{
 		class NewTurret;
+		class HitPoints;
 	};
 	class Tank_F: Tank
 	{
@@ -84,6 +85,14 @@ class CfgVehicles
 			class MainTurret: NewTurret
 			{};
 		};
+		class HitPoints: HitPoints
+		{
+			class HitHull;
+			class HitFuel;
+			class HitEngine;
+			class HitLTrack;
+			class HitRTrack;
+		};
 	};
 	class 3AS_GAT_base_F:Tank_F
 	{
@@ -94,11 +103,20 @@ class CfgVehicles
 			{
 			};
 		};
+		class HitPoints: HitPoints
+		{
+			class HitHull:HitHull{};
+			class HitFuel:HitFuel{};
+			class HitEngine:HitEngine{};
+			class HitLTrack:HitLTrack{};
+			class HitRTrack:HitRTrack{};
+		};
 	};
 	class macro_new_vehicle(cis,gat):3AS_GAT_base_F
 	{
 		scope=2;
-		armor = 2000;
+		armor = 700;
+		armorStructural=4;
 		displayName = "CIS GAT"
 		crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;
@@ -124,6 +142,56 @@ class CfgVehicles
 				};
 			};
 		};
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull {	// Handle internal damage
+				armor=4.5;
+				material=-1;
+				name="telo";
+				visual="zbytek";
+				passThrough=1;
+				minimalHit = 0.2;
+				explosionShielding = 0.2;
+				radius = 0.12;
+			};
+			class HitEngine: HitEngine {
+				armor=0.75;
+				material=-1;
+				name="motor";
+				passThrough=0.2;
+				minimalHit = 0.2;
+				explosionShielding = 0.2;
+				radius = 0.33;
+			};
+			class HitLTrack: HitLTrack {
+				armor=0.5;
+				material=-1;
+				name="track_l_hit";
+				passThrough=0;
+				minimalHit = 0.08;
+				explosionShielding = 1.44;
+				radius = 0.3;
+			};
+			class HitRTrack: HitRTrack {
+				armor=0.5;
+				material=-1;
+				name="track_r_hit";
+				passThrough=0;
+				minimalHit = 0.08;
+				explosionShielding = 1.44;
+				radius = 0.3;
+			};
+			class HitFuel: HitFuel
+			{
+				armor = 1.5;
+				material = -1;
+				name = "palivo";
+				passThrough = 0.1;
+				minimalHit = 0.1;
+				explosionShielding = 0.6;
+				radius = 0.25;
+			};
+		};
 	}
 	class macro_new_vehicle(cis,gat_tan): macro_new_vehicle(cis,gat)
 	{
@@ -181,6 +249,14 @@ class CfgVehicles
 			{
 			};
 		};
+		class HitPoints: HitPoints
+		{
+			class HitHull:HitHull{};
+			class HitFuel:HitFuel{};
+			class HitEngine:HitEngine{};
+			class HitLTrack:HitLTrack{};
+			class HitRTrack:HitRTrack{};
+		};
 	};
 	class macro_new_vehicle(cis,gat_aa):3AS_GAT_Light_Base
 	{
@@ -200,6 +276,56 @@ class CfgVehicles
 		irScanToEyeFactor = 2;
 		irTarget = 1;
 		irTargetSize = 1.2;
+		class HitPoints: HitPoints
+		{
+			class HitHull: HitHull {	// Handle internal damage
+				armor=4.5;
+				material=-1;
+				name="telo";
+				visual="zbytek";
+				passThrough=1;
+				minimalHit = 0.2;
+				explosionShielding = 0.2;
+				radius = 0.12;
+			};
+			class HitEngine: HitEngine {
+				armor=0.75;
+				material=-1;
+				name="motor";
+				passThrough=0.2;
+				minimalHit = 0.2;
+				explosionShielding = 0.2;
+				radius = 0.33;
+			};
+			class HitLTrack: HitLTrack {
+				armor=0.5;
+				material=-1;
+				name="track_l_hit";
+				passThrough=0;
+				minimalHit = 0.08;
+				explosionShielding = 1.44;
+				radius = 0.3;
+			};
+			class HitRTrack: HitRTrack {
+				armor=0.5;
+				material=-1;
+				name="track_r_hit";
+				passThrough=0;
+				minimalHit = 0.08;
+				explosionShielding = 1.44;
+				radius = 0.3;
+			};
+			class HitFuel: HitFuel
+			{
+				armor = 1.5;
+				material = -1;
+				name = "palivo";
+				passThrough = 0.1;
+				minimalHit = 0.1;
+				explosionShielding = 0.6;
+				radius = 0.25;
+			};
+		};
 		class Components: Components
 		{
 			class SensorsManagerComponent

addons - Copy/RD501_Weapons/DC_Family/DC_15a/DC_15a__GL_rifle.hpp

@@ -1,69 +0,0 @@
-class macro_new_weapon(DC,15a_gl_rifle):SWOP_DC15AGL // RD501_DC_15a_base
-{
-	weaponPoolAvailable = 1;
-	scope=2;
-	scopeArsenal=2;
-	displayname = "DC-15A GL Rifle";
-
-	dlc = "RD501";
-
-	author= "RD501";
-	baseWeapon = macro_new_weapon(DC,15a_gl_rifle);
-
-	//DC_Family_Flashlight
-
-	ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-	ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-	ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-	ACE_overheating_mrbs = DC15a_Overheat_mrbs
-	ACE_overheating_allowSwapBarrel = 1;
-	ACE_clearJamAction = "ReloadMagazine";
-
-	canShootInWater = 1;
-	magazineWell[] += {macro_new_magwell(DC_15a_energy)};
-	magazines[] = {"DCStun_Mag"};
-	
-	muzzles[] = {"this", "EGLM"};
-	class Single:Single
-	{
-		reloadTime = DC15A_reloadtime_single
-		dispersion = DC15A_accuracy
-		recoil = "recoil_single_mx";
-		recoilProne = "recoil_single_prone_mx";
-
-	};
-
-	class Burst:Burst
-	{
-		reloadTime = DC15A_reloadtime_burst
-		dispersion = DC15A_accuracy
-		recoil = "recoil_auto_primary_3outof10";
-		recoilProne = "recoil_auto_primary_prone_3outof10";
-
-	};
-
-	class FullAuto:FullAuto
-	{
-		reloadTime = DC15A_reloadtime_full
-		dispersion = DC15A_accuracy
-	};
-
-	class WeaponSlotsInfo: WeaponSlotsInfo
-	{
-		mass = 30;
-		class CowsSlot: CowsSlot
-		{
-			compatibleItems[] = {
-				macro_new_weapon(scope,dc_15a_acog)
-			};
-		};
-	};
-
-	class EGLM:EGLM
-	{
-		discreteDistance[] = {100,150,200,250,300,350,400};
-		magazines[] = {};
-		magazineWell[] += {macro_new_magwell(GL_Mags)};
-	};
-
-};

addons - Copy/RD501_Weapons/DC_Family/DC_15a/DC_15a__LE_rifle.hpp

@@ -1,107 +0,0 @@
-class macro_new_weapon(DC,15a_LE):SWOP_DC15ABlasterRifle_mod1 // RD501_DC_15a_base
-{
-	weaponPoolAvailable = 1;
-	displayName="DC-15A Long Engagement";
-	scope=2;
-	scopeArsenal=2;
-
-	// class Secondary:Secondary
-	// {
-	// 	class Single;
-	// };
-	dlc = "RD501";
-
-	author= "RD501";
-	baseWeapon = macro_new_weapon(DC,15a_LE);
-
-	//DC_Family_Flashlight
-
-	ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-	ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-	ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-	ACE_overheating_mrbs = DC15a_Overheat_mrbs
-	ACE_overheating_allowSwapBarrel = 1;
-	ACE_clearJamAction = "ReloadMagazine";
-
-	canShootInWater = 1;
-	modes[] = {"Single","close","short","medium"};
-	muzzles[] = {"this"};
-
-	//magazineWell[] += {macro_new_magwell(DC_15a_energy)};
-	magazines[] = {macro_new_mag(DC15a_LE,15),macro_new_mag(DC15a_High,15)};
-	class Single:Single
-	{
-		reloadTime = DC15A_reloadtime_single/2;
-		dispersion = DC15A_accuracy/10;
-		recoil = "recoil_single_mx";
-		recoilProne = "recoil_single_prone_mx";
-
-		class BaseSoundModeType
-		{
-			weaponSoundEffect = "DefaultRifle";
-			closure1[] = {};
-			closure2[] = {};
-			soundClosure[] = {};
-		};
-		class StandardSound: BaseSoundModeType
-		{
-			weaponSoundEffect = "DefaultRifle";
-			begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_auto.ogg", 1, 0.5, 1800};
-			begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_auto.ogg", 1, 0.5, 1800};
-			begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_auto.ogg", 1, 0.5, 1800};
-			soundBegin[] = {"begin1", 0.33, "begin2", 0.33, "begin3", 0.33};
-			beginwater1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single_bajoagua.ogg", 1, 1, 400};
-			beginwater2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single_bajoagua.ogg", 1.05, 1, 400};
-			beginwater3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single_bajoagua.ogg", 0.95, 1, 400};
-			soundBeginWater[] = {"beginwater1", 0.33, "beginwater2", 0.33, "beginwater3", 0.34};
-			class SoundTails
-			{
-				class TailInterior
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_interior", 2.23872, 1, 1800};
-					frequency = 1;
-					volume = "interior";
-				};
-				class TailTrees
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_trees", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*trees";
-				};
-				class TailForest
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_forest", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*forest";
-				};
-				class TailMeadows
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_meadows", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*(meadows/2 max sea/2)";
-				};
-				class TailHouses
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_houses", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*houses";
-				};
-			};
-		};
-
-	};
-
-
-
-	class WeaponSlotsInfo: WeaponSlotsInfo
-	{
-		mass = 30;
-		class CowsSlot: CowsSlot
-		{
-			compatibleItems[] = {		
-				macro_new_weapon(scope,dc_15a_x4_x8)
-			};
-		};
-	};
-
-};

addons - Copy/RD501_Weapons/DC_Family/DC_15a/DC_15a__mod0_rifle.hpp

@@ -1,101 +0,0 @@
-class macro_new_weapon(DC,15a_mod_0_rifle):SWOP_DC15ABlasterRifle_mod0
-{
-	weaponPoolAvailable = 1;
-	displayname = "DC-15A Mod-0 LSW Rifle";
-	scope=2;
-	scopeArsenal=2;
-	baseWeapon = macro_new_weapon(DC,15a_mod_0_rifle);
-
-	dlc = "RD501";
-
-	author= "RD501";
-
-
-	//DC_Family_Flashlight
-
-	ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-	ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-	ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-	ACE_overheating_mrbs = DC15a_Overheat_mrbs
-	ACE_overheating_allowSwapBarrel = 1;
-	
-	ACE_clearJamAction = "ReloadMagazine";
-
-	canShootInWater = 1;
-
-	modes[] = {"FullAuto", "close", "short", "medium"};
-	recoil = "recoil_mk20";
-	magazines[]={macro_new_mag(DC15a_box_mag,240)};
-	magazineWell[] = {macro_new_magwell(DC_15a_energy)};
-	class FullAuto:FullAuto
-	{
-		reloadTime = DC15A_Mod_0_reloadtime_full
-		dispersion = DC15A_Mod_0_accuracy
-		recoil = "recoil_auto_mk20";
-		recoilProne = "recoil_auto_prone_mk20";
-
-		class BaseSoundModeType
-		{
-			weaponSoundEffect = "DefaultRifle";
-			closure1[] = {};
-			closure2[] = {};
-			soundClosure[] = {};
-		};
-		class StandardSound: BaseSoundModeType
-		{
-			weaponSoundEffect = "DefaultRifle";
-			begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_auto.ogg", 1, 2, 1800};
-			begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_auto.ogg", 1, 2, 1800};
-			begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_auto.ogg", 1, 2, 1800};
-			soundBegin[] = {"begin1", 0.33, "begin2", 0.33, "begin3", 0.33};
-			beginwater1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single_bajoagua.ogg", 1, 1, 400};
-			beginwater2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single_bajoagua.ogg", 1.05, 1, 400};
-			beginwater3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single_bajoagua.ogg", 0.95, 1, 400};
-			soundBeginWater[] = {"beginwater1", 0.33, "beginwater2", 0.33, "beginwater3", 0.34};
-			class SoundTails
-			{
-				class TailInterior
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_interior", 2.23872, 1, 1800};
-					frequency = 1;
-					volume = "interior";
-				};
-				class TailTrees
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_trees", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*trees";
-				};
-				class TailForest
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_forest", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*forest";
-				};
-				class TailMeadows
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_meadows", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*(meadows/2 max sea/2)";
-				};
-				class TailHouses
-				{
-					sound[] = {"A3\Sounds_F\arsenal\weapons\Rifles\Katiba\Katiba_tail_houses", 1, 1, 1800};
-					frequency = 1;
-					volume = "(1-interior/1.4)*houses";
-				};
-			};
-		};
-	};
-
-	class WeaponSlotsInfo: WeaponSlotsInfo
-	{
-		mass = 30;
-		class CowsSlot: CowsSlot
-		{
-			compatibleItems[] = {
-				macro_new_weapon(scope,dc_15a_x4)
-			};
-		};
-	};
-};

addons - Copy/RD501_Weapons/DC_Family/DC_15a/DC_15a_rifle.hpp

@@ -1,73 +0,0 @@
-class macro_new_weapon(DC,15a_base):SWOP_DC15ABlasterRifle // RD501_DC_15a_base
-{
-    weaponPoolAvailable = 1;
-    displayName="rd501 DC15A base";
-    scope=0;
-    scopeArsenal=0;
-
-  
-    dlc = "RD501";
-
-    author= "RD501";
-    baseWeapon = macro_new_weapon(DC,15a_base);
-
-    //DC_Family_Flashlight
-
-    ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-    ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-    ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-    ACE_overheating_mrbs = DC15a_Overheat_mrbs
-    ACE_overheating_allowSwapBarrel = 1;
-    ACE_clearJamAction = "ReloadMagazine";
-
-    canShootInWater = 1;
-    magazines[] = {};
-    magazineWell[] += {macro_new_magwell(DC_15a_energy)};
-    class Single:Single
-    {
-        reloadTime = DC15A_reloadtime_single
-        dispersion = DC15A_accuracy
-        recoil = "recoil_single_mx";
-        recoilProne = "recoil_single_prone_mx";
-
-    };
-
-    class Burst:Burst
-    {
-        reloadTime = DC15A_reloadtime_burst
-        dispersion = DC15A_accuracy
-        recoil = "recoil_auto_primary_3outof10";
-        recoilProne = "recoil_auto_primary_prone_3outof10";
-
-    };
-
-    class FullAuto:FullAuto
-    {
-        reloadTime = DC15A_reloadtime_full
-        dispersion = DC15A_accuracy
-    };
-
-    class WeaponSlotsInfo: WeaponSlotsInfo
-    {
-        mass = 30;
-        class CowsSlot: CowsSlot
-        {
-            compatibleItems[] = {
-                macro_new_weapon(scope,dc_15a_acog)
-            };
-        };
-    };
-
-};
-
-class macro_new_weapon(DC,15a):macro_new_weapon(DC,15a_base)
-{
-    displayname = "DC-15A Rifle";
-    scope=2;
-    scopeArsenal=2;
-    baseWeapon = macro_new_weapon(DC,15a);
-    // class Secondary:Secondary
-    // {
-
-    // };
-};

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

@@ -43,6 +43,7 @@ class cfgWeapons
 		reloadTime=0.1;
 		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mx";
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(20mwup,20),
@@ -118,9 +119,5 @@ class cfgWeapons
 			};
 		};
 	};
-	//#include "DC_15a__LE_rifle.hpp"
-	//#include "DC_15a__GL_rifle.hpp"
-	//#include "DC_15a__mod0_rifle.hpp"
-	//#include "DC_15a_rifle.hpp"
 };
 

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

@@ -36,6 +36,7 @@ class CfgWeapons
 		dispersion=0.00116;
 		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mxc";
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)

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

@@ -38,6 +38,7 @@ class CfgWeapons
 		displayName="Republic DC-15A UGL";
 		JLTS_hasElectronics=0;
 		ACE_Overheating_mrbs = 300000;
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)
@@ -132,6 +133,7 @@ class CfgWeapons
 		dispersion=0.00116;
 		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mxc";
+		canShootInWater=1;
 		scope = 2;
 		magazines[]=
 		{

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

@@ -37,6 +37,7 @@ class CfgWeapons
 		recoil="recoil_mmg_02";
 		dispersion=0.00075;
 		ACE_Overheating_mrbs = 450000;
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(20mw,240)

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

@@ -25,157 +25,12 @@ class CfgPatches
 
 class cfgWeapons 
 {
-	/*class SWOP_B2gun;
-	class Rifle_Long_Base_F;
-	class SWOP_BlasterRifle_Base:Rifle_Long_Base_F
-	{
-		class WeaponSlotsInfo;
-	};
-	class SWOP_DC15: SWOP_BlasterRifle_Base
-	{
-		class Single;
-		class Burst;
-		class FullAuto;
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-
-		
-		
-		
-	};
-
-	class macro_new_weapon(DC,15s):SWOP_DC15
-	{
-		DC_Family_Flashlight
-
-		displayName="DC-15s Carbine";
-    	scope=2;
-		scopeArsenal=2;
-		weaponPoolAvailable = 1;
-		
-		dlc = "RD501";
-
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15s);
-
-		magazines[]={macro_new_mag(DC15s,60),macro_new_mag(DC15_underwater,40)};
-
-		ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-		ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-		ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-		ACE_overheating_mrbs = DC15a_Overheat_mrbs
-		ACE_overheating_allowSwapBarrel = 1;
-		ACE_clearJamAction = "ReloadMagazine";
-		modes[] = {"Single","FullAuto", "close", "short", "medium"};
-
-		class FullAuto:FullAuto
-		{
-			reloadTime = DC15s_reloadtime_full
-        	dispersion = DC15s_accuracy
-		};
-
-		class Single:Single
-		{
-			reloadTime = DC15s_reloadtime_full*2;
-        	dispersion = DC15s_accuracy*0.8;
-		};
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			mass = 30;
-			class CowsSlot: CowsSlot
-			{
-				access = 1;
-				compatibleItems[] = 
-				{
-					macro_new_weapon(scope,dc_15a_acog)
-				};
-
-			};
-		};
-	};*/
-
 	class Pistol;
 	class Pistol_Base_F:Pistol
 	{
 		class WeaponSlotsInfo;
 	};
 	
-	class SWOP_DC15_sh: Pistol_Base_F
-	{
-		
-		class FullAuto;
-		
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		}
-		
-	};
-
-	
-	class macro_new_weapon(DC,15s_shield):SWOP_DC15_sh
-	{
-		DC_Family_Flashlight
-		weaponPoolAvailable = 1;
-		displayName="DC-15s Carbine Shield";
-    	scope=2;
-		scopeArsenal=2;
-		canShootInWater = 1;
-		magazines[]={macro_new_mag(DC15s,60)};
-		dlc = "RD501";
-
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15s_shield);
-
-		ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-		ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-		ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-		ACE_overheating_mrbs = DC15a_Overheat_mrbs
-		ACE_overheating_allowSwapBarrel = 1;
-		ACE_clearJamAction = "ReloadMagazine";
-
-		modes[] = {"FullAuto", "close", "short", "medium"};
-
-		class FullAuto:FullAuto
-		{
-			reloadTime = DC15s_reloadtime_full
-        	dispersion = DC15s_accuracy
-		};
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			mass = 30;
-			class CowsSlot: CowsSlot
-			{
-				access = 1;
-				compatibleItems[] = 
-				{
-					macro_new_weapon(scope,dc_15a_acog)
-				};
-
-			};
-		};
-	};
-
-	class macro_new_weapon(DC,15s_shield_212):macro_new_weapon(DC,15s_shield)
-	{
-		displayname = "DC-15s Carbine Shield (212th Battalion)";
-		hiddenSelections[] = {"Camo"};
-		hiddenSelectionsTextures[] = {"\SW_CloneWarsWeapons\DCrifles\textures\sh212.paa"};
-		baseWeapon = macro_new_weapon(DC,15s_shield_212);
-	};
-
-	class macro_new_weapon(DC,15s_shield_cg):macro_new_weapon(DC,15s_shield)
-	{
-		displayname = "DC-15s Carbine Shield (Corusant Guard)";
-		hiddenSelections[] = {"Camo"};
-		hiddenSelectionsTextures[] = {"\SW_CloneWarsWeapons\DCrifles\textures\shCG.paa"};
-		baseWeapon = macro_new_weapon(DC,15s_shield_cg);
-	};
 	class RD501_stun_muzzle;
 	class 3AS_DC15S_Base_F;
 	class 3AS_DC15S_F:3AS_DC15S_Base_F
@@ -191,6 +46,7 @@ class cfgWeapons
 		recoil="recoil_smg_01";
 		reloadAction="ReloadMagazine";
 		ACE_Overheating_mrbs = 300000;
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(5mw,60)

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

@@ -41,6 +41,7 @@ class cfgWeapons
 		displayName="Republic DC-15X";
 		descriptionShort = "DC-15X Scope (12-20x)";
 		baseWeapon=macro_new_weapon(DC,r15x)
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(40mw,5),

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

@@ -123,6 +123,7 @@ class cfgWeapons
 		JLTS_hasElectronics=0;
 		JLTS_canHaveShield=1;
 		JLTS_shieldedWeapon=macro_new_weapon(DC,r17_shield)
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(5mw,10)
@@ -182,6 +183,7 @@ class cfgWeapons
 		};
 		inertia=0.80000001;
 		recoil="recoil_pdw";
+		canShootInWater=1;
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass=110;
@@ -210,6 +212,7 @@ class cfgWeapons
 		JLTS_hasElectronics=0;
 		JLTS_canHaveShield=1;
 		JLTS_shieldedWeapon=macro_new_weapon(DC,r17a_shield)
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(2mw,30)
@@ -278,6 +281,7 @@ class cfgWeapons
 		};
 		inertia=0.80000001;
 		recoil="recoil_pdw";
+		canShootInWater=1;
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass=110;

addons - Copy/RD501_Weapons/Droid_weapons/DGL/config.cpp

@@ -27,11 +27,11 @@ class cfgWeapons
 {
 	
 	class arifle_MX_Base_F;
-	class JLTS_SBB3;/*: arifle_MX_Base_F
+	class JLTS_SBB3: arifle_MX_Base_F
 	{
 		class Single: Mode_SemiAuto
 		{};
-	};*/
+	};
 	class macro_new_weapon(cis,dgl): JLTS_SBB3
 	{
 		scope=2;
@@ -46,9 +46,13 @@ class cfgWeapons
 			macro_new_mag(UGL_HE,6),
 			macro_new_mag(UGL_AP,6)
 		};
-		/*class Single : Single
+		modes[]=
+		{
+			"SingleDGL"
+		};
+		class SingleDGL : Single
 		{
-			reloadTime=0.5;
-		};*/
+			reloadTime=1;
+		};
 	};
 };

addons - Copy/RD501_Weapons/Droid_weapons/E5_C/config.cpp

@@ -1,68 +0,0 @@
-#define COMPONENT E5_C
-#include "../../../RD501_main/config_macros.hpp"
-#include "../../_common/common.hpp"
-
-
-
-class CfgPatches
-{
-	class macro_patch_name(e5_c)
-	{
-		author=DANKAUTHORS;
-		addonRootClass= macro_patch_name(weapons)
-		requiredAddons[]=
-		{
-			macro_patch_name(weapons)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			//macro_new_weapon(e5,c)
-			"SWOP_E5C",
-			macro_new_weapon(e5,C)
-		};
-	};
-};
-class Mode_FullAuto;
-class cfgWeapons 
-{
-	
-	class SWOP_BlasterRifle_Base;
-	
-	class SWOP_E5C: SWOP_BlasterRifle_Base
-	{
-		
-		displayName="E5 C Heavy Blaster";
-		class FullAuto:Mode_FullAuto
-		{
-			dispersion = E5_C_accuracy
-	 		reloadTime = E5_C_reloadtime_auto
-		};
-		class GunParticles;
-	
-	};
-
-	class macro_new_weapon(e5,C): SWOP_E5C
-	{
-		dlc = "rd501";
-		author = "RD501";
-		scope = 2;
-		displayname = "CIS E5C-A Blaster Rifle";
-		baseweapon = "E5C-A Blaster Rifle";
-		canShootInWater = 1;
-		magazines[] = {macro_new_mag(20mw,90)};
-		descriptionShort = "E5C Rifle";
-		selectionFireAnim = "muzzleFlash";
-		magazines[]={macro_new_mag(E5c_aqua,90)};
-		class GunParticles : GunParticles
-		{	class SecondEffect
-			{
-				effectName = "ShotUnderwater";
-				positionName = "barrel";
-				directionName = "Tip";
-			};
-		};
-	};
-
-};
-

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -35,6 +35,7 @@ class CfgWeapons
 		displayName="Republic Valken 38X";
 		dispersion=0.00045;
 		ACE_Overheating_JamChance = 0;
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(20mwdp,20),

addons - Copy/RD501_Weapons/Z6/config.cpp

@@ -46,6 +46,7 @@ class cfgWeapons
 		baseWeapon=macro_new_weapon_nofam(rZ6)
         displayName="Republic Z6 Chaingun";
 		ACE_Overheating_mrbs = 450000;
+		canShootInWater=1;
 		magazines[]=
 		{
 			macro_new_mag(10mw,400)

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -50,6 +50,7 @@ class CfgAmmo
 		typicalSpeed=400;
 		caliber=1.2;
 		airFriction=0;
+		waterFriction=-0.009;
 	};
 	class macro_new_ammo(5mw) : 3AS_EC30_BluePlasma
 	{
@@ -58,6 +59,7 @@ class CfgAmmo
 		typicalSpeed=400;
 		caliber=1.4;
 		airFriction=0;
+		waterFriction=-0.009;
 	};
 	class macro_new_ammo(10mw) : 3AS_EC40_BluePlasma
 	{
@@ -66,6 +68,7 @@ class CfgAmmo
 		typicalSpeed=550;
 		caliber=1;
 		airFriction=0;
+		waterFriction=-0.009;
 		explosive = 0;
 	};
 	class macro_new_ammo(10mws) : 3AS_EC40_BluePlasma
@@ -78,6 +81,7 @@ class CfgAmmo
 		audibleFire=5;
 		visibleFireTime=3;
 		airFriction=0;
+		waterFriction=-0.009;
 		explosive = 0;
 	};
 	class macro_new_ammo(20mw) : 3AS_EC50_BluePlasma
@@ -87,6 +91,7 @@ class CfgAmmo
 		typicalSpeed=700;
 		caliber=2.8;
 		airFriction=0;
+		waterFriction=-0.009;
 		explosive = 0.4;
 	};
 	class macro_new_ammo(20mw_d) : JLTS_bullet_carbine_red
@@ -96,6 +101,7 @@ class CfgAmmo
 		typicalSpeed=700;
 		caliber=2.8;
 		airFriction=0;
+		waterFriction=-0.009;
 	};
 	class macro_new_ammo(20mwup) : 3AS_EC50_BluePlasma
 	{
@@ -107,6 +113,7 @@ class CfgAmmo
 		explosive = 0.4;
 		caliber=0.6;
 		airFriction=0;
+		waterFriction=-0.009;
 	};
 	class macro_new_ammo(20mwdp) : 3AS_EC50_BluePlasma
 	{
@@ -115,7 +122,8 @@ class CfgAmmo
 		typicalSpeed=700;
 		caliber=2.8;
 		airFriction=0;
-		explosive = 0.2;
+		waterFriction=-0.009;
+		explosive = 0;
 	};
 	class macro_new_ammo(30mw) : 3AS_EC60_BluePlasma
 	{
@@ -124,7 +132,8 @@ class CfgAmmo
 		typicalSpeed=1000;
 		caliber=2.4;
 		airFriction=0;
-		explosive = 0.4;
+		waterFriction=-0.009;
+		explosive = 0;
 	};
 	class macro_new_ammo(30mw_d) : JLTS_bullet_carbine_red
 	{
@@ -141,7 +150,8 @@ class CfgAmmo
 		typicalSpeed=1100;
 		caliber=3.6;
 		airFriction=0;
-		explosive = 0.4;
+		waterFriction=-0.009;
+		explosive = 0;
 	};
 	class macro_new_ammo(40mwemp) : 3AS_EC70_BluePlasma
 	{

addons - Copy/RD501_Weapons/config.cpp

@@ -216,7 +216,7 @@ class CfgMagazines
 	class macro_new_mag(RPS_AT,1): Titan_AT
 	{
 		scope = 2;
-		displayName = "RPS AT Rocket";
+		displayName = "RPS  6 AT Rocket";
 		ammo = macro_new_ammo(RPS_AT);
 		type = "2 *   256";
 		count = 1;
@@ -233,7 +233,7 @@ class CfgMagazines
 	{
 		author = "Bohemia Interactive";
 		scope = 2;
-		displayName = "RPS AA Rocket";
+		displayName = "RPS 6 AA Rocket";
 		displayNameShort = "AA";
 		ammo = macro_new_ammo(RPS_AA);
 		type = "6 * 		256";

addons - Copy/RD501_Weapons/shotguns/config.cpp

@@ -1,32 +0,0 @@
-#include "../../RD501_main/config_macros.hpp"
-#include "../_common/common.hpp"
-
-
-class CfgPatches
-{
-	class macro_patch_name(shotguns)
-	{
-		author=DANKAUTHORS;
-		addonRootClass= macro_patch_name(weapons)
-		requiredAddons[]=
-		{
-			macro_patch_name(weapons)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_weapon(shotgun,sg001)
-		};
-	};
-};
-
-class cfgWeapons 
-{	
-	class swop_RepShotgun;
-	class macro_new_weapon(shotgun,sg001):swop_RepShotgun
-	{
-		displayname = "Droid SG-001";
-		descriptionShort = "SG-001";
-	};
-};
-