Merge pull request #119 from 501st-Aux-Mod-Team/staticweapons

Staticweapons

addons - Copy/RD501_Main/XEH_postinit.sqf

@@ -30,7 +30,7 @@ call macro_fnc_name(magclamp);
 // Check every second for if the Loading Screen is still up and forcibly end it.
 _fnc_endLoadingScreen = {
 	params ["_args", "_handle"];
-	systemChat format["Ending LoadingScreen [Attempt %1]", _handle];
+	systemChat format["Ending LoadingScreen [Handle %1]", _handle];
 	endLoadingScreen;
 	_stillLoading = call BIS_fnc_isLoading;
 	if(!_stillLoading) exitWith {
@@ -38,6 +38,6 @@ _fnc_endLoadingScreen = {
 	};
 };
 [_fnc_endLoadingScreen, 5, []] call CBA_fnc_addPerFrameHandler;
-
 // Flip Backpack
-rd501_flip_vehicle_validBackpacks = ["RD501_JLTS_Clone_Flip_backpack"];
+rd501_flip_vehicle_validBackpacks = ["RD501_JLTS_Clone_Flip_backpack"];
+["rd501_external_reload", { _this call rd501_fnc_onReloadExternalHandler }, []] call CBA_fnc_addEventHandlerArgs;

addons - Copy/RD501_Main/XEH_preInit.sqf

@@ -105,4 +105,9 @@ macro_prep_xeh(reload_on_select\fnc_onWeaponFiredSwapToEmpty.sqf,onWeaponFiredSw
 
 // Flip backpack
 macro_prep_xeh(flip_vehicle\fnc_flipVehicle.sqf,flipVehicle)
-macro_prep_xeh(flip_vehicle\fnc_canFlipVehicle.sqf,canFlipVehicle)
+macro_prep_xeh(flip_vehicle\fnc_canFlipVehicle.sqf,canFlipVehicle)
+
+// Reload Externally
+macro_prep_xeh(external_reload\fnc_canReloadExternal.sqf,canReloadExternal)
+macro_prep_xeh(external_reload\fnc_reloadExternal.sqf,reloadExternal)
+macro_prep_xeh(external_reload\fnc_onReloadExternalHandler.sqf,onReloadExternalHandler)

addons - Copy/RD501_Main/config.cpp

@@ -595,6 +595,19 @@ class CfgVehicles
 			};
 		};
 	};
+	class StaticWeapon: LandVehicle {
+		class ACE_Actions {
+			class ACE_MainActions {
+				class rd501_external_reload {
+					displayName = "Reload";
+					condition = "_this call rd501_fnc_canReloadExternal";
+					statement = "_this call rd501_fnc_reloadExternal";
+					exceptions[] = {};
+					runOnHover = 0;
+				};
+			};
+		};
+	};
 	class Man;
 	class CAManBase: Man
 	{

addons - Copy/RD501_Main/functions/external_reload/fnc_canReloadExternal.sqf

@@ -0,0 +1,10 @@
+params ["_target", "_player", "_params"];
+if(!(alive _target) || !(alive _player)) exitWith { false };
+if(vehicle _target != _target) exitWith {false};
+_currentTurret = _target currentWeaponTurret [0];
+if(_currentTurret == "") then {
+	_currentTurret =  _target weaponsTurret [0] select 0;
+};
+_compatMags = [_currentTurret] call CBA_fnc_compatibleMagazines;
+_magazines = (magazinesAmmo _player) select {_x select 1 > 0 && (_x select 0) in _compatMags};
+count _magazines > 0

addons - Copy/RD501_Main/functions/external_reload/fnc_onReloadExternalHandler.sqf

@@ -0,0 +1,5 @@
+params ["_target", "_magazine", "_ammoAmount"];
+{
+	_target removeMagazinesTurret [_magazine, _x];
+	_target addMagazineTurret [_magazine, _x, _ammoAmount];
+} forEach allTurrets _target;

addons - Copy/RD501_Main/functions/external_reload/fnc_reloadExternal.sqf

@@ -0,0 +1,36 @@
+params ["_target", "_player", "_params"];
+
+_currentTurret = _target currentWeaponTurret [0];
+if(_currentTurret == "") then {
+	_currentTurret =  _target weaponsTurret [0] select 0;
+};
+_compatMags = [_currentTurret] call CBA_fnc_compatibleMagazines;
+
+
+_magazines = (magazinesAmmo _player) select {_x select 1 > 0 && (_x select 0) in _compatMags};
+_magazines sort false;
+if(count _magazines == 0) exitWith {
+	["No compatible mags found", true, 2, 0] call ace_common_fnc_displayText;
+};
+
+_magazine = _magazines select 0;
+_ammoAmount = _magazine select 1;
+_magazine = _magazine select 0;
+
+private _onFinish = {
+    (_this select 0) params ["_player", "_target", "_magazine", "_ammoAmount"];
+
+	[_player, _magazine, _ammoAmount] call ace_common_fnc_removeSpecificMagazine;
+
+	["rd501_external_reload", [_target, _magazine, _ammoAmount], [_target]] call CBA_fnc_targetEvent;
+	[format["Reloaded %1", _target], true, 2, 0] call ace_common_fnc_displayText;
+};
+
+private _onFailure = {
+    (_this select 0) params ["_player", "_target"];
+    [_player, "AmovPknlMstpSrasWrflDnon", 1] call ace_common_fnc_doAnimation;
+};
+
+[_player, "AinvPknlMstpSnonWnonDr_medic5", 0] call ace_common_fnc_doAnimation;
+
+[5, [_player, _target, _magazine, _ammoAmount], _onFinish, _onFailure, ("Reloading")] call ace_common_fnc_progressBar;

addons - Copy/RD501_Vehicle_Weapons/land/static/config.cpp.old

@@ -0,0 +1,84 @@
+
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+
+
+class CfgPatches
+{
+	class macro_patch_name(staticweapons)
+	{
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(vehicle_weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(vehicle_weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(stat,eweb),
+			macro_new_weapon(stat,ragl40),
+			macro_new_weapon(stat,aap4)
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class 3AS_HeavyRepeater;
+	class 3AS_BlasterTurret_Repeater:3AS_HeavyRepeater
+	{
+		class manual;
+	}
+	class macro_new_weapon(stat,eweb):3AS_BlasterTurret_Repeater
+	{
+		class manual: manual
+		{
+			dispersion=0.011;
+			reloadTime=0.05;
+		};
+		magazines[]=
+		{
+			macro_new_mag(eweb,600)
+		};
+	};
+	class macro_new_weapon(stat,ragl40):3AS_BlasterTurret_Repeater
+	{
+		magazines[]=
+		{
+			macro_new_mag(ragl40he,40)
+		};
+	};
+	class ace_javelin_Titan_Static;
+	class macro_new_weapon(stat,aap4):ace_javelin_Titan_Static
+	{
+		/*magazines[]=
+		{
+			macro_new_mag(aap,4)
+		};*/
+	};
+};
+class CfgMagazines
+{
+	class 3AS_500_Rnd_BlasterTurret_mag;
+	class 40Rnd_20mm_G_belt;
+	class 1Rnd_GAT_missiles;
+	class macro_new_mag(eweb,600): 3AS_500_Rnd_BlasterTurret_mag
+	{
+		count=600;
+		ammo=macro_new_ammo(z1000)
+	};
+	class macro_new_mag(ragl40he,40): 40Rnd_20mm_G_belt
+	{
+		count=40;
+		ammo=macro_new_ammo(UGL_HE)
+	};
+	class macro_new_mag(aap,4): 1Rnd_GAT_missiles
+	{
+		count=4;
+	};
+};
+class CfgAmmo
+{
+	
+};

addons - Copy/RD501_Vehicles/static/TitanTurret.hpp

@@ -0,0 +1,121 @@
+ace_fcs_DistanceInterval = 5;
+ace_fcs_Enabled = 0;
+ace_fcs_MaxDistance = 5500;
+ace_fcs_MinDistance = 200;
+aggregateReflectors[] = {};
+allowLauncherIn = 0;
+allowLauncherOut = 0;
+allowTabLock = 1;
+animationSourceBody = "mainTurret";
+animationSourceCamElev = "camElev";
+animationSourceGun = "mainGun";
+animationSourceHatch = "hatchGunner";
+armorLights = 0.4;
+body = "mainTurret";
+canEject = 0;
+canHideGunner = -1;
+canUseScanners = 1;
+castGunnerShadow = 1;
+commanding = 1;
+disableSoundAttenuation = 1;
+discretefov[] = {0.08333,0.04167};
+discreteInitIndex = 0;
+displayName = "";
+dontCreateAI = 0;
+ejectDeadGunner = 1;
+forceHideGunner = 0;
+forceNVG = 0;
+gun = "mainGun";
+gunBeg = "Usti hlavne";
+gunEnd = "Konec hlavne";
+gunnerAction = "gunner_staticlauncher";
+gunnerCompartments = "Compartment1";
+gunnerDoor = "";
+gunnerFireAlsoInInternalCamera = 1;
+gunnerForceOptics = 0;
+gunnergetInAction = "";
+gunnergetOutAction = "";
+gunnerInAction = "ManActTestDriver";
+gunnerLeftHandAnimName = "OtocHlaven_shake";
+gunnerLeftLegAnimName = "";
+gunnerName = "Gunner";
+gunnerOpticsColor[] = {0,0,0,1};
+gunnerOpticsEffect[] = {};
+gunnerOpticsModel = "\z\ace\addons\javelin\data\reticle_titan.p3d";
+gunnerOpticsShowCursor = 0;
+gunnerOutFireAlsoInInternalCamera = 1;
+gunnerOutForceOptics = 0;
+gunnerOutOpticsColor[] = {0,0,0,1};
+gunnerOutOpticsEffect[] = {};
+gunnerOutOpticsModel = "";
+gunnerOutOpticsShowCursor = 0;
+gunnerRightHandAnimName = "OtocHlaven_shake";
+gunnerRightLegAnimName = "";
+gunnerType = "";
+gunnerUsesPilotView = 0;
+hasGunner = 1;
+hideWeaponsGunner = 1;
+inGunnerMayFire = 1;
+initCamElev = 0;
+initElev = 0;
+initOutElev = 0;
+initOutTurn = 0;
+initTurn = 0;
+isCopilot = 0;
+lockWhenDriverOut = 0;
+lockWhenVehicleSpeed = -1;
+LODTurnedIn = -1;
+LODTurnedOut = -1;
+magazines[] = {"RD501_aap_x4_mag"};
+maxCamElev = 90;
+maxElev = 70;
+maxHorizontalRotSpeed = 1.2;
+maxOutElev = 20;
+maxOutTurn = 60;
+maxTurn = 40;
+maxVerticalRotSpeed = 1.2;
+memoryPointGun = "usti hlavne";
+memoryPointGunnerOptics = "look";
+memoryPointGunnerOutOptics = "";
+memoryPointsGetInGunner = "pos_gunner_dir";
+memoryPointsGetInGunnerDir = "pos_gunner";
+memoryPointsGetInGunnerPrecise = "";
+minCamElev = -90;
+minElev = -20;
+minOutElev = -4;
+minOutTurn = -60;
+minTurn = -40;
+missileBeg = "spice rakety";
+missileEnd = "konec rakety";
+optics = 1;
+opticsFlare = 0;
+opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"};
+opticsZoomInit = 0.08333;
+opticsZoomMax = 0.04167;
+opticsZoomMin = 0.08333;
+outGunnerMayFire = 1;
+playerPosition = 0;
+preciseGetInOut = 0;
+primary = 1;
+primaryGunner = 1;
+primaryObserver = 0;
+proxyIndex = 1;
+proxyType = "CPGunner";
+selectionFireAnim = "";
+showAllTargets = 0;
+showCrewAim = 0;
+showHMD = 0;
+slingLoadOperator = 0;
+soundElevation[] = {"",0.00316228,1};
+soundServo[] = {"",0.00316228,1};
+stabilizedInAxes = 3;
+startEngine = 1;
+turretCanSee = 0;
+turretFollowFreeLook = 0;
+turretInfoType = "ACE_RscOptics_javelin";
+viewGunnerInExternal = 0;
+viewGunnerShadow = 1;
+viewGunnerShadowAmb = 1;
+viewGunnerShadowDiff = 1;
+weapons[] = {"RD501_stat_aap4"};
+

addons - Copy/RD501_Vehicles/static/config.cpp

@@ -0,0 +1,383 @@
+#include "../../RD501_main/config_macros.hpp"
+class CfgPatches
+{
+    class macro_patch_name(staticturret)
+    {
+        addonRootClass=macro_patch_name(vehicles)
+
+        requiredAddons[]=
+        {
+            macro_patch_name(vehicles)
+        };
+        requiredVersion=0.1;
+        units[]=
+        {
+            macro_new_vehicle(stat,reweb),
+            macro_new_vehicle(stat,ragl40),
+            macro_new_vehicle(stat,Striker),
+            macro_new_vehicle(stat,Railgun)
+        };
+        weapons[]=
+        {
+        	macro_new_weapon(stat,eweb),
+			macro_new_weapon(stat,ragl40),
+			macro_new_weapon(stat,aap4),
+			macro_new_weapon(stat,mar1)
+        };
+    };
+};
+
+class CfgVehicles
+{
+	class StaticMGWeapon;
+	class AT_01_base_F:StaticMGWeapon
+	{
+		class Turrets;
+	};
+	class B_static_AT_F:AT_01_base_F 
+	{
+		class Turrets:Turrets{
+		class MainTurret;};
+	};
+	class 3AS_HeavyRepeater_base:StaticMGWeapon
+	{
+		class Turrets;
+	};
+	class 3AS_HeavyRepeater_Unarmoured: 3AS_HeavyRepeater_base
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret;
+		};
+	};
+	class 3AS_HeavyRepeater_Armoured:3AS_HeavyRepeater_base
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret;
+		};
+	};
+	class LandVehicle;
+	class StaticWeapon : LandVehicle
+	{
+		class Turrets;
+	};
+	class OPTRE_Static_M41:StaticMGWeapon
+	{
+		class Turrets;
+	};
+	class OPTRE_Static_Gauss:OPTRE_Static_M41
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret;
+		};
+	};
+	class macro_new_vehicle(stat,reweb): 3AS_HeavyRepeater_Unarmoured
+	{
+		scope = 2;
+		author="501st Aux Mod";
+		displayName = "Republic Heavy E-Web";
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(turrets)
+		vehicleClass = macro_editor_vehicle_type(turrets)
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret
+			{
+				weapons[]=
+				{
+					macro_new_weapon(stat,eweb)
+				};
+				magazines[]=
+				{
+					macro_new_mag(eweb,600)
+				};
+			};
+		};
+		class assembleInfo
+		{
+			dissasembleTo[]=
+			{
+				macro_new_vehicle(stat,reweb_bag)
+			};
+		};
+	};
+	class macro_new_vehicle(stat,ragl40): 3AS_HeavyRepeater_Armoured
+	{
+		scope = 2;
+		author="501st Aux Mod";
+		displayName	= "RAGL40 'Boomer'";
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(turrets)
+		vehicleClass = macro_editor_vehicle_type(turrets)
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret
+			{
+				weapons[]=
+				{
+					macro_new_weapon(stat,ragl40)
+				};
+				magazines[]=
+				{
+					macro_new_mag(ragl40he,40)
+				};
+			};
+		};
+		class assembleInfo
+		{
+			dissasembleTo[]=
+			{
+				macro_new_vehicle(stat,ragl40_bag)
+			};
+		};
+	};
+	class macro_new_vehicle(stat,Striker): B_static_AT_F
+	{
+		scope = 2;
+		author="501st Aux Mod";
+		displayName = "AAP4 'Striker'";
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(turrets)
+		vehicleClass = macro_editor_vehicle_type(turrets)
+		model = "\OPTRE_Weapons\static\LAU65D\LAU65D_pod.p3d";
+		class Turrets: Turrets
+		{
+		class MainTurret: MainTurret
+		{
+			animationSourceBody = "Turret_rot";
+			animationSourceCamElev = "camElev";
+			animationSourceGun = "camElev";
+			memoryPointsGetInGunner = "pos_gunner";
+			memoryPointsGetInGunnerDir = "pos_gunner_dir";
+			body = "Turret_rot";
+			discreteDistanceCameraPoint[] = {"eye"};
+			stabilizedInAxes = "StabilizedInAxesNone";
+			gunnerAction = "Gunner_OPTRE_Lau";
+			maxTurn = 360;
+			weapons[] = {macro_new_weapon(stat,aap4)};
+			magazines[] = {macro_new_mag(aap,4)};
+		};
+		};
+		class assembleInfo
+		{
+			dissasembleTo[]=
+			{
+				macro_new_vehicle(stat,Striker_bag)
+			};
+		};
+	};
+	class macro_new_vehicle(stat,Railgun): OPTRE_Static_Gauss
+	{
+		scope = 2;
+		author="501st Aux Mod";
+		displayName = "MAR1 'Driver'";
+		faction = macro_republic_faction
+		editorSubcategory = macro_editor_cat(turrets)
+		vehicleClass = macro_editor_vehicle_type(turrets)
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret
+			{
+				weapons[]=
+				{
+					macro_new_weapon(stat,mar1)
+				};
+				magazines[]=
+				{
+					macro_new_mag(mar,1)
+				};
+				class Viewoptics
+				{
+					initAngleX = 0;
+					initAngleY = 0;
+					initFov = 0.75;
+					maxAngleX = 30;
+					maxAngleY = 100;
+					maxFov = 1.1;
+					maxMoveX = 0;
+					maxMoveY = 0;
+					maxMoveZ = 0;
+					minAngleX = -30;
+					minAngleY = -100;
+					minFov = 0.0125;
+					minMoveX = 0;
+					minMoveY = 0;
+					minMoveZ = 0;
+					opticsZoomInit = 0.75;
+					opticsZoomMax = 0.75;
+					opticsZoomMin = 0.25;
+					thermalMode[] = {5,6};
+					visionMode[] = {"Normal","NVG","Ti"};
+				}
+			};
+		};
+		class assembleInfo
+		{
+			dissasembleTo[]=
+			{
+				macro_new_vehicle(stat,Railgun_bag)
+			};
+		};
+	};
+	class Weapon_bag_base;
+	class JLTS_UAV_prowler_gar_backpack:Weapon_bag_base
+	{
+		class assembleInfo;
+	}
+	class macro_new_vehicle(stat,reweb_bag):JLTS_UAV_prowler_gar_backpack
+	{
+		displayName="Republic E-Web Bag";
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Vehicles\air\drones\Clone_backpack_uav.paa"
+		};
+		class assembleInfo: assembleInfo
+		{
+			displayName="Assemble E-Web Bag";
+			assembleTo = macro_new_vehicle(stat,reweb)
+		};
+	};
+	class macro_new_vehicle(stat,ragl40_bag):JLTS_UAV_prowler_gar_backpack
+	{
+		displayName="RAGL40 'Boomer' Bag";
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Vehicles\air\drones\Clone_backpack_uav.paa"
+		};
+		class assembleInfo: assembleInfo
+		{
+			displayName="Assemble Boomer";
+			assembleTo = macro_new_vehicle(stat,ragl40)
+		};
+	};
+	class macro_new_vehicle(stat,Striker_bag):JLTS_UAV_prowler_gar_backpack
+	{
+		displayName="AAP4 'Striker' Bag";
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Vehicles\air\drones\Clone_backpack_uav.paa"
+		};
+		class assembleInfo: assembleInfo
+		{
+			displayName="Assemble Striker";
+			assembleTo = macro_new_vehicle(stat,Striker)
+		};
+	};
+	class macro_new_vehicle(stat,Railgun_bag):JLTS_UAV_prowler_gar_backpack
+	{
+		displayName="MAR1 'Driver' Bag";
+		hiddenSelectionsTextures[]=
+		{
+			"\RD501_Vehicles\air\drones\Clone_backpack_uav.paa"
+		};
+		class assembleInfo: assembleInfo
+		{
+			displayName="Assemble Driver";
+			assembleTo = macro_new_vehicle(stat,Railgun)
+		};
+	};
+};
+class CfgWeapons
+{
+	class 3AS_HeavyRepeater;
+	class 3AS_BlasterTurret_Repeater:3AS_HeavyRepeater
+	{
+		class manual;
+	}
+	class macro_new_weapon(stat,eweb):3AS_BlasterTurret_Repeater
+	{
+		magazineReloadTime=2;
+		class manual: manual
+		{
+			dispersion=0.011;
+			reloadTime=0.05;
+		};
+		magazines[]=
+		{
+			macro_new_mag(eweb,600)
+		};
+	};
+	class macro_new_weapon(stat,ragl40):3AS_BlasterTurret_Repeater
+	{
+		magazineReloadTime=2;
+		magazines[]=
+		{
+			macro_new_mag(ragl40he,40)
+		};
+	};
+	class ace_javelin_Titan_Static;
+	class macro_new_weapon(stat,aap4):ace_javelin_Titan_Static
+	{
+		magazineReloadTime=2;
+		ace_javelin_enabled = 1;  // Enable Javelin-style locking (0-disabled, 1-enabled)
+        weaponInfoType = "ACE_RscOptics_javelin";  // Inteface
+        modelOptics = "\z\ace\addons\javelin\data\reticle_titan.p3d";  // Optics model
+        canLock = 0;  // Disable vanilla locking (0-disabled, 1-enabled)
+        lockingTargetSound[] = {"", 0, 1};  // Locking sound
+        lockedTargetSound[] = {"", 0, 1};  // Target acquired sound
+		hiddenSelectionsTextures[]=
+		{
+			"RD501_Vehicles\textures\static\warthog_addons_grey_co.paa"
+		};
+		magazines[]=
+		{
+			macro_new_mag(aap,4)
+		};
+	};
+	class macro_new_weapon(stat,mar1):3AS_BlasterTurret_Repeater
+	{
+		magazineReloadTime=2;
+		class manual: manual
+		{
+			dispersion=0.00001;
+		};
+		magazines[]=
+		{
+			macro_new_mag(mar,1)
+		};
+	};
+};
+class CfgMagazines
+{
+	class 3AS_500_Rnd_BlasterTurret_mag;
+	class 40Rnd_20mm_G_belt;
+	class 1Rnd_GAT_missiles;
+	class macro_new_mag(eweb,600): 3AS_500_Rnd_BlasterTurret_mag
+	{
+		scope=2;
+		scopeArsenal = 2;
+		type=256;
+		displayName= "Republic E-Web Charge"
+		count=600;
+		ammo=macro_new_ammo(z1000)
+	};
+	class macro_new_mag(ragl40he,40): 40Rnd_20mm_G_belt
+	{
+		scope=2;
+		scopeArsenal = 2;
+		type=256;
+		muzzleImpulseFactor[] = {0.1,0.1};
+		displayName= "RAGL40 'Boomer' belt"
+		count=40;
+		ammo=macro_new_ammo(UGL_HE)
+	};
+	class macro_new_mag(aap,4): 1Rnd_GAT_missiles
+	{
+		scope=2;
+		scopeArsenal = 2;
+		type=256;
+		displayName= "AAP4 'Striker' Pod"
+		count=4;
+	};
+		class macro_new_mag(mar,1): 3AS_500_Rnd_BlasterTurret_mag
+	{
+		scope=2;
+		scopeArsenal = 2;
+		type=256;
+		displayName= "MAR1 'Driver' Slug"
+		count=1;
+		ammo=macro_new_ammo(mar1)
+	};
+};

addons - Copy/RD501_Weapons/RGL6/config.cpp

@@ -42,7 +42,7 @@ class CfgWeapons
 		};
 		class Single : Single
 		{
-			reloadTime=2;
+			reloadTime=0.24;
 		};
 	};
 };

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -150,6 +150,17 @@ class CfgAmmo
 		caliber=5;
 		airFriction=0;
 	};
+	class macro_new_ammo(mar1) : 3AS_EC80_BluePlasma
+	{
+		hit=900;
+		thrust=500;
+		explosive=0;
+		thrustTime=1.5;
+		airLock=1;
+		typicalSpeed=3000;
+		caliber=50;
+		airFriction=0;
+	};
 	class macro_new_ammo(UGL_AP): G_40mm_HE
 	{
 		hit = 350;