diff --git a/addons/refuel/defines.hpp b/addons/refuel/defines.hpp new file mode 100644 index 0000000000..dc9055da9a --- /dev/null +++ b/addons/refuel/defines.hpp @@ -0,0 +1,5 @@ +#define REFUEL_INFINITE_FUEL -10 +#define REFUEL_DISABLED_FUEL -1 +#define REFUEL_ACTION_DISTANCE 7 +#define REFUEL_NOZZLE_ACTION_DISTANCE 2 +#define REFUEL_PROGRESS_DURATION 2 diff --git a/addons/refuel/script_component.hpp b/addons/refuel/script_component.hpp index be346e0cca..09d0afc599 100644 --- a/addons/refuel/script_component.hpp +++ b/addons/refuel/script_component.hpp @@ -18,11 +18,7 @@ #include "\z\ace\addons\main\script_macros.hpp" -#define REFUEL_INFINITE_FUEL -10 -#define REFUEL_DISABLED_FUEL -1 -#define REFUEL_ACTION_DISTANCE 7 -#define REFUEL_NOZZLE_ACTION_DISTANCE 2 -#define REFUEL_PROGRESS_DURATION 2 +#include "\z\ace\addons\refuel\defines.hpp" #ifdef FAST_PROGRESSBARS #define TIME_PROGRESSBAR(X) ((X) * 0.075) diff --git a/optionals/compat_sog/CfgVehicles.hpp b/optionals/compat_sog/CfgVehicles.hpp index 7d398612f0..3192739489 100644 --- a/optionals/compat_sog/CfgVehicles.hpp +++ b/optionals/compat_sog/CfgVehicles.hpp @@ -20,4 +20,6 @@ class CfgVehicles { #include "CfgVehicles\turrets.hpp" #include "CfgVehicles\units.hpp" #include "CfgVehicles\wheeled.hpp" + #include "CfgVehicles\land.hpp" + #include "CfgVehicles\vn_boxes.hpp" }; diff --git a/optionals/compat_sog/CfgVehicles/land.hpp b/optionals/compat_sog/CfgVehicles/land.hpp new file mode 100644 index 0000000000..9f66b2d087 --- /dev/null +++ b/optionals/compat_sog/CfgVehicles/land.hpp @@ -0,0 +1,26 @@ + +// fuel pumps +class Land_vn_commercial_base; +class Land_vn_fuelstation_01_pump_f: Land_vn_commercial_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL; +}; +class Land_vn_fuelstation_02_pump_f: Land_vn_commercial_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL; +}; +class Land_vn_fuelstation_feed_f: Land_vn_commercial_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL; +}; + +// fuel objects +class Land_vn_building_b_base; +class Land_vn_usaf_fueltank_75_01: Land_vn_building_b_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = 2840; // 750 * 3.785 +}; diff --git a/optionals/compat_sog/CfgVehicles/vn_boxes.hpp b/optionals/compat_sog/CfgVehicles/vn_boxes.hpp new file mode 100644 index 0000000000..085f7cc324 --- /dev/null +++ b/optionals/compat_sog/CfgVehicles/vn_boxes.hpp @@ -0,0 +1,15 @@ + +// dragging carrying items +class ReammoBox_F; +class vn_ammobox_base: ReammoBox_F { + EGVAR(cargo,size) = 1; + EGVAR(cargo,canLoad) = 1; + + EGVAR(dragging,canCarry) = 1; + EGVAR(dragging,carryPosition)[] = {0,1,1}; + EGVAR(dragging,carryDirection) = 0; + + EGVAR(dragging,canDrag) = 1; + EGVAR(dragging,dragPosition)[] = {0,1.2,0}; + EGVAR(dragging,dragDirection) = 0; +}; diff --git a/optionals/compat_sog/CfgVehicles/wheeled.hpp b/optionals/compat_sog/CfgVehicles/wheeled.hpp index dcd8c31ff2..c0561375bd 100644 --- a/optionals/compat_sog/CfgVehicles/wheeled.hpp +++ b/optionals/compat_sog/CfgVehicles/wheeled.hpp @@ -5,9 +5,20 @@ class vn_wheeled_m54_base: vn_wheeled_truck_base { }; class vn_wheeled_m54_cab_base; class vn_wheeled_m54_fuel_base: vn_wheeled_m54_cab_base { + transportFuel = 0; EGVAR(refuel,hooks)[] = {{-1.15, -2.3, 0.28}}; EGVAR(refuel,fuelCargo) = 4542; }; +class vn_wheeled_m54_03_base; +class vn_wheeled_m54_repair_base: vn_wheeled_m54_03_base { + transportRepair = 0; + EGVAR(repair,canRepair) = 1; +}; +class vn_wheeled_m54_01_base; +class vn_wheeled_m54_ammo_base: vn_wheeled_m54_01_base { + transportAmmo = 0; + EGVAR(rearm,defaultSupply) = 1200; +}; // M151 class vn_wheeled_car_base; @@ -20,9 +31,19 @@ class vn_wheeled_z157_base: vn_wheeled_truck_base { EGVAR(refuel,fuelCapacity) = 150; }; class vn_wheeled_z157_fuel_base: vn_wheeled_z157_base { + transportFuel = 0; EGVAR(refuel,hooks)[] = {{-1.36, -3.575, -0.4}}; EGVAR(refuel,fuelCargo) = 4000; }; +class vn_wheeled_z157_repair_base: vn_wheeled_z157_base { + transportRepair = 0; + EGVAR(repair,canRepair) = 1; +}; +class vn_wheeled_z157_01_base; +class vn_wheeled_z157_ammo_base: vn_wheeled_z157_01_base { + transportAmmo = 0; + EGVAR(rearm,defaultSupply) = 1200; +}; // BTR-40 class vn_wheeled_btr40_base: vn_wheeled_car_base { diff --git a/optionals/compat_sog/script_component.hpp b/optionals/compat_sog/script_component.hpp index d1d3e65186..2b5d04fff9 100644 --- a/optionals/compat_sog/script_component.hpp +++ b/optionals/compat_sog/script_component.hpp @@ -5,5 +5,7 @@ #include "\z\ace\addons\main\script_macros.hpp" +#include "\z\ace\addons\refuel\defines.hpp" + #define EXPLOSIVES_PLACE(CLASS) EGVAR(explosives,DOUBLES(Place,CLASS)) #define QEXPLOSIVES_PLACE(CLASS) QUOTE(EXPLOSIVES_PLACE(CLASS))