Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed interaction menu overwrapping, Moved all actions under one main Refuel action, Changed fuel nozzle pickup action to config

Browse Source
This commit is contained in:
jonpas 2015-08-17 00:55:26 +02:00
parent 214c639839
commit b717ff8dde
3 changed files with 191 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

338
addons/refuel/CfgVehicles.hpp
View File

@ -1,10 +1,18 @@
#define REFUEL_ACTION_DISTANCE 4.5 #define REFUEL_ACTION_DISTANCE 4.5
#define MACRO_REFUEL_ACTIONS \ #define MACRO_REFUEL_ACTIONS \
class ACE_Actions : ACE_Actions { \ class ACE_Actions: ACE_Actions { \
class ACE_MainActions : ACE_MainActions { \ class ACE_MainActions: ACE_MainActions { \
class GVAR(Refuel) { \
displayName = CSTRING(Refuel); \
distance = REFUEL_ACTION_DISTANCE; \
condition = "true"; \
statement = ""; \
showDisabled = 0; \
priority = 2; \
icon = PATHTOF(ui\icon_refuel_interact.paa); \
class GVAR(TakeNozzle) { \ class GVAR(TakeNozzle) { \
displayName = CSTRING(TakeNozzle); \ displayName = CSTRING(TakeNozzle); \
distance = REFUEL_ACTION_DISTANCE; \
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTakeNozzle)); \ condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTakeNozzle)); \
statement = QUOTE([ARR_3(_player,_target,objNull)] call FUNC(TakeNozzle)); \ statement = QUOTE([ARR_3(_player,_target,objNull)] call FUNC(TakeNozzle)); \
exceptions[] = {"isNotInside"}; \ exceptions[] = {"isNotInside"}; \
@ -12,32 +20,35 @@
}; \ }; \
class GVAR(CheckFuel) { \ class GVAR(CheckFuel) { \
displayName = CSTRING(CheckFuel); \ displayName = CSTRING(CheckFuel); \
distance = REFUEL_ACTION_DISTANCE; \ condition = QUOTE([ARR_2(_player,_target)] call FUNC(getFuel) >= 0); \
condition = QUOTE(([ARR_2(_player,_target)] call FUNC(getFuel) >= 0) && {(_target distance _player) < REFUEL_ACTION_DISTANCE}); \
statement = QUOTE([ARR_2(_player,_target)] call FUNC(checkFuel)); \ statement = QUOTE([ARR_2(_player,_target)] call FUNC(checkFuel)); \
exceptions[] = {"isNotInside"}; \ exceptions[] = {"isNotInside"}; \
icon = PATHTOF(ui\icon_refuel_interact.paa); \ icon = PATHTOF(ui\icon_refuel_interact.paa); \
}; \ }; \
class GVAR(connect) { \ class GVAR(Connect) { \
displayName = CSTRING(Return); \ displayName = CSTRING(Return); \
distance = REFUEL_ACTION_DISTANCE; \
condition = QUOTE([ARR_1(_player)] call FUNC(canConnectNozzle)); \ condition = QUOTE([ARR_1(_player)] call FUNC(canConnectNozzle)); \
statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \ statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \
exceptions[] = {"isNotInside"}; \ exceptions[] = {"isNotInside"}; \
icon = PATHTOF(ui\icon_refuel_interact.paa); \ icon = PATHTOF(ui\icon_refuel_interact.paa); \
}; \ }; \
}; \ }; \
}; }; \
};
#define MACRO_CONNECT_ACTIONS \ #define MACRO_CONNECT_ACTIONS \
class ACE_Actions { \ class ACE_Actions { \
class ACE_MainActions { \ class ACE_MainActions { \
displayName = ECSTRING(interaction,MainAction); \ class GVAR(Refuel) { \
selection = ""; \ displayName = CSTRING(Refuel); \
distance = 10; \ distance = REFUEL_ACTION_DISTANCE; \
condition = "true"; \ condition = "true"; \
class GVAR(connect) { \ statement = ""; \
displayName = CSTRING(connect); \ showDisabled = 0; \
distance = REFUEL_ACTION_DISTANCE; \ priority = 2; \
icon = PATHTOF(ui\icon_refuel_interact.paa); \
class GVAR(Connect) { \
displayName = CSTRING(Connect); \
condition = QUOTE([ARR_1(_player)] call FUNC(canConnectNozzle)); \ condition = QUOTE([ARR_1(_player)] call FUNC(canConnectNozzle)); \
statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \ statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \
exceptions[] = {"isNotInside"}; \ exceptions[] = {"isNotInside"}; \
@ -45,7 +56,6 @@
}; \ }; \
class GVAR(Disconnect) { \ class GVAR(Disconnect) { \
displayName = CSTRING(Disconnect); \ displayName = CSTRING(Disconnect); \
distance = REFUEL_ACTION_DISTANCE; \
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canDisconnect)); \ condition = QUOTE([ARR_2(_player,_target)] call FUNC(canDisconnect)); \
statement = QUOTE([ARR_2(_player,_target)] call DFUNC(disconnect)); \ statement = QUOTE([ARR_2(_player,_target)] call DFUNC(disconnect)); \
exceptions[] = {"isNotInside"}; \ exceptions[] = {"isNotInside"}; \
@ -53,34 +63,27 @@
}; \ }; \
class GVAR(TurnOff) { \ class GVAR(TurnOff) { \
displayName = CSTRING(TurnOff); \ displayName = CSTRING(TurnOff); \
distance = REFUEL_ACTION_DISTANCE; \
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTurnOff)); \ condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTurnOff)); \
statement = QUOTE([ARR_2(_player,_target)] call DFUNC(turnOff)); \ statement = QUOTE([ARR_2(_player,_target)] call DFUNC(turnOff)); \
exceptions[] = {"isNotInside"}; \ exceptions[] = {"isNotInside"}; \
icon = PATHTOF(ui\icon_refuel_interact.paa); \ icon = PATHTOF(ui\icon_refuel_interact.paa); \
}; \ }; \
}; \ }; \
}; }; \
};
// does not work
#define MACRO_NOZZLE_ACTIONS \ #define MACRO_NOZZLE_ACTIONS \
class ACE_Actions { \ class ACE_Actions { \
class ACE_MainActions { \ class ACE_MainActions { \
displayName = ECSTRING(interaction,MainAction); \ displayName = CSTRING(TakeNozzle); \
selection = ""; \ distance = 2; \
distance = 2; \ condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTakeNozzle)); \
condition = "true"; \ statement = QUOTE([ARR_3(_player,_target,_target)] call FUNC(TakeNozzle)); \
class GVAR(TakeNozzle) { \ exceptions[] = {"isNotInside"}; \
displayName = CSTRING(TakeNozzle); \ icon = PATHTOF(ui\icon_refuel_interact.paa); \
distance = REFUEL_ACTION_DISTANCE; \ }; \
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTakeNozzle)); \ };
statement = QUOTE([ARR_3(_player,_target,_target)] call FUNC(TakeNozzle)); \
exceptions[] = {"isNotInside"}; \
icon = PATHTOF(ui\icon_refuel_interact.paa); \
}; \
}; \
};
class CfgVehicles { class CfgVehicles {
class ACE_Module; class ACE_Module;
class ACE_moduleRefuelSettings : ACE_Module { class ACE_moduleRefuelSettings : ACE_Module {
@ -112,17 +115,18 @@ class CfgVehicles {
}; };
}; };
}; };
class Sign_Sphere10cm_F; class Sign_Sphere10cm_F;
class ACE_refuel_fuelNozzle : Sign_Sphere10cm_F { class ACE_refuel_fuelNozzle : Sign_Sphere10cm_F {
// TODO replace with custom model XEH_ENABLED;
MACRO_NOZZLE_ACTIONS
}; };
class All; class All;
class Static : All {}; class Static : All {};
class Building : Static { class Building : Static {
class ACE_Actions { class ACE_Actions {
class ACE_MainActions { class ACE_MainActions {
@ -133,19 +137,19 @@ class CfgVehicles {
}; };
}; };
}; };
class NonStrategic : Building {}; class NonStrategic : Building {};
class House_Base : NonStrategic {}; class House_Base : NonStrategic {};
class House : House_Base {}; class House : House_Base {};
class House_F : House {}; class House_F : House {};
class House_Small_F : House_F {}; class House_Small_F : House_F {};
class Strategic : Building {}; class Strategic : Building {};
class AllVehicles : All { class AllVehicles : All {
GVAR(flowRate) = 1; GVAR(flowRate) = 1;
}; };
@ -158,7 +162,7 @@ class CfgVehicles {
class Tank : LandVehicle { class Tank : LandVehicle {
MACRO_CONNECT_ACTIONS MACRO_CONNECT_ACTIONS
}; };
class StaticWeapon : LandVehicle { class StaticWeapon : LandVehicle {
MACRO_CONNECT_ACTIONS MACRO_CONNECT_ACTIONS
}; };
@ -166,14 +170,14 @@ class CfgVehicles {
class Air : AllVehicles { class Air : AllVehicles {
GVAR(flowRate) = 8; GVAR(flowRate) = 8;
}; };
class Helicopter : Air { class Helicopter : Air {
MACRO_CONNECT_ACTIONS MACRO_CONNECT_ACTIONS
GVAR(fuelCapacity) = 1500; GVAR(fuelCapacity) = 1500;
}; };
class Helicopter_Base_F : Helicopter {}; class Helicopter_Base_F : Helicopter {};
class Helicopter_Base_H : Helicopter_Base_F { class Helicopter_Base_H : Helicopter_Base_F {
GVAR(fuelCapacity) = 3000; GVAR(fuelCapacity) = 3000;
}; };
@ -183,11 +187,11 @@ class CfgVehicles {
GVAR(fuelCapacity) = 2000; GVAR(fuelCapacity) = 2000;
GVAR(flowRate) = 16; GVAR(flowRate) = 16;
}; };
class Plane_Base_F : Plane {}; class Plane_Base_F : Plane {};
class Ship : AllVehicles {}; class Ship : AllVehicles {};
class Ship_F : Ship { class Ship_F : Ship {
MACRO_CONNECT_ACTIONS MACRO_CONNECT_ACTIONS
GVAR(fuelCapacity) = 2000; GVAR(fuelCapacity) = 2000;
@ -196,9 +200,9 @@ class CfgVehicles {
class Boat_Civil_01_base_F : Ship_F { class Boat_Civil_01_base_F : Ship_F {
GVAR(fuelCapacity) = 200; GVAR(fuelCapacity) = 200;
}; };
class Boat_F : Ship_F {}; class Boat_F : Ship_F {};
class Boat_Armed_01_base_F : Boat_F { class Boat_Armed_01_base_F : Boat_F {
GVAR(fuelCapacity) = 1000; GVAR(fuelCapacity) = 1000;
}; };
@ -209,33 +213,33 @@ class CfgVehicles {
// SDV is using electrical propulsion // SDV is using electrical propulsion
GVAR(fuelCapacity) = 0; GVAR(fuelCapacity) = 0;
}; };
class Car_F : Car { class Car_F : Car {
// Assuming large vehicle tank // Assuming large vehicle tank
GVAR(fuelCapacity) = 60; GVAR(fuelCapacity) = 60;
}; };
class Kart_01_Base_F : Car_F { class Kart_01_Base_F : Car_F {
GVAR(fuelCapacity) = 8; GVAR(fuelCapacity) = 8;
}; };
class Offroad_01_base_F: Car_F {}; class Offroad_01_base_F: Car_F {};
class Wheeled_APC_F: Car_F { class Wheeled_APC_F: Car_F {
// Assuming average APC tank // Assuming average APC tank
GVAR(fuelCapacity) = 300; GVAR(fuelCapacity) = 300;
}; };
class Hatchback_01_base_F: Car_F { class Hatchback_01_base_F: Car_F {
// Assume normal vehicle tank // Assume normal vehicle tank
GVAR(fuelCapacity) = 50; GVAR(fuelCapacity) = 50;
}; };
class Quadbike_01_base_F : Car_F { class Quadbike_01_base_F : Car_F {
// Assuming usual Yamaha quad // Assuming usual Yamaha quad
GVAR(fuelCapacity) = 10; GVAR(fuelCapacity) = 10;
}; };
class MRAP_01_base_F: Car_F { class MRAP_01_base_F: Car_F {
// M-ATV // M-ATV
// No data, assuming similar to Fennek // No data, assuming similar to Fennek
@ -252,7 +256,7 @@ class CfgVehicles {
// Fennek // Fennek
GVAR(fuelCapacity) = 230; GVAR(fuelCapacity) = 230;
}; };
class APC_Wheeled_01_base_F: Wheeled_APC_F { class APC_Wheeled_01_base_F: Wheeled_APC_F {
// Patria = LAV // Patria = LAV
GVAR(fuelCapacity) = 269; GVAR(fuelCapacity) = 269;
@ -261,72 +265,72 @@ class CfgVehicles {
class Truck_F : Car_F { class Truck_F : Car_F {
GVAR(fuelCapacity) = 400; GVAR(fuelCapacity) = 400;
}; };
class Truck_01_base_F: Truck_F { class Truck_01_base_F: Truck_F {
// HEMTT // HEMTT
GVAR(fuelCapacity) = 583; GVAR(fuelCapacity) = 583;
}; };
class B_Truck_01_transport_F : Truck_01_base_F {}; class B_Truck_01_transport_F : Truck_01_base_F {};
class B_Truck_01_mover_F: B_Truck_01_transport_F {}; class B_Truck_01_mover_F: B_Truck_01_transport_F {};
class Truck_02_base_F: Truck_F { class Truck_02_base_F: Truck_F {
// KamAZ // KamAZ
// Assuming similar to Ural // Assuming similar to Ural
GVAR(fuelCapacity) = 400; GVAR(fuelCapacity) = 400;
}; };
class Truck_03_base_F: Truck_F { class Truck_03_base_F: Truck_F {
// Tempest // Tempest
// Assuming heavier than KamAZ // Assuming heavier than KamAZ
GVAR(fuelCapacity) = 600; GVAR(fuelCapacity) = 600;
}; };
class Van_01_base_F : Truck_F { class Van_01_base_F : Truck_F {
// Small Truck // Small Truck
// Assuming 80L as in Ford Transit // Assuming 80L as in Ford Transit
GVAR(fuelCapacity) = 80; GVAR(fuelCapacity) = 80;
}; };
class Van_01_fuel_base_F : Van_01_base_F { class Van_01_fuel_base_F : Van_01_base_F {
transportFuel = 0; //1k transportFuel = 0; //1k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 2000; GVAR(fuelCargo) = 2000;
}; };
class Tank_F : Tank { class Tank_F : Tank {
GVAR(fuelCapacity) = 1200; GVAR(fuelCapacity) = 1200;
}; };
class APC_Tracked_01_base_F: Tank_F { class APC_Tracked_01_base_F: Tank_F {
// Namer // Namer
// Assuming Merkava fuel // Assuming Merkava fuel
GVAR(fuelCapacity) = 1400; GVAR(fuelCapacity) = 1400;
}; };
class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F {}; class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F {};
class B_APC_Tracked_01_CRV_F : B_APC_Tracked_01_base_F { class B_APC_Tracked_01_CRV_F : B_APC_Tracked_01_base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 1000; GVAR(fuelCargo) = 1000;
}; };
class APC_Tracked_02_base_F: Tank_F { class APC_Tracked_02_base_F: Tank_F {
// BM-2T // BM-2T
// Assuming 1 L/km // Assuming 1 L/km
GVAR(fuelCapacity) = 1000; GVAR(fuelCapacity) = 1000;
}; };
class APC_Tracked_03_base_F: Tank_F { class APC_Tracked_03_base_F: Tank_F {
// FV 510 // FV 510
// Assuming 1 L/km // Assuming 1 L/km
GVAR(fuelCapacity) = 660; GVAR(fuelCapacity) = 660;
}; };
class MBT_01_base_F: Tank_F { class MBT_01_base_F: Tank_F {
// Merkava IV // Merkava IV
GVAR(fuelCapacity) = 1400; GVAR(fuelCapacity) = 1400;
@ -337,98 +341,98 @@ class CfgVehicles {
// Assuming T80 // Assuming T80
GVAR(fuelCapacity) = 1100; GVAR(fuelCapacity) = 1100;
}; };
class MBT_03_base_F: Tank_F { class MBT_03_base_F: Tank_F {
// Leopard // Leopard
GVAR(fuelCapacity) = 1160; GVAR(fuelCapacity) = 1160;
}; };
class MBT_01_arty_base_F : MBT_01_base_F { class MBT_01_arty_base_F : MBT_01_base_F {
// Assuming similar 2S3 // Assuming similar 2S3
GVAR(fuelCapacity) = 830; GVAR(fuelCapacity) = 830;
}; };
class MBT_02_arty_base_F : MBT_02_base_F { class MBT_02_arty_base_F : MBT_02_base_F {
// Assuming similar 2S3 // Assuming similar 2S3
GVAR(fuelCapacity) = 830; GVAR(fuelCapacity) = 830;
}; };
class Heli_Attack_01_base_F : Helicopter_Base_F { class Heli_Attack_01_base_F : Helicopter_Base_F {
// Commanche // Commanche
}; };
class Heli_Attack_02_base_F : Helicopter_Base_F { class Heli_Attack_02_base_F : Helicopter_Base_F {
// Mi-48 Kajman // Mi-48 Kajman
}; };
class Heli_Light_01_base_F : Helicopter_Base_H { class Heli_Light_01_base_F : Helicopter_Base_H {
// MH-6 // MH-6
GVAR(fuelCapacity) = 242; GVAR(fuelCapacity) = 242;
}; };
class Heli_Light_02_base_F : Helicopter_Base_H { class Heli_Light_02_base_F : Helicopter_Base_H {
// Ka-60 Kasatka // Ka-60 Kasatka
GVAR(fuelCapacity) = 1450; GVAR(fuelCapacity) = 1450;
}; };
class Heli_light_03_base_F : Helicopter_Base_F { class Heli_light_03_base_F : Helicopter_Base_F {
// AW159 // AW159
GVAR(fuelCapacity) = 1004; GVAR(fuelCapacity) = 1004;
}; };
class Heli_Transport_01_base_F : Helicopter_Base_H { class Heli_Transport_01_base_F : Helicopter_Base_H {
// Ghost Hawk // Ghost Hawk
// Assuming similar UH60 // Assuming similar UH60
GVAR(fuelCapacity) = 1360; GVAR(fuelCapacity) = 1360;
}; };
class Heli_Transport_02_base_F : Helicopter_Base_H { class Heli_Transport_02_base_F : Helicopter_Base_H {
// AW101 // AW101
GVAR(fuelCapacity) = 3222; GVAR(fuelCapacity) = 3222;
}; };
class Heli_Transport_03_base_F : Helicopter_Base_H { class Heli_Transport_03_base_F : Helicopter_Base_H {
// Chinook 47I // Chinook 47I
GVAR(fuelCapacity) = 3914; GVAR(fuelCapacity) = 3914;
}; };
class Heli_Transport_04_base_F : Helicopter_Base_H { class Heli_Transport_04_base_F : Helicopter_Base_H {
// Mi-290 Taru // Mi-290 Taru
GVAR(fuelCapacity) = 3914; GVAR(fuelCapacity) = 3914;
}; };
class Plane_CAS_01_base_F : Plane_Base_F { class Plane_CAS_01_base_F : Plane_Base_F {
// Assuming similar to A10 // Assuming similar to A10
GVAR(fuelCapacity) = 6223; GVAR(fuelCapacity) = 6223;
} }
class Plane_CAS_02_base_F : Plane_Base_F { class Plane_CAS_02_base_F : Plane_Base_F {
// Yak-130 // Yak-130
GVAR(fuelCapacity) = 2099; GVAR(fuelCapacity) = 2099;
}; };
class UAV_01_base_F : Helicopter_Base_F { class UAV_01_base_F : Helicopter_Base_F {
// Darter is electrical // Darter is electrical
GVAR(fuelCapacity) = 0; GVAR(fuelCapacity) = 0;
}; };
class UAV : Plane {}; class UAV : Plane {};
class UAV_02_base_F : UAV { class UAV_02_base_F : UAV {
// Assuming similar YAHBON-R2 // Assuming similar YAHBON-R2
GVAR(fuelCapacity) = 270; GVAR(fuelCapacity) = 270;
}; };
class UGV_01_base_F : Car_F { class UGV_01_base_F : Car_F {
// Stomper // Stomper
GVAR(fuelCapacity) = 100; GVAR(fuelCapacity) = 100;
}; };
class Plane_Fighter_03_base_F : Plane_Base_F { class Plane_Fighter_03_base_F : Plane_Base_F {
// L-159 ALCA // L-159 ALCA
GVAR(fuelCapacity) = 1914; GVAR(fuelCapacity) = 1914;
}; };
// Vanilla fuel vehicles // Vanilla fuel vehicles
class I_Truck_02_fuel_F : Truck_02_base_F { class I_Truck_02_fuel_F : Truck_02_base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
@ -436,57 +440,57 @@ class CfgVehicles {
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 10000; GVAR(fuelCargo) = 10000;
}; };
class O_Truck_02_fuel_F : Truck_02_base_F { class O_Truck_02_fuel_F : Truck_02_base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 10000; GVAR(fuelCargo) = 10000;
}; };
class B_Truck_01_fuel_F : B_Truck_01_mover_F { class B_Truck_01_fuel_F : B_Truck_01_mover_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 10000; GVAR(fuelCargo) = 10000;
}; };
class O_Truck_03_fuel_F : Truck_03_base_F { class O_Truck_03_fuel_F : Truck_03_base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 10000; GVAR(fuelCargo) = 10000;
}; };
class ReammoBox_F; class ReammoBox_F;
class Slingload_01_Base_F : ReammoBox_F { class Slingload_01_Base_F : ReammoBox_F {
class ACE_Actions { class ACE_Actions {
class ACE_MainActions { class ACE_MainActions {
displayName = ECSTRING(interaction,MainAction); displayName = ECSTRING(interaction,MainAction);
selection = ""; selection = "";
distance = 10; distance = 10;
condition = "true"; condition = "true";
}; };
}; };
}; };
class B_Slingload_01_Fuel_F : Slingload_01_Base_F { class B_Slingload_01_Fuel_F : Slingload_01_Base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 10000; GVAR(fuelCargo) = 10000;
}; };
class O_Heli_Transport_04_fuel_F : Heli_Transport_04_base_F { class O_Heli_Transport_04_fuel_F : Heli_Transport_04_base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = 10000; GVAR(fuelCargo) = 10000;
}; };
class Pod_Heli_Transport_04_base_F : StaticWeapon {}; class Pod_Heli_Transport_04_base_F : StaticWeapon {};
class Land_Pod_Heli_Transport_04_fuel_F : Pod_Heli_Transport_04_base_F { class Land_Pod_Heli_Transport_04_fuel_F : Pod_Heli_Transport_04_base_F {
transportFuel = 0; //3k transportFuel = 0; //3k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
@ -501,63 +505,63 @@ class CfgVehicles {
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_fs_feed_F : House_Small_F { class Land_fs_feed_F : House_Small_F {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class FuelStation : Strategic { class FuelStation : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_Fuelstation : Strategic { class Land_Fuelstation : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_Fuelstation_army : Strategic { class Land_Fuelstation_army : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_Benzina_schnell : Strategic { class Land_Benzina_schnell : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_A_FuelStation_Feed : Strategic { class Land_A_FuelStation_Feed : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_Ind_FuelStation_Feed_EP1 : Strategic { class Land_Ind_FuelStation_Feed_EP1 : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
class Land_FuelStation_Feed_PMC : Strategic { class Land_FuelStation_Feed_PMC : Strategic {
transportFuel = 0; //50k transportFuel = 0; //50k
MACRO_REFUEL_ACTIONS MACRO_REFUEL_ACTIONS
GVAR(hooks[]) = {{0,0,0}}; GVAR(hooks[]) = {{0,0,0}};
GVAR(fuelCargo) = -1; GVAR(fuelCargo) = -1;
}; };
/* // Barrels from rhs? /* // Barrels from rhs?
BarrelHelper : Misc_thing 100 BarrelHelper : Misc_thing 100
BarrelBase : BarrelHelper 100 BarrelBase : BarrelHelper 100
@ -570,12 +574,12 @@ class CfgVehicles {
Barrel6 : BarrelBase 100 Barrel6 : BarrelBase 100
Wooden_barrel : BarrelBase 100 Wooden_barrel : BarrelBase 100
Wooden_barrels : Wooden_barrel 400 Wooden_barrels : Wooden_barrel 400
// Warfare points // Warfare points
Base_WarfareBVehicleServicePoint : WarfareBBaseStructure 3000 Base_WarfareBVehicleServicePoint : WarfareBBaseStructure 3000
Land_StorageBladder_01_F : StorageBladder_base_F 60000 Land_StorageBladder_01_F : StorageBladder_base_F 60000
Land_FlexibleTank_01_F : FlexibleTank_base_F 300 Land_FlexibleTank_01_F : FlexibleTank_base_F 300
// Mods // Mods
rhsusf_M978A2_usarmy_wd : rhsusf_M977A2_usarmy_wd 10000 rhsusf_M978A2_usarmy_wd : rhsusf_M977A2_usarmy_wd 10000
rhsusf_M978A2_CPK_usarmy_wd : rhsusf_M978A2_usarmy_wd 10000 rhsusf_M978A2_CPK_usarmy_wd : rhsusf_M978A2_usarmy_wd 10000
@ -585,7 +589,7 @@ class CfgVehicles {
RHS_Ural_Fuel_VV_01 : RHS_Ural_Fuel_MSV_01 10000 RHS_Ural_Fuel_VV_01 : RHS_Ural_Fuel_MSV_01 10000
LOP_UA_Ural_fuel : RHS_Ural_Fuel_VV_01 10000 LOP_UA_Ural_fuel : RHS_Ural_Fuel_VV_01 10000
*/ */
// Trucks // Trucks
// Src: HEMTT http://www.inetres.com/gp/military/cv/eng/M977.html 583L > 483km // Src: HEMTT http://www.inetres.com/gp/military/cv/eng/M977.html 583L > 483km
// Src: https://en.wikipedia.org/wiki/Heavy_Expanded_Mobility_Tactical_Truck 587L > 483km // Src: https://en.wikipedia.org/wiki/Heavy_Expanded_Mobility_Tactical_Truck 587L > 483km
@ -598,7 +602,7 @@ class CfgVehicles {
// Src: http://www.automobile-catalog.com/car/2012/1024400/gaz_233011_tigr.html 138L // Src: http://www.automobile-catalog.com/car/2012/1024400/gaz_233011_tigr.html 138L
// Src: https://en.wikipedia.org/wiki/UAZ-469 78L // Src: https://en.wikipedia.org/wiki/UAZ-469 78L
// Src: https://en.wikipedia.org/wiki/GAZ-66 210L // Src: https://en.wikipedia.org/wiki/GAZ-66 210L
// Tracked IFV // Tracked IFV
// Src: https://en.wikipedia.org/wiki/Marder_%28IFV%29 652L > 520km // Src: https://en.wikipedia.org/wiki/Marder_%28IFV%29 652L > 520km
// Src: https://en.wikipedia.org/wiki/Tanque_Argentino_Mediano ~250L > 500km (200L additional tank for 400km range boost) // Src: https://en.wikipedia.org/wiki/Tanque_Argentino_Mediano ~250L > 500km (200L additional tank for 400km range boost)
@ -617,7 +621,7 @@ class CfgVehicles {
// Src: http://afvdb.50megs.com/usa/m2bradley.html 746L // Src: http://afvdb.50megs.com/usa/m2bradley.html 746L
// Src: https://en.wikipedia.org/wiki/BMD-1 300L // Src: https://en.wikipedia.org/wiki/BMD-1 300L
// Trend: 1-2 L/km // Trend: 1-2 L/km
// Wheeled IFV/APC // Wheeled IFV/APC
// Src: https://en.wikipedia.org/wiki/BTR-60 290L > 500km // Src: https://en.wikipedia.org/wiki/BTR-60 290L > 500km
// Src: http://www.inetres.com/gp/military/cv/inf/BTR-70.html 350L > 600km // Src: http://www.inetres.com/gp/military/cv/inf/BTR-70.html 350L > 600km
@ -634,21 +638,21 @@ class CfgVehicles {
// Src: https://en.wikipedia.org/wiki/Patria_AMV ? > 600-850km // Src: https://en.wikipedia.org/wiki/Patria_AMV ? > 600-850km
// Src: https://en.wikipedia.org/wiki/Otokar_Arma ? > 700km // Src: https://en.wikipedia.org/wiki/Otokar_Arma ? > 700km
// Trend: 0.3-0.6 L/km // Trend: 0.3-0.6 L/km
// MBT // MBT
// Src: http://www.inetres.com/gp/military/cv/tank/Leopard2.html 1200L > 550km // Src: http://www.inetres.com/gp/military/cv/tank/Leopard2.html 1200L > 550km
// Src: http://www.inetres.com/gp/military/cv/tank/M1.html 1909L > 479km // Src: http://www.inetres.com/gp/military/cv/tank/M1.html 1909L > 479km
// Src: https://en.wikipedia.org/wiki/T-80 1100L > 335km // Src: https://en.wikipedia.org/wiki/T-80 1100L > 335km
// Src: https://en.wikipedia.org/wiki/T-72 1200L > 490km // Src: https://en.wikipedia.org/wiki/T-72 1200L > 490km
// Trend: 2-4 L/km // Trend: 2-4 L/km
// Artillery // Artillery
// Src: http://www.inetres.com/gp/military/cv/arty/M109.html 511L > 349km // Src: http://www.inetres.com/gp/military/cv/arty/M109.html 511L > 349km
// Src: https://en.wikipedia.org/wiki/2S3_Akatsiya 830L > 500km // Src: https://en.wikipedia.org/wiki/2S3_Akatsiya 830L > 500km
// Other // Other
// https://en.wikipedia.org/wiki/ZSU-23-4 515L // https://en.wikipedia.org/wiki/ZSU-23-4 515L
// Helicopter // Helicopter
// Src: http://www.bga-aeroweb.com/Defense/UH-1Y-Venom.html 1172kg / 0.81 kg/L = 1447L // Src: http://www.bga-aeroweb.com/Defense/UH-1Y-Venom.html 1172kg / 0.81 kg/L = 1447L
// Src: http://www.bga-aeroweb.com/Defense/AH-1Z-Viper.html 1296kg / 0.81 kg/L = 1600L // Src: http://www.bga-aeroweb.com/Defense/AH-1Z-Viper.html 1296kg / 0.81 kg/L = 1600L
@ -662,7 +666,7 @@ class CfgVehicles {
// Src: http://www.globalsecurity.org/military/world/europe/aw159-specs.htm 1004L // Src: http://www.globalsecurity.org/military/world/europe/aw159-specs.htm 1004L
// Src: https://en.wikipedia.org/wiki/AgustaWestland_AW101 3 * 1074L = 3222L // Src: https://en.wikipedia.org/wiki/AgustaWestland_AW101 3 * 1074L = 3222L
// Src: http://www.aviastar.org/helicopters_eng/ka-62.php 1450L // Src: http://www.aviastar.org/helicopters_eng/ka-62.php 1450L
// Planes // Planes
// Src: http://www.theaviationzone.com/factsheets/c130j.asp 20820kg / 0.81 kg/L = 25704L // Src: http://www.theaviationzone.com/factsheets/c130j.asp 20820kg / 0.81 kg/L = 25704L
// Src: http://www.avialogs.com/viewer/avialogs-documentviewer.php?id=3298 p29 1644 gal = 6223L // Src: http://www.avialogs.com/viewer/avialogs-documentviewer.php?id=3298 p29 1644 gal = 6223L
@ -670,130 +674,130 @@ class CfgVehicles {
// Src: http://www.thaitechnics.com/aircraft/L159.html 1551kg / 0.81 kg/L = 1914L // Src: http://www.thaitechnics.com/aircraft/L159.html 1551kg / 0.81 kg/L = 1914L
// Src: https://en.wikipedia.org/wiki/Yakovlev_Yak-130 1700kg / 0.81 kg/L = 2099L // Src: https://en.wikipedia.org/wiki/Yakovlev_Yak-130 1700kg / 0.81 kg/L = 2099L
// Src: http://www.adcom-systems.com/ENG/UAV/YAHBON-R2/Overview.html 270L // Src: http://www.adcom-systems.com/ENG/UAV/YAHBON-R2/Overview.html 270L
// BWMod // BWMod
class BWA3_Puma_base: Tank_F { class BWA3_Puma_base: Tank_F {
// Assuming 1 L/km // Assuming 1 L/km
GVAR(fuelCapacity) = 700; GVAR(fuelCapacity) = 700;
}; };
class BWA3_Leopard_base: Tank_F { class BWA3_Leopard_base: Tank_F {
GVAR(fuelCapacity) = 1160; GVAR(fuelCapacity) = 1160;
}; };
// RHS // RHS
class RHS_UH1_Base : Heli_light_03_base_F { class RHS_UH1_Base : Heli_light_03_base_F {
GVAR(fuelCapacity) = 1447; GVAR(fuelCapacity) = 1447;
}; };
class RHS_UH60_Base : Heli_Transport_01_base_F { class RHS_UH60_Base : Heli_Transport_01_base_F {
GVAR(fuelCapacity) = 1360; GVAR(fuelCapacity) = 1360;
}; };
class RHS_CH_47F_base : Heli_Transport_02_base_F { class RHS_CH_47F_base : Heli_Transport_02_base_F {
GVAR(fuelCapacity) = 3914; GVAR(fuelCapacity) = 3914;
}; };
class RHS_AH1Z_base : Heli_Attack_01_base_F { class RHS_AH1Z_base : Heli_Attack_01_base_F {
GVAR(fuelCapacity) = 1600; GVAR(fuelCapacity) = 1600;
}; };
class RHS_AH64_base : Heli_Attack_01_base_F { class RHS_AH64_base : Heli_Attack_01_base_F {
GVAR(fuelCapacity) = 1420; GVAR(fuelCapacity) = 1420;
}; };
class rhsusf_m1a1tank_base : MBT_01_base_F { class rhsusf_m1a1tank_base : MBT_01_base_F {
GVAR(fuelCapacity) = 1909; GVAR(fuelCapacity) = 1909;
}; };
class rhsusf_m109tank_base : MBT_01_arty_base_F { class rhsusf_m109tank_base : MBT_01_arty_base_F {
GVAR(fuelCapacity) = 511; GVAR(fuelCapacity) = 511;
}; };
class rhsusf_hmmwe_base : MRAP_01_base_F { class rhsusf_hmmwe_base : MRAP_01_base_F {
GVAR(fuelCapacity) = 95; GVAR(fuelCapacity) = 95;
}; };
class rhsusf_rg33_base : MRAP_01_base_F { class rhsusf_rg33_base : MRAP_01_base_F {
GVAR(fuelCapacity) = 302; GVAR(fuelCapacity) = 302;
}; };
class rhsusf_fmtv_base : Truck_01_base_F { class rhsusf_fmtv_base : Truck_01_base_F {
GVAR(fuelCapacity) = 219; GVAR(fuelCapacity) = 219;
}; };
class rhsusf_m113_tank_base : APC_Tracked_02_base_F { class rhsusf_m113_tank_base : APC_Tracked_02_base_F {
GVAR(fuelCapacity) = 360; GVAR(fuelCapacity) = 360;
}; };
class RHS_M2A2_Base : APC_Tracked_03_base_F { class RHS_M2A2_Base : APC_Tracked_03_base_F {
GVAR(fuelCapacity) = 746; GVAR(fuelCapacity) = 746;
}; };
class RHS_A10 : Plane_CAS_01_base_F { class RHS_A10 : Plane_CAS_01_base_F {
GVAR(fuelCapacity) = 6223; GVAR(fuelCapacity) = 6223;
}; };
class RHS_C130J_Base : Plane_Base_F { class RHS_C130J_Base : Plane_Base_F {
GVAR(fuelCapacity) = 25704; GVAR(fuelCapacity) = 25704;
}; };
class O_Plane_CAS_02_F : Plane_CAS_02_base_F {}; class O_Plane_CAS_02_F : Plane_CAS_02_base_F {};
class RHS_su25_base : O_Plane_CAS_02_F { class RHS_su25_base : O_Plane_CAS_02_F {
GVAR(fuelCapacity) = 3600; GVAR(fuelCapacity) = 3600;
}; };
class RHS_Mi8_base : Heli_Light_02_base_F { class RHS_Mi8_base : Heli_Light_02_base_F {
GVAR(fuelCapacity) = 3700; GVAR(fuelCapacity) = 3700;
}; };
class RHS_Ka52_base : Heli_Attack_02_base_F { class RHS_Ka52_base : Heli_Attack_02_base_F {
GVAR(fuelCapacity) = 1870; GVAR(fuelCapacity) = 1870;
}; };
class RHS_Mi24_base : Heli_Attack_02_base_F { class RHS_Mi24_base : Heli_Attack_02_base_F {
GVAR(fuelCapacity) = 1851; GVAR(fuelCapacity) = 1851;
}; };
class rhs_bmp3tank_base : Tank_F { class rhs_bmp3tank_base : Tank_F {
// Assuming same as BMP1/2 // Assuming same as BMP1/2
GVAR(fuelCapacity) = 460; GVAR(fuelCapacity) = 460;
}; };
class a3t72tank_base : Tank_F { class a3t72tank_base : Tank_F {
GVAR(fuelCapacity) = 1200; GVAR(fuelCapacity) = 1200;
}; };
class rhs_tank_base : Tank_F { class rhs_tank_base : Tank_F {
GVAR(fuelCapacity) = 1200; GVAR(fuelCapacity) = 1200;
}; };
class rhs_t80b : rhs_tank_base { class rhs_t80b : rhs_tank_base {
GVAR(fuelCapacity) = 1100; GVAR(fuelCapacity) = 1100;
}; };
class RHS_Ural_BaseTurret : Truck_F { class RHS_Ural_BaseTurret : Truck_F {
GVAR(fuelCapacity) = 360; GVAR(fuelCapacity) = 360;
}; };
class rhs_tigr_base : MRAP_02_base_F { class rhs_tigr_base : MRAP_02_base_F {
GVAR(fuelCapacity) = 138; GVAR(fuelCapacity) = 138;
}; };
class RHS_UAZ_Base : Offroad_01_base_f { class RHS_UAZ_Base : Offroad_01_base_f {
GVAR(fuelCapacity) = 78; GVAR(fuelCapacity) = 78;
}; };
class rhs_zsutank_base : APC_Tracked_02_base_F { class rhs_zsutank_base : APC_Tracked_02_base_F {
GVAR(fuelCapacity) = 515; GVAR(fuelCapacity) = 515;
}; };
class rhs_bmp1tank_base : Tank_F { class rhs_bmp1tank_base : Tank_F {
GVAR(fuelCapacity) = 460; GVAR(fuelCapacity) = 460;
}; };
class rhs_truck : Truck_F { class rhs_truck : Truck_F {
GVAR(fuelCapacity) = 210; GVAR(fuelCapacity) = 210;
}; };
class rhs_btr_base : Wheeled_Apc_F {}; class rhs_btr_base : Wheeled_Apc_F {};
class rhs_btr60_base : rhs_btr_base { class rhs_btr60_base : rhs_btr_base {
GVAR(fuelCapacity) = 290; GVAR(fuelCapacity) = 290;
@ -801,26 +805,26 @@ class CfgVehicles {
class rhs_btr70_vmf : rhs_btr_base { class rhs_btr70_vmf : rhs_btr_base {
GVAR(fuelCapacity) = 350; GVAR(fuelCapacity) = 350;
}; };
class rhs_btr70_msv : rhs_btr70_vmf {}; class rhs_btr70_msv : rhs_btr70_vmf {};
class rhs_btr80_msv : rhs_btr70_msv { class rhs_btr80_msv : rhs_btr70_msv {
GVAR(fuelCapacity) = 300; GVAR(fuelCapacity) = 300;
}; };
class rhs_a3spruttank_base : Tank_F { class rhs_a3spruttank_base : Tank_F {
// BMD4 / 2S25 // BMD4 / 2S25
GVAR(fuelCapacity) = 400; GVAR(fuelCapacity) = 400;
}; };
class rhs_bmd_base : Tank_F { class rhs_bmd_base : Tank_F {
GVAR(fuelCapacity) = 300; GVAR(fuelCapacity) = 300;
}; };
class rhs_2s3tank_base : Tank_F { class rhs_2s3tank_base : Tank_F {
GVAR(fuelCapacity) = 830; GVAR(fuelCapacity) = 830;
}; };
class OTR21_Base : Truck_F { class OTR21_Base : Truck_F {
// No info about ballistic carrier ;-) // No info about ballistic carrier ;-)
GVAR(fuelCapacity) = 500; GVAR(fuelCapacity) = 500;

34
addons/refuel/functions/fnc_takeNozzle.sqf
View File

@ -29,36 +29,26 @@ if (isNull _nozzle) then { // func is called on fuel truck
_endPosOffset = getArray (configFile >> "CfgVehicles" >> typeOf _target >> "ace_refuel_hooks") select 0; _endPosOffset = getArray (configFile >> "CfgVehicles" >> typeOf _target >> "ace_refuel_hooks") select 0;
// TODO add pickup animation ? // TODO add pickup animation ?
[{ [{
params ["_unit", "_target", "_endPosTestOffset"]; params ["_unit", "_target"];
_newNozzle = "ACE_refuel_fuelNozzle" createVehicle position _unit; _newNozzle = "ACE_refuel_fuelNozzle" createVehicle position _unit;
_newNozzle attachTo [_unit, [-0.02,-0.05,0], "righthandmiddle1"]; // TODO replace with right coordinates for real model _newNozzle attachTo [_unit, [-0.02,-0.05,0], "righthandmiddle1"]; // TODO replace with right coordinates for real model
_unit setVariable [QGVAR(nozzle), _newNozzle]; _unit setVariable [QGVAR(nozzle), _newNozzle];
// TODO action is only local // Create rope with offset -1 to prevent wrapping over interaction base point
_action = [QGVAR(TakeNozzleFromGround), _rope = ropeCreate [_target, [0, 0, -1], _newNozzle, [0, 0, 0], 12];
localize LSTRING(TakeNozzle),
QUOTE(PATHTOF(ui\icon_refuel_interact.paa)),
{params ["_nozzle", "_unit"]; [ARR_3(_unit,_nozzle,_nozzle)] call DFUNC(TakeNozzle); true},
{params ["_nozzle", "_unit"]; [ARR_2(_unit,_nozzle)] call FUNC(canTakeNozzle)},
{},
[]
] call EFUNC(interact_menu,createAction);
[_newNozzle, 0, [], _action] call EFUNC(interact_menu,addActionToObject);
_rope = ropeCreate [_target, _endPosTestOffset, _newNozzle, [0, 0, 0], 12];
_newNozzle setVariable [QGVAR(source), _target, true]; _newNozzle setVariable [QGVAR(source), _target, true];
_newNozzle setVariable [QGVAR(rope), _rope, true]; _newNozzle setVariable [QGVAR(rope), _rope, true];
_target setVariable [QGVAR(isConnected), true, true]; _target setVariable [QGVAR(isConnected), true, true];
}, [_unit, _target, _endPosOffset], 2, 0] call EFUNC(common,waitAndExecute); }, [_unit, _target, _endPosOffset], 2, 0] call EFUNC(common,waitAndExecute);
[{ [{
private ["_nozzle"]; private ["_nozzle"];
params ["_args", "_pfID"]; params ["_args", "_pfID"];
_args params ["_unit", "_target"]; _args params ["_unit", "_target"];
if ((_unit distance _target) > 10) exitWith { if ((_unit distance _target) > 10) exitWith {
_nozzle = _unit getVariable [QGVAR(nozzle), objNull]; _nozzle = _unit getVariable [QGVAR(nozzle), objNull];
if !(isNull _nozzle) then { if !(isNull _nozzle) then {
@ -67,11 +57,11 @@ if (isNull _nozzle) then { // func is called on fuel truck
_nozzle setVelocity [0,0,0]; _nozzle setVelocity [0,0,0];
_unit setVariable [QGVAR(isRefueling), false]; _unit setVariable [QGVAR(isRefueling), false];
_unit setVariable [QGVAR(nozzle), objNull]; _unit setVariable [QGVAR(nozzle), objNull];
_weaponSelect = _unit getVariable QGVAR(selectedWeaponOnRefuel); _weaponSelect = _unit getVariable QGVAR(selectedWeaponOnRefuel);
_unit selectWeapon _weaponSelect; _unit selectWeapon _weaponSelect;
_unit setVariable [QGVAR(selectedWeaponOnRefuel), nil]; _unit setVariable [QGVAR(selectedWeaponOnRefuel), nil];
[_unit, QGVAR(vehAttach), false] call EFUNC(common,setForceWalkStatus); [_unit, QGVAR(vehAttach), false] call EFUNC(common,setForceWalkStatus);
[LSTRING(Hint_TooFar), 2, _unit] call EFUNC(common,displayTextStructured); [LSTRING(Hint_TooFar), 2, _unit] call EFUNC(common,displayTextStructured);
}; };
@ -82,10 +72,10 @@ if (isNull _nozzle) then { // func is called on fuel truck
_unit setVariable [QGVAR(isRefueling), true]; _unit setVariable [QGVAR(isRefueling), true];
} else { // func is called in muzzle either connected or on ground } else { // func is called in muzzle either connected or on ground
// TODO add pickup animation ? // TODO add pickup animation ?
[{ [{
params ["_unit", "_target", "_nozzle"]; params ["_unit", "_target", "_nozzle"];
detach _nozzle; detach _nozzle;
_target setVariable [QGVAR(nozzle), objNull, true]; _target setVariable [QGVAR(nozzle), objNull, true];
_nozzle attachTo [_unit, [-0.02,-0.05,0], "righthandmiddle1"]; // TODO replace with right coordinates for real model _nozzle attachTo [_unit, [-0.02,-0.05,0], "righthandmiddle1"]; // TODO replace with right coordinates for real model

13
addons/refuel/stringtable.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Refuel"> <Package name="Refuel">
<Key ID="STR_ACE_Refuel_RefuelSettings_Module_DisplayName"> <Key ID="STR_ACE_Refuel_RefuelSettings_Module_DisplayName">
@ -45,15 +45,18 @@
<English>How many liters does a stationary object e.g. a fuel station hold? -1 is infinite.</English> <English>How many liters does a stationary object e.g. a fuel station hold? -1 is infinite.</English>
<German>Wieviele Liter enthält ein stationäres Objekt z.B. eine Tankstelle? -1 bedeutet unendlich.</German> <German>Wieviele Liter enthält ein stationäres Objekt z.B. eine Tankstelle? -1 bedeutet unendlich.</German>
</Key> </Key>
<Key ID="STR_ACE_Refuel_TakeNozzle"> <Key ID="STR_ACE_Refuel_Refuel">
<English>Refuel</English>
</Key>
<Key ID="STR_ACE_Refuel_TakeNozzle">
<English>Take fuel nozzle</English> <English>Take fuel nozzle</English>
<German>Zapfpistole nehmen</German> <German>Zapfpistole nehmen</German>
</Key> </Key>
<Key ID="STR_ACE_Refuel_Connect"> <Key ID="STR_ACE_Refuel_Connect">
<English>Connect fuel nozzle</English> <English>Connect fuel nozzle</English>
<German>Zapfpistole anschließen</German> <German>Zapfpistole anschließen</German>
</Key> </Key>
<Key ID="STR_ACE_Refuel_Disconnect"> <Key ID="STR_ACE_Refuel_Disconnect">
<English>Disconnect fuel nozzle</English> <English>Disconnect fuel nozzle</English>
<German>Zapfpistole entfernen</German> <German>Zapfpistole entfernen</German>
</Key> </Key>
@ -72,7 +75,7 @@
<Key ID="STR_ACE_Refuel_Hint_Empty"> <Key ID="STR_ACE_Refuel_Hint_Empty">
<English>There is no fuel left.</English> <English>There is no fuel left.</English>
<German>Es ist kein Treibstoff übrig.</German> <German>Es ist kein Treibstoff übrig.</German>
</Key> </Key>
<Key ID="STR_ACE_Refuel_Cancel"> <Key ID="STR_ACE_Refuel_Cancel">
<English>Cancel</English> <English>Cancel</English>
<German>Abbrechen</German> <German>Abbrechen</German>