Browse Source

Removed Prototype. Added primary and sidearms. Added new GL rounds that actually aim correctly

Erliens 4 years ago
parent
commit
b0abbad28d
57 changed files with 910 additions and 3088 deletions
  1. 0 147
      addons - Copy/RD501_Prototype/DC_series/_dc15a_gl.hpp
  2. 0 246
      addons - Copy/RD501_Prototype/DC_series/_dc15a_le.hpp
  3. 0 89
      addons - Copy/RD501_Prototype/DC_series/_dc15a_mod0.hpp
  4. 0 160
      addons - Copy/RD501_Prototype/DC_series/_dc15a_rifle.hpp
  5. 0 182
      addons - Copy/RD501_Prototype/DC_series/_dc15s_carbine.hpp
  6. 0 104
      addons - Copy/RD501_Prototype/DC_series/config.cpp
  7. 0 147
      addons - Copy/RD501_Prototype/MRP/_dc15a_gl.hpp
  8. 0 246
      addons - Copy/RD501_Prototype/MRP/_dc15a_le.hpp
  9. 0 89
      addons - Copy/RD501_Prototype/MRP/_dc15a_mod0.hpp
  10. 0 160
      addons - Copy/RD501_Prototype/MRP/_dc15a_rifle.hpp
  11. 0 182
      addons - Copy/RD501_Prototype/MRP/_dc15s_carbine.hpp
  12. 0 123
      addons - Copy/RD501_Prototype/MRP/config.cpp
  13. BIN
      addons - Copy/RD501_Prototype/MRP/textures/DC15A_co.paa
  14. 0 202
      addons - Copy/RD501_Prototype/Z6/config.cpp
  15. 0 183
      addons - Copy/RD501_Prototype/_ammo/core_ammo.hpp
  16. 0 73
      addons - Copy/RD501_Prototype/_ammo/flares.hpp
  17. 0 47
      addons - Copy/RD501_Prototype/_ammo/shotgun.hpp
  18. 0 118
      addons - Copy/RD501_Prototype/_mags/core_mags.hpp
  19. 0 99
      addons - Copy/RD501_Prototype/_mags/flares.hpp
  20. 0 32
      addons - Copy/RD501_Prototype/_mags/shotgun.hpp
  21. 0 39
      addons - Copy/RD501_Prototype/_magwell/magwell.hpp
  22. BIN
      addons - Copy/RD501_Prototype/_textures/icons/AP_GL.paa
  23. BIN
      addons - Copy/RD501_Prototype/_textures/icons/HE_GL.paa
  24. BIN
      addons - Copy/RD501_Prototype/_textures/icons/LE.paa
  25. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_blue.paa
  26. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_cyan.paa
  27. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_grey_IR.paa
  28. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_light_green.paa
  29. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_orange.paa
  30. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_purple.paa
  31. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_red.paa
  32. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_white.paa
  33. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_yellow.paa
  34. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/TEST.paa
  35. BIN
      addons - Copy/RD501_Prototype/_textures/icons/canister/canister_dark_green.paa
  36. BIN
      addons - Copy/RD501_Prototype/_textures/icons/carbine.paa
  37. BIN
      addons - Copy/RD501_Prototype/_textures/icons/mod0.paa
  38. BIN
      addons - Copy/RD501_Prototype/_textures/icons/rum.paa
  39. BIN
      addons - Copy/RD501_Prototype/_textures/icons/z6.paa
  40. 0 140
      addons - Copy/RD501_Prototype/config.cpp
  41. 0 141
      addons - Copy/RD501_Prototype/config_macros.hpp
  42. BIN
      addons - Copy/RD501_Prototype/logo.paa
  43. 42 2
      addons - Copy/RD501_Weapons/DC_Family/DC_15a/config.cpp
  44. 21 41
      addons - Copy/RD501_Weapons/DC_Family/DC_15c/config.cpp
  45. 73 0
      addons - Copy/RD501_Weapons/DC_Family/DC_15gl/config.cpp
  46. 65 0
      addons - Copy/RD501_Weapons/DC_Family/DC_15l/config.cpp
  47. 26 1
      addons - Copy/RD501_Weapons/DC_Family/DC_15s/config.cpp
  48. 42 2
      addons - Copy/RD501_Weapons/DC_Family/DC_17/config.cpp
  49. 1 84
      addons - Copy/RD501_Weapons/Grenades/config.cpp
  50. 62 0
      addons - Copy/RD501_Weapons/Valken/config.cpp
  51. 36 2
      addons - Copy/RD501_Weapons/Z6/config.cpp
  52. 158 0
      addons - Copy/RD501_Weapons/_ammo/config.cpp
  53. 161 0
      addons - Copy/RD501_Weapons/_mag/config.cpp
  54. 70 0
      addons - Copy/RD501_Weapons/_scopes/DC_15A_2-6x_acog.hpp
  55. 69 0
      addons - Copy/RD501_Weapons/_scopes/DC_15A_LE_x4_x8.hpp
  56. 70 0
      addons - Copy/RD501_Weapons/_scopes/DC_15A_x4_acog.hpp
  57. 14 7
      addons - Copy/RD501_Weapons/config.cpp

+ 0 - 147
addons - Copy/RD501_Prototype/DC_series/_dc15a_gl.hpp

@@ -1,147 +0,0 @@
-    class macro_new_weapon(DC,15a_gl_proto):SCI_arifle_DC15GL_F
-	{
-		dlc = "RD501";
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15a_gl_proto);
-		
-		//changes
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(Republic_Universal_Magazine,30)};
-		displayName="[PROTOTYPE] DC15A GL Rifle";
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single","Burst"};
-		class Single:Single
-		{
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-
-		};
-		class Burst:Burst
-		{
-			burst=2;
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_burst_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-			textureType = "dual";
-		};
-		macro_dc15a_rifle_scope
-		class SCI_GL_F:SCI_GL_F
-		{
-			discreteDistance[]={100,200,300};
-			magazineWell[] = {Republic_GL_Magazine_Well};
-			magazines[] = {
-				
-			};
-		};
-		//end changes
-	};

+ 0 - 246
addons - Copy/RD501_Prototype/DC_series/_dc15a_le.hpp

@@ -1,246 +0,0 @@
-    class macro_new_weapon(DC,15a_LE_proto):SCI_DC15XM//SWOP_DC15ABlasterRifle_mod1
-	{
-		weaponPoolAvailable = 1;
-		
-		scope=2;
-		scopeArsenal=2;
-
-		// class Secondary:Secondary
-		// {
-		// 	class Single;
-		// };
-		dlc = "RD501";
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15a_LE_proto);
-
-		//changes
-		muzzles[] = {"this"};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_DC15a_LE,20)};
-		//initSpeed = -1.5;
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		displayName="[PROTOTYPE] DC15A Long Engagement Rifle";
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single"};
-		opticsZoomMin= macro_scope_magnification(12);
-		opticsZoomMax= macro_scope_magnification(6);
-		opticsZoomInit= macro_scope_magnification(6);
-		//discretefov[] = {macro_scope_magnification(6),macro_scope_magnification(12),macro_scope_magnification(24),macro_scope_magnification(48)};
-		distanceZoomMin=100;
-		distanceZoomMax=2000;
-		maxZeroing=2000;
-		discreteInitIndex=0;
-		discreteDistance[]={100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600};
-		modelOptics = "Scope\a180.p3d";	
-		
-
-		visionMode[]=
-		{
-			"Normal",
-			"NVG",
-			"TI"
-		};
-		thermalMode[]={0};
-		hasbipod=1;
-		class Single:Single
-		{
-			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";
-					};
-				};
-			};
-
-			reloadTime = macro_dc15a_le_rof
-			dispersion = macro_dc15a_le_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-
-		};
-
-	};
-
-	// class macro_new_weapon(DC,15a_LE_stageI_v2):SCI_arifle_DC15LE_F//SWOP_DC15ABlasterRifle_mod1
-	// {
-	// 	weaponPoolAvailable = 1;
-		
-	// 	scope=2;
-	// 	scopeArsenal=2;
-
-	// 	// class Secondary:Secondary
-	// 	// {
-	// 	// 	class Single;
-	// 	// };
-	// 	dlc = "RD501";
-	// 	author= "RD501";
-	// 	baseWeapon = macro_new_weapon(DC,15a_LE_stageI_v2);
-
-	// 	//changes
-	// 	muzzles[] = {"this"};
-	// 	magazineWell[]={Republic_Universal_Magazine_Well};
-	// 	magazines[]={macro_new_mag(DC15a_LE,20)};
-	// 	//initSpeed = -1.5;
-	// 	picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-	// 	displayName="[Stage I] DC15A Long Engagement Rifle v2";
-	// 	macro_ace_heating
-	// 	canShootInWater = 1;
-	// 	recoil =  macro_new_recoil(dc15a_rifle)
-	// 	modes[] = {"Single"};
-	// 	opticsZoomMin= macro_scope_magnification(12);
-	// 	opticsZoomMax= macro_scope_magnification(6);
-	// 	opticsZoomInit= macro_scope_magnification(6);
-	// 	distanceZoomMin=100;
-	// 	distanceZoomMax=2000;
-	// 	maxZeroing=2000;
-	// 	discreteInitIndex=0;
-	// 	discreteDistance[]={100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600};	
-
-	// 	visionMode[]=
-	// 	{
-	// 		"Normal",
-	// 		"NVG",
-	// 		"TI"
-	// 	};
-	// 	thermalMode[]={0};
-	// 	hasbipod=1;
-	// 	class Single:Single
-	// 	{
-	// 		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";
-	// 				};
-	// 			};
-	// 		};
-
-	// 		reloadTime = macro_dc15a_le_rof
-	// 		dispersion = macro_dc15a_le_acc
-	// 		recoil = "recoil_single_mx";
-	// 		recoilProne = "recoil_single_prone_mx";
-
-	// 	};
-
-	// 	class OpticsModes
-	// 	{
-	// 		class Scope
-	// 		{
-	// 			opticsID=1;
-	// 			useModelOptics=1;
-	// 			opticsPPEffects[]=
-	// 			{
-	// 				"OpticsCHAbera5",
-	// 				"OpticsBlur5"
-	// 			};
-	// 			opticsDisablePeripherialVision=0.67000002;
-	// 			opticsZoomMin=0.0099999998;
-	// 			opticsZoomMax=0.090000004;
-	// 			opticsZoomInit=0.090000004;
-	// 			memoryPointCamera="opticView";
-	// 			visionMode[]=
-	// 			{
-	// 				"Normal",
-	// 				"NVG",
-	// 				"TI"
-	// 			};
-	// 			thermalMode[]={2};
-	// 			opticsFlare="true";
-	// 			weaponInfoType="RscWeaponRangeFinder";
-	// 			distanceZoomMin=300;
-	// 			distanceZoomMax=300;
-	// 			cameraDir="";
-	// 		};
-	// 	};
-	// };

+ 0 - 89
addons - Copy/RD501_Prototype/DC_series/_dc15a_mod0.hpp

@@ -1,89 +0,0 @@
-    class macro_new_weapon(DC,15a_mod0_proto):SCI_arifle_VALKEN38A_F//SWOP_DC15ABlasterRifle_mod0
-	{
-		weaponPoolAvailable = 1;
-		scope=2;
-		scopeArsenal=2;
-
-		//changes
-		macro_ace_heating
-		muzzles[] = {"this"};
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_DC15a_mod_0,200)};
-		modes[] = {"fullauto","fastauto"};
-		recoil = macro_new_recoil(dc15a_mod_0)
-		recoilProne = macro_new_recoil(dc15a_mod_0_prone)
-		displayName="[PROTOTYPE] DC15A Mod 0 LSD";
-		author ="namenai";
-		baseWeapon = macro_new_weapon(DC,15a_mod0_proto);
-		// initSpeed = -0.50;
-		class fullauto:fullauto
-		{
-			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";
-					};
-				};
-			};
-			
-			reloadTime= macro_dc15a_mod0_rof_slow
-			dispersion = macro_dc15a_mod0_acc
-			
-		};
-		class fastauto:fullauto
-		{
-			reloadTime= macro_dc15a_mod0_rof_fast
-			textureType = "fastAuto";
-			dispersion = macro_dc15a_mod0_fast_acc
-		};
-
-		MACRO_MOD0_SCOPE
-	
-		//end changes
-	};

+ 0 - 160
addons - Copy/RD501_Prototype/DC_series/_dc15a_rifle.hpp

@@ -1,160 +0,0 @@
-    class macro_new_weapon(DC,15a_proto):SCI_arifle_DC15A_F//SWOP_DC15ABlasterRifle // RD501_DC_15a_base
-	{
-		weaponPoolAvailable = 1;
-		
-		scope=2;
-		scopeArsenal=2;
-
-
-		dlc = "RD501";
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15a_proto);
-
-		//changes
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		muzzles[] = {"this"};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(Republic_Universal_Magazine,30)};
-		displayName=  "[PROTOTYPE] DC15A Rifle";
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single","Burst"};
-		// initSpeed = -1.0;
-		
-		class Single:Single
-		{
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-
-		};
-		class Burst:Burst
-		{
-			burst=2;
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_burst_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-			textureType = "dual";
-		};
-		macro_dc15a_rifle_scope
-
-		// class WeaponSlotsInfo: WeaponSlotsInfo
-		// {
-		// 	mass = 30;
-		// 	class CowsSlot: CowsSlot
-		// 	{
-		// 		compatibleItems[] = {
-		// 			macro_new_scope(x4_dc15_acog)
-		// 		};
-		// 	};
-		// };
-		//end changes
-
-	};

+ 0 - 182
addons - Copy/RD501_Prototype/DC_series/_dc15s_carbine.hpp

