Browse Source

Minor fixes

Erliens 4 years ago
parent
commit
0e645f242b

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

@@ -130,7 +130,7 @@ class cfgWeapons
 			reloadAction="GestureReloadPistol";
 			magazines[]=
 			{
-				macro_new_mag(pistolstun,5)
+				macro_new_mag(stun,5)
 			};
 		};
 		class Single : Single
@@ -159,7 +159,7 @@ class cfgWeapons
 			reloadAction="GestureReloadPistol";
 			magazines[]=
 			{
-				macro_new_mag(pistolstun,5)
+				macro_new_mag(stun,5)
 			};
 		};
 		class FullAuto : Single

+ 1 - 1
addons - Copy/RD501_Weapons/Grenades/config.cpp

@@ -99,7 +99,7 @@ class CfgWeapons
 		class ThrowMuzzle;
 		class Shadow_Muzzle: ThrowMuzzle
 		{
-			magazines[] = {"RD501_BlueShadow_Grenade"};
+			magazines[] = {"RD501_BlueShadow_Grenade",macro_new_mag(imploder,1),macro_new_mag(thermaldet,1)};
 		};
 	};
 };

+ 0 - 1
addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -53,7 +53,6 @@ class CfgWeapons
 				access = 1;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,dc_15a_acogtcw),
 					macro_new_weapon(scope,valken_6_12x)
 				};
 

+ 14 - 0
addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -26,6 +26,8 @@ class CfgAmmo
 	class 3AS_EC70_BluePlasma;
 	class 3AS_EC80_BluePlasma;
 	class G_40mm_HE;
+	class SWOP_BCCKtermimploder;
+	class SWOP_termDet;
 	class macro_new_ammo(2mw):3AS_EC20_BluePlasma
 	{
 		hit=4;
@@ -200,5 +202,17 @@ class CfgAmmo
 			power=0;
 		};
     };
+	class macro_new_ammo(imploder) : SWOP_BCCKtermimploder
+	{
+		hit=50;
+		indirectHit=45;
+		indirectHitRange=2;
+	}
+	class macro_new_ammo(thermaldet) : SWOP_termDet
+	{
+		hit=18;
+		indirectHit=14;
+		indirectHitRange=8;
+	}
 
 };

+ 24 - 9
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -24,6 +24,8 @@ class CfgMagazines
 	class 1Rnd_Smoke_Grenade_shell;
 	class UGL_FlareWhite_F;
 	class SWOP_DC15SA_Ammo;
+	class SWOP_termDet_Gm;
+	class SWOP_BCCKtermimploder_G;
 	///Rifle/Pistol Magazines
 	class macro_new_mag(2mw,30) : 3AS_45Rnd_EC50_Mag
 	{
@@ -153,14 +155,6 @@ class CfgMagazines
 		count=5;
 		picture="\MRC\JLTS\weapons\Core\data\ui\stun_mag_ui_ca.paa";
 	};
-	class macro_new_mag(pistolstun,5):DCStun_Mag
-	{
-		displayName="5 Round Stun Cell";
-		descriptionShort = "5 Round Stun Cell";
-		displayNameShort = "5 Round Stun Cell";
-		count=5;
-		picture="\MRC\JLTS\weapons\Core\data\ui\stun_mag_ui_ca.paa";
-	};
 	////////////////////////////////////////////////////
 	/////////Grenade Launcher Magazines/////////////////
 	////////////////////////////////////////////////////
@@ -226,7 +220,7 @@ class CfgMagazines
 		displayName = "6 Rd AP RGL6 Grenades";
 		displayNameShort = "6 Rd AP RGL6";
 		count=6;
-		ammo = macro_new_ammo(UGL_HE)
+		ammo = macro_new_ammo(UGL_AP)
 		descriptionShort = "6Rd AP RGL6 Grenade";
 	}
 	class macro_new_mag(UGL_EMP,6) : 1Rnd_HE_Grenade_shell
@@ -278,4 +272,25 @@ class CfgMagazines
 		ammo = "F_40mm_White";
 		descriptionShort = "6Rd White Flare RGL6 Grenade";
 	};
+	/////////////////////////////////////////////////////
+	/////////////Grenades Magazines/////////////////////
+	////////////////////////////////////////////////////
+	class macro_new_mag(imploder,1):SWOP_BCCKtermimploder_G
+	{
+		scope=2;
+		displayName = "Republic Thermal Imploder";
+		displayNameShort = "Thermal Imploder";
+		count=1;
+		ammo = macro_new_ammo(imploder)
+		descriptionShort = "Thermal Imploder";
+	};
+	class macro_new_mag(thermaldet,1):SWOP_termDet_Gm
+	{
+		scope=2;
+		displayName = "Republic Thermal Detonator";
+		displayNameShort = "Thermal Detonator";
+		count=1;
+		ammo = macro_new_ammo(thermaldet)
+		descriptionShort = "Thermal Detonator";
+	};
 };