Cleanup heli pod actions (#5271)

Close #4783 - Make taru pods non loadable - Make taru pods non draggable - Increase interaction range for huron pods
acemod · Jul 10, 2017 · bb8d5ca · bb8d5ca
1 parent 7b91629
commit bb8d5ca
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 21 deletions.
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
@@ -327,26 +327,6 @@ class CfgVehicles {
         GVAR(canLoad) = 1;
     };
 
-    // Taru pods
-    class Pod_Heli_Transport_04_base_F;
-    class Land_Pod_Heli_Transport_04_ammo_F: Pod_Heli_Transport_04_base_F {
-        GVAR(space) = 8;
-        GVAR(hasCargo) = 1;
-    };
-    class Land_Pod_Heli_Transport_04_box_F: Pod_Heli_Transport_04_base_F {
-        GVAR(space) = 20;
-        GVAR(hasCargo) = 1;
-    };
-    class Land_Pod_Heli_Transport_04_repair_F: Pod_Heli_Transport_04_base_F {
-        GVAR(space) = 12;
-        GVAR(hasCargo) = 1;
-    };
-    class Pod_Heli_Transport_04_crewed_base_F;
-    class Land_Pod_Heli_Transport_04_medevac_F: Pod_Heli_Transport_04_crewed_base_F {
-        GVAR(space) = 8;
-        GVAR(hasCargo) = 1;
-    };
-
     class StaticMortar;
     class Mortar_01_base_F: StaticMortar {
         GVAR(size) = 2; // 1 = small, 2 = large
@@ -377,6 +357,37 @@ class CfgVehicles {
     };
     class Slingload_01_Base_F: Slingload_base_F { //Huron 20ft containers
         GVAR(canLoad) = 0;
+        GVAR(size) = -1;
+    };
+
+    // Taru pods
+    class Pod_Heli_Transport_04_base_F: Slingload_base_F {
+        GVAR(canLoad) = 0;
+        GVAR(size) = -1;
+    };
+    class Land_Pod_Heli_Transport_04_ammo_F: Pod_Heli_Transport_04_base_F {
+        GVAR(space) = 8;
+        GVAR(hasCargo) = 1;
+    };
+    class Land_Pod_Heli_Transport_04_box_F: Pod_Heli_Transport_04_base_F {
+        GVAR(space) = 20;
+        GVAR(hasCargo) = 1;
+    };
+    class Land_Pod_Heli_Transport_04_repair_F: Pod_Heli_Transport_04_base_F {
+        GVAR(space) = 12;
+        GVAR(hasCargo) = 1;
+    };
+    class Pod_Heli_Transport_04_crewed_base_F: StaticWeapon {
+        GVAR(canLoad) = 0;
+        GVAR(size) = -1;
+    };
+    class Land_Pod_Heli_Transport_04_covered_F: Pod_Heli_Transport_04_crewed_base_F {
+        GVAR(space) = 8;
+        GVAR(hasCargo) = 1;
+    };
+    class Land_Pod_Heli_Transport_04_medevac_F: Pod_Heli_Transport_04_crewed_base_F {
+        GVAR(space) = 8;
+        GVAR(hasCargo) = 1;
     };
 
     //Plastic and metal case

diff --git a/addons/dragging/CfgVehicles.hpp b/addons/dragging/CfgVehicles.hpp
@@ -67,6 +67,10 @@ class CfgVehicles {
         GVAR(canCarry) = 0;
         GVAR(canDrag) = 0;
     };
+    class Pod_Heli_Transport_04_crewed_base_F: StaticWeapon {
+        GVAR(canCarry) = 0;
+        GVAR(canDrag) = 0;
+    };
 
     class EAST_Box_Base: ReammoBox_F {
         GVAR(canCarry) = 1;

diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
@@ -550,7 +550,7 @@ class CfgVehicles {
 
                 class ACE_OpenBox {
                     displayName = CSTRING(OpenBox);
-                    condition = QUOTE(alive _target);
+                    condition = QUOTE((alive _target) && {(getNumber (configFile >> 'CfgVehicles' >> (typeOf _target) >> 'disableInventory')) == 0});
                     statement = QUOTE(_player action [ARR_2(QUOTE(QUOTE(Gear)), _target)]);
                     showDisabled = 0;
                     priority = -1;
@@ -561,6 +561,13 @@ class CfgVehicles {
         class ACE_SelfActions {};
     };
     class Slingload_base_F: ReammoBox_F {};
+    class Slingload_01_Base_F: Slingload_base_F {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions: ACE_MainActions {
+                distance = 5;
+            };
+        };
+    };
     class Pod_Heli_Transport_04_base_F: Slingload_base_F {
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {