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 setting for hose length (#5224)

Browse Source
This commit is contained in:
PabstMirror 2017-05-31 11:30:48 -05:00 committed by GitHub
parent 4ad73446a6
commit afe862324e
9 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/refuel/ACE_Settings.hpp
View File

@ -6,4 +6,10 @@ class ACE_Settings {
value = 1;
typeName = "SCALAR";
};
class GVAR(hoseLength) {
category = ECSTRING(OptionsMenu,CategoryLogistics);
displayName = CSTRING(RefuelSettings_hoseLength_DisplayName);
value = 12;
typeName = "SCALAR";
};
};

5
addons/refuel/CfgVehicles.hpp
View File

@ -119,6 +119,11 @@ class CfgVehicles {
typeName = "NUMBER";
defaultValue = 10;
};
class hoseLength {
displayName = CSTRING(RefuelSettings_hoseLength_DisplayName);
typeName = "NUMBER";
defaultValue = 12;
};
};
};

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

@ -38,7 +38,8 @@ if (_nozzle getVariable [QGVAR(jerryCan), false]) exitWith {};
[_pfID] call CBA_fnc_removePerFrameHandler;
};
if (isNull _source || {_unit distance (_source modelToWorld _endPosOffset) > (REFUEL_HOSE_LENGTH - 2)} || {!alive _source}) exitWith {
private _hoseLength = _source getVariable [QGVAR(hoseLength), GVAR(hoseLength)];
if (isNull _source || {_unit distance (_source modelToWorld _endPosOffset) > (_hoseLength - 2)} || {!alive _source}) exitWith {
if !(isNull _nozzle) then {
[_unit, _nozzle] call FUNC(dropNozzle);
REFUEL_UNHOLSTER_WEAPON

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

@ -20,5 +20,6 @@ params ["_logic", "", ["_activated", false, [false]]];
if !(_activated) exitWith {};
[_logic, QGVAR(rate), "rate"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(hoseLength), "hoseLength"] call EFUNC(common,readSettingFromModule);
diag_log text format ["[ACE]: Refuel Module Initialized with flow rate: %1", GVAR(rate)];
INFO_2("Refuel Module Initialized with flow rate: %1 - hoseLength: %2",GVAR(rate), GVAR(hoseLength))

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

@ -44,7 +44,8 @@ if (_maxFuel == 0) then {
_sink setVariable [QGVAR(nozzle), objNull, true];
[_pfID] call CBA_fnc_removePerFrameHandler;
};
private _tooFar = ((_sink modelToWorld _connectToPoint) distance (_source modelToWorld _connectFromPoint)) > (REFUEL_HOSE_LENGTH - 2);
private _hoseLength = _source getVariable [QGVAR(hoseLength), GVAR(hoseLength)];
private _tooFar = ((_sink modelToWorld _connectToPoint) distance (_source modelToWorld _connectFromPoint)) > (_hoseLength - 2);
if (_tooFar && {!(_nozzle getVariable [QGVAR(jerryCan), false])}) exitWith {
[LSTRING(Hint_TooFar), 2, _unit] call EFUNC(common,displayTextStructured);

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

@ -67,7 +67,8 @@ if (isNull _nozzle) then { // func is called on fuel truck
_newNozzle setVariable [QGVAR(helper), _helper, true];
_ropeTarget = _helper;
};
private _rope = ropeCreate [_ropeTarget, _endPosOffset, _newNozzle, [0, -0.20, 0.12], REFUEL_HOSE_LENGTH];
private _hoseLength = _target getVariable [QGVAR(hoseLength), GVAR(hoseLength)];
private _rope = ropeCreate [_ropeTarget, _endPosOffset, _newNozzle, [0, -0.20, 0.12], _hoseLength];
_newNozzle setVariable [QGVAR(rope), _rope, true];
_newNozzle setVariable [QGVAR(attachPos), _endPosOffset, true];
_newNozzle setVariable [QGVAR(source), _target, true];

1
addons/refuel/script_component.hpp
View File

@ -18,7 +18,6 @@
#define REFUEL_INFINITE_FUEL -10
#define REFUEL_ACTION_DISTANCE 7
#define REFUEL_HOSE_LENGTH 12
#define REFUEL_PROGRESS_DURATION 2
#define REFUEL_HOLSTER_WEAPON \

5
addons/refuel/stringtable.xml
View File

@ -404,5 +404,10 @@
<Japanese>%1 リッターがある</Japanese>
<Korean>%1 리터가 재급유되었습니다.</Korean>
</Key>
<Key ID="STR_ACE_Refuel_RefuelSettings_hoseLength_DisplayName">
<English>Refuel hose length</English>
<German>Betankung Schlauchlänge</German>
<Spanish>Reabastecer longitud de manguera</Spanish>
</Key>
</Package>
</Project>

6
docs/wiki/feature/refuel.md
View File

@ -65,6 +65,12 @@ Please check the framework description for more details.
### Something broke, I can't use the fuel truck / nozzle any longer. What to do?
You can reset the fuel truck and its nozzle by calling `ace_refuel_fnc_reset` with its first parameter being the fuel truck object.
### How do I increase the length of the hose?
There is a global setting that will effect all vehicles and static pumps. To only effect a specific vehicle put the following in it's init box:
```cpp
this setVariable ["ace_refuel_hoseLength", 30];
```
## 4. Dependencies
{% include dependencies_list.md component="refuel" %}