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>
36 lines
1.6 KiB
Plaintext
36 lines
1.6 KiB
Plaintext
[
|
|
QGVAR(rate), "SLIDER",
|
|
[LSTRING(RefuelSettings_speed_DisplayName), LSTRING(RefuelSettings_speed_Description)],
|
|
[localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_refuel"],
|
|
[0,25,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
|
|
true, // isGlobal
|
|
{[QGVAR(rate), _this] call EFUNC(common,cbaSettings_settingChanged)}
|
|
] call CBA_fnc_addSetting;
|
|
|
|
[
|
|
QGVAR(cargoRate), "SLIDER",
|
|
[LSTRING(RefuelSettings_speedCargo_DisplayName), LSTRING(RefuelSettings_speedCargo_Description)],
|
|
[localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_refuel"],
|
|
[0,250,10,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
|
|
true, // isGlobal
|
|
{[QGVAR(cargoRate), _this] call EFUNC(common,cbaSettings_settingChanged)}
|
|
] call CBA_fnc_addSetting;
|
|
|
|
[
|
|
QGVAR(hoseLength), "SLIDER",
|
|
[LSTRING(RefuelSettings_hoseLength_DisplayName)],
|
|
[localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_refuel"],
|
|
[0,50,12,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
|
|
true, // isGlobal
|
|
{[QGVAR(hoseLength), _this] call EFUNC(common,cbaSettings_settingChanged)}
|
|
] call CBA_fnc_addSetting;
|
|
|
|
[
|
|
QGVAR(progressDuration), "TIME",
|
|
[LSTRING(RefuelSettings_progressDuration_DisplayName), LSTRING(RefuelSettings_progressDuration_Description)],
|
|
[localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_refuel"],
|
|
[0, 10, 2], // [min, max, default value]
|
|
true, // isGlobal
|
|
{[QGVAR(progressDuration), _this] call EFUNC(common,cbaSettings_settingChanged)}
|
|
] call CBA_fnc_addSetting;
|