Merge pull request #81 from 501st-Aux-Mod-Team/hotfix4

Hotfix4

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

@@ -42,7 +42,7 @@ class CfgWeapons
 		{
 			macro_new_mag(10mw,30)
 		};
-		modes[] = {"Single", "Burst"};
+		modes[] = {"Single", "Burst","EGLM"};
 		muzzles[]=
 		{
 			"this",

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

@@ -187,6 +187,7 @@ class cfgWeapons
 	{
 		displayName="Republic DC-15S";
 		reloadTime=0.66;
+		recoil="recoil_smg_01";
 		reloadAction="ReloadMagazine";
 		magazines[]=
 		{

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

@@ -127,6 +127,7 @@ class cfgWeapons
 		class Stun: RD501_stun_muzzle
 		{
 			displayName="High Energy StunMode";
+			reloadAction="GestureReloadPistol";
 			magazines[]=
 			{
 				macro_new_mag(pistolstun,5)

addons - Copy/RD501_Weapons/Z6/config.cpp

@@ -114,7 +114,7 @@ class cfgWeapons
 		scope=2;
         scopeArsenal=2;
 		JLTS_hasElectronics=0;
-		recoil="recoil_mmg_02"
+		recoil="recoil_lim"
 		baseWeapon=macro_new_weapon_nofam(rZ6)
         displayName="Republic Z6 Chaingun";
 		magazines[]=
@@ -130,22 +130,42 @@ class cfgWeapons
 		{
 			dispersion = Z6_accuracy_burst
 			displayName = "Over Charge Auto";
-			recoil = "recoil_single_smg_02";
-			recoilProne = "recoil_single_prone_smg_02";
-			//reloadTime = 0.1;
 			reloadTime = Z6_burst_reload
-			//soundContinuous = 1;
 			burst = 25;
 			textureType = "fastAuto";
 		};
-
+		class HitEffects
+		{
+			Hit_Foliage_green="";
+			Hit_Foliage_Dead="";
+			Hit_Foliage_Green_big="";
+			Hit_Foliage_Palm="";
+			Hit_Foliage_Pine="";
+			hitFoliage="";
+			hitGlass="";
+			hitGlassArmored="";
+			hitWood="";
+			hitHay="";
+			hitMetal="";
+			hitMetalPlate="";
+			hitBuilding="";
+			hitPlastic="";
+			hitRubber="";
+			hitConcrete="";
+			hitMan="ImpactEffectsBlood";
+			hitGroundSoft="";
+			hitGroundRed="";
+			hitGroundHard="";
+			hitWater="";
+			hitVirtual="";
+		};
 	};
 	class 3AS_Chaingun;
     class macro_new_weapon_nofam(z1000): 3AS_Chaingun
     {
         scope=2;
         scopeArsenal=2;
-		recoil="recoil_mmg_01";
+		recoil="recoil_mmg_02";
         displayName="Republic Z1000 Chaingun";
 		picture = "\RD501_Weapons\Z6\chaingun_icon.paa";
 		RD501_Empty_Weapon = macro_quote(macro_new_weapon_nofam(z1000u));
@@ -156,6 +176,31 @@ class cfgWeapons
 		class EventHandlers {
 			fired = macro_quote(_this call macro_fnc_name(onWeaponFiredSwapToEmpty));
 		};
+		class HitEffects
+		{
+			Hit_Foliage_green="";
+			Hit_Foliage_Dead="";
+			Hit_Foliage_Green_big="";
+			Hit_Foliage_Palm="";
+			Hit_Foliage_Pine="";
+			hitFoliage="";
+			hitGlass="";
+			hitGlassArmored="";
+			hitWood="";
+			hitHay="";
+			hitMetal="";
+			hitMetalPlate="";
+			hitBuilding="";
+			hitPlastic="";
+			hitRubber="";
+			hitConcrete="";
+			hitMan="ImpactEffectsBlood";
+			hitGroundSoft="";
+			hitGroundRed="";
+			hitGroundHard="";
+			hitWater="";
+			hitVirtual="";
+		};
     };
 	class macro_new_weapon_nofam(z1000u): 3AS_Chaingun
     {
@@ -169,100 +214,5 @@ class cfgWeapons
 			"none"
 		};
     };
-
-	/*class OPTRE_UnguidedLauncher_Base;
-	class OPTRE_M41_SSR:OPTRE_UnguidedLauncher_Base
-	{
-		class Single;
-	};
-	class macro_new_weapon(chaingun,z6x): OPTRE_M41_SSR
-	{
-		baseWeapon = macro_new_weapon(chaingun,z6x);
-		recoil = macro_new_recoil(chaingun);
-		displayName = "Z-6X";
-		magazines[] = {macro_new_mag(chaingun_z6x,1000)};
-
-		ace_overpressure_priority = 1;
-		ace_overpressure_angle = 0;
-		ace_overpressure_range = 0;
-		ace_overpressure_damage = 0;
-
-		descriptionshort = "Ur mom gay :)";
-
-		class GunParticles
-		{
-			class effect1
-			{
-				positionName = "muzzleEnd2";
-				directionName = "muzzlePos2";
-				effectName = "";
-			};
-		};
-		
-		modelOptics = "Scope\4x_xm8.p3d";
-		class OpticsModes
-		{
-		
-			class StepScope
-			{
-				
-				opticsID = 1;
-				useModelOptics = 1;
-				opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
-				opticsFlare = 0;
-				opticsZoomMin = 0.125;
-				opticsZoomMax = 0.125/2;
-				opticsZoomInit = 0.125;
-				distanceZoomMin = 300;
-				distanceZoomMax = 300;
-				memoryPointCamera = "eye";
-				cameraDir = "look";
-				visionMode[] = {"Normal", "NVG", "Ti"};
-				thermalMode[] = {0, 1};
-				opticsDisablePeripherialVision = 1;
-				discretefov[] = {0.125, 0.125/4, 0.125/8};
-				discreteInitIndex = 0;
-			};
-		};
-
-		modes[] = {"Single"};
-		class Single: Single
-		{
-			sounds[] = {"StandardSound"};
-			class BaseSoundModeType
-			{
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				// begin1[] = {"OPTRE_Weapons\Rockets\data\sounds\rocket_1.wss", 2.5, 1, 1500};
-				// soundBegin[] = {"begin1", 1};
-				begin1[] = {"SW_CloneWarsWeapons\SW_Z6\sound\fire1z6.ogg", 0.9, 3, 2000};
-				begin2[] = {"SW_CloneWarsWeapons\SW_Z6\sound\fire1z6.ogg", 0.9, 3, 2000};
-				soundBegin[] = {"begin1", 0.5, "begin2", 0.5};
-
-				// begin1[] = {"SW_CloneWarsWeapons\DC17\DC171.ogg", 1, 3, 1200};
-				// begin2[] = {"SW_CloneWarsWeapons\DC17\DC172.ogg", 1, 3, 1200};
-				// begin3[] = {"SW_CloneWarsWeapons\DC17\DC173.ogg", 1, 3, 1200};
-				// begin4[] = {"SW_CloneWarsWeapons\DC17\DC174.ogg", 1, 3, 1200};
-				// begin5[] = {"SW_CloneWarsWeapons\DC17\DC175.ogg", 1, 3, 1200};
-				// soundBegin[] = {"begin1", 0.2, "begin2", 0.2, "begin3", 0.2, "begin4", 0.2, "begin5", 0.2};
-			};
-			recoil = "recoil_empty";
-			//reloadtime = 1;
-			reloadTime = 0.03;
-			dispersion = 0.0015;
-			autoFire=1;
-			burst = 1;
-			aiRateOfFire = 7;
-			aiRateOfFireDistance = 600;
-			minRange = 10;
-			minRangeProbab = 0.3;
-			midRange = 400;
-			midRangeProbab = 0.8;
-			maxRange = 600;
-			maxRangeProbab = 0.1;
-		};
-	};*/
-
 };
 

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -49,6 +49,7 @@ class CfgAmmo
 		typicalSpeed=450;
 		caliber=1;
 		airFriction=0;
+		explosive = 0.4;
 	};
 	class macro_new_ammo(20mw) : 3AS_EC50_BluePlasma
 	{
@@ -57,6 +58,7 @@ class CfgAmmo
 		typicalSpeed=500;
 		caliber=1.6;
 		airFriction=0;
+		explosive = 0.4;
 	};
 	class macro_new_ammo(20mwup) : 3AS_EC50_BluePlasma
 	{
@@ -65,7 +67,7 @@ class CfgAmmo
 		typicalSpeed=500;
 		indirectHit = 3;
 		indirectHitRange = 0.5;
-		explosive = 0.2;
+		explosive = 0.4;
 		caliber=0.6;
 		airFriction=0;
 	};
@@ -76,6 +78,7 @@ class CfgAmmo
 		typicalSpeed=700;
 		caliber=2.8;
 		airFriction=0;
+		explosive = 0.2;
 	};
 	class macro_new_ammo(30mw) : 3AS_EC60_BluePlasma
 	{
@@ -84,14 +87,16 @@ class CfgAmmo
 		typicalSpeed=800;
 		caliber=2.4;
 		airFriction=0;
+		explosive = 0.4;
 	};
 	class macro_new_ammo(40mw) : 3AS_EC70_BluePlasma
 	{
-		hit=35;
+		hit=60;
 		airLock=1;
 		typicalSpeed=1100;
-		caliber=2.8;
+		caliber=3.6;
 		airFriction=0;
+		explosive = 0.4;
 	};
 	class macro_new_ammo(50mw) : 3AS_EC80_BluePlasma
 	{

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -43,7 +43,7 @@ class CfgMagazines
 	class macro_new_mag(5mw,10) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="10 Round 5MW Cell";
-		count = 10;
+		count = 15;
 		ammo=macro_new_ammo(5mw)
 		typicalSpeed=400;
 		descriptionShort="Low power magazine";

addons - Copy/RD501_Weapons/config.cpp

@@ -825,6 +825,7 @@ class CfgAmmo
 	{
 		hit=57.45;
 		caliber=3.5999999;
+		ACE_caliber=1;
 		typicalSpeed=860;
 		model="\A3\Weapons_f\Data\bullettracer\tracer_green";
 	};