From 47a4a7a17ae009be3285befb79a10299aa0bd1f8 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Sun, 12 Jan 2025 12:27:09 +0100
Subject: [PATCH] Add water sources to CUP terrains compat

---
 addons/compat_cup_terrains/CfgVehicles.hpp | 16 ++++++++++++++++
 addons/compat_cup_terrains/config.cpp      |  2 +-
 addons/dragging/CfgVehicles.hpp            |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/compat_cup_terrains/CfgVehicles.hpp b/addons/compat_cup_terrains/CfgVehicles.hpp
index 3fbd69f2913..2ecc9e88f65 100644
--- a/addons/compat_cup_terrains/CfgVehicles.hpp
+++ b/addons/compat_cup_terrains/CfgVehicles.hpp
@@ -53,4 +53,20 @@ class CfgVehicles {
         // "vehicle service point" (a conex /w barrels) - need hooks???
         XEH_INHERITED;
     };
+
+    class Land_stand_waterl_EP1: House_EP1 {
+        EXGVAR(field_rations,waterSupply) = 250;
+        EXGVAR(field_rations,offset)[] = {0, -0.33, 0.4};
+    };
+
+    class Land_pumpa: House {
+        EXGVAR(field_rations,waterSupply) = -10;
+        EXGVAR(field_rations,offset)[] = {0.3, 0, 0.68};
+    };
+
+    class Thing;
+    class Land_Barrel_water: Thing {
+        EXGVAR(field_rations,waterSupply) = 160;
+        EXGVAR(field_rations,offset)[] = {0, 0, 0.25};
+    };
 };
diff --git a/addons/compat_cup_terrains/config.cpp b/addons/compat_cup_terrains/config.cpp
index a7020be4da9..f3842af2e16 100644
--- a/addons/compat_cup_terrains/config.cpp
+++ b/addons/compat_cup_terrains/config.cpp
@@ -13,7 +13,7 @@ class CfgPatches {
             "CAStructures_E_Ind_Ind_FuelStation",
             "CAStructures_PMC_FuelStation",
             "CUP_Buildings_Config",
-            "ace_refuel" // not a sub-component because it's all this compat does
+            "ace_common"
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
diff --git a/addons/dragging/CfgVehicles.hpp b/addons/dragging/CfgVehicles.hpp
index d0b34c43f53..63a5a5faa91 100644
--- a/addons/dragging/CfgVehicles.hpp
+++ b/addons/dragging/CfgVehicles.hpp
@@ -350,6 +350,11 @@ class CfgVehicles {
         GVAR(canDrag) = 1;
         GVAR(dragPosition)[] = {0,1,0};
     };
+    class Land_BarrelWater_grey_F: Items_base_F {
+        EGVAR(interaction,replaceTerrainObject) = 1;
+        GVAR(canDrag) = 1;
+        GVAR(dragPosition)[] = {0,1,0};
+    };
     class Land_Bucket_F: Items_base_F {
         EGVAR(interaction,replaceTerrainObject) = 1;
         GVAR(canCarry) = 1;