@@ -1,182 +0,0 @@
-    class macro_new_weapon(DC,15s_proto):SCI_arifle_DC15S_F//SWOP_DC15
-	{
-		
-
-		
-    	scope=2;
-		scopeArsenal=2;
-		weaponPoolAvailable = 1;
-		
-		dlc = "RD501";
-
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15s_proto);
-
-		
-		//changes
-		// initSpeed = -0.80;
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15s.paa";
-		recoil =  macro_new_recoil(dc15s)
-		class OpticsModes
-		{
-			class Ironsights
-			{
-				opticsID=1;
-				useModelOptics=0;
-				opticsFlare="true";
-				opticsPPEffects[]=
-				{
-					"OpticsCHAbera5",
-					"OpticsBlur5"
-				};
-				opticsDisablePeripherialVision=0.67000002;
-				opticsZoomMin=macro_scope_magnification(1);
-				opticsZoomMax=1.1;
-				opticsZoomInit=0.75;
-				memoryPointCamera="eye";
-				visionMode[]={};
-				distanceZoomMin=100;
-				distanceZoomMax=100;
-				cameraDir="";
-				discreteDistanceInitIndex = 1;
-				discreteinitIndex = 0;
-			};
-			class Scope: Ironsights
-			{
-				opticsID=2;
-				useModelOptics=1;
-				opticsPPEffects[]=
-				{
-					"OpticsCHAbera5",
-					"OpticsBlur5"
-				};
-				opticsDisablePeripherialVision=0.67000002;
-				opticsZoomMin = macro_scope_magnification(4);
-				opticsZoomMax = macro_scope_magnification(1);
-				opticsZoomInit = macro_scope_magnification(4);
-				discretefov[] = {macro_scope_magnification(4)};
-				memoryPointCamera="opticView";
-				visionMode[]=
-				{
-					"Normal",
-					"NVG"
-				};
-				opticsFlare="true";
-				distanceZoomMin=300;
-				distanceZoomMax=300;
-			};
-		};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_DC15s,100)};
-		displayName="[PROTOTYPE] DC15s Carbine";
-		canShootInWater = 1;
-		macro_ace_heating
-		modes[] = {"FullAuto", "Single"};
-		
-		opticsDisablePeripherialVision = 0.67;
-		modelOptics = "sci_weaponsMain\Data\A3_2d_optic.p3d";
-		opticsZoomMin=macro_scope_magnification(4);
-		opticsZoomMax=1.25;
-		opticsZoomInit=macro_scope_magnification(1);
-		muzzles[] = {"this"};//ShotgunBlast
-		class FullAuto:FullAuto
-		{
-			reloadTime = macro_dc15s_rof
-        	dispersion = macro_dc15s_acc
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s1.ogg", 1, 1.1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s2.ogg", 1, 1.1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s3.ogg", 1, 1.1, 1800};
-				begin4[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s4.ogg", 1, 1.1, 1800};
-				begin5[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s5.ogg", 1, 1.1, 1800};
-				begin6[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s6.ogg", 1, 1.1, 1800};
-				begin7[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s7.ogg", 1, 1.1, 1800};
-				begin8[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s8.ogg", 1, 1.1, 1800};
-				begin9[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s9.ogg", 1, 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\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 ShotgunBlast: SCI_arifle_DC15S_F
-		// {
-		// 	displayName = "DC-15s I.O.N Blast";
-			
-		// 	magazines[] = {macro_new_mag(shotgun_test,2)};
-			
-		// 	modes[] = {"Single"};
-		// 	class Single: Mode_SemiAuto
-		// 	{
-				
-		// 		sounds[] = {"StandardSound"};
-		// 		class StandardSound
-		// 		{
-		// 			soundSetShot[] = {"Msbs65_01_Shotgun_Shot_SoundSet", "Msbs65_01_Shotgun_Tail_SoundSet"};
-		// 		};
-		// 		reloadTime = 0.2;
-		// 		dispersion = 0.01245;
-		// 		minRange = 2;
-		// 		minRangeProbab = 0.95;
-		// 		midRange = 30;
-		// 		midRangeProbab = 0.95;
-		// 		maxRange = 100;
-		// 		maxRangeProbab = 0.3;
-		// 		aiRateOfFire = 1;
-		// 		aiRateOfFireDistance = 30;
-		// 	};
-		// };
-
-		class Single:FullAuto
-		{
-			autoFire=0;
-			textureType = "semi";
-			
-		};
-		
-		//end changes
-	};

+ 0 - 104
addons - Copy/RD501_Prototype/DC_series/config.cpp

@@ -1,104 +0,0 @@
-#include "../config_macros.hpp" 
-#include "../../RD501_main/config_macros.hpp"
-class CfgPatches
-{
-	class macro_patch_name(DC_15_proto)
-	{
-		author=macro_authors_ppl;
-		addonRootClass= macro_patch_name(weapon_prototypes)
-		requiredAddons[]=
-		{
-			macro_patch_name(weapon_prototypes)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_weapon(DC,15a_stageI),
-			macro_new_weapon(DC,15a_gl_stageI),
-			macro_new_weapon(DC,15a_LE_stageI),
-			macro_new_weapon(DC,15a_mod0_stageI),
-
-			macro_new_weapon(DC,15s_stageI),
-			"RD501_TEST_LE_GUN"
-
-			//macro_new_weapon(DC,verision_checker)
-		};
-	};
-};
-class CowsSlot;
-class Mode_SemiAuto;
-class cfgWeapons 
-{	
-	//swop rifles
-	//verision checker
-	// class macro_new_weapon(DC,verision_checker):SWOP_DC15ABlasterRifle
-	// {	
-	// 	weaponPoolAvailable = 1;
-	// 	scope=2;
-	// 	scopeArsenal=2;
-	// 	baseWeapon = macro_new_weapon(DC,verision_checker);
-	// 	displayName = macro_mod_ver
-	// };
-
-	
-	
-	//212th dc15x
-	class SCI_dc15x_base;
-	class SCI_DC15XM:SCI_dc15x_base
-	{
-		class Single;
-	};
-
-	//212th valken
-	class SCI_arifle_VALKEN38A_Base_F;
-	class SCI_arifle_VALKEN38A_F:SCI_arifle_VALKEN38A_Base_F
-	{
-		class fullauto;
-	};
-
-	//212th Gl
-	class Rifle_Base_F;
-	class SCI_arifle_DC15GL_Base_F;
-	class SCI_arifle_DC15GL_F: SCI_arifle_DC15GL_Base_F
-	{
-		class Single;
-		class Burst;
-		class SCI_GL_F;
-	};
-
-	class SCI_arifle_DC15A_Base_F;
-	class SCI_arifle_DC15A_F:SCI_arifle_DC15A_Base_F
-	{
-		class Single;
-		class Burst;
-	};
-
-	class SCI_arifle_DC15LE_F: SCI_arifle_DC15A_Base_F
-	{	
-		class Single;
-	};
-
-	class RD501_TEST_LE_GUN:SCI_arifle_DC15LE_F
-	{
-		scope = 2;
-	}
-	#include "_dc15a_gl.hpp"
-
-	#include "_dc15a_rifle.hpp"
-
-	#include "_dc15a_le.hpp"
-
-	#include "_dc15a_mod0.hpp"
-
-
-	class SCI_arifle_DC15S_Base_F;
-	class SCI_arifle_DC15S_F: SCI_arifle_DC15S_Base_F
-	{
-		
-		class FullAuto;
-		
-	};
-	#include "_dc15s_carbine.hpp"
-
-};
-

+ 0 - 147
addons - Copy/RD501_Prototype/MRP/_dc15a_gl.hpp

@@ -1,147 +0,0 @@
-    class macro_new_weapon(DC,15a_gl_proto):SCI_arifle_DC15GL_F
-	{
-		dlc = "RD501";
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15a_gl_proto);
-		
-		//changes
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(Republic_Universal_Magazine,30)};
-		displayName="[PROTOTYPE] DC15A GL Rifle";
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single","Burst"};
-		class Single:Single
-		{
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-
-		};
-		class Burst:Burst
-		{
-			burst=2;
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_burst_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-			textureType = "dual";
-		};
-		macro_dc15a_rifle_scope
-		class SCI_GL_F:SCI_GL_F
-		{
-			discreteDistance[]={100,200,300};
-			magazineWell[] = {Republic_GL_Magazine_Well};
-			magazines[] = {
-				
-			};
-		};
-		//end changes
-	};

+ 0 - 246
addons - Copy/RD501_Prototype/MRP/_dc15a_le.hpp

@@ -1,246 +0,0 @@
-    class macro_new_weapon(DC,15a_LE_proto):SCI_DC15XM//SWOP_DC15ABlasterRifle_mod1
-	{
-		weaponPoolAvailable = 1;
-		
-		scope=2;
-		scopeArsenal=2;
-
-		// class Secondary:Secondary
-		// {
-		// 	class Single;
-		// };
-		dlc = "RD501";
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15a_LE_proto);
-
-		//changes
-		muzzles[] = {"this"};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_DC15a_LE,20)};
-		//initSpeed = -1.5;
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		displayName="[PROTOTYPE] DC15A Long Engagement Rifle";
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single"};
-		opticsZoomMin= macro_scope_magnification(12);
-		opticsZoomMax= macro_scope_magnification(6);
-		opticsZoomInit= macro_scope_magnification(6);
-		//discretefov[] = {macro_scope_magnification(6),macro_scope_magnification(12),macro_scope_magnification(24),macro_scope_magnification(48)};
-		distanceZoomMin=100;
-		distanceZoomMax=2000;
-		maxZeroing=2000;
-		discreteInitIndex=0;
-		discreteDistance[]={100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600};
-		modelOptics = "Scope\a180.p3d";	
-		
-
-		visionMode[]=
-		{
-			"Normal",
-			"NVG",
-			"TI"
-		};
-		thermalMode[]={0};
-		hasbipod=1;
-		class Single:Single
-		{
-			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";
-					};
-				};
-			};
-
-			reloadTime = macro_dc15a_le_rof
-			dispersion = macro_dc15a_le_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-
-		};
-
-	};
-
-	// class macro_new_weapon(DC,15a_LE_stageI_v2):SCI_arifle_DC15LE_F//SWOP_DC15ABlasterRifle_mod1
-	// {
-	// 	weaponPoolAvailable = 1;
-		
-	// 	scope=2;
-	// 	scopeArsenal=2;
-
-	// 	// class Secondary:Secondary
-	// 	// {
-	// 	// 	class Single;
-	// 	// };
-	// 	dlc = "RD501";
-	// 	author= "RD501";
-	// 	baseWeapon = macro_new_weapon(DC,15a_LE_stageI_v2);
-
-	// 	//changes
-	// 	muzzles[] = {"this"};
-	// 	magazineWell[]={Republic_Universal_Magazine_Well};
-	// 	magazines[]={macro_new_mag(DC15a_LE,20)};
-	// 	//initSpeed = -1.5;
-	// 	picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-	// 	displayName="[Stage I] DC15A Long Engagement Rifle v2";
-	// 	macro_ace_heating
-	// 	canShootInWater = 1;
-	// 	recoil =  macro_new_recoil(dc15a_rifle)
-	// 	modes[] = {"Single"};
-	// 	opticsZoomMin= macro_scope_magnification(12);
-	// 	opticsZoomMax= macro_scope_magnification(6);
-	// 	opticsZoomInit= macro_scope_magnification(6);
-	// 	distanceZoomMin=100;
-	// 	distanceZoomMax=2000;
-	// 	maxZeroing=2000;
-	// 	discreteInitIndex=0;
-	// 	discreteDistance[]={100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600};	
-
-	// 	visionMode[]=
-	// 	{
-	// 		"Normal",
-	// 		"NVG",
-	// 		"TI"
-	// 	};
-	// 	thermalMode[]={0};
-	// 	hasbipod=1;
-	// 	class Single:Single
-	// 	{
-	// 		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";
-	// 				};
-	// 			};
-	// 		};
-
-	// 		reloadTime = macro_dc15a_le_rof
-	// 		dispersion = macro_dc15a_le_acc
-	// 		recoil = "recoil_single_mx";
-	// 		recoilProne = "recoil_single_prone_mx";
-
-	// 	};
-
-	// 	class OpticsModes
-	// 	{
-	// 		class Scope
-	// 		{
-	// 			opticsID=1;
-	// 			useModelOptics=1;
-	// 			opticsPPEffects[]=
-	// 			{
-	// 				"OpticsCHAbera5",
-	// 				"OpticsBlur5"
-	// 			};
-	// 			opticsDisablePeripherialVision=0.67000002;
-	// 			opticsZoomMin=0.0099999998;
-	// 			opticsZoomMax=0.090000004;
-	// 			opticsZoomInit=0.090000004;
-	// 			memoryPointCamera="opticView";
-	// 			visionMode[]=
-	// 			{
-	// 				"Normal",
-	// 				"NVG",
-	// 				"TI"
-	// 			};
-	// 			thermalMode[]={2};
-	// 			opticsFlare="true";
-	// 			weaponInfoType="RscWeaponRangeFinder";
-	// 			distanceZoomMin=300;
-	// 			distanceZoomMax=300;
-	// 			cameraDir="";
-	// 		};
-	// 	};
-	// };

+ 0 - 89
addons - Copy/RD501_Prototype/MRP/_dc15a_mod0.hpp

@@ -1,89 +0,0 @@
-    class macro_new_weapon(DC,15a_mod0_proto):SCI_arifle_VALKEN38A_F//SWOP_DC15ABlasterRifle_mod0
-	{
-		weaponPoolAvailable = 1;
-		scope=2;
-		scopeArsenal=2;
-
-		//changes
-		macro_ace_heating
-		muzzles[] = {"this"};
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_DC15a_mod_0,200)};
-		modes[] = {"fullauto","fastauto"};
-		recoil = macro_new_recoil(dc15a_mod_0)
-		recoilProne = macro_new_recoil(dc15a_mod_0_prone)
-		displayName="[PROTOTYPE] DC15A Mod 0 LSD";
-		author ="namenai";
-		baseWeapon = macro_new_weapon(DC,15a_mod0_proto);
-		// initSpeed = -0.50;
-		class fullauto:fullauto
-		{
-			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";
-					};
-				};
-			};
-			
-			reloadTime= macro_dc15a_mod0_rof_slow
-			dispersion = macro_dc15a_mod0_acc
-			
-		};
-		class fastauto:fullauto
-		{
-			reloadTime= macro_dc15a_mod0_rof_fast
-			textureType = "fastAuto";
-			dispersion = macro_dc15a_mod0_fast_acc
-		};
-
-		MACRO_MOD0_SCOPE
-	
-		//end changes
-	};

+ 0 - 160
addons - Copy/RD501_Prototype/MRP/_dc15a_rifle.hpp

@@ -1,160 +0,0 @@
-    class macro_new_weapon(DC,15a_proto):SCI_arifle_DC15A_F//SWOP_DC15ABlasterRifle // RD501_DC_15a_base
-	{
-		weaponPoolAvailable = 1;
-		
-		scope=2;
-		scopeArsenal=2;
-
-
-		dlc = "RD501";
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15a_proto);
-
-		//changes
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15A.paa";
-		muzzles[] = {"this"};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(Republic_Universal_Magazine,30)};
-		displayName=  "[PROTOTYPE] DC15A Rifle";
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single","Burst"};
-		// initSpeed = -1.0;
-		
-		class Single:Single
-		{
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-
-		};
-		class Burst:Burst
-		{
-			burst=2;
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15A_single.ogg", 1, 1, 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";
-					};
-				};
-			};
-			reloadTime = macro_dc15a_burst_rof
-			dispersion = macro_dc15a_acc
-			recoil = "recoil_single_mx";
-			recoilProne = "recoil_single_prone_mx";
-			textureType = "dual";
-		};
-		macro_dc15a_rifle_scope
-
-		// class WeaponSlotsInfo: WeaponSlotsInfo
-		// {
-		// 	mass = 30;
-		// 	class CowsSlot: CowsSlot
-		// 	{
-		// 		compatibleItems[] = {
-		// 			macro_new_scope(x4_dc15_acog)
-		// 		};
-		// 	};
-		// };
-		//end changes
-
-	};

+ 0 - 182
addons - Copy/RD501_Prototype/MRP/_dc15s_carbine.hpp

