From 7a64ccb7a5defe4b83a50fe2eb443603d0d1d115 Mon Sep 17 00:00:00 2001
From: Samuel Deutsch <Quantx@users.noreply.github.com>
Date: Wed, 17 Aug 2022 04:00:54 -0700
Subject: [PATCH] Refuel - Improved fuel hose texture (#8983)

* Added custom fuel hose

* Fixed indentation

* Added model config for hose

* Added model config for hose
---
 addons/refuel/CfgVehicles.hpp              |  20 ++++++++++++++++++++
 addons/refuel/data/hose.cfg                |   7 +++++++
 addons/refuel/data/hose.p3d                | Bin 0 -> 13867 bytes
 addons/refuel/functions/fnc_takeNozzle.sqf |   2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 addons/refuel/data/hose.cfg
 create mode 100644 addons/refuel/data/hose.p3d

diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp
index 41c4f12625..6745469a2a 100644
--- a/addons/refuel/CfgVehicles.hpp
+++ b/addons/refuel/CfgVehicles.hpp
@@ -42,6 +42,18 @@
 
 class CBA_Extended_EventHandlers;
 
+class CfgNonAIVehicles {
+    class GVAR(fuelHoseSegment) {
+        access = 0;
+        scope = 2;
+        displayName = "Fuel Hose";
+        simulation = "ropesegment";
+        autocenter = 0;
+        animated = 0;
+        model = QPATHTOF(data\hose.p3d);
+    };
+};
+
 class CfgVehicles {
     class ACE_Module;
     class ACE_moduleRefuelSettings: ACE_Module {
@@ -82,6 +94,14 @@ class CfgVehicles {
         model = QPATHTOF(data\nozzle.p3d);
         destrType = "DestructNo";
     };
+    
+    class Rope;
+    class GVAR(fuelHose): Rope {
+        hiddenSelections[] = {"rope"};
+        hiddenSelectionsTextures[] = {"#(argb,8,8,3)color(0.009,0.009,0.009,1.0,co)"};
+        segmentType = QGVAR(fuelHoseSegment);
+        model = QPATHTOF(data\hose.p3d);
+    };
 
     class All;
     class Static: All {};
diff --git a/addons/refuel/data/hose.cfg b/addons/refuel/data/hose.cfg
new file mode 100644
index 0000000000..a49123a444
--- /dev/null
+++ b/addons/refuel/data/hose.cfg
@@ -0,0 +1,7 @@
+class CfgModels {
+    class hose {
+        sectionsInherit = "";
+        sections[] = {"rope"};
+        skeletonName = "";
+    };
+};
\ No newline at end of file
diff --git a/addons/refuel/data/hose.p3d b/addons/refuel/data/hose.p3d
new file mode 100644
index 0000000000000000000000000000000000000000..cc233eacf611c2a83d3dd80d42f1213458ee30c7
GIT binary patch
literal 13867
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
T6YZ~q9E(yrH2v(s(fj`kG7!pD

literal 0
HcmV?d00001

diff --git a/addons/refuel/functions/fnc_takeNozzle.sqf b/addons/refuel/functions/fnc_takeNozzle.sqf
index 7ce0a9d808..efb0256654 100644
--- a/addons/refuel/functions/fnc_takeNozzle.sqf
+++ b/addons/refuel/functions/fnc_takeNozzle.sqf
@@ -69,7 +69,7 @@ params [
                 _attachPos = _attachPos select (_hookDistances find selectMin _hookDistances);
             };
             private _hoseLength = _source getVariable [QGVAR(hoseLength), GVAR(hoseLength)];
-            private _rope = ropeCreate [_ropeTarget, _attachPos, _nozzle, [0, -0.20, 0.12], _hoseLength];
+            private _rope = ropeCreate [_ropeTarget, _attachPos, _nozzle, [0, -0.20, 0.12], _hoseLength, [], [], QGVAR(fuelHose)];
             _nozzle setVariable [QGVAR(rope), _rope, true];
             _nozzle setVariable [QGVAR(attachPos), _attachPos, true];
             _nozzle setVariable [QGVAR(source), _source, true];