From ea140f63a5fcbda49eaf9cb4bc65e6f1db6a093e Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sun, 3 Jul 2016 15:17:00 -0500
Subject: [PATCH] Refuel - Simplify Actions, Fix Van_01 config

---
 addons/refuel/CfgVehicles.hpp  | 30 +++++++++++++++---------------
 addons/refuel/XEH_postInit.sqf | 13 +++++++++++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp
index 6774140cc7..c8af4268c4 100644
--- a/addons/refuel/CfgVehicles.hpp
+++ b/addons/refuel/CfgVehicles.hpp
@@ -52,21 +52,13 @@
 #define MACRO_CONNECT_ACTIONS \
     class ACE_Actions { \
         class ACE_MainActions { \
-            class GVAR(Refuel) { \
-                displayName = CSTRING(Refuel); \
+            class GVAR(Refuel_Connect) { \
+                displayName = CSTRING(Connect); \
                 distance = REFUEL_ACTION_DISTANCE; \
-                condition = "true"; \
-                statement = ""; \
-                showDisabled = 0; \
-                priority = 2; \
+                condition = QUOTE([ARR_2(_player,_target)] call FUNC(canConnectNozzle)); \
+                statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \
                 icon = QPATHTOF(ui\icon_refuel_interact.paa); \
-                class GVAR(Connect) { \
-                    displayName = CSTRING(Connect); \
-                    condition = QUOTE([ARR_2(_player,_target)] call FUNC(canConnectNozzle)); \
-                    statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \
-                    exceptions[] = {"isNotInside"}; \
-                    icon = QPATHTOF(ui\icon_refuel_interact.paa); \
-                }; \
+                exceptions[] = {"isNotInside"}; \
             }; \
         }; \
     };
@@ -76,6 +68,7 @@
         class ACE_MainActions { \
             displayName = CSTRING(Refuel); \
             distance = REFUEL_ACTION_DISTANCE; \
+            position = "[0,-0.025,0.125]"; \
             condition = "true"; \
             statement = ""; \
             showDisabled = 0; \
@@ -318,13 +311,20 @@ class CfgVehicles {
         GVAR(fuelCapacity) = 80;
     };
 
-    class Van_01_fuel_base_F: Van_01_base_F {
+    class Van_01_fuel_base_F: Van_01_base_F {};
+    class C_Van_01_fuel_F: Van_01_fuel_base_F {
         transportFuel = 0; //1k
         MACRO_REFUEL_ACTIONS
         GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}};
         GVAR(fuelCargo) = 2000;
     };
-
+    class I_G_Van_01_fuel_F: Van_01_fuel_base_F {
+        transportFuel = 0; //1k
+        MACRO_REFUEL_ACTIONS
+        GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}};
+        GVAR(fuelCargo) = 2000;
+    };
+    
     class Tank_F: Tank {
         GVAR(fuelCapacity) = 1200;
     };
diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf
index 8c28464287..89a1f3dc45 100644
--- a/addons/refuel/XEH_postInit.sqf
+++ b/addons/refuel/XEH_postInit.sqf
@@ -9,3 +9,16 @@ if (isServer) then {
 [QGVAR(resetLocal), {
     _this call FUNC(resetLocal);
 }] call CBA_fnc_addEventHandler;
+
+
+#ifdef DEBUG_MODE_FULL
+diag_log text format ["[ACE-refuel] Showing CfgVehicles with vanilla transportFuel"];
+private _fuelTrucks = configProperties [configFile >> "CfgVehicles", "(isClass _x) && {(getNumber (_x >> 'transportFuel')) > 0}", true];
+{
+    if ((configName _x) isKindOf "Car") then {
+        diag_log text format ["Car [%1] needs config [fuel: %2]", configName _x, getNumber (_x >> 'transportFuel')];
+    } else {
+        diag_log text format ["Non-car? [%1] needs config [fuel: %2]", configName _x, getNumber (_x >> 'transportFuel')];
+    };
+} forEach _fuelTrucks;
+#endif