Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SOG Compat - Remove Vanilla systems left in CfgVehicles #8708

Merged
merged 14 commits into from
Dec 18, 2021
2 changes: 2 additions & 0 deletions optionals/compat_sog/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
};
26 changes: 26 additions & 0 deletions optionals/compat_sog/CfgVehicles/land.hpp
Original file line number Diff line number Diff line change
@@ -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 {
commy2 marked this conversation as resolved.
Show resolved Hide resolved
transportFuel = 0;
EGVAR(refuel,hooks)[] = {{0, -0.4, -0.5}};
EGVAR(refuel,fuelCargo) = 2840; // 750 * 3.785
};
15 changes: 15 additions & 0 deletions optionals/compat_sog/CfgVehicles/vn_boxes.hpp
Original file line number Diff line number Diff line change
@@ -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;
};
21 changes: 21 additions & 0 deletions optionals/compat_sog/CfgVehicles/wheeled.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
commy2 marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions optionals/compat_sog/script_component.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@

#define EXPLOSIVES_PLACE(CLASS) EGVAR(explosives,DOUBLES(Place,CLASS))
#define QEXPLOSIVES_PLACE(CLASS) QUOTE(EXPLOSIVES_PLACE(CLASS))
#include "\z\ace\addons\refuel\script_component.hpp"