From 2ada87e3ac09e4a2ae3db6a5257a60e349ee436e Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Sun, 5 Apr 2015 18:05:23 -0500
Subject: [PATCH] Rangetable Item

---
 addons/mk6mortar/CfgVehicles.hpp              |  4 ++--
 addons/mk6mortar/CfgWeapons.hpp               | 12 +++++++++++
 addons/mk6mortar/XEH_preInit.sqf              |  1 +
 addons/mk6mortar/config.cpp                   |  2 +-
 .../functions/fnc_rangeTableCanUse.sqf        | 21 +++++++++++++++++++
 5 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 addons/mk6mortar/functions/fnc_rangeTableCanUse.sqf

diff --git a/addons/mk6mortar/CfgVehicles.hpp b/addons/mk6mortar/CfgVehicles.hpp
index 7c39aeafdd..b7d6ed9365 100644
--- a/addons/mk6mortar/CfgVehicles.hpp
+++ b/addons/mk6mortar/CfgVehicles.hpp
@@ -5,8 +5,8 @@ class CfgVehicles {
             class ACE_Equipment {
                 class GVAR(rangetable) {
                     displayName = "Open 82mm Rangetable";
-                    condition = QUOTE(true);
-                    statement = QUOTE(call FUNC(rangeTableOpen));
+                    condition = QUOTE(_this call FUNC(rangeTableCanUse));
+                    statement = QUOTE(_this call FUNC(rangeTableOpen));
                     priority = 0;
                     icon = QUOTE(PATHTOF(UI\icon_rangeTable.paa));
                 };
diff --git a/addons/mk6mortar/CfgWeapons.hpp b/addons/mk6mortar/CfgWeapons.hpp
index 9d03783519..f628fe1717 100644
--- a/addons/mk6mortar/CfgWeapons.hpp
+++ b/addons/mk6mortar/CfgWeapons.hpp
@@ -1,3 +1,15 @@
 class CfgWeapons {
+    class ACE_ItemCore;
+    class InventoryItem_Base_F;
 
+    class ACE_RangeTable_82mm: ACE_ItemCore {
+        author = "$STR_ACE_Common_ACETeam";
+        scope = 2;
+        displayName = "82mm Rangetable";
+        descriptionShort = "82mm Rangetable D";
+        picture = QUOTE(PATHTOF(UI\icon_rangeTable.paa));
+        class ItemInfo: InventoryItem_Base_F {
+            mass = 0.5;
+        };
+    };
 };
diff --git a/addons/mk6mortar/XEH_preInit.sqf b/addons/mk6mortar/XEH_preInit.sqf
index a60fcb9ce6..9af89ccb35 100644
--- a/addons/mk6mortar/XEH_preInit.sqf
+++ b/addons/mk6mortar/XEH_preInit.sqf
@@ -11,6 +11,7 @@ PREP(dev_simulateShot);
 PREP(handleFired);
 PREP(handlePlayerVehicleChanged);
 PREP(moduleInit);
+PREP(rangeTableCanUse);
 PREP(rangeTableOpen);
 PREP(rangeTablePageChange);
 PREP(rangeTablePreCalculatedValues);
diff --git a/addons/mk6mortar/config.cpp b/addons/mk6mortar/config.cpp
index b39b036416..a6e63c819b 100644
--- a/addons/mk6mortar/config.cpp
+++ b/addons/mk6mortar/config.cpp
@@ -3,7 +3,7 @@
 class CfgPatches {
     class ADDON {
         units[] = {};
-        weapons[] = {};
+        weapons[] = {"ACE_RangeTable_82mm"};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_interaction"};
         author[] = {"PabstMirror"};
diff --git a/addons/mk6mortar/functions/fnc_rangeTableCanUse.sqf b/addons/mk6mortar/functions/fnc_rangeTableCanUse.sqf
new file mode 100644
index 0000000000..04ca9c3278
--- /dev/null
+++ b/addons/mk6mortar/functions/fnc_rangeTableCanUse.sqf
@@ -0,0 +1,21 @@
+/*
+ * Author: PabstMirror
+ * Can player open 82mm rangetable.
+ *
+ * Arguments:
+ * 0: Vehicle <OBJECT>
+ * 1: Player <OBJECT>
+ *
+ * Return Value:
+ * Can Open <BOOL>
+ *
+ * Example:
+ * [bob, bob] call ace_mk6mortar_fnc_rangeTableCanUse
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+PARAMS_2(_vehicle,_player);
+
+"ACE_RangeTable_82mm" in (items _player);
\ No newline at end of file