@@ -1,182 +0,0 @@
-    class macro_new_weapon(DC,15s_proto):SCI_arifle_DC15S_F//SWOP_DC15
-	{
-		
-
-		
-    	scope=2;
-		scopeArsenal=2;
-		weaponPoolAvailable = 1;
-		
-		dlc = "RD501";
-
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,15s_proto);
-
-		
-		//changes
-		// initSpeed = -0.80;
-		picture = "\SW_CloneWarsWeapons\DCrifles\icons\DC15s.paa";
-		recoil =  macro_new_recoil(dc15s)
-		class OpticsModes
-		{
-			class Ironsights
-			{
-				opticsID=1;
-				useModelOptics=0;
-				opticsFlare="true";
-				opticsPPEffects[]=
-				{
-					"OpticsCHAbera5",
-					"OpticsBlur5"
-				};
-				opticsDisablePeripherialVision=0.67000002;
-				opticsZoomMin=macro_scope_magnification(1);
-				opticsZoomMax=1.1;
-				opticsZoomInit=0.75;
-				memoryPointCamera="eye";
-				visionMode[]={};
-				distanceZoomMin=100;
-				distanceZoomMax=100;
-				cameraDir="";
-				discreteDistanceInitIndex = 1;
-				discreteinitIndex = 0;
-			};
-			class Scope: Ironsights
-			{
-				opticsID=2;
-				useModelOptics=1;
-				opticsPPEffects[]=
-				{
-					"OpticsCHAbera5",
-					"OpticsBlur5"
-				};
-				opticsDisablePeripherialVision=0.67000002;
-				opticsZoomMin = macro_scope_magnification(4);
-				opticsZoomMax = macro_scope_magnification(1);
-				opticsZoomInit = macro_scope_magnification(4);
-				discretefov[] = {macro_scope_magnification(4)};
-				memoryPointCamera="opticView";
-				visionMode[]=
-				{
-					"Normal",
-					"NVG"
-				};
-				opticsFlare="true";
-				distanceZoomMin=300;
-				distanceZoomMax=300;
-			};
-		};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_DC15s,100)};
-		displayName="[PROTOTYPE] DC15s Carbine";
-		canShootInWater = 1;
-		macro_ace_heating
-		modes[] = {"FullAuto", "Single"};
-		
-		opticsDisablePeripherialVision = 0.67;
-		modelOptics = "sci_weaponsMain\Data\A3_2d_optic.p3d";
-		opticsZoomMin=macro_scope_magnification(4);
-		opticsZoomMax=1.25;
-		opticsZoomInit=macro_scope_magnification(1);
-		muzzles[] = {"this"};//ShotgunBlast
-		class FullAuto:FullAuto
-		{
-			reloadTime = macro_dc15s_rof
-        	dispersion = macro_dc15s_acc
-			class BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				closure1[] = {};
-				closure2[] = {};
-				soundClosure[] = {};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s1.ogg", 1, 1.1, 1800};
-				begin2[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s2.ogg", 1, 1.1, 1800};
-				begin3[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s3.ogg", 1, 1.1, 1800};
-				begin4[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s4.ogg", 1, 1.1, 1800};
-				begin5[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s5.ogg", 1, 1.1, 1800};
-				begin6[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s6.ogg", 1, 1.1, 1800};
-				begin7[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s7.ogg", 1, 1.1, 1800};
-				begin8[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s8.ogg", 1, 1.1, 1800};
-				begin9[] = {"SW_CloneWarsWeapons\DCrifles\sounds\dc15s9.ogg", 1, 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\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 ShotgunBlast: SCI_arifle_DC15S_F
-		// {
-		// 	displayName = "DC-15s I.O.N Blast";
-			
-		// 	magazines[] = {macro_new_mag(shotgun_test,2)};
-			
-		// 	modes[] = {"Single"};
-		// 	class Single: Mode_SemiAuto
-		// 	{
-				
-		// 		sounds[] = {"StandardSound"};
-		// 		class StandardSound
-		// 		{
-		// 			soundSetShot[] = {"Msbs65_01_Shotgun_Shot_SoundSet", "Msbs65_01_Shotgun_Tail_SoundSet"};
-		// 		};
-		// 		reloadTime = 0.2;
-		// 		dispersion = 0.01245;
-		// 		minRange = 2;
-		// 		minRangeProbab = 0.95;
-		// 		midRange = 30;
-		// 		midRangeProbab = 0.95;
-		// 		maxRange = 100;
-		// 		maxRangeProbab = 0.3;
-		// 		aiRateOfFire = 1;
-		// 		aiRateOfFireDistance = 30;
-		// 	};
-		// };
-
-		class Single:FullAuto
-		{
-			autoFire=0;
-			textureType = "semi";
-			
-		};
-		
-		//end changes
-	};

+ 0 - 123
addons - Copy/RD501_Prototype/MRP/config.cpp

@@ -1,123 +0,0 @@
-#include "../config_macros.hpp" 
-#include "../../RD501_main/config_macros.hpp"
-class CfgPatches
-{
-	class macro_patch_name(MRP)
-	{
-		author=macro_authors_ppl;
-		addonRootClass= macro_patch_name(weapon_MRP)
-		requiredAddons[]=
-		{
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]=
-		{
-			macro_new_weapon(DC,15a_MRP),
-			macro_new_weapon(DC,15a_GL_MRP),
-			macro_new_weapon(Z6,RC_MRP),
-			macro_new_weapon(DC,17_MRP)
-		};
-	};
-};
-class CowsSlot;
-class UnderBarrelSlot;
-class MuzzleSlot;
-class PointerSlot;
-class Mode_SemiAuto;
-class Mode_FullAuto;
-
-class cfgWeapons 
-{	
-	//212th dc15x
-	class JLTS_DC15A;
-	class JLTS_DC15A_ugl;
-	class UGL_F;
-	class JLTS_Z6;
-	class JLTS_DC17SA;
-
-	class macro_new_weapon(DC,15a_MRP): JLTS_DC15A
-	{
-		author = RD501;
-		displayname="[MRP] DC15a";
-		hiddenSelectionsTextures[]=
-		{
-			"RD501_Prototype\MRP\textures\DC15A_co.paa"
-		};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(Republic_Universal_Magazine,30)};
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single","FullAuto"};
-	};
-	class macro_new_weapon(DC,15a_GL_MRP): JLTS_DC15A_ugl
-	{
-		author = RD501;
-		displayName="[MRP] DC-15A UGL";
-		hiddenSelectionsTextures[]=
-		{
-			"RD501_Prototype\MRP\textures\DC15A_co.paa",
-			"\MRC\JLTS\weapons\DC15A\data\DC15A_ugl_co.paa"
-		};
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(Republic_Universal_Magazine,30)};
-		macro_ace_heating
-		canShootInWater = 1;
-		recoil =  macro_new_recoil(dc15a_rifle)
-		modes[] = {"Single","FullAuto"};
-		class EGLM: UGL_F
-		{
-			magazineWell[] += {macro_new_magwell(GL_Mags)};
-			magazines[] = {};
-			displayName="Grenade launcher";
-			descriptionShort="UGL";
-			useModelOptics=0;
-			useExternalOptic=0;
-			cameraDir="OP_look";
-			discreteDistance[] = {100,150,200,250,300,350,400};
-			discreteDistanceCameraPoint[]=
-			{
-				"OP_eye",
-				"OP_eye2",
-				"OP_eye3",
-				"OP_eye4"
-			};
-			discreteDistanceInitIndex=0;
-		};
-	};
-	class macro_new_weapon(Z6,RC_MRP): JLTS_Z6
-	{
-		scope=2;
-		scopeArsenal=2;
-		baseWeapon="JLTS_Z6";
-		author = RD501;
-		displayName="[MRP] Z6 Rotary Cannon";
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_z6,300)};
-		recoil = macro_new_recoil(z6)
-		modes[]=
-		{
-			"manual",
-			"close",
-			"short",
-			"medium",
-			"far_optic1",
-			"far_optic2"
-		};
-	};
-	class macro_new_weapon(DC,17_MRP): JLTS_DC17SA
-	{
-		scope=2;
-		scopeArsenal=2;
-		author = RD501;
-		displayName="[MRP] DC17";
-		magazines[]={macro_new_mag(DC17,20),"DCStun_Mag"};
-		magazineWell[] = {macro_new_magwell(DC17_GL_Mags)};
-		modes[]=
-		{
-			"Single"
-		};
-	};
-};
-

BIN
addons - Copy/RD501_Prototype/MRP/textures/DC15A_co.paa


+ 0 - 202
addons - Copy/RD501_Prototype/Z6/config.cpp

@@ -1,202 +0,0 @@
-#include "../config_macros.hpp" 
-#include "../../RD501_main/config_macros.hpp"
-class CfgPatches
-{
-	class macro_patch_name(Z6_proto)
-	{
-		author=macro_authors_ppl;
-		addonRootClass= macro_patch_name(weapon_prototypes)
-		requiredAddons[]=
-		{
-			macro_patch_name(weapon_prototypes)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_weapon(proto,z6)
-		};
-	};
-};
-class CowsSlot;
-class Mode_SemiAuto;
-class cfgWeapons 
-{	
-	
-
-	class Rifle_Base_F;
-	class SCI_arifle_z6_Base_F:Rifle_Base_F
-	{
-		class WeaponSlotsInfo;
-	};
-	class SCI_arifle_z6_F:SCI_arifle_z6_Base_F
-	{
-		class FullAuto;
-		class Burst;
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	};
-
-	class macro_new_weapon(proto,z6):SCI_arifle_z6_F
-	{
-		model="\MRC\JLTS\weapons\Z6\Z6.p3d";
-		selectionFireAnim="zasleh";
-		hiddenSelections[]=
-		{
-			"camo1",
-			"camo2"
-		};
-		hiddenSelectionsTextures[]=
-		{
-			"\MRC\JLTS\weapons\Z6\data\Z6_1_co.paa",
-			"\MRC\JLTS\weapons\Z6\data\Z6_2_co.paa"
-		};
-		handAnim[]=
-		{
-			"OFP2_ManSkeleton",
-			"\MRC\JLTS\weapons\Z6\anims\Z6_handanim.rtm"
-		};
-		
-		scope=2;
-		scopeArsenal=2;
-
-		dlc = "RD501";
-		author= "RD501";
-
-		//changes
-		picture="\MRC\JLTS\weapons\Z6\data\ui\Z6_ui_ca.paa";
-		UiPicture = "\SW_CloneWarsWeapons\SW_Z6\UI\z6.paa";
-		magazineWell[]={Republic_Universal_Magazine_Well};
-		magazines[]={macro_new_mag(proto_z6,300)};
-		modelOptics="sci_weaponsMain\Data\A3_2d_optic.p3d";
-		class OpticsModes
-		{
-			class Ironsights
-			{
-				opticsID=1;
-				useModelOptics=0;
-				opticsFlare="true";
-				opticsPPEffects[]=
-				{
-					"OpticsCHAbera5",
-					"OpticsBlur5"
-				};
-
-				opticsDisablePeripherialVision=0.67000002;
-				opticsZoomMin=macro_scope_magnification(1);
-				opticsZoomMax=1.1;
-				opticsZoomInit=0.75;
-				memoryPointCamera="eye";
-				visionMode[]={};
-				distanceZoomMin=100;
-				distanceZoomMax=100;
-				cameraDir="";
-				discreteinitIndex = 0;
-			};
-			class Scope: Ironsights
-			{
-				opticsID=2;
-				useModelOptics=1;
-				opticsPPEffects[]=
-				{
-					"OpticsCHAbera5",
-					"OpticsBlur5"
-				};
-				opticsDisablePeripherialVision=0.67000002;
-				opticsZoomMin = macro_scope_magnification(4);
-				opticsZoomMax = macro_scope_magnification(1);
-				opticsZoomInit = macro_scope_magnification(4);
-				discretefov[] = {macro_scope_magnification(4)};
-				memoryPointCamera="opticView";
-				visionMode[]=
-				{
-					"Normal",
-					"NVG"
-				};
-				opticsFlare="true";
-				distanceZoomMin=300;
-				distanceZoomMax=300;
-			};
-		};
-		baseWeapon = macro_new_weapon(proto,z6)
-		modes[] = {"FullAuto1"};
-		macro_ace_heating
-		recoil = macro_new_recoil(z6)//"recoil_pdw";
-		// initSpeed=-1.2;
-		displayName="[PROTOTYPE] Z6";
-		muzzles[] = {"this"};//SixBarrleBlast
-		class FullAuto1:FullAuto
-		{	
-			class BaseSoundModeType
-			{
-				closure1[] = {"SW_CloneWarsWeapons\SW_Z6\sound\closure.wav", 0.9, 1, 30};
-				closure2[] = {"SW_CloneWarsWeapons\SW_Z6\sound\no.wav", 0, 1, 30};
-				closure3[] = {"SW_CloneWarsWeapons\SW_Z6\sound\no.wav", 0, 1, 30};
-				closure4[] = {"SW_CloneWarsWeapons\SW_Z6\sound\closure.wav", 0.9, 1, 30};
-				closure5[] = {"SW_CloneWarsWeapons\SW_Z6\sound\no.wav", 0, 1, 30};
-				closure6[] = {"SW_CloneWarsWeapons\SW_Z6\sound\no.wav", 0, 1, 30};
-				closure7[] = {"SW_CloneWarsWeapons\SW_Z6\sound\closure.wav", 0.9, 1, 30};
-				closure8[] = {"SW_CloneWarsWeapons\SW_Z6\sound\no.wav", 0, 1, 30};
-				closure9[] = {"SW_CloneWarsWeapons\SW_Z6\sound\no.wav", 0, 1, 30};
-				soundClosure[] = {"closure1", 0.5, "closure2", 0.5, "closure3", 0.5, "closure4", 0.5, "closure5", 0.5, "closure6", 0.5, "closure7", 0.5, "closure8", 0.5, "closure9", 0.5};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				begin1[] = {"SW_CloneWarsWeapons\SW_Z6\sound\fire1z6.ogg", 0.9, 1, 2000};
-				begin2[] = {"SW_CloneWarsWeapons\SW_Z6\sound\fire1z6.ogg", 0.9, 1, 2000};
-				soundBegin[] = {"begin1", 0.5, "begin2", 0.5};
-			};
-
-			dispersion = macro_z6_acc
-			recoil = "recoil_single_smg_02";
-			recoilProne = "recoil_single_prone_smg_02";
-			reloadTime = macro_z6_rof
-		};
-
-		// class SixBarrleBlast: SCI_arifle_z6_F
-		// {
-		// 	displayName = "Z6 Six Barrel Barrage";
-			
-		// 	magazines[] = {macro_new_mag(shotgun_test,20)};
-			
-		// 	modes[] = {"Single"};
-		// 	class Single: Mode_SemiAuto
-		// 	{
-				
-		// 		sounds[] = {"StandardSound"};
-		// 		class StandardSound
-		// 		{
-		// 			soundSetShot[] = {"Msbs65_01_Shotgun_Shot_SoundSet", "Msbs65_01_Shotgun_Tail_SoundSet"};
-		// 		};
-		// 		reloadTime = 0.2;
-		// 		dispersion = 0.01245;
-		// 		minRange = 2;
-		// 		minRangeProbab = 0.95;
-		// 		midRange = 30;
-		// 		midRangeProbab = 0.95;
-		// 		maxRange = 100;
-		// 		maxRangeProbab = 0.3;
-		// 		aiRateOfFire = 1;
-		// 		aiRateOfFireDistance = 30;
-		// 		autoFire = 1;
-		// 	};
-		// };
-		// class overcharge_burst:FullAuto1
-		// {
-
-		// 	dispersion = macro_z6_acc
-		// 	displayName = "Over Charge Auto";
-		// 	recoil = "recoil_single_smg_02";
-		// 	recoilProne = "recoil_single_prone_smg_02";
-		// 	//reloadTime = 0.1;
-		// 	reloadTime = macro_z6_super_rof
-		// 	//soundContinuous = 1;
-		// 	burst = 25;
-		// 	textureType = "fastAuto";
-		// };
-
-
-	};
-};
-

+ 0 - 183
addons - Copy/RD501_Prototype/_ammo/core_ammo.hpp

@@ -1,183 +0,0 @@
-class macro_new_ammo(Republic_Universal_Ammo):SWOP_DC15ABlasterRifle_L_Ammo
-{
-    macro_ammo_no_fric
-    coefGravity=0.12;//0.050000001;
-    cartridge = "FxCartridge_slug";
-    effectFly = "SWOP_BlueLaserEffect";
-    model="sci_weaponsMain\Data\tracer_blue.p3d";
-    indirectHit = 0.0;
-    indirectHitRange = 0.0;
-    explosive = 0.0;
-
-    hit = 27;
-    waterFriction = -0.001;//
-    caliber = 1;
-    tracerScale = 1.0;
-    tracerStartTime = 0;
-    tracerEndTime = 4;
-    timeToLive = 4;
-
-
-
-    // soundSetBulletFly[]= 
-    // { 
-    // 	"PlasmaFlyBy_SoundSet" 
-    // }; 
-    class HitEffects 
-    { 
-        Hit_Foliage_green=macro_new_complex_effect(impack_plasma); 
-        Hit_Foliage_Dead=macro_new_complex_effect(impack_plasma); 
-        Hit_Foliage_Green_big=macro_new_complex_effect(impack_plasma); 
-        Hit_Foliage_Palm=macro_new_complex_effect(impack_plasma); 
-        Hit_Foliage_Pine=macro_new_complex_effect(impack_plasma); 
-        hitFoliage=macro_new_complex_effect(impack_plasma); 
-        hitGlass=macro_new_complex_effect(impack_plasma); 
-        hitGlassArmored=macro_new_complex_effect(impack_plasma); 
-        hitWood=macro_new_complex_effect(impack_plasma); 
-        hitMetal=macro_new_complex_effect(impack_plasma); 
-        hitMetalPlate=macro_new_complex_effect(impack_plasma); 
-        hitBuilding=macro_new_complex_effect(impack_plasma); 
-        hitPlastic=macro_new_complex_effect(impack_plasma); 
-        hitRubber=macro_new_complex_effect(impack_plasma); 
-        hitTyre=macro_new_complex_effect(impack_plasma); 
-        hitConcrete=macro_new_complex_effect(impack_plasma); 
-        hitMan=macro_new_complex_effect(impack_plasma); 
-        hitGroundSoft=macro_new_complex_effect(impack_plasma); 
-        hitGroundRed=macro_new_complex_effect(impack_plasma); 
-        hitGroundHard=macro_new_complex_effect(impack_plasma); 
-        hitWater=macro_new_complex_effect(impack_plasma); 
-        hitVirtual=macro_new_complex_effect(impack_plasma); 
-    }; 
-    class CamShakeFire 
-    { 
-        power=0; 
-        duration=0; 
-        frequency=0; 
-        distance=0; 
-    }; 
-    class CamShakePlayerFire 
-    { 
-        power=0; 
-        duration=0; 
-        frequency=0; 
-        distance=0; 
-    }; 
-    
-};
-
-class macro_new_ammo(proto_DC_15a_le):macro_new_ammo(Republic_Universal_Ammo)
-{
-    hit = 75;
-    coefGravity=0.05;	
-    caliber = 0.4;
-    tracerScale = 3;
-};
-
-// class macro_new_ammo(DC_15a_le_HE):G_40mm_HE
-// {
-//     hit = 10;
-//     coefGravity=0.3;	
-
-//     indirectHit = 30.0;
-//     indirectHitRange = 1.0;
-//     explosive = 1;
-//     caliber = 0.0;
-//     explosionEffects = "ExploAmmoLaserCannon";
-
-//     deflecting = 5;
-// 	fuseDistance = 2;
-//     airFriction = 0;
-//     sideAirFriction = 0;
-
-    
-
-// };
-
-class macro_new_ammo(proto_DC_15a_mod0):macro_new_ammo(Republic_Universal_Ammo)
-{
-    hit = 16;//9//14;
-    coefGravity=0.08;
-    tracerScale = 0.5;
-};
-
-class macro_new_ammo(proto_DC_15s):macro_new_ammo(Republic_Universal_Ammo)
-{
-    hit = 12;//6;
-    coefGravity=0.3;
-    caliber = 1;
-    tracerScale = 0.5;
-};
-
-class macro_new_ammo(proto_z6):macro_new_ammo(Republic_Universal_Ammo)
-{
-    hit = 32;
-    coefGravity=0.5;
-    tracerScale = 2;
-};
-
-
-class macro_new_ammo(proto_40mm_HE_GL): G_40mm_HE
-{
-	explosionSoundEffect = "DefaultExplosion";
-	
-	//model = "\A3\weapons_f\ammo\UGL_slug";
-	model = "SW_AV7\ion.p3d";
-	hit = 60;
-	indirectHit = 55;
-	indirectHitRange = 5;
-	warheadName = "HE";
-	visibleFire = 1;
-	timeToLive = 38;
-	audibleFire = 30;
-	visibleFireTime = 3;
-	dangerRadiusHit = 60;
-	suppressionRadiusHit = 24;
-	explosive = 1;
-	cost = 10;
-	deflecting = 5;
-	airFriction = -0.001;
-
-	fuseDistance = 2;
-	whistleDist = 16;
-	typicalSpeed = 185;
-	caliber = 4;
-};
-
-class macro_new_ammo(proto_40mm_AP_GL): G_40mm_HE
-{
-	explosionSoundEffect = "DefaultExplosion";
-	simulation = "shotShell";
-	model = "\GeonFighter\LaserGeon.p3d";
-	hit = 450;
-	indirectHit = 5;
-	indirectHitRange = 0.5;
-    caliber = 5;
-
-	warheadName = "HE";
-	visibleFire = 1;
-	audibleFire = 30;
-	visibleFireTime = 3;
-
-	timeToLive =10;
-	dangerRadiusHit = 60;
-	suppressionRadiusHit = 24;
-	explosive = 0.0;
-	cost = 10;
-	deflecting = 5;
-	airFriction = -0.001;
-
-	fuseDistance = .1;
-	// whistleDist = 16;
-	// typicalSpeed = 185;
-	// caliber = 5;
-	
-	// SoundSetExplosion[] = {"GrenadeHe_Exp_SoundSet", "GrenadeHe_Tail_SoundSet", "Explosion_Debris_SoundSet"};
-	ace_frag_enabled = 0;
-	ace_frag_force = 0;
-	ace_frag_classes[] = {};
-	ace_frag_metal = 0;
-	ace_frag_charge = 0;
-	ace_frag_gurney_c = 0;
-	ace_frag_gurney_k = "1/2";
-	ace_rearm_caliber = 39;
-};

+ 0 - 73
addons - Copy/RD501_Prototype/_ammo/flares.hpp

@@ -1,73 +0,0 @@
-class macro_new_ammo(proto_40mm_flare_white): FlareBase
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.5, 0.5, 0.5};
-    lightColor[] = {1, 1, 1 ,1};
-    useFlare = 1;
-    deflecting = 30;
-    smokeColor[] = {1, 1, 1, 1};
-    //brightness = 12;
-    brightness = 1200;
-    size = 3;//1
-    triggerTime = 3;
-    triggerSpeedCoef = 1;
-    audibleFire = 20;
-    //intensity = 40000;
-    intensity  = 1000000;
-    flareSize = 3;//1
-    timeToLive = 120;
-    flareMaxDistance = 300;
-    
-};
-
-class macro_new_ammo(proto_40mm_flare_green): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.25, 0.5, 0.25, 0};
-    lightColor[] = {0, 1, 0, 0};
-};
-class macro_new_ammo(proto_40mm_flare_red): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.25, 0.25, 0};
-    lightColor[] = {1, 0, 0, 0};
-};
-class macro_new_ammo(proto_40mm_flare_yellow): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.5, 0.25, 0};
-    lightColor[] = {1, 1, 0, 0};
-};
-class macro_new_ammo(proto_40mm_flare_cir): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    lightColor[] = {0.5, 0.5, 0.25, 0};
-};
-
-class macro_new_ammo(proto_40mm_flare_blue): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.5, 0.25, 0};
-    lightColor[] = {0, 0, 1, 0};
-};
-
-class macro_new_ammo(proto_40mm_flare_cyan): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.5, 0.25, 0};
-    lightColor[] = {0, 1, 1, 0};
-};
-
-class macro_new_ammo(proto_40mm_flare_purple): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.5, 0.25, 0};
-    lightColor[] = {.7, 0, 1, 0};
-};
-
-class macro_new_ammo(proto_40mm_flare_orange): macro_new_ammo(proto_40mm_flare_white)
-{
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    //lightColor[] = {0.5, 0.5, 0.25, 0};
-    lightColor[] = {1, .5, 0, 0};
-};

+ 0 - 47
addons - Copy/RD501_Prototype/_ammo/shotgun.hpp

@@ -1,47 +0,0 @@
-class macro_new_ammo(proto_shotgun_submunition_deploy):B_12Gauge_Pellets_Submunition_Deploy
-{
-    airFriction = -0.0067;
-    hit = 90;
-    indirectHit = 0;
-    indirectHitRange = 0;
-    typicalSpeed = 360;
-    deflecting = 35;
-};
-class B_12Gauge_Pellets_Submunition;
-class macro_new_ammo(proto_shotgun_submunition): B_12Gauge_Pellets_Submunition
-{
-    cost = 1;
-    hit = 20;
-    simulationStep = 0.0001;
-    cartridge = "";
-    submunitionAmmo = macro_new_ammo(proto_shotgun_submunition_deploy)//macro_new_ammo(shotgun_submunition_deploy)
-    submunitionConeType[] = {"poissondisc", 6};
-    submunitionConeAngle = 0.8;
-    triggerSpeedCoef[] = {0.85, 1};
-    triggerTime = 0.001;
-    model = "\SWOP_Main\Effects\Tracer\LaserRed";
-};
-
-class macro_new_ammo(proto_shotgun_submunition_carbine_deploy):B_12Gauge_Pellets_Submunition_Deploy
-{
-    airFriction = -0.0067;
-    hit = 180;
-    indirectHit = 0;
-    indirectHitRange = 0;
-    typicalSpeed = 360;
-    deflecting = 35;
-};
-
-class macro_new_ammo(proto_shotgun_submunition_carbine): B_12Gauge_Pellets_Submunition
-{
-    cost = 1;
-    hit = 20;
-    simulationStep = 0.0001;
-    cartridge = "";
-    submunitionAmmo = macro_new_ammo(proto_shotgun_submunition_carbine_deploy)
-    submunitionConeType[] = {"poissondisc", 7};
-    submunitionConeAngle = 0.8;
-    triggerSpeedCoef[] = {0.85, 1};
-    triggerTime = 0.001;
-    model = "\SWOP_Main\Effects\Tracer\LaserRed";
-};

