mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
edf4a70ed6
* Simplify main fuel loop * Remove unecessary action macro * Add container refueling * Fuel counter behaviour is now consistent for both limited and unlimited fuel sources * Update maxFuel and refuelContainer whenever fueling begins * Update maxFuel and refuelContainer whenever fueling begins * Prevent loading of fuel sources into cargo when they have a nozzle connected to them * Added action to check how much fuel is left in a jerry can * Prevent jerry cans from being picked up if they have a nozzle connected to them * Added function to check if a nozzle can be connected to an object * Prevent fuel sources which have their nozzle deployed from being loaded * Compute both tank volumes inside of refuel instead of durring turn on * Didn't mean to delete these * Allow for user defined fuel capacities * Handle more edge cases with infinite fuel sources * Refuel - Prevent fuel sources from being dragged while they're refueling other things * Refuel - Added flow rate multiplier for refueling fuel sources * Refuel - Use FUNC instead of DFUNC for nozzle actions * Refuel - getCapacity should return REFUEL_DISABLED_FUEL instead of 0 when argument is not a fuel source * Refuel - Correctly reset fuel counter when fueling a new target * Refuel - Implemented all suggested changes * Refuel - Added newlines to end of files * Refuel - Added missing newline at end of XEH_PREP * Only setFuel once per jerry can creation Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Calling getFuel will initialize the fuel source * Refuel - Add newline to end of file --------- Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
96 lines
3.4 KiB
Plaintext
96 lines
3.4 KiB
Plaintext
#include "script_component.hpp"
|
|
|
|
if (isServer) then {
|
|
addMissionEventHandler ["HandleDisconnect", {call FUNC(handleDisconnect)}];
|
|
};
|
|
|
|
[QGVAR(initSource), LINKFUNC(initSource)] call CBA_fnc_addEventHandler;
|
|
|
|
if (!hasInterface) exitWith {};
|
|
|
|
["isNotRefueling", {!((_this select 0) getVariable [QGVAR(isRefueling), false])}] call EFUNC(common,addCanInteractWithCondition);
|
|
|
|
["MouseButtonDown", LINKFUNC(onMouseButtonDown)] call CBA_fnc_addDisplayHandler;
|
|
|
|
GVAR(mainAction) = [
|
|
QGVAR(Refuel),
|
|
localize LSTRING(Refuel),
|
|
QPATHTOF(ui\icon_refuel_interact.paa),
|
|
{},
|
|
{
|
|
alive _target
|
|
&& {[_player, _target, [INTERACT_EXCEPTIONS]] call EFUNC(common,canInteractWith)}
|
|
&& {REFUEL_DISABLED_FUEL != ([_target] call FUNC(getCapacity))}
|
|
},
|
|
{}, [], [0,0,0],
|
|
REFUEL_ACTION_DISTANCE
|
|
] call EFUNC(interact_menu,createAction);
|
|
|
|
GVAR(actions) = [
|
|
[QGVAR(TakeNozzle),
|
|
localize LSTRING(TakeNozzle),
|
|
QPATHTOF(ui\icon_refuel_interact.paa),
|
|
{[_player, _target] call FUNC(TakeNozzle)},
|
|
{[_player, _target] call FUNC(canTakeNozzle)},
|
|
{}, [], [0,0,0],
|
|
REFUEL_ACTION_DISTANCE
|
|
] call EFUNC(interact_menu,createAction),
|
|
[QGVAR(CheckFuelCounter),
|
|
localize LSTRING(CheckFuelCounter),
|
|
QPATHTOF(ui\icon_refuel_interact.paa),
|
|
{[_player, _target] call FUNC(readFuelCounter)},
|
|
{true},
|
|
{}, [], [0,0,0],
|
|
REFUEL_ACTION_DISTANCE
|
|
] call EFUNC(interact_menu,createAction),
|
|
[QGVAR(CheckFuel),
|
|
localize LSTRING(CheckFuel),
|
|
QPATHTOF(ui\icon_refuel_interact.paa),
|
|
{[_player, _target] call FUNC(checkFuel)},
|
|
{[_player, _target] call FUNC(canCheckFuel)},
|
|
{}, [], [0,0,0],
|
|
REFUEL_ACTION_DISTANCE
|
|
] call EFUNC(interact_menu,createAction),
|
|
[QGVAR(Return),
|
|
localize LSTRING(Return),
|
|
QPATHTOF(ui\icon_refuel_interact.paa),
|
|
{[_player, _target] call FUNC(returnNozzle)},
|
|
{[_player, _target] call FUNC(canReturnNozzle)},
|
|
{}, [], [0,0,0],
|
|
REFUEL_ACTION_DISTANCE
|
|
] call EFUNC(interact_menu,createAction)
|
|
];
|
|
|
|
// init menu for config refuel vehicles
|
|
private _cacheRefuelClasses = call (uiNamespace getVariable [QGVAR(cacheRefuelClasses), {[[],[]]}]);
|
|
_cacheRefuelClasses params [["_staticClasses", [], [[]]], ["_dynamicClasses", [], [[]]]];
|
|
|
|
{
|
|
private _className = _x;
|
|
[_className, 0, ["ACE_MainActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToClass);
|
|
{
|
|
[_className, 0, ["ACE_MainActions", QGVAR(Refuel)], _x] call EFUNC(interact_menu,addActionToClass);
|
|
} forEach GVAR(actions);
|
|
TRACE_1("add menu to static",_x);
|
|
} forEach _staticClasses;
|
|
|
|
{
|
|
private _className = _x;
|
|
[_className, 0, ["ACE_MainActions"], GVAR(mainAction), true] call EFUNC(interact_menu,addActionToClass);
|
|
{
|
|
[_className, 0, ["ACE_MainActions", QGVAR(Refuel)], _x, true] call EFUNC(interact_menu,addActionToClass);
|
|
} forEach GVAR(actions);
|
|
TRACE_1("add menu to dynamic",_x);
|
|
} forEach _dynamicClasses;
|
|
|
|
#ifdef DRAW_HOOKS_POS
|
|
addMissionEventHandler ["Draw3D", {
|
|
private _source = cursorObject;
|
|
private _cfgPos = getArray (configOf _source >> QGVAR(hooks));
|
|
private _dynPos = _source getVariable [QGVAR(hooks), []];
|
|
{
|
|
drawIcon3D ["\a3\ui_f\data\gui\cfg\hints\icon_text\group_1_ca.paa", [1,1,1,1], _source modelToWorldVisual _x, 1, 1, 0, format ["Hook %1", _forEachIndex]];
|
|
} forEach ([_dynPos, _cfgPos] select (_dynPos isEqualTo []));
|
|
}];
|
|
#endif
|