From a2c81045399d0b0f2cb874f1038f8ee7d138d43c Mon Sep 17 00:00:00 2001 From: TenuredCLOUD <85143513+TenuredCLOUD@users.noreply.github.com> Date: Sat, 27 Jun 2026 12:10:06 -0700 Subject: [PATCH] Fuel - Fix restrictions - title, fixed bad logic for early leaving of fuel listener for ACE refuel - fixed notifier prompt when fuel pump can't be used on certain vehicles --- .../functions/fnc_initRefuelRestrictions.sqf | 4 ++-- addons/fuel/stringtable.xml | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/addons/fuel/functions/fnc_initRefuelRestrictions.sqf b/addons/fuel/functions/fnc_initRefuelRestrictions.sqf index 9758e492..0a65836a 100644 --- a/addons/fuel/functions/fnc_initRefuelRestrictions.sqf +++ b/addons/fuel/functions/fnc_initRefuelRestrictions.sqf @@ -19,7 +19,7 @@ private _pumpAllowedFuels = _source getVariable [QGVAR(fuelTypeSupported), []]; // If target is a generator & source isn't jetfuel allow refilling - if (_target in EGVAR(power,generators) && 0 in _pumpAllowedFuels || 1 in _pumpAllowedFuels) exitWith {}; + if (typeOf _target in EGVAR(power,generators) && [0, 1] in [_pumpAllowedFuels]) exitWith {}; if (_pumpAllowedFuels isNotEqualTo []) then { @@ -57,7 +57,7 @@ case 2: { _reqString = localize LSTRING(JetFuel) }; }; - private _msg = format [localize LSTRING(PumpSupports), _pumpAllowedFuels joinString " + ", _reqString]; + private _msg = format [localize LSTRING(PumpDoesNotDispense), _reqString]; [[_msg, 1, [1, 1, 1, 1]], [], true] call CBA_fnc_notify; }; }; diff --git a/addons/fuel/stringtable.xml b/addons/fuel/stringtable.xml index fa2cb3c1..463d32ac 100644 --- a/addons/fuel/stringtable.xml +++ b/addons/fuel/stringtable.xml @@ -113,22 +113,6 @@ 泵未分配 %1... Pompa %1 dağıtmıyor... - - Pump supports: %1 Vehicle requires: %2 - Čerpadlo podporuje: %1 Vozidlo vyžaduje: %2 - La pompe fournit : %1 Le véhicule nécessite : %2 - La bomba admite: %1 El vehículo requiere: %2 - La pompa eroga: %1 Il veicolo richiede: %2 - Pompa obsługuje: %1 Pojazd wymaga: %2 - A bomba suporta: %1 O veículo requer: %2 - Насос поддерживает: %1 Транспорту требуется: %2 - Pumpe unterstützt: %1 Fahrzeug benötigt: %2 - 펌프 지원: %1 차량 요구: %2 - ポンプの対応: %1 車両の要求: %2 - 幫浦支援: %1 車輛需要: %2 - 泵支持: %1 车辆需要: %2 - Pompa desteği: %1 Araç gereksinimi: %2 - Refill fuel can at pump Napleněte nádrž na pompe