+ 0 - 118
addons - Copy/RD501_Prototype/_mags/core_mags.hpp

@@ -1,118 +0,0 @@
-class macro_new_mag(Republic_Universal_Magazine,30): CA_Magazine
-{
-    author = "RD501";
-    scope = 2;
-    model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-    picture =  MACRO_TEXTURE_PATH\icons\rum.paa //"\z\acex\addons\field_rations\ui\item_canteen_co.paa";
-    displayName = "[PROTOTYPE] 60Rnd Republic Universal Magazine";
-    ammo =  macro_new_ammo(Republic_Universal_Ammo);//macro_new_ammo(Republic_Universal_Ammo)
-    tracersEvery = 1;
-    count = 30;
-    descriptionShort = "60Rnd R.U.M";
-    mass = 30;
-    initSpeed = 500;
-};
-
-// class macro_new_mag(DC15a_standard,30): macro_new_mag(Republic_Universal_Magazine,30)
-// {
-// 	ammo = macro_new_ammo(DC_15a)
-// 	initSpeed = 500;
-// 	displayName = "30Rnd DC-15A Rifle Magazine";
-// 	descriptionShort = "30rnd Magazine";
-// 	count = 30;
-// 	mass = 40;
-// 	picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-// };
-
-class macro_new_mag(proto_DC15a_LE,20): macro_new_mag(Republic_Universal_Magazine,30)
-{
-    ammo = macro_new_ammo(proto_DC_15a_le)
-    initSpeed = 1000;//666.66;
-    displayName = "[PROTOTYPE] 20Rnd DC-15A LE Magazine";
-    descriptionShort = "20rnd Magazine";
-    count = 20;
-    mass = 30;
-    picture = MACRO_TEXTURE_PATH\icons\LE.paa
-};
-
-// class macro_new_mag(DC_15a_le_HE,5): macro_new_mag(Republic_Universal_Magazine,30)
-// {
-//     ammo = macro_new_ammo(DC_15a_le_HE)
-//     initSpeed = 400;//666.66;
-//     displayName = "20Rnd DC-15A LE HE Magazine";
-//     descriptionShort = "20rnd Magazine";
-//     count = 5;
-//     mass = 90;
-//     picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-// };
-
-class macro_new_mag(proto_DC15a_mod_0,200): macro_new_mag(Republic_Universal_Magazine,30)
-{
-    ammo = macro_new_ammo(proto_DC_15a_mod0)
-    initSpeed = 700;
-    displayName = "[PROTOTYPE] 200Rnd DC-15A Mod 0 Magazine";
-    descriptionShort = "200rnd Magazine";
-    count = 200;
-    mass = 40;
-    picture = MACRO_TEXTURE_PATH\icons\mod0.paa
-    tracersEvery = 3;
-    ACE_isBelt = 1;
-};
-
-class macro_new_mag(proto_DC15s,100): macro_new_mag(Republic_Universal_Magazine,30)
-{
-    ammo = macro_new_ammo(proto_DC_15s)
-    initSpeed = 450;
-    displayName = "[PROTOTYPE] 100Rnd DC-15S Carbine Magazine";
-    descriptionShort = "100rnd Magazine";
-    count = 100;
-    mass = 30;
-    picture = MACRO_TEXTURE_PATH\icons\carbine.paa
-    tracersEvery = 4;
-};
-
-class macro_new_mag(proto_z6,300): macro_new_mag(Republic_Universal_Magazine,30)
-{
-    ammo = macro_new_ammo(proto_z6)
-    initSpeed = 500;
-    displayName = "[PROTOTYPE] 300Rnd Z6 Drum";
-    descriptionShort = "300rnd Drum";
-    count = 300;
-    mass = 50;
-    picture = MACRO_TEXTURE_PATH\icons\z6.paa//"\SW_CloneWarsWeapons\SW_Z6\UI\SW_Z6-mag.paa";
-    tracersEvery = 3;
-    ACE_isBelt = 1;
-};
-
-class macro_new_mag(proto_HE_GL,3): 1Rnd_HE_Grenade_shell
-{
-	author = "RD501";
-	scope = 2;
-	type = 16;
-	displayName = "[PROTOTYPE] 3Rnd HE DC-15A Grenades";
-	displayNameShort = "3Rnd HE DC-15A";
-	picture = MACRO_TEXTURE_PATH\icons\HE_GL.paa
-	ammo = macro_new_ammo(proto_40mm_HE_GL);
-	count = 3;
-	initSpeed = 85;
-	nameSound = "";
-	descriptionShort = "3Rnd HE DC-15A Grenade";
-	mass = 15;
-};
-
-class macro_new_mag(proto_AP_GL,2): 1Rnd_HE_Grenade_shell
-{
-	author = "RD501";
-	scope = 2;
-	type = 16;
-	displayName = "[PROTOTYPE] 2 Rnd AP DC-15A Grenades";
-	displayNameShort = "2 Rnd AP DC-15A";
-	picture = MACRO_TEXTURE_PATH\icons\AP_GL.paa
-	ammo = macro_new_ammo(proto_40mm_AP_GL)
-	initSpeed = 85;//120;
-	count = 2;
-	nameSound = "";
-	descriptionShort = "2Rnd AP DC-15A Grenade";
-	//mass = 30;
-	mass = 15;
-};

+ 0 - 99
addons - Copy/RD501_Prototype/_mags/flares.hpp

@@ -1,99 +0,0 @@
-
-
-class macro_new_mag(proto_flare_white,3): CA_Magazine
-{
-    author = "RD501";
-    scope = 2;
-    type = 16;
-    displayName = "[PROTOTYPE] Flare 3 Rounds (White)";
-    displayNameShort = "White Flare";
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_white.paa
-    model = "\A3\Weapons_F\Ammo\UGL_Flare";
-    ammo = macro_new_ammo(proto_40mm_flare_white)
-    initSpeed = 80;
-    count = 3;
-    nameSound = "";
-    descriptionShort = "Type: Flare 3 Rounds - White <br />Rounds: 3";
-    weaponPoolAvailable = 1;
-    mass = 4;
-};
-
-class macro_new_mag(proto_flare_cir,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (IR)";
-    ammo = macro_new_ammo(proto_40mm_flare_cir)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_grey_IR.paa
-    descriptionShort = "Type: Flare - IR<br />Rounds: 3<br />";
-    displayNameShort = "IR";
-};
-
-class macro_new_mag(proto_flare_green,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Green)";
-    displayNameShort = "Green Flare";
-    ammo = macro_new_ammo(proto_40mm_flare_green)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_light_green.paa
-    descriptionShort = "Type: Flare - Green<br />Rounds: 3<br />";
-};
-
-class macro_new_mag(proto_flare_red,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Red)";
-    ammo = macro_new_ammo(proto_40mm_flare_red)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_red.paa
-    descriptionShort = "Type: Flare - Red<br />Rounds: 3";
-    displayNameShort = "Red Flare";
-};
-
-class macro_new_mag(proto_flare_yellow,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Yellow)";
-    ammo = macro_new_ammo(proto_40mm_flare_yellow)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_yellow.paa
-    descriptionShort = "Type: Flare - Yellow<br />Rounds: 3";
-    displayNameShort = "Yellow Flare";
-};
-
-class macro_new_mag(proto_flare_blue,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Blue)";
-    ammo = macro_new_ammo(proto_40mm_flare_blue)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_blue.paa
-    descriptionShort = "Type: Flare - Blue<br />Rounds: 3";
-    displayNameShort = "Blue Flare";
-};
-
-class macro_new_mag(proto_flare_cyan,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Cyan)";
-    ammo = macro_new_ammo(proto_40mm_flare_cyan)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_cyan.paa
-    descriptionShort = "Type: Flare - Cyan<br />Rounds: 3";
-    displayNameShort = "Cyan Flare";
-};
-
-class macro_new_mag(proto_flare_purple,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Purple)";
-    ammo = macro_new_ammo(proto_40mm_flare_purple)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_purple.paa
-    descriptionShort = "Type: Flare - Purple<br />Rounds: 3";
-    displayNameShort = "Purple Flare";
-};
-
-class macro_new_mag(proto_flare_orange,3): macro_new_mag(proto_flare_white,3)
-{
-    author = "RD501";
-    displayName = "[PROTOTYPE] Flare 3 Rounds (Orange)";
-    ammo = macro_new_ammo(proto_40mm_flare_orange)
-    picture = MACRO_TEXTURE_PATH\icons\canister\Canister_orange.paa
-    descriptionShort = "Type: Flare - Orange<br />Rounds: 3";
-    displayNameShort = "Orange Flare";
-};

+ 0 - 32
addons - Copy/RD501_Prototype/_mags/shotgun.hpp

@@ -1,32 +0,0 @@
-class macro_new_mag(proto_shotgun_test,20): 2Rnd_12Gauge_Pellets
-{
-    author = "RD501";
-    scope = 2;
-    displayName = "[PROTOTYPE] Z6 6 Barrel Blast Mag";
-    displayNameShort = "Pellets";
-    descriptionShort = "Pellets";
-    picture = "\a3\Weapons_F_Enoch\MagazineProxies\data\UI\icon_2rnd_12gauge_CA.paa";
-    ammo = macro_new_ammo(proto_shotgun_submunition)
-    initSpeed = 480;
-    count = 20;
-    mass = 100;
-    modelSpecialIsProxy = 1;
-    modelSpecial = "a3\Weapons_F_Enoch\MagazineProxies\mag_12ga_hunter_2rnd";
-    hiddenSelections[] = {"camo", "cap1"};
-    hiddenSelectionsTextures[] = {"\a3\Weapons_F_Enoch\MagazineProxies\data\12GA_Pellets_CO.paa"};
-};
-class macro_new_mag(proto_shotgun_test,2): macro_new_mag(proto_shotgun_test,20)
-{
-    count = 2;
-    ammo = macro_new_ammo(proto_shotgun_submunition_carbine)
-    displayName = "[PROTOTYPE] DC-15s Carbine I.C.E Shot Mag";
-    mass = 40;
-}
-
-class macro_new_mag(proto_dc15_gl_shotgun,2): macro_new_mag(proto_shotgun_test,20)
-{
-    count = 2;
-    ammo = macro_new_ammo(proto_shotgun_submunition_carbine)
-    displayName = "[PROTOTYPE] DC-15A Shotgun Round";
-    mass = 40;
-}

+ 0 - 39
addons - Copy/RD501_Prototype/_magwell/magwell.hpp

@@ -1,39 +0,0 @@
-class Republic_Universal_Magazine_Well
-{
-    Republic_Universal_Magazine[]=
-    {
-        macro_new_mag(Republic_Universal_Magazine,30),
-        "DCStun_Mag"
-    };
-};
-class Republic_GL_Magazine_Well
-{
-    Republic_GL_Magazines[]=
-    {
-        macro_new_mag(proto_HE_GL,3),
-        macro_new_mag(proto_AP_GL,2),
-
-        macro_new_mag(proto_flare_white,3),
-
-        macro_new_mag(proto_flare_red,3),
-        macro_new_mag(proto_flare_green,3),
-        macro_new_mag(proto_flare_blue,3),
-
-        macro_new_mag(proto_flare_cyan,3),
-        macro_new_mag(proto_flare_purple,3),
-        macro_new_mag(proto_flare_yellow,3),
-        macro_new_mag(proto_flare_orange,3),
-        
-        macro_new_mag(proto_flare_cir,3),
-    
-
-        "3Rnd_Smoke_Grenade_shell",
-        "3Rnd_SmokeRed_Grenade_shell",
-        "3Rnd_SmokeGreen_Grenade_shell",
-        "3Rnd_SmokeYellow_Grenade_shell",
-        "3Rnd_SmokePurple_Grenade_shell",
-        "3Rnd_SmokeBlue_Grenade_shell",
-        "3Rnd_SmokeOrange_Grenade_shell",
-        "ACE_HuntIR_M203"
-    };
-};

BIN
addons - Copy/RD501_Prototype/_textures/icons/AP_GL.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/HE_GL.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/LE.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_blue.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_cyan.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_grey_IR.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_light_green.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_orange.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_purple.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_red.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_white.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/Canister_yellow.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/TEST.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/canister/canister_dark_green.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/carbine.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/mod0.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/rum.paa


BIN
addons - Copy/RD501_Prototype/_textures/icons/z6.paa


+ 0 - 140
addons - Copy/RD501_Prototype/config.cpp

