1.0 release

Author: AtrixZockt

.hemtt/project.toml

@@ -10,11 +10,9 @@ mainprefix = "z"
 [files]
 include = [
     "mod.cpp",
-#    "README.md",
-#    "LICENSE.md",
-#   "KAMLogoLowRes.paa",
-#   "KAMLogoHighRes.paa",
-#   "AUTHORS.txt"
+    "README.md",
+    "LICENSE.md",
+    "Icon.paa",
 ]
 
 [version]

Icon.paa

@@ -1,5 +1,5 @@
 #include "script_component.hpp"
- #include "\a3\ui_f\hpp\defineDIKCodes.inc"
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
 
 //////////////////////////////////////////////////
 // CBA key input handling
@@ -16,9 +16,13 @@ GVAR(deviceKeyCurrentIndex) = -1;
     // Conditions:
     if !([ACE_player, objNull, ["isNotInside"]] call ACEFUNC(common,canInteractWith)) exitWith {false};
 
+    private _allowedWeapons = ['AssaultRifle', 'Handgun', 'Rifle', 'SubmachineGun', 'SniperRifle'];
     private _currentWeapon = currentWeapon ACE_player;
+    private _currentWeaponType = _currentWeapon call BIS_fnc_itemType;
     if !(_currentWeapon != primaryWeapon _unit && {_currentWeapon != handgunWeapon _unit} && {_currentWeapon != secondaryWeapon _unit}) exitWith {false};
 
+    if (!((_currentWeaponType select 1) in _allowedWeapons) && !(missionNamespace getVariable [QGVAR(allowAllWeapons), false])) exitWith {false};
+
     private _currentMuzzle = currentMuzzle ACE_player;
 	private _currentAmmoCount = ACE_player ammo _currentMuzzle;
 	if (_currentAmmoCount < 1) exitWith {false};

addons/main/XEH_postInit.sqf

@@ -8,20 +8,17 @@ PREP_RECOMPILE_END;
 
 #define CBA_SETTINGS_CHEM "DiGii - FastReload"
 
-/*
 [
-    QGVAR(availGasmask),
-    "EDITBOX",
-    [LLSTRING(SETTING_AVAIL_GASMASK), LLSTRING(SETTING_AVAIL_GASMASK_DISC)],
+    QGVAR(allowAllWeapons),
+    "CHECKBOX",
+    ["Allow all Weapons","If enabled you can fast realod any weapon you can carry."],
     CBA_SETTINGS_CHEM,
-    "'G_AirPurifyingRespirator_01_F'",
-    1,
+    false,
+    true,
     {
-        private _array = [_this, "CfgGlasses"] call FUNC(getList);
-        missionNamespace setVariable [QGVAR(availGasmaskList), _array, true];
-    },
-    true
-] call CBA_Settings_fnc_init;*/
+        missionNamespace setVariable [QGVAR(allowAllWeapons), _this, true];
+    }
+] call CBA_Settings_fnc_init;
 
 
 ADDON = true;

addons/main/XEH_preInit.sqf

@@ -13,38 +13,39 @@
  * None
  *
  * Example:
-* [ACE_player, currentWeapon ACE_player, currentMuzzle ACE_player, 23] call digii_main_fnc_fastReload;
+* [player, currentWeapon player, currentMuzzle player, 23] call digii_main_fnc_fastReload;
  *
  * Public: No
  */
 
 
 params ["_unit", "_weapon", ["_muzzle", _weapon], ["_ammoCount", _unit ammo _muzzle ]];
 
-private _delay = 2;
+private _delay = 1.8;
 [_unit, "ReloadMagazine", 1] call ACEFUNC(common,doGesture);
 
-[{
-    params ["_unit", "_weapon", "_ammoCount", "_muzzle"];
-
-    // remove weapon item
-    private _magazineClass = currentMagazine _unit;
-
-    switch true do {
-        case (_weapon == primaryWeapon _unit): {
-            _unit removePrimaryWeaponItem _magazineClass;
-        };
-        case (_weapon == handgunWeapon _unit): {
-            _unit removeHandgunItem _magazineClass;
-        };
-        case (_weapon == secondaryWeapon _unit): {
-            _unit removeSecondaryWeaponItem _magazineClass;
-        };
+// remove weapon item
+private _magazineClass = currentMagazine _unit;
+
+switch true do {
+    case (_weapon == primaryWeapon _unit): {
+        _unit removePrimaryWeaponItem _magazineClass;
+    };
+    case (_weapon == handgunWeapon _unit): {
+        _unit removeHandgunItem _magazineClass;
+    };
+    case (_weapon == secondaryWeapon _unit): {
+        _unit removeSecondaryWeaponItem _magazineClass;
     };
+};
+
+private _weaponHolder = createVehicle ["Weapon_Empty", getPosATL _unit, [], 0, "CAN_COLLIDE"];
+_weaponHolder addMagazineAmmoCargo [_magazineClass, 1, _ammoCount];
+
+[{
+    params ["_unit", "_weapon", "_ammoCount", "_muzzle"];	
 
-	private _weaponHolder = createVehicle ["Weapon_Empty", getPosATL _unit, [], 0, "CAN_COLLIDE"];
-	_weaponHolder addMagazineAmmoCargo [_magazineClass, 1, _ammoCount];
-	
+    _unit switchAction "";
 
 	private _currentMagazines = magazinesAmmo _unit;
 	private _compatibleMagazines = compatibleMagazines _weapon;

addons/main/functions/fnc_fastReload.sqf

@@ -9,7 +9,7 @@
 * NONE
 *
 * Example:
-* [] call kat_chemical_fnc_init;
+* [] call digii_main_fnc_init;
 *
 * Public: No
 */

addons/main/functions/fnc_init.sqf

@@ -0,0 +1,14 @@
+name = "DIGii - Fast Reload";
+dir = "@digii_fastreload";
+picture = "Icon.paa";
+actionName = "Github";
+action = "https://github.com/AtrixZockt/DiGii-FastReload";
+logo = "Icon.paa";
+logoOver = "Icon.paa";
+tooltip = "DiGii - Fast Reload";
+tooltipOwned = "DiGii - Fast Reload";
+overview = "";
+author = "DiGii";
+overviewPicture = "Icon.paa";
+overviewText = "DiGii - Fast Reload";
+overviewFootnote = "";