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

Refuel - Add Progress Bar Duration Setting (#8971)

Browse Source 
* Refuel: Allow changing progress bars' duration

* Clarify Turkish progressDuration_DisplayName

* Update addons/refuel/functions/fnc_moduleRefuelSettings.sqf

* Change progressDuration setting's type to TIME

* Update progressDuration setting display name, add description too

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
Ozan Eğitmen 2022-08-17 14:25:37 +03:00 committed by GitHub
parent a76f8924d8
commit f3c66e83b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/refuel/CfgVehicles.hpp
View File

@ -78,6 +78,11 @@ class CfgVehicles {
typeName = "NUMBER";
defaultValue = 12;
};
class progressDuration {
displayName = CSTRING(RefuelSettings_progressDuration_DisplayName);
typeName = "NUMBER";
defaultValue = 2;
};
};
};

1
addons/refuel/defines.hpp
View File

@ -2,4 +2,3 @@
#define REFUEL_DISABLED_FUEL -1
#define REFUEL_ACTION_DISTANCE 7
#define REFUEL_NOZZLE_ACTION_DISTANCE 2
#define REFUEL_PROGRESS_DURATION 2

2
addons/refuel/functions/fnc_checkFuel.sqf
View File

@ -21,7 +21,7 @@ params [["_unit", objNull, [objNull]], ["_source", objNull, [objNull]]];
private _fuel = [_source] call FUNC(getFuel);
[
TIME_PROGRESSBAR(REFUEL_PROGRESS_DURATION * 2),
GVAR(progressDuration) * 2,
[_unit, _source, _fuel],
{
params ["_args"];

2
addons/refuel/functions/fnc_connectNozzleAction.sqf
View File

@ -65,7 +65,7 @@ _bestPosASL = _bestPosASL vectorAdd ((_bestPosASL vectorFromTo _startingPosASL)
private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL);
[
TIME_PROGRESSBAR(REFUEL_PROGRESS_DURATION),
GVAR(progressDuration),
[_unit, _nozzle, _sink, _attachPosModel],
{
params ["_args"];

3
addons/refuel/functions/fnc_moduleRefuelSettings.sqf
View File

@ -23,5 +23,6 @@ if !(_activated) exitWith {};
[_logic, QGVAR(rate), "rate"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(hoseLength), "hoseLength"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(progressDuration), "progressDuration"] call EFUNC(common,readSettingFromModule);
INFO_2("Refuel Module Initialized with flow rate: %1 - hoseLength: %2",GVAR(rate), GVAR(hoseLength))
INFO_3("Refuel Module Initialized with flow rate: %1 - hoseLength: %2 - progressDuration: %3",GVAR(rate),GVAR(hoseLength),GVAR(progressDuration))

2
addons/refuel/functions/fnc_returnNozzle.sqf
View File

@ -23,7 +23,7 @@ private _nozzle = _unit getVariable [QGVAR(nozzle), objNull];
if (isNull _nozzle || {_source != _nozzle getVariable QGVAR(source)}) exitWith {};
[
TIME_PROGRESSBAR(REFUEL_PROGRESS_DURATION),
GVAR(progressDuration),
[_unit, _nozzle, _source],
{
params ["_args"];

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

@ -22,7 +22,7 @@ params [
];
[
TIME_PROGRESSBAR(REFUEL_PROGRESS_DURATION),
GVAR(progressDuration),
[_unit, _object],
{
params ["_args"];

9
addons/refuel/initSettings.sqf
View File

@ -15,3 +15,12 @@
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;

7
addons/refuel/script_component.hpp
View File

@ -2,7 +2,6 @@
#define COMPONENT_BEAUTIFIED Refuel
#include "\z\ace\addons\main\script_mod.hpp"
// #define FAST_PROGRESSBARS
// #define DRAW_HOOKS_POS
// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
@ -20,11 +19,5 @@
#include "\z\ace\addons\refuel\defines.hpp"
#ifdef FAST_PROGRESSBARS
#define TIME_PROGRESSBAR(X) ((X) * 0.075)
#else
#define TIME_PROGRESSBAR(X) (X)
#endif
#define INTERACT_EXCEPTIONS_REFUELING "isNotInside", "isNotOnLadder", "isNotSwimming"
#define INTERACT_EXCEPTIONS INTERACT_EXCEPTIONS_REFUELING, "isNotRefueling"

10
addons/refuel/stringtable.xml
View File

@ -479,7 +479,15 @@
<Portuguese>Comprimento da Mangueira de Combustível</Portuguese>
<French>Longueur du tuyau</French>
<Czech>Délka hadice na palivo</Czech>
<Turkish>Yakıt poması uzunluğu</Turkish>
<Turkish>Yakıt hortumu uzunluğu</Turkish>
</Key>
<Key ID="STR_ACE_Refuel_RefuelSettings_progressDuration_DisplayName">
<English>Pump/Hose Interaction Time</English>
<Turkish>Pompa/Hortum Etkileşim Süresi</Turkish>
</Key>
<Key ID="STR_ACE_Refuel_RefuelSettings_progressDuration_Description">
<English>How long refuel interactions take in seconds.</English>
<Turkish>Saniye biriminde yakıt ikmali etkileşimlerinin süresi.</Turkish>
</Key>
<Key ID="STR_ACE_Refuel_fuelCargo_edenName">
<English>Fuel Cargo Volume</English>