@@ -1,140 +0,0 @@
-#include "config_macros.hpp" // my config macro lib
-#include "../RD501_main/config_macros.hpp"
-
-class CfgPatches
-{
-	class macro_patch_name(weapon_prototypes)
-	{
-		author=macro_authors_ppl
-		requiredAddons[]=
-		{
-		
-			//"A3_Data_F_Enoch_Loadorder",//Load all of arma first
-			"sci_dc15a",
-			"sci_dc15gl",
-			"sci_dc15s",
-			"sci_z6",
-			"sci_valken38a",
-			macro_lvl1_req
-		
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_scope(x4_dc15_acog),
-			macro_new_scope(x4_x12_dc15_le),
-			macro_new_scope(x4_dc15_mod0_acog)
-		
-		};
-		
-	};
-};
-
-class CfgRecoils
-{
-	
-	class recoil_SMG_03;
-	class Default;
-	class recoil_default;
-
-	class macro_new_recoil(z6): recoil_default
-	{
-		muzzleOuter[] = {0.04, 1, 0.24, 0.3};
-		kickBack[] = {0.024, 0.048};
-		temporary = 0.02;
-	};
-	
-	class macro_new_recoil(dc15a_rifle)
-	{
-		kickBack[] = {0.012,0.02};
-		muzzleInner[] = {0,0,0.04,0.04};
-		muzzleOuter[] = {.07,.4,.04,.10};
-		permanent = 0.12;
-		temporary = 0.03;
-	};
-
-	class macro_new_recoil(dc15a_mod_0_prone): recoil_default
-	{
-		muzzleOuter[] = {0.04, 0.2, 0.15, 0.2};
-		kickBack[] = {0.01, 0.03};
-		temporary = 0.004;
-	};
-
-	class  macro_new_recoil(dc15a_mod_0): recoil_default
-	{
-		muzzleOuter[] = {0.10, 0.24, 0.20,0.24};
-		kickBack[] = {0.015, 0.045};
-		temporary = 0.005;
-		prone		= 1.25;
-	};
-
-	class  macro_new_recoil(dc15s): Default
-	{
-		muzzleInner[]={0,0,0.07,0.11};
-		permanent=0.2;
-
-		muzzleOuter[]={0.01,0.12,0.08,0.12};
-		kickBack[]={0.003,0.012};
-		temporary=0.002;
-	};
-
-
-};
-
-class CfgMagazineWells
-{
-	#include "_magwell/magwell.hpp"
-};
-class CfgMagazines
-{	
-	class CA_Magazine;
-	class 1Rnd_HE_Grenade_shell;
-	
-	#include "_mags/core_mags.hpp"
-
-	#include "_mags/flares.hpp"
-
-	class 2Rnd_12Gauge_Pellets;
-	#include "_mags/shotgun.hpp"
-	
-};
-
-class CfgAmmo
-{
-	class SWOP_DC15ABlasterRifle_L_Ammo;
-	class SCI_B_bluePlasma_762;
-	class FlareBase;
-	class G_40mm_HE;
-	
-	#include "_ammo/core_ammo.hpp"
-	// class macro_new_ammo(DC_15a):macro_new_ammo(Republic_Universal_Ammo)
-	// {
-	// 	hit = 16;
-	// 	//caliber = 3.8;
-	// };
-
-	#include "_ammo/flares.hpp"
-
-	// class  macro_new_ammo(test_sub_deplopy):G_40mm_HE
-	// {
-	// 	model = "\SWOP_Main\Effects\Tracer\LaserBlue";
-	// 	effectFly = "SWOP_BlueLaserEffect";
-
-	// 	airFriction = -0.0067;
-	// 	hit = 90;
-	// 	indirectHit = 0;
-	// 	indirectHitRange = 0;
-	// 	typicalSpeed = 360;
-	// 	deflecting = 35;
-
-	// 	indirectHit = 15;
-	// 	indirectHitRange = 1;
-
-	// 	deflecting = 0;
-	// 	fuseDistance = 0;
-	// };
-
-	class B_12Gauge_Pellets_Submunition_Deploy;
-	#include "_ammo/shotgun.hpp"
-};
-

+ 0 - 141
addons - Copy/RD501_Prototype/config_macros.hpp

@@ -1,141 +0,0 @@
-
-#define DC15a_Overheat_Dispersion 0.0
-#define DC15a_Overheat_SlowdownFactor 0.0
-#define DC15a_Overheat_JamChance 0.0
-#define DC15a_Overheat_mrbs 3e+009
-
-#define macro_ace_heating \
-ACE_Overheating_Dispersion = 0.0;\
-ACE_Overheating_SlowdownFactor = 0.0;\
-ACE_Overheating_JamChance = 0.0;\
-ACE_overheating_mrbs = 3e+009;\
-ACE_overheating_allowSwapBarrel = 1;\
-ACE_clearJamAction = "ReloadMagazine";
-
-
-//weapon definitions
-#define macro_dc15a_rof 0.1
-#define macro_dc15a_burst_rof 0.08
-#define macro_dc15a_acc 0.0
-
-#define macro_dc15a_mod0_rof_slow 0.15
-#define macro_dc15a_mod0_rof_fast 0.10
-#define macro_dc15a_mod0_acc 0.00007
-#define macro_dc15a_mod0_fast_acc 0.0001
-
-#define macro_dc15a_le_rof 0.3
-#define macro_dc15a_le_acc macro_dc15a_acc
-
-#define macro_dc15s_rof .06
-#define macro_dc15s_acc 0.0001
-
-#define macro_z6_rof 0.08
-#define macro_z6_super_rof 0.05
-#define macro_z6_acc 0.001
-
-
-//ammo
-#define macro_ammo_no_fric \
-deflecting = 0;\
-airFriction = 0;\
-sideAirFriction = 0;
-
-
-#define macro_dc15a_rifle_scope \
-class OpticsModes\
-{\
-	class Ironsights\
-	{\
-		opticsID=1;\
-		useModelOptics=0;\
-		opticsFlare="true";\
-		opticsPPEffects[]=\
-		{\
-		};\
-		opticsDisablePeripherialVision=0.67000002;\
-		opticsZoomMin=macro_scope_magnification(1);\
-		opticsZoomMax=1.1;\
-		opticsZoomInit=0.75;\
-		memoryPointCamera="eye";\
-		visionMode[]={};\
-		distanceZoomMin=100;\
-		distanceZoomMax=100;\
-		discreteDistanceInitIndex = 1;\
-		discreteinitIndex = 0;\
-	};\
-	class Scope: Ironsights\
-	{\
-		opticsID=2;\
-		useModelOptics=1;\
-		opticsPPEffects[]=\
-		{\
-		};\
-		opticsDisablePeripherialVision=0.67000002;\
-		opticsZoomMin = macro_scope_magnification(6);\
-		opticsZoomMax = macro_scope_magnification(1);\
-		opticsZoomInit = macro_scope_magnification(6);\
-		discretefov[] = {macro_scope_magnification(6)};\
-		memoryPointCamera="opticView";\
-		visionMode[]=\
-		{\
-			"Normal",\
-			"NVG"\
-		};\
-		opticsFlare="true";\
-		distanceZoomMin=300;\
-		distanceZoomMax=300;\
-		cameraDir="";\
-		discreteDistance[] = {100,200,300,400,500,600,700,800,900,1000,1100};\
-	};\
-};
-
-
-#define MACRO_MOD0_SCOPE \
-class OpticsModes\
-{\
-	class Ironsights\
-	{\
-		opticsID=1;\
-		useModelOptics=0;\
-		opticsFlare="true";\
-		opticsPPEffects[]=\
-		{\
-		};\
-		opticsDisablePeripherialVision=0.67000002;\
-		opticsZoomMin=macro_scope_magnification(1);\
-		opticsZoomMax=1.1;\
-		opticsZoomInit=0.75;\
-		memoryPointCamera="eye";\
-		visionMode[]={};\
-		distanceZoomMin=100;\
-		distanceZoomMax=100;\
-		discreteDistanceInitIndex = 1;\
-		discreteinitIndex = 0;\
-	};\
-	class Scope: Ironsights\
-	{\
-		opticsID=2;\
-		useModelOptics=1;\
-		opticsPPEffects[]=\
-		{\
-		};\
-		opticsDisablePeripherialVision=0.67000002;\
-		opticsZoomMin = macro_scope_magnification(8);\
-		opticsZoomMax = macro_scope_magnification(1);\
-		opticsZoomInit = macro_scope_magnification(8);\
-		discretefov[] = {macro_scope_magnification(8)};\
-		memoryPointCamera="opticView";\
-		visionMode[]=\
-		{\
-			"Normal",\
-			"NVG"\
-		};\
-		opticsFlare="true";\
-		distanceZoomMin=300;\
-		distanceZoomMax=300;\
-		cameraDir="";\
-		discreteDistance[] = {100,200,300,400,500,600,700,800,900,1000,1100};\
-	};\
-};
-
-#define MACRO_TEXTURE_PATH \RD501_Prototype\_textures

BIN
addons - Copy/RD501_Prototype/logo.paa


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

@@ -21,7 +21,8 @@ class CfgPatches
 			macro_new_weapon(DC,15a),
 			macro_new_weapon(DC,15a_gl_rifle),
 			macro_new_weapon(DC,15a_LE),
-			macro_new_weapon(DC,15a_mod_0_rifle)
+			macro_new_weapon(DC,15a_mod_0_rifle),
+			macro_new_weapon(DC,r15a)
 		};
 	};
 };
@@ -100,7 +101,46 @@ class cfgWeapons
 			class CowsSlot;
 		};
 	}
-
+	class 3AS_DC15A_Base_F;
+	class 3AS_DC15A_F:3AS_DC15A_Base_F
+	{
+		class Single;
+		class Burst;
+		class WeaponSlotsInfo
+		{
+			class CowsSlot;
+		};
+	};
+	class macro_new_weapon(DC,r15a):3AS_DC15A_F
+	{
+		displayName="Republic DC-15A";
+		reloadTime=0.1;
+		magazines[]=
+		{
+			macro_new_mag(20mw,20)
+		};
+		class Single:Single
+		{
+			reloadTime=0.1;						
+		}
+		class Burst:Burst
+		{
+			reloadTime=0.1;
+		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot: CowsSlot
+			{
+				access = 1;
+				compatibleItems[] = 
+				{
+					macro_new_weapon(scope,dc_r15a_acog)
+				};
+
+			};
+		};
+	};
 	#include "DC_15a__LE_rifle.hpp"
 	#include "DC_15a__GL_rifle.hpp"
 	#include "DC_15a__mod0_rifle.hpp"

+ 21 - 41
addons - Copy/RD501_Weapons/DC_Family/DC_15c/config.cpp

@@ -20,24 +20,33 @@ class CfgPatches
 		};
 	};
 };
-class Mode_SemiAuto;
-class Mode_Burst;
-class Mode_FullAuto;
-class SlotInfo;
-class CowsSlot;
-class MuzzleSlot;
-class PointerSlot;
-class UnderBarrelSlot;
-class WeaponSlotsInfo;
+
 class CfgWeapons
 {
-	class 3AS_DC15C_F;
+	class 3AS_DC15C_Base_F;
+	class 3AS_DC15C_F:3AS_DC15C_Base_F
+	{
+		class FullAuto;
+		class Single;
+		class WeaponSlotsInfo
+		{
+		class CowsSlot;	
+		};
+	};
 	class macro_new_weapon(DC,15c):3AS_DC15C_F
 	{
 		displayName="Republic DC-15C";
 		magazines[]=
 		{
-			"RD501_Mag_30rnd_10MW"
+			macro_new_mag(10mw,30)
+		};
+		class FullAuto:FullAuto
+		{
+			reloadTime=0.08;
+		};
+		class Single : Single
+		{
+			reloadTime=0.08;
 		};
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
@@ -47,39 +56,10 @@ class CfgWeapons
 				access = 1;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,dc_15a_acog)
+					macro_new_weapon(scope,dc_15a_acogtcw)
 				};
 
 			};
 		};
 	};
 };
-class CfgMagazines
-{
-	class 3AS_40Rnd_EC40_Mag;
-	class RD501_Mag_30rnd_10MW : 3AS_40Rnd_EC40_Mag
-	{
-		scope=2;
-		displayName="30 round 10MW Magazine";
-		picture="\3AS\3AS_Weapons\Data\Textures\Energy_Cell_Arsenal.paa";
-		ammo="RD501_10MW_Round";
-		count=30;
-		mass=12;
-		initSpeed=420;
-		tracersEvery=1;
-		lastRoundsTracer=30;
-		descriptionShort="Standard charge cell used by the DC-15C platform.";
-	};
-};
-class CfgAmmo
-{
-	class 3AS_EC40_BluePlasma;
-	class RD501_10MW_Round : 3AS_EC40_BluePlasma
-	{
-		hit=9;
-		cost=1.2;
-		airLock=1;
-		typicalSpeed=600;
-		caliber=0.86956501;
-	};
-};

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

@@ -0,0 +1,73 @@
+#define COMPONENT DC_15s
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+
+
+class CfgPatches
+{
+	class macro_patch_name(dc_15c)
+	{
+		author="RD501";
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(DC,15gl),
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class JLTS_DC15A_ugl;
+	class JLTS_DC15A_ugl_plastic:JLTS_DC15A_ugl
+	{
+		class Single;
+		class EGLM;
+		class WeaponSlotsInfo
+		{
+		class CowsSlot;	
+		};
+	};
+	class macro_new_weapon(DC,15gl):JLTS_DC15A_ugl_plastic
+	{
+		displayName="Republic DC-15A UGL";
+		magazines[]=
+		{
+			macro_new_mag(10mw,30)
+		};
+		modes[] = {"Single", "Burst"};
+		class Single:Single
+		{
+			reloadTime=0.1;
+		};
+		class Burst : Single
+		{
+			reloadTime=0.1;
+			burst=3;
+			textureType="burst";
+		};
+		class EGLM:EGLM
+	{
+		magazines[] = {};
+		magazineWell[] += {macro_new_magwell(GL_Mags)};
+	};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot: CowsSlot
+			{
+				access = 1;
+				compatibleItems[] = 
+				{
+					macro_new_weapon(scope,dc_15a_acogtcw)
+				};
+
+			};
+		};
+	};
+};

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

@@ -0,0 +1,65 @@
+#define COMPONENT DC_15s
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+
+
+class CfgPatches
+{
+	class macro_patch_name(dc_15l)
+	{
+		author="RD501";
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(DC,15l),
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class 3AS_DC15L_Base_F;
+	class 3AS_DC15L_F:3AS_DC15L_Base_F
+	{
+		class FullAuto;
+		class Single;
+		class WeaponSlotsInfo
+		{
+		class CowsSlot;	
+		};
+	};
+	class macro_new_weapon(DC,15l):3AS_DC15L_F
+	{
+		displayName="Republic DC-15L";
+		magazines[]=
+		{
+			macro_new_mag(20mw,240)
+		};
+		class FullAuto:FullAuto
+		{
+			reloadTime=0.08;
+		};
+		class Single : Single
+		{
+			reloadTime=0.08;
+		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot: CowsSlot
+			{
+				access = 1;
+				compatibleItems[] = 
+				{
+					macro_new_weapon(scope,dc_15a_acogtcw)
+				};
+
+			};
+		};
+	};
+};

+ 26 - 1
addons - Copy/RD501_Weapons/DC_Family/DC_15s/config.cpp

@@ -17,7 +17,8 @@ class CfgPatches
 		units[]={};
 		weapons[]={
 			macro_new_weapon(DC,15s),
-			macro_new_weapon(DC,15s_shield)
+			macro_new_weapon(DC,15s_shield),
+			macro_new_weapon(DC,r15s)
 		};
 	};
 };
@@ -175,5 +176,29 @@ class cfgWeapons
 		hiddenSelectionsTextures[] = {"\SW_CloneWarsWeapons\DCrifles\textures\shCG.paa"};
 		baseWeapon = macro_new_weapon(DC,15s_shield_cg);
 	};
+	class 3AS_DC15S_Base_F;
+	class 3AS_DC15S_F:3AS_DC15S_Base_F
+	{
+		class Single;
+		class FullAuto;
+	};
+	class macro_new_weapon(DC,r15s):3AS_DC15S_F
+	{
+		displayName="Republic DC-15S";
+		reloadTime=0.66;
+		magazines[]=
+		{
+			macro_new_mag(5mw,60)
+		};
+		class Single:Single
+		{
+			reloadTime=0.066;
+		};
+		class FullAuto:FullAuto
+		{
+			reloadTime=0.066;
+		};
+	};
+};
 };
 

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

@@ -26,7 +26,7 @@ class CfgPatches
 
 class cfgWeapons 
 {
-	
+	class Mode_FullAuto;
 	class Pistol_Base_F;
 	class SWOP_DC17Pistol: Pistol_Base_F
 	{
@@ -101,7 +101,47 @@ class cfgWeapons
 		class Single;
 	};
 
-
+	class hgun_P07_F;
+	class JLTS_DC17SA:hgun_P07_F
+	{
+		class Single;
+	};
+	class macro_new_weapon(DC,r17):JLTS_DC17SA
+	{
+		displayName="Republic DC-17";
+		baseWeapon=macro_new_weapon(DC,r17)
+		magazines[]=
+		{
+			macro_new_mag(5mw,10)
+		};
+		class Single : Single
+		{
+			reloadTime=0.1;
+		};
+	};
+	class macro_new_weapon(DC,r17a):JLTS_DC17SA
+	{
+		displayName="Republic DC-17A";
+		baseWeapon=macro_new_weapon(DC,r17a)
+		magazines[]=
+		{
+			macro_new_mag(2mw,30)
+		};
+		modes[] = {"FullAuto"};
+		class FullAuto : Single
+		{
+			autoFire=1;
+			reloadTime=0.055;
+			displayName="$STR_DN_MODE_FULLAUTO";
+			textureType="fullAuto";
+			recoil="recoil_auto_primary_3outof10";
+			recoilProne="recoil_auto_primary_prone_3outof10";
+			aiDispersionCoefY=3;
+			aiDispersionCoefX=2;
+			soundBurst=0;
+			burst=3;
+		};
+	};
 
 	class RD501_DC_15_RB:SWOP_DC15SAPistol
 	{

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

@@ -56,7 +56,6 @@ class CfgAmmo
 	class SmokeShell;
 	class SWOP_SCAR_Dioxis;
 	class GrenadeHand_stone;
-	class G_40mm_HE;
 	class RD501_ShadowMag: SWOP_SCAR_Dioxis
 	{
 		model = "\thermalD\Dioxis.p3d";
@@ -69,56 +68,6 @@ class CfgAmmo
 		smokeColor[] = {0.2125,0.6258,0.48909998,1};
 		effectsSmoke = "Shadow_Smoke";
 	};
-	class RD501_grenade_emp_ammo: G_40mm_HE
-    {
-            JLTS_isEMPAmmo=1;
-            hit = 0.1;
-            indirectHit = 0.01;
-            indirectHitRange = 12;
-            timeToLive =30;
-            model = "\thermalD\EMP_Grenade_ammo.p3d";
-            fuseDistance = 1;
-
-            explosive = 0.0001;
-            deflecting = 5;
-            caliber = 5;
-
-            ace_frag_enabled = 0;
-            ace_frag_force = 0;
-            ace_frag_classes[] = {""};
-            ace_frag_metal = 0;
-            ace_frag_charge = 0;
-            ace_frag_gurney_c = 0;
-            ace_frag_gurney_k = "0";
-            ace_rearm_caliber = 0;
-            explosionEffects="JLTS_fx_exp_EMP";
-            grenadeBurningSound[]=
-            {
-                "EMPSoundLoop1",
-                0.5
-            };
-            EMPSoundLoop1[]=
-            {
-                "MRC\JLTS\weapons\Grenades\sounds\grenade_burning.wss",
-                0.125893,
-                1,
-                70
-            };
-            SoundSetExplosion[]=
-            {
-                "JLTS_GrenadeEMP_Exp_SoundSet",
-                "JLTS_GrenadeEMP_Tail_SoundSet",
-                "Explosion_Debris_SoundSet"
-            };
-            aiAmmoUsageFlags=0;
-            class CamShakeExplode
-            {
-                distance=10;
-                duration=1;
-                frequency=20;
-                power=0;
-            };
-    };
 };
 class CfgMagazines
 {
@@ -138,39 +87,7 @@ class CfgMagazines
 			libTextDesc = "";
 		};
 	};
-	class RD501_emp_GL_x1_mag : EGLM
-{
-	ammo = "RD501_grenade_emp_ammo";
-	count = 1;
-	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;
-	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 CfgWeapons
 {

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

@@ -0,0 +1,62 @@
+#define COMPONENT DC_15s
+#include "../../RD501_main/config_macros.hpp"
+#include "../_common/common.hpp"
+
+
+class CfgPatches
+{
+	class macro_patch_name(valken38x)
+	{
+		author="RD501";
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon_nofam(valken38x),
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class 3AS_Valken38X_Base_F;
+	class 3AS_Valken38X_F:3AS_Valken38X_Base_F
+	{
+		class Single;
+		class WeaponSlotsInfo
+		{
+		class CowsSlot;	
+		};
+	};
+	class macro_new_weapon_nofam(valken38x):3AS_Valken38X_F
+	{
+		displayName="Republic Valken 38X";
+		magazines[]=
+		{
+			macro_new_mag(20mw,20),
+			macro_new_mag(30mw,10)
+		};
+		class Single : Single
+		{
+			reloadTime=0.5;
+		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot: CowsSlot
+			{
+				access = 1;
+				compatibleItems[] = 
+				{
+					macro_new_weapon(scope,dc_15a_acogtcw),
+					macro_new_weapon(scope,valken_6_12x)
+				};
+
+			};
+		};
+	};
+};

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

@@ -18,6 +18,7 @@ class CfgPatches
 		units[]={};
 		weapons[]={
 			macro_new_weapon_nofam(Z6),
+			macro_new_weapon_nofam(rZ6),
 			"SWOP_Valken38XAuto_XD",
 			macro_new_weapon_nofam(Z1000)
 		};
@@ -102,6 +103,40 @@ class cfgWeapons
 			};
 		};
 
+	};
+	class LMG_Mk200_F;
+	class JLTS_Z6:LMG_Mk200_F
+	{
+		class manual;
+	};
+	class macro_new_weapon_nofam(rZ6):JLTS_Z6
+	{
+		scope=2;
+        scopeArsenal=2;
+		baseWeapon=macro_new_weapon_nofam(rZ6)
+        displayName="Republic Z6 Chaingun";
+		magazines[]=
+		{
+			macro_new_mag(10mw,400)
+		};
+		modes[] = {"manual", "Overcharge"};
+		class manual:manual
+		{
+		reloadTime=0.059;
+		};
+		class Overcharge:manual
+		{
+			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 3AS_Chaingun;
     class macro_new_weapon_nofam(z1000): 3AS_Chaingun
@@ -109,8 +144,7 @@ class cfgWeapons
         scope=2;
         scopeArsenal=2;
 		reloadAction="broken";
-        displayName="Z1000 Chaingun";
-        _generalMacro="launch_RPG32_F";
+        displayName="Republic Z1000 Chaingun";
 		magazines[]=
 		{
 			macro_new_mag(z1000,3000)

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

@@ -0,0 +1,158 @@
+#include "../../RD501_main/config_macros.hpp"
+
+class CfgPatches
+{
+    class macro_patch_name(ammo)
+    {
+        author=RD501;
+        addonRootClass= macro_patch_name(weapons)
+        requiredAddons[]=
+        {
+            macro_patch_name(weapons)
+        };
+        requiredVersion=0.1;
+        units[]={};
+        weapons[]={};
+    };
+};
+
+class CfgAmmo
+{
+	class 3AS_EC20_BluePlasma;
+	class 3AS_EC30_BluePlasma;
+	class 3AS_EC40_BluePlasma;
+	class 3AS_EC50_BluePlasma;
+	class 3AS_EC60_BluePlasma;
+	class 3AS_EC70_BluePlasma;
+	class 3AS_EC80_BluePlasma;
+	class G_40mm_HE;
+	class macro_new_ammo(2mw):3AS_EC20_BluePlasma
+	{
+		hit=4;
+		airLock=1;
+		typicalSpeed=400;
+		caliber=1.2;		
+	};
+	class macro_new_ammo(5mw) : 3AS_EC30_BluePlasma
+	{
+		hit=6;
+		airLock=1;
+		typicalSpeed=400;
+		caliber=1.4;
+	};
+	class macro_new_ammo(10mw) : 3AS_EC40_BluePlasma
+	{
+		hit=9;
+		airLock=1;
+		typicalSpeed=450;
+		caliber=0.86956501;
+	};
+	class macro_new_ammo(20mw) : 3AS_EC50_BluePlasma
+	{
+		hit=12;
+		airLock=1;
+		typicalSpeed=500;
+		caliber=1.6;
+	};
+	class macro_new_ammo(30mw) : 3AS_EC60_BluePlasma
+	{
+	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;
+	};
+	class macro_new_ammo(50mw) : 3AS_EC80_BluePlasma
+	{
+	hit=60;
+	airLock=1;
+	typicalSpeed=1100;
+	caliber=2.8;
+	};
+	class macro_new_ammo(UGL_HE): G_40mm_HE
+	{
+		hit = 350;
+		indirectHit = 0;
+		indirectHitRange = .1;
+		timeToLive =30;
+		model = "\GeonFighter\LaserGeon.p3d";
+		fuseDistance = 3;
+
+		explosive = 0.0001;
+		deflecting = 5;
+		caliber = 5;
+
+		ace_frag_enabled = 0;
+		ace_frag_force = 0;
+		ace_frag_classes[] = {""};
+		ace_frag_metal = 0;
+		ace_frag_charge = 0;
+		ace_frag_gurney_c = 0;
+		ace_frag_gurney_k = "0";
+		ace_rearm_caliber = 0;
+	};
+	class macro_new_ammo(UGL_AP) :G_40mm_HE
+	{
+		hit = 60;
+		indirectHit = 50;
+		indirectHitRange = 5;
+		timeToLive =30;
+		model = "SW_AV7\ion.p3d";
+		fuseDistance = 3;
+	};
+	class RD501_grenade_emp_ammo: G_40mm_HE
+    {
+		JLTS_isEMPAmmo=1;
+		hit = 0.1;
+		indirectHit = 0.01;
+		indirectHitRange = 12;
+		timeToLive =30;
+		model = "\thermalD\EMP_Grenade_ammo.p3d";
+		fuseDistance = 1
+		explosive = 0.0001;
+		deflecting = 5;
+		caliber = 5;
+		ace_frag_enabled = 0;
+		ace_frag_force = 0;
+		ace_frag_classes[] = {""};
+		ace_frag_metal = 0;
+		ace_frag_charge = 0;
+		ace_frag_gurney_c = 0;
+		ace_frag_gurney_k = "0";
+		ace_rearm_caliber = 0;
+		explosionEffects="JLTS_fx_exp_EMP";
+		grenadeBurningSound[]=
+		{
+			"EMPSoundLoop1",
+			0.5
+		};
+		EMPSoundLoop1[]=
+		{
+			"MRC\JLTS\weapons\Grenades\sounds\grenade_burning.wss",
+			0.125893,
+			1,
+				70
+			};
+		SoundSetExplosion[]=
+		{
+			"JLTS_GrenadeEMP_Exp_SoundSet",
+			"JLTS_GrenadeEMP_Tail_SoundSet",
+			"Explosion_Debris_SoundSet"
+		};
+		aiAmmoUsageFlags=0;
+		class CamShakeExplode
+		{
+			distance=10;
+			duration=1;
+			frequency=20;
+			power=0;
+		};
+    };
+
+};

+ 161 - 0
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -0,0 +1,161 @@
+#include "../../RD501_main/config_macros.hpp"
+
+class CfgPatches
+{
+    class macro_patch_name(magazines)
+    {
+        author=RD501;
+        addonRootClass= macro_patch_name(weapons)
+        requiredAddons[]=
+        {
+            macro_patch_name(weapons)
+        };
+        requiredVersion=0.1;
+        units[]={};
+        weapons[]={};
+    };
+};
+
+class CfgMagazines
+{
+	class 3AS_45Rnd_EC50_Mag;
+	class 1Rnd_HE_Grenade_shell;
+	class macro_new_mag(2mw,30) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="30 Round 2MW Cell";
+		count = 30;
+		ammo=macro_new_ammo(2mw)
+		typicalSpeed=400;
+		descriptionShort="Low power magazine";
+	};
+	class macro_new_mag(5mw,60) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="60 Round 5MW Cell";
+		count = 60;
+		ammo=macro_new_ammo(5mw)
+		typicalSpeed=400;
+		descriptionShort="Low power magazine";
+	};
+	class macro_new_mag(5mw,10) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="10 Round 5MW Cell";
+		count = 10;
+		ammo=macro_new_ammo(5mw)
+		typicalSpeed=400;
+		descriptionShort="Low power magazine";
+	};
+	class macro_new_mag(10mw,30) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="30 Round 10MW Cell";
+		count = 30;
+		ammo=macro_new_ammo(10mw)
+		typicalSpeed=450;
+		descriptionShort="Medium power magazine";
+	};
+	class macro_new_mag(10mw,400) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="400 Round 10MW Cell";
+		count = 400;
+		ammo=macro_new_ammo(10mw)
+		typicalSpeed=450;
+		descriptionShort="Medium power box magazine";
+	};
+	class macro_new_mag(20mw,20) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="20 Round20MW Cell";
+		count = 20;
+		ammo=macro_new_ammo(20mw)
+		typicalSpeed=500;
+		descriptionShort="Medium power magazine";
+	};
+	class macro_new_mag(20mw,240) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="240 Round 20MW Cell";
+		count = 240;
+		ammo=macro_new_ammo(20mw)
+		typicalSpeed=500;
+		descriptionShort="Medium power box magazine";
+	};
+	class macro_new_mag(30mw,10) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="10 Round 30MW Cell";
+		count = 10;
+		ammo=macro_new_ammo(30mw)
+		typicalSpeed=800;
+		descriptionShort="High power magazine";
+	};
+	class macro_new_mag(40mw,5) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="5 Round 40MW Cell";
+		count = 5;
+		ammo=macro_new_ammo(40mw)
+		typicalSpeed=1100;
+		descriptionShort="High power magazine";
+	};
+	class macro_new_mag(50mw,10) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="10 Round 50MW Cell";
+		count = 10;
+		ammo=macro_new_ammo(20mw)
+		typicalSpeed=1100;
+		descriptionShort="High power magazine";
+	};
+	class macro_new_mag(50mw,8) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="8 Round 50MW Cell";
+		count = 8;
+		ammo=macro_new_ammo(20mw)
+		typicalSpeed=1100;
+		descriptionShort="High power magazine";
+	};
+	class macro_new_mag(UGL_HE,3):1Rnd_HE_Grenade_shell
+	{
+		displayName = "3 Rd HE DC-15A Grenades";
+		displayNameShort = "3 Rnd HE DC-15A";
+		count=3;
+		ammo = macro_new_ammo(UGL_HE)
+		descriptionShort = "3Rd HE DC-15A Grenade";
+	}
+	class macro_new_mag(UGL_AP,2):1Rnd_HE_Grenade_shell
+	{
+		displayName = "2 Rd AP DC-15A Grenades";
+		displayNameShort = "2 Rd AP DC-15A";
+		count=2;
+		ammo = macro_new_ammo(UGL_HE)
+		descriptionShort = "2Rd AP DC-15A Grenade";
+	}
+	class macro_new_mag(UGL_EMP,1) : 1Rnd_HE_Grenade_shell
+	{
+		ammo = "RD501_grenade_emp_ammo";
+		count = 1;
+		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;
+		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 = "";
+		};
+};
+};

+ 70 - 0
addons - Copy/RD501_Weapons/_scopes/DC_15A_2-6x_acog.hpp

@@ -0,0 +1,70 @@
+class macro_new_weapon(scope,dc_r15a_acog): itemCore
+{
+    scope = 2;
+    author = "SWOP";
+    inertia = 0.1;
+    displayName = "DC-15A ACOG (2-6x)";
+    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
+    model = "Scope\holoscopedc15A.p3d";
+    descriptionShort = "DC-15 ACOG (2-6x) ";
+    weaponInfoType = "RscOptics_nightstalkerbluenorange";
+    class ItemInfo: InventoryOpticsItem_Base_F
+    {
+        opticType = 2;
+        mass = 4;
+        RMBhint = "DC-15A Scope (x4)";
+        optics = 1;
+        weaponInfoType = "RscOptics_nightstalkerbluenorange";
+        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
+        modelOptics = "Scope\4x_xm8.p3d";
+        class OpticsModes
+        {
+            /*class Iron
+            {
+                opticsID = 2;
+                opticsDisplayName = "";
+                useModelOptics = 0;
+                opticsPPEffects[] = {"", ""};
+                opticsFlare = 0;
+                opticsDisablePeripherialVision = 0;
+                opticsZoomMin =  scope_magnification(.53);
+                opticsZoomMax = 1.25;
+                opticsZoomInit = 0.75;
+                memoryPointCamera = "eye";
+                visionMode[] = {};
+                //discretefov[] = {scope_magnification(.53)};
+                discreteDistance[] = {200};
+                discreteDistanceInitIndex = 0;
+                distanceZoomMin = 200;
+                distanceZoomMax = 200;
+                discreteInitIndex = 0;
+                modelOptics = "\A3\Weapons_F\empty";
+                //modelOptics = "Scope\DC17MSniperZoom.p3d";
+            };*/
+            class Snip
+            {
+                opticsID = 1;
+                opticsDisplayName = "WFOV";
+                useModelOptics = 1;
+                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
+                opticsZoomMin = scope_magnification(6);
+                opticsZoomMax = scope_magnification(2);
+                opticsZoomInit = scope_magnification(2);
+                discreteinitIndex = 0;
+                discretefov[] = {scope_magnification(2),scope_magnification(6)};
+                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000};
+                discreteDistanceInitIndex = 1;
+                distanceZoomMin = 100;
+                distanceZoomMax = 1000;
+                visionMode[] = {"Normal", "NVG"};
+                thermalMode[] = {1, 2};
+                memoryPointCamera = "opticView";
+                modelOptics = "Scope\4x_xm8.p3d";
+                weaponInfoType = "RscOptics_nightstalkerbluenorange";
+                opticsFlare = 1;
+                opticsDisablePeripherialVision = 0;//1;
+                cameraDir = "";
+            };
+        };
+    };
+};

+ 69 - 0
addons - Copy/RD501_Weapons/_scopes/DC_15A_LE_x4_x8.hpp

@@ -66,4 +66,73 @@ class macro_new_weapon(scope,dc_15a_x4_x8): itemCore
             };
         };
     };
+};
+class macro_new_weapon(scope,valken_6_12x): itemCore
+{
+    scope = 2;
+    author = "SWOP";
+    inertia = 0.1;
+    displayName = "DC-15A LE Scope (6-12x)";
+    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
+    model = "SW_CloneWarsWeapons\DCrifles\dc15azoomscopeX10range.p3d";
+    descriptionShort = "DC-15A Scope (x10+Range)";
+    weaponInfoType = "RscOptics_nightstalkerblue";
+    class ItemInfo: InventoryOpticsItem_Base_F
+    {
+        opticType = 2;
+        mass = 4;
+        RMBhint = "Valken 38X Scope (6-12x)";
+        optics = 1;
+        weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
+        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
+        modelOptics = "Scope\a180.p3d";
+        class OpticsModes
+        {
+            class Snip
+            {
+                modelOptics = "Scope\a180.p3d";
+                opticsID = 1;
+                opticsDisplayName = "WFOV";
+                useModelOptics = 1;
+                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
+                opticsZoomMin = scope_magnification(12);
+                opticsZoomMax = scope_magnification(1);
+                opticsZoomInit = scope_magnification(1);
+                discretefov[] = {scope_magnification(1),scope_magnification(4),scope_magnification(12)};
+                discreteinitIndex = 0;
+                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,4000};
+                discreteDistanceInitIndex = 1;
+                distanceZoomMin = 100;
+                distanceZoomMax = 4000;
+                visionMode[] = {"Normal", "NVG","TI"};
+                thermalMode[] = {1,8};
+                memoryPointCamera = "opticView";
+                weaponInfoType = "RscOptics_nightstalkerblue";//make diffrent scope?
+                opticsFlare = 1;
+                opticsDisablePeripherialVision = 1;
+                cameraDir = "";
+            };
+            class Iron
+            {
+                opticsID = 2;
+                opticsDisplayName = "";
+                useModelOptics = 0;
+                opticsPPEffects[] = {"", ""};
+                opticsFlare = 0;
+                opticsDisablePeripherialVision = 0;
+                opticsZoomMin = 0.25;
+                opticsZoomMax = 1.25;
+                opticsZoomInit = 0.75;
+                memoryPointCamera = "eye";
+                visionMode[] = {};
+                discretefov[] = {};
+                discreteDistance[] = {200};
+                discreteDistanceInitIndex = 0;
+                distanceZoomMin = 200;
+                distanceZoomMax = 200;
+                discreteInitIndex = 0;
+                modelOptics = "\A3\Weapons_F\empty";
+            };
+        };
+    };
 };

+ 70 - 0
addons - Copy/RD501_Weapons/_scopes/DC_15A_x4_acog.hpp

@@ -68,4 +68,74 @@ class macro_new_weapon(scope,dc_15a_acog): itemCore
         };
     };
 };
+class macro_new_weapon(scope,dc_15a_acogtcw): itemCore
+{
+    scope = 2;
+    author = "SWOP";
+    inertia = 0.1;
+    displayName = "DC-15C Holo (x4)";
+    picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Scope.paa";
+    model = "Scope\holoscopedc15A.p3d";
+    descriptionShort = "DC-15 Holo (x3)";
+    weaponInfoType = "RscOptics_nightstalkerbluenorange";
+    class ItemInfo: InventoryOpticsItem_Base_F
+    {
+        opticType = 2;
+        mass = 4;
+        RMBhint = "DC-15A Scope (x4)";
+        optics = 1;
+        weaponInfoType = "RscOptics_nightstalkerbluenorange";
+        //modelOptics = "Scope\dc15zoomscope_sight.p3d";
+        modelOptics = "Scope\4x_xm8.p3d";
+        class OpticsModes
+        {
+           /* class Iron
+            {
+                opticsID = 2;
+                opticsDisplayName = "";
+                useModelOptics = 0;
+                opticsPPEffects[] = {"", ""};
+                opticsFlare = 0;
+                opticsDisablePeripherialVision = 0;
+                opticsZoomMin =  scope_magnification(.53);
+                opticsZoomMax = 1.25;
+                opticsZoomInit = 0.75;
+                memoryPointCamera = "opticView";
+                visionMode[] = {};
+                //discretefov[] = {scope_magnification(.53)};
+                discreteDistance[] = {200};
+                discreteDistanceInitIndex = 0;
+                distanceZoomMin = 200;
+                distanceZoomMax = 200;
+                discreteInitIndex = 0;
+                modelOptics = "\A3\Weapons_F\empty";
+                //modelOptics = "Scope\DC17MSniperZoom.p3d";
+            };*/
+            class Snip
+            {
+                opticsID = 1;
+                opticsDisplayName = "WFOV";
+                useModelOptics = 1;
+                opticsPPEffects[] = {"OpticsCHAbera1", "OpticsBlur1"};
+                opticsZoomMin = scope_magnification(4);
+                opticsZoomMax = scope_magnification(1);
+                opticsZoomInit = scope_magnification(4);
+                discreteinitIndex = 0;
+                discretefov[] = {scope_magnification(1.25),scope_magnification(4)};
+                discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000};
+                discreteDistanceInitIndex = 1;
+                distanceZoomMin = 100;
+                distanceZoomMax = 1000;
+                visionMode[] = {"Normal", "NVG"};
+                thermalMode[] = {1, 2};
+                memoryPointCamera = "opticView";
+                modelOptics = "Scope\4x_xm8.p3d";
+                weaponInfoType = "RscOptics_nightstalkerbluenorange";
+                opticsFlare = 1;
+                opticsDisablePeripherialVision = 0;//1;
+                cameraDir = "";
+            };
+        };
+    };
+};
 

+ 14 - 7
addons - Copy/RD501_Weapons/config.cpp

@@ -33,6 +33,8 @@ class CfgWeapons
 	#include "_scopes/DC_15A_x4_acog.hpp"
 
 	#include "_scopes/DC_15A_LE_x4_x8.hpp"
+	
+	#include "_scopes/DC_15A_2-6x_acog.hpp"
 	class GrenadeLauncher;
 	// class Throw: GrenadeLauncher
 	// {
@@ -62,12 +64,15 @@ class CfgMagazineWells
 	
 		macro_new_magwell(GL_AP)[]=
 		{
-			macro_new_mag(AT_GL,2)
+			macro_new_mag(AT_GL,2),
+			macro_new_mag(UGL_AP,2)
 		};
 
 		macro_new_magwell(GL_HE)[]=
 		{
-			macro_new_mag(HE_GL,3)
+			macro_new_mag(HE_GL,3),
+			macro_new_mag(UGL_EMP,1),
+			macro_new_mag(UGL_HE,3)
 		};
 		
 		macro_new_magwell(smoke)[]=
@@ -79,8 +84,10 @@ class CfgMagazineWells
 			"3Rnd_SmokePurple_Grenade_shell",
 			"3Rnd_SmokeBlue_Grenade_shell",
 			"3Rnd_SmokeOrange_Grenade_shell",
-			"ACE_HuntIR_M203",
-			"RD501_emp_GL_x1_mag"
+			"ACE_HuntIR_M203"
+			
+			
+			
 		};
 	
 	};
@@ -166,7 +173,7 @@ class CfgMagazines
 
 	
 	#include "_mag/flare_mag.hpp"
-
+	class 1Rnd_HE_Grenade_shell;
 	class macro_new_mag(AT_GL,2): CA_Magazine
 	{
 		author = "RD501";
@@ -175,7 +182,7 @@ class CfgMagazines
 		displayName = "2 Rnd AP DC-15A Grenades";
 		displayNameShort = "2 Rnd AP DC-15A";
 		picture = "\A3\Weapons_f\Data\ui\gear_UGL_slug_CA.paa";
-		ammo = macro_new_ammo(GL_AT);
+		ammo = macro_new_ammo(GL_AT)
 		initSpeed = 220;//120;
 		count = 2;
 		nameSound = "";
@@ -189,7 +196,7 @@ class CfgMagazines
 		displayName = "3 Rnd HE DC-15A Grenades";
 		displayNameShort = "3 Rnd HE DC-15A";
 		count=3;
-		ammo = macro_new_ammo(GL_HE);
+		ammo = macro_new_ammo(GL_HE)
 		descriptionShort = "3Rnd HE DC-15A Grenade";
 		initSpeed = 120;
 	};