Sfoglia il codice sorgente

Stuns added. Advanced weapons added

Erliens 4 anni fa
parent
commit
4d60ee0ed1

+ 13 - 2
addons - Copy/RD501_Weapons/DC_Family/DC_15a/config.cpp

@@ -102,6 +102,7 @@ class cfgWeapons
 		};
 	}
 	class 3AS_DC15A_Base_F;
+	class RD501_stun_muzzle;
 	class 3AS_DC15A_F:3AS_DC15A_Base_F
 	{
 		class Single;
@@ -117,12 +118,22 @@ class cfgWeapons
 		reloadTime=0.1;
 		magazines[]=
 		{
-			macro_new_mag(20mw,20)
+			macro_new_mag(20mwup,20),
+			macro_new_mag(20mwdp,20)
+		};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
 		};
 		class Single:Single
 		{
 			reloadTime=0.1;						
-		}
+		};
 		class Burst:Burst
 		{
 			reloadTime=0.1;

+ 11 - 1
addons - Copy/RD501_Weapons/DC_Family/DC_15c/config.cpp

@@ -22,7 +22,8 @@ class CfgPatches
 };
 
 class CfgWeapons
-{
+{	
+	class RD501_stun_muzzle;
 	class 3AS_DC15C_Base_F;
 	class 3AS_DC15C_F:3AS_DC15C_Base_F
 	{
@@ -40,6 +41,15 @@ class CfgWeapons
 		{
 			macro_new_mag(10mw,30)
 		};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
+		};
 		class FullAuto:FullAuto
 		{
 			reloadTime=0.08;

+ 10 - 0
addons - Copy/RD501_Weapons/DC_Family/DC_15gl/config.cpp

@@ -23,6 +23,7 @@ class CfgPatches
 
 class CfgWeapons
 {
+	class RD501_stun_muzzle;
 	class JLTS_DC15A_ugl;
 	class JLTS_DC15A_ugl_plastic:JLTS_DC15A_ugl
 	{
@@ -41,6 +42,15 @@ class CfgWeapons
 			macro_new_mag(10mw,30)
 		};
 		modes[] = {"Single", "Burst"};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
+		};
 		class Single:Single
 		{
 			reloadTime=0.1;

+ 1 - 0
addons - Copy/RD501_Weapons/DC_Family/DC_15l/config.cpp

@@ -36,6 +36,7 @@ class CfgWeapons
 	class macro_new_weapon(DC,15l):3AS_DC15L_F
 	{
 		displayName="Republic DC-15L";
+		recoil="recoil_mk200";
 		magazines[]=
 		{
 			macro_new_mag(20mw,240)

+ 10 - 0
addons - Copy/RD501_Weapons/DC_Family/DC_15s/config.cpp

@@ -176,6 +176,7 @@ class cfgWeapons
 		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
 	{
@@ -190,6 +191,15 @@ class cfgWeapons
 		{
 			macro_new_mag(5mw,60)
 		};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
+		};
 		class Single:Single
 		{
 			reloadTime=0.066;

+ 35 - 7
addons - Copy/RD501_Weapons/DC_Family/DC_15x/config.cpp

@@ -17,7 +17,8 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]={};
 		weapons[]={
-			macro_new_weapon(DC,15x)
+			macro_new_weapon(DC,15x),
+			macro_new_weapon(DC,r15x)
 			
 		};
 	};
@@ -62,7 +63,6 @@ class cfgWeapons
 
 	};
 
-
 	class macro_new_weapon(DC,15x):macro_new_weapon(DC,15x_base)
 	{	
 		displayName="DC-15 Xtreme Engagement";
@@ -97,10 +97,38 @@ class cfgWeapons
 		};
 
 	};
-
-
-
-
-	
+	class arifle_MX_Base_F;
+	class JLTS_DC15X: arifle_MX_Base_F
+	{
+		class Single;
+		class WeaponSlotsInfo
+		{
+			class CowsSlot;
+		};
+	};
+	class macro_new_weapon(DC,r15x):JLTS_DC15X
+	{
+		displayName="Republic DC-15X";
+		baseWeapon=macro_new_weapon(DC,r15x)
+		magazines[]=
+		{
+			macro_new_mag(40mw,5)
+		};
+		class Single:Single
+		{
+			reloadTime=1.5;
+			dispersion=0.0003;
+		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			class CowsSlot: CowsSlot
+			{
+				compatibleItems[]=
+				{
+					macro_new_weapon(scope,dc15x_12_20x_scope)
+				};
+			};
+		};
+	};
 };
 

+ 22 - 2
addons - Copy/RD501_Weapons/DC_Family/DC_17/config.cpp

@@ -18,7 +18,9 @@ class CfgPatches
 		units[]={};
 		weapons[]={
 			macro_new_weapon(DC,17),
-			macro_new_weapon(DC,17a)
+			macro_new_weapon(DC,17a),
+			macro_new_weapon(DC,r17),
+			macro_new_weapon(DC,r17a)
 			
 		};
 	};
@@ -100,7 +102,7 @@ class cfgWeapons
 	{
 		class Single;
 	};
-
+	class RD501_stun_muzzle;
 	class hgun_P07_F;
 	class JLTS_DC17SA:hgun_P07_F
 	{
@@ -114,6 +116,15 @@ class cfgWeapons
 		{
 			macro_new_mag(5mw,10)
 		};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
+		};
 		class Single : Single
 		{
 			reloadTime=0.1;
@@ -128,6 +139,15 @@ class cfgWeapons
 			macro_new_mag(2mw,30)
 		};
 		modes[] = {"FullAuto"};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
+		};
 		class FullAuto : Single
 		{
 			autoFire=1;

BIN
addons - Copy/RD501_Weapons/RAMER/config.bin


+ 17 - 16
addons - Copy/RD501_Weapons/RAMER/config.cpp

@@ -1,8 +1,10 @@
+#include "../../RD501_main/config_macros.hpp"
+#include "../_common/common.hpp"
 class CfgPatches
 {
 	class RD501_patch_ramer
 	{
-		author="Namenai, Rexi, Zatama";
+		author="RD501";
 		addonRootClass="RD501_patch_weapons";
 		requiredAddons[]=
 		{
@@ -13,7 +15,7 @@ class CfgPatches
 		weapons[]=
 		{
 			"RD501_RAMER",
-			"RD501_T21"
+			macro_new_weapon_nofam(t21)
 		};
 	};
 };
@@ -34,23 +36,22 @@ class cfgWeapons
 			"RD501_RAMER_x6_mag"
 		};
 	};
-	class RD501_T21: SWOP_T21BlasterRifle
+	class arifle_MX_Base_F;
+	class JLTS_EPL2:arifle_MX_Base_F
 	{
-		baseWeapon="RD501_T21";
-		author="RD501";
-		scope=2;
-		scopecurator=2;
-		scopearsenal=2;
-		displayname="[PROTOTYPE] Republic T21 Light Repeater";
-		descriptionShort="Low rate of fire heavy infantry weapon";
+		class Single;
+	}
+	class macro_new_weapon_nofam(t21):JLTS_EPL2
+	{
+		baseWeapon=macro_new_weapon_nofam(t21)
+		displayname="T21 R.A.M.E.R."
 		magazines[]=
 		{
-			"RD501_T21_x25_mag"
+			macro_new_mag(50mw,10)
 		};
+		class Single : Single
+		{
+			reloadTime=2;
+		}
 	};
 };
-class cfgMods
-{
-	author="Zatama";
-	timepacked="1580895574";
-};

+ 48 - 0
addons - Copy/RD501_Weapons/RGL6/config.cpp

@@ -0,0 +1,48 @@
+#define COMPONENT DC_15s
+#include "../../RD501_main/config_macros.hpp"
+#include "../_common/common.hpp"
+
+
+class CfgPatches
+{
+	class macro_patch_name(rgl6)
+	{
+		author="RD501";
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon_nofam(rgl6),
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class OPTRE_Rifle_Base;
+	class OPTRE_M319:OPTRE_Rifle_Base
+	{
+		class Single;
+	};
+	class macro_new_weapon_nofam(rgl6):OPTRE_M319
+	{
+		displayName="Republic GL-6";
+		baseWeapon=macro_new_weapon_nofam(rgl6)
+		magazines[]=
+		{
+			macro_new_mag(UGL_EMP,6),
+			macro_new_mag(UGL_HE,6),
+			macro_new_mag(UGL_AP,6),
+			macro_new_mag(UGL_Smoke,6),
+			macro_new_mag(UGL_Flare,6)
+		};
+		class Single : Single
+		{
+			reloadTime=2;
+		};
+	};
+};

+ 2 - 208
addons - Copy/RD501_Weapons/Z6/config.cpp

@@ -113,6 +113,7 @@ class cfgWeapons
 	{
 		scope=2;
         scopeArsenal=2;
+		recoil="recoil_mmg_02"
 		baseWeapon=macro_new_weapon_nofam(rZ6)
         displayName="Republic Z6 Chaingun";
 		magazines[]=
@@ -143,7 +144,7 @@ class cfgWeapons
     {
         scope=2;
         scopeArsenal=2;
-		reloadAction="broken";
+		recoil="recoil_mmg_01";
         displayName="Republic Z1000 Chaingun";
 		magazines[]=
 		{
@@ -161,213 +162,6 @@ class cfgWeapons
 			"none"
 		};
     };
-	class SWOP_BlasterRifle_Base;
-	class SWOP_Valken38XAuto:SWOP_BlasterRifle_Base
-	{
-		magazines[] = {};//SWOP_Valken38Xauto_Mag
-		class Single;
-		class FullAuto;
-		class WeaponSlotsInfo;
-	};
-
-
-	class SWOP_Valken38XAuto_XD:SWOP_Valken38XAuto
-	{
-		magazines[] = {"SWOP_Valken38Xauto_MagXXD"};
-		baseWeapon = "SWOP_Valken38XAuto_XD";
-		//recoil = "Valken_Super_auto_recoil";
-		scopeArsenal=2;
-		
-		ACE_Overheating_Dispersion = 0.0;
-		ACE_Overheating_SlowdownFactor = 1;
-		ACE_Overheating_JamChance = 1.5e-014;
-		ACE_overheating_mrbs = 3e+009;
-		ACE_overheating_allowSwapBarrel = 1;
-		class Single:Single
-		{
-			dispersion = 0.0001;
-			reloadTime = 0.06;
-			class BaseSoundModeType
-			{
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-				weaponSoundEffect = "DefaultRifle";
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s1.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s2.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s3.ogg", 1, 1, 1800};
-				begin4[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s4.ogg", 1, 1, 1800};
-				begin5[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s5.ogg", 1, 1, 1800};
-				begin6[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s6.ogg", 1, 1, 1800};
-				begin7[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s7.ogg", 1, 1, 1800};
-				begin8[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s8.ogg", 1, 1, 1800};
-				begin9[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s9.ogg", 1, 1, 1800};
-				soundBegin[] = {"begin1", 0.11, "begin2", 0.11, "begin3", 0.11, "begin4", 0.11, "begin5", 0.11, "begin6", 0.11, "begin7", 0.11, "begin8", 0.11, "begin9", 0.11};
-				beginwater1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_3_bajoagua.ogg", 1, 1, 400};
-				beginwater2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_3_bajoagua.ogg", 1.05, 1, 400};
-				beginwater3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_3_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\SMG\Sting\Silencer_Sting_Tail_interior", 1, 1, 400};
-						frequency = 1;
-						volume = "interior";
-					};
-					class TailTrees
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\Silencer_Sting_Tail_trees", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*trees";
-					};
-					class TailForest
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\silencer_Sting_tail_forest", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*forest";
-					};
-					class TailMeadows
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\Silencer_Sting_Tail_meadows", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*(meadows/2 max sea/2)";
-					};
-					class TailHouses
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\Silencer_Sting_Tail_houses", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*houses";
-					};
-				};
-				weaponSoundEffect = "DefaultRifle";
-			};
-		};
-
-		class FullAuto:FullAuto
-		{
-			dispersion = "1*0.0001";
-			reloadTime = 0.08;
-			class BaseSoundModeType
-			{
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-				weaponSoundEffect = "DefaultRifle";
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s1.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s2.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s3.ogg", 1, 1, 1800};
-				begin4[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s4.ogg", 1, 1, 1800};
-				begin5[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s5.ogg", 1, 1, 1800};
-				begin6[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s6.ogg", 1, 1, 1800};
-				begin7[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s7.ogg", 1, 1, 1800};
-				begin8[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s8.ogg", 1, 1, 1800};
-				begin9[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s9.ogg", 1, 1, 1800};
-				soundBegin[] = {"begin1", 0.11, "begin2", 0.11, "begin3", 0.11, "begin4", 0.11, "begin5", 0.11, "begin6", 0.11, "begin7", 0.11, "begin8", 0.11, "begin9", 0.11};
-				beginwater1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_3_bajoagua.ogg", 1, 1, 400};
-				beginwater2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_3_bajoagua.ogg", 1.05, 1, 400};
-				beginwater3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_3_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\SMG\Sting\Silencer_Sting_Tail_interior", 1, 1, 400};
-						frequency = 1;
-						volume = "interior";
-					};
-					class TailTrees
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\Silencer_Sting_Tail_trees", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*trees";
-					};
-					class TailForest
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\silencer_Sting_tail_forest", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*forest";
-					};
-					class TailMeadows
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\Silencer_Sting_Tail_meadows", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*(meadows/2 max sea/2)";
-					};
-					class TailHouses
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\SMG\Sting\Silencer_Sting_Tail_houses", 1, 1, 400};
-						frequency = 1;
-						volume = "(1-interior/1.4)*houses";
-					};
-				};
-				weaponSoundEffect = "DefaultRifle";
-			};
-		};
-
-		displayname = "Valken-39XX-XD";
-		class OpticsModes
-		{
-			class Snip
-			{
-				//modelOptics = "Scope\a180.p3d";
-				modelOptics = "Scope\4x_xm8.p3d";
-				opticsID = 1;
-				opticsDisplayName = "WFOV";
-				useModelOptics = 1;
-				opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-				opticsZoomMin = ".25/24";
-				opticsZoomMax = 0.25;
-				opticsZoomInit = 0.25;
-				discretefov[] = {.25/4,.25/8,.25/12,.25/24};
-				discreteinitIndex = 0;
-				discreteDistance[] = {100};
-				discreteDistanceInitIndex = 1;
-				distanceZoomMin = 100;
-				distanceZoomMax = 4000;
-				visionMode[] = {"Normal", "NVG","TI"};
-				thermalMode[] = {1};
-				memoryPointCamera = "opticView";
-				//modelOptics = "Scope\dc15zoomscope_sight.p3d";
-				weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
-				opticsFlare = 1;
-				opticsDisablePeripherialVision = 0;
-				cameraDir = "";
-			};
-			class Iron
-			{
-				opticsID = 2;
-				opticsDisplayName = "";
-				useModelOptics = 0;
-				opticsPPEffects[] = {"", ""};
-				opticsFlare = 0;
-				opticsDisablePeripherialVision = 0;
-				opticsZoomMin = 0.25;
-				opticsZoomMax = 1.25;
-				opticsZoomInit = 0.75;
-				memoryPointCamera = "eye";
-				modelOptics = "\A3\Weapons_F\empty";
-				visionMode[] = {};
-				discretefov[] = {};
-				discreteDistance[] = {200};
-				discreteDistanceInitIndex = 0;
-				distanceZoomMin = 200;
-				distanceZoomMax = 200;
-				discreteInitIndex = 0;
-			};
-		};
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			mass = 0.1;
-		};
-
-	};
 
 	/*class OPTRE_UnguidedLauncher_Base;
 	class OPTRE_M41_SSR:OPTRE_UnguidedLauncher_Base

+ 29 - 12
addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -54,26 +54,43 @@ class CfgAmmo
 		typicalSpeed=500;
 		caliber=1.6;
 	};
+	class macro_new_ammo(20mwup) : 3AS_EC50_BluePlasma
+	{
+		hit=10;
+		airLock=1;
+		typicalSpeed=500;
+		indirectHit = 3;
+		indirectHitRange = 0.5;
+		explosive = 0.2;
+		caliber=0.6;
+	};
+	class macro_new_ammo(20mwdp) : 3AS_EC50_BluePlasma
+	{
+		hit=17;
+		airLock=1;
+		typicalSpeed=700;
+		caliber=2.8;
+	};
 	class macro_new_ammo(30mw) : 3AS_EC60_BluePlasma
 	{
-	hit=19;
-	airLock=1;
-	typicalSpeed=800;
-	caliber=2.2;
+		hit=19;
+		airLock=1;
+		typicalSpeed=800;
+		caliber=2.2;
 	};
 	class macro_new_ammo(40mw) : 3AS_EC70_BluePlasma
 	{
-	hit=35;
-	airLock=1;
-	typicalSpeed=1100;
-	caliber=2.8;
+		hit=35;
+		airLock=1;
+		typicalSpeed=1100;
+		caliber=2.8;
 	};
 	class macro_new_ammo(50mw) : 3AS_EC80_BluePlasma
 	{
-	hit=60;
-	airLock=1;
-	typicalSpeed=1100;
-	caliber=2.8;
+		hit=300;
+		airLock=1;
+		typicalSpeed=1100;
+		caliber=5;
 	};
 	class macro_new_ammo(UGL_HE): G_40mm_HE
 	{

+ 99 - 5
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -20,6 +20,10 @@ class CfgMagazines
 {
 	class 3AS_45Rnd_EC50_Mag;
 	class 1Rnd_HE_Grenade_shell;
+	class DCStun_Mag;
+	class 1Rnd_Smoke_Grenade_shell;
+	class UGL_FlareWhite_F;
+	///Rifle/Pistol Magazines
 	class macro_new_mag(2mw,30) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="30 Round 2MW Cell";
@@ -62,12 +66,28 @@ class CfgMagazines
 	};
 	class macro_new_mag(20mw,20) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="20 Round20MW Cell";
+		displayName="20 Round 20MW Cell";
 		count = 20;
 		ammo=macro_new_ammo(20mw)
 		typicalSpeed=500;
 		descriptionShort="Medium power magazine";
 	};
+	class macro_new_mag(20mwup,20) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="20 Round 20MW UP Cell";
+		count = 20;
+		ammo=macro_new_ammo(20mwup)
+		typicalSpeed=500;
+		descriptionShort="Medium power unstable plasma magazine";
+	};
+	class macro_new_mag(20mwdp,20) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="20 Round 20MW DP Cell";
+		count = 20;
+		ammo=macro_new_ammo(20mwdp)
+		typicalSpeed=700;
+		descriptionShort="Medium power dense plasma magazine";
+	};
 	class macro_new_mag(20mw,240) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="240 Round 20MW Cell";
@@ -96,7 +116,7 @@ class CfgMagazines
 	{
 		displayName="10 Round 50MW Cell";
 		count = 10;
-		ammo=macro_new_ammo(20mw)
+		ammo=macro_new_ammo(50mw)
 		typicalSpeed=1100;
 		descriptionShort="High power magazine";
 	};
@@ -104,10 +124,20 @@ class CfgMagazines
 	{
 		displayName="8 Round 50MW Cell";
 		count = 8;
-		ammo=macro_new_ammo(20mw)
+		ammo=macro_new_ammo(50mw)
 		typicalSpeed=1100;
 		descriptionShort="High power magazine";
 	};
+	class macro_new_mag(stun,5):DCStun_Mag
+	{
+		displayName="5 Round Stun Cell";
+		descriptionShort = "5 Round Stun Cell";
+		count=5;
+		picture="\MRC\JLTS\weapons\Core\data\ui\stun_mag_ui_ca.paa";
+	};
+	///
+	///Grenade Launcher Magazines
+	///
 	class macro_new_mag(UGL_HE,3):1Rnd_HE_Grenade_shell
 	{
 		displayName = "3 Rd HE DC-15A Grenades";
@@ -131,7 +161,6 @@ class CfgMagazines
 		descriptionShort = "1Rnd EMP DC-15A Grenade";
 		displayName = "1 Rnd EMP DC-15A Grenades";
 		displayNameShort = "1Rnd EMP DC-15A";
-		//initSpeed = 120;
 		mass = 50;
 		maxLeadSpeed = 25;
 		maxThrowHoldTime = 2;
@@ -157,5 +186,70 @@ class CfgMagazines
 		{
 			libTextDesc = "";
 		};
-};
+	}
+	class macro_new_mag(UGL_HE,6):1Rnd_HE_Grenade_shell
+	{
+		displayName = "6 Rd HE RGL6 Grenades";
+		displayNameShort = "6 Rnd HE RGL6";
+		count=6;
+		ammo = macro_new_ammo(UGL_HE)
+		descriptionShort = "6Rd HE RGL6 Grenade";
+	}
+	class macro_new_mag(UGL_AP,6):1Rnd_HE_Grenade_shell
+	{
+		displayName = "6 Rd AP RGL6 Grenades";
+		displayNameShort = "6 Rd AP RGL6";
+		count=6;
+		ammo = macro_new_ammo(UGL_HE)
+		descriptionShort = "6Rd AP RGL6 Grenade";
+	}
+	class macro_new_mag(UGL_EMP,6) : 1Rnd_HE_Grenade_shell
+	{
+		ammo = "RD501_grenade_emp_ammo";
+		count = 6;
+		descriptionShort = "6Rnd EMP RGL6 Grenade";
+		displayName = "6 Rnd EMP RGL6 Grenades";
+		displayNameShort = "6Rnd EMP RGL6";
+		mass = 50;
+		maxLeadSpeed = 25;
+		maxThrowHoldTime = 2;
+		maxThrowIntensityCoef = 1.4;
+		minThrowIntensityCoef = 0.3;
+		model = "\thermalD\EMP_Grenade_ammo.p3d";
+		modelSpecial = "";
+		nameSound = "";
+		picture = "\thermalD\flash_x_ca.paa";
+		quickReload = 0 ;
+		reloadAction = "";
+		scope = 2;
+		selectionFireAnim = "zasleh";
+		simulation = "ProxyMagazines";
+		type = 16;
+		useAction = 0;
+		useActionTitle = "";
+		value = 1;
+		weaponpoolavailable = 1;
+		weight = 0;
+		class InventoryPlacements;
+		class Library 
+		{
+			libTextDesc = "";
+		};
+	};
+	class macro_new_mag(UGL_Smoke,6):1Rnd_Smoke_Grenade_shell
+	{
+		displayName = "6 Rd White Smoke RGL6 Grenades";
+		displayNameShort = "6 Rnd White Smoke RGL6";
+		count=6;
+		ammo = "G_40mm_Smoke";
+		descriptionShort = "6Rd White Smoke RGL6 Grenade";
+	};
+	class macro_new_mag(UGL_Flare,6):UGL_FlareWhite_F
+	{
+		displayName = "6 Rd White Flare RGL6 Grenades";
+		displayNameShort = "6 Rnd White Flare RGL6";
+		count=6;
+		ammo = "F_40mm_White";
+		descriptionShort = "6Rd White Flare RGL6 Grenade";
+	};
 };

+ 8 - 0
addons - Copy/RD501_Weapons/_scopes/DC_15X_12_20x_scope.hpp

@@ -0,0 +1,8 @@
+
+class JLTS_DC15X_scope;
+class macro_new_weapon(scope,dc15x_12_20x_scope):JLTS_DC15X_scope
+{
+	scope = 2;
+    displayName = "DC-15X Scope (12-20x)";
+    descriptionShort = "DC-15X Scope (12-20x)";
+}

+ 12 - 193
addons - Copy/RD501_Weapons/config.cpp

@@ -24,6 +24,7 @@ class CfgPatches
 //scopes
 class CfgWeapons
 {
+	class Mode_SemiAuto;
 	class ItemCore;
 	class InventoryItem_Base_F;
 	class InventoryOpticsItem_Base_F;
@@ -35,20 +36,17 @@ class CfgWeapons
 	#include "_scopes/DC_15A_LE_x4_x8.hpp"
 	
 	#include "_scopes/DC_15A_2-6x_acog.hpp"
-	class GrenadeLauncher;
-	// class Throw: GrenadeLauncher
-	// {
-	// 	muzzles[] += {"NICEMEME_MUZZLE"};
-	// 	class ThrowMuzzle;
-		
 	
-	// 	class NICEMEME_MUZZLE: ThrowMuzzle
-	// 	{
-	// 		displayName = "AYAYAYAYYA";
-	// 		magazines[] = {"smoke_meme_mag"};
-	// 	};
-		
-	// };
+	#include "_scopes/DC_15X_12_20x_scope.hpp"
+	class GrenadeLauncher;
+	class JLTS_stun_muzzle;
+	class RD501_stun_muzzle: JLTS_stun_muzzle
+	{
+		magazines[]=
+		{
+			macro_new_mag(stun,5)
+		};
+	};
 };
 
 class CfgMagazineWells
@@ -452,20 +450,6 @@ class CfgMagazines
 		initSpeed = 310;
 	};
 
-	class SWOP_Valken38Xauto_MagXXD: CA_Magazine
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "400Rnd Valken38X Magazine";
-		tracersEvery = 1;
-		count = 400;
-		weight = 90;
-		initSpeed = 1700;
-		ammo = "valken_38xxd_ammo";
-		descriptionShort = "400Rnd Valken38X Blaster Magazine";
-	};
 
 	class SmokeShell;
 	class smoke_meme_mag: SmokeShell
@@ -498,24 +482,6 @@ class CfgMagazines
 		initSpeed = 310;
 	};
 
-	class RPG32_HE_F;
-	class macro_new_mag(chaingun_z6x,1000): RPG32_HE_F
-	{	
-		dlc = "RD501";
-		displayname = "Z6x 1000rnd Mag";
-		displaynameshort = "1000rnd Mag";
-		descriptionshort = "Z6x 1000rnd mag";
-		ammo = macro_new_ammo(chaingun_z6x);
-		// picture = "\OPTRE_weapons\rockets\icons\rocket.paa";
-		// model = "\OPTRE_Weapons\Rockets\M41_tube.p3d";
-		// modelSpecial = "\OPTRE_Weapons\Rockets\M41_launcher_loaded.p3d";
-		count = 1000;
-		mass = 100;
-		initSpeed = 550;
-		allowedSlots[] = {901, 701};
-		tracersEvery = 100;
-		ACE_isBelt = 1;
-	};
 	class 3AS_Chaingun_Drum_Mag;
 	class macro_new_mag(z1000,3000) : 3AS_Chaingun_Drum_Mag
 	{
@@ -867,15 +833,6 @@ class CfgAmmo
 		timeToLive = 2;
 	};
 
-	class valken_38xxd_ammo: SWOP_dc15xBlasterRifle_Ammo
-	{
-		hit = 55;
-		indirectHit = 0;
-		indirectHitRange = 0.00;
-		explosive = 0.0;
-		caliber = 10;
-		timeToLive = 4;
-	};
 	
 	class SmokeShell;
 	class smoke_meme: SmokeShell
@@ -886,145 +843,7 @@ class CfgAmmo
 	};
 
 	//LOOK HERE $$$
-	class M_NLAW_AT_F;
-	class ammo_Penetrator_Base;
-	class macro_new_ammo(chaingun_z6x_penetrator): ammo_Penetrator_Base
-	{
-		hit = 30;
-		indirectHit = 0.0;
-		indirectHitRange = 0.0;
-		explosive = 0.0;
-		caliber = 2;
-		ACE_caliber = 0;
-		timeToLive = 6;
-		class HitEffects
-		{
-			Hit_Foliage_green="SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Dead="SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Green_big="SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Palm="SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Pine="SWOP_LaserExploSmallblue2";
-			hitFoliage="SWOP_LaserExploSmallblue2";
-			hitGlass="SWOP_LaserExploSmallblue2";
-			hitGlassArmored="SWOP_LaserExploSmallblue2";
-			hitWood="SWOP_LaserExploSmallblue2";
-			hitMetal="SWOP_LaserExploSmallblue2";
-			hitMetalPlate="SWOP_LaserExploSmallblue2";
-			hitBuilding="SWOP_LaserExploSmallblue2";
-			hitPlastic="SWOP_LaserExploSmallblue2";
-			hitRubber="SWOP_LaserExploSmallblue2";
-			hitTyre="SWOP_LaserExploSmallblue2";
-			hitConcrete="SWOP_LaserExploSmallblue2";
-			hitMan="SWOP_LaserExploSmallblue2";
-			hitGroundSoft="SWOP_LaserExploSmallblue2";
-			hitGroundRed="SWOP_LaserExploSmallblue2";
-			hitGroundHard="SWOP_LaserExploSmallblue2";
-			hitWater="SWOP_LaserExploSmallblue2";
-			hitVirtual="SWOP_LaserExploSmallblue2";
-			default_mat="SWOP_LaserExploSmallblue2";
-		};
-		coefGravity = 0.6;
-	};
-	class macro_new_ammo(chaingun_z6x): M_NLAW_AT_F
-	{	
-		hit = 32;
-		indirectHit = 20;
-		indirectHitRange = 0.1;
-		explosive = 0;
-		caliber = 2;
-		ACE_caliber = 0;
-		model = "\SWOP_Main\Effects\Tracer\laserblue";
-		effectFly = "SWOP_BlueLaserEffect";
-		cost = 500;
-		airFriction = 0;
-		sideairFriction = 0;
-		coefGravity = 0;
-		maxSpeed = 1050;
-		typicalSpeed = 1050;
-		initTime = 0.0;
-		thrustTime = 3.4;
-		thrust = 500;
-		fuseDistance = 0;
-		simulationStep = 0.02;
-		timeToLive = 4;
-		effectsMissile = "SWOP_BlueLaserEffect";
-		whistleDist = 20;
-		aiAmmoUsageFlags = "64 + 128 + 256 + 512";
-		submunitionAmmo = macro_new_ammo(chaingun_z6x_penetrator);
-		submunitionDirectionType = "SubmunitionModelDirection";
-		submunitionInitSpeed = 1000;
-		submunitionParentSpeedCoef = 0;
-		submunitionInitialOffset[] = {0,0,-0.2};
-		triggerOnImpact = 1;
-		deleteParentWhenTriggered = 0;
-		flightProfiles[] = {"Direct"};
-		CraterEffects = "ExploAmmoLaserCrater";
-		explosionEffects = "SWOP_LaserExploSmallblue2";
-		soundHit[] = {"A3\Sounds_F\arsenal\sfx\bullet_hits\concrete_01",1,1,150};
-		soundHit1[] = {"A3\Sounds_F\arsenal\sfx\bullet_hits\concrete_01",1,1,200};
-		soundHit2[] = {"A3\Sounds_F\arsenal\sfx\bullet_hits\concrete_01",1,1,200};
-		soundHit3[] = {"A3\Sounds_F\arsenal\sfx\bullet_hits\concrete_01",1,1,2000};
-		effectsSmoke = "SWOP_BlueLaserEffect";
-		explosionSoundEffect = "";
-		soundFly[] = {"",1,1,50};
-		muzzleEffect = "";
-		SoundSetExplosion[] = {""};
-		class HitEffects
-		{
-			Hit_Foliage_green = "SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Dead = "SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Green_big = "SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Palm = "SWOP_LaserExploSmallblue2";
-			Hit_Foliage_Pine = "SWOP_LaserExploSmallblue2";
-			hitFoliage = "SWOP_LaserExploSmallblue2";
-			hitGlass = "SWOP_LaserExploSmallblue2";
-			hitGlassArmored = "SWOP_LaserExploSmallblue2";
-			hitWood = "SWOP_LaserExploSmallblue2";
-			hitMetal = "SWOP_LaserExploSmallblue2";
-			hitMetalPlate = "SWOP_LaserExploSmallblue2";
-			hitBuilding = "SWOP_LaserExploSmallblue2";
-			hitPlastic = "SWOP_LaserExploSmallblue2";
-			hitRubber = "SWOP_LaserExploSmallblue2";
-			hitTyre = "SWOP_LaserExploSmallblue2";
-			hitConcrete = "SWOP_LaserExploSmallblue2";
-			hitMan = "SWOP_LaserExploSmallblue2";
-			hitGroundSoft = "SWOP_LaserExploSmallblue2";
-			hitGroundRed = "SWOP_LaserExploSmallblue2";
-			hitGroundHard = "SWOP_LaserExploSmallblue2";
-			hitWater = "SWOP_LaserExploSmallblue2";
-			hitVirtual = "SWOP_LaserExploSmallblue2";
-			default_mat = "SWOP_LaserExploSmallblue2";
-		};
-		class Direct{};
-		class CamShakeExplode
-		{
-			power = 1;
-			duration = 1.4;
-			frequency = 20;
-			distance = 1;
-		};
-		class CamShakeHit
-		{
-			power = 1;
-			duration = 0.6;
-			frequency = 20;
-			distance = 1;
-		};
-		class CamShakeFire
-		{
-			power = 1;
-			duration = 1.2;
-			frequency = 20;
-			distance = 1;
-		};
-		class CamShakePlayerFire
-		{
-			power = 1;
-			duration = 0.1;
-			frequency = 20;
-			distance = 1;
-		};
-	};
+
 	class macro_new_ammo(z1000) : 3AS_Chaingun_Ammo
 	{
 		hit=57.45;