Refueling fuel containers #7039
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -111,7 +111,7 @@ private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL); | |
| _nozzle setVariable [QGVAR(isConnected), true, true]; | ||
| _sink setVariable [QGVAR(nozzle), _nozzle, true]; | ||
|
|
||
| private _source = _nozzle getVariable QGVAR(source); | ||
| private _fuel = [_source] call FUNC(getFuel); | ||
| if (_fuel == REFUEL_INFINITE_FUEL) then { | ||
| _source setVariable [QGVAR(fuelCounter), 0, true]; | ||
|
|
@@ -121,11 +121,30 @@ private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL); | |
|
|
||
| [_unit, _sink, _nozzle, _endPosTestOffset] call FUNC(refuel); | ||
|
|
||
| private _canReceive = getNumber (configFile >> "CfgVehicles" >> typeOf _sink >> QGVAR(canReceive)) == 1; | ||
| private _isContainer = !(isNil {_sink getVariable QGVAR(currentFuelCargo)}) | ||
| || {isNumber (configFile >> "CfgVehicles" >> typeOf _sink >> QGVAR(fuelCargo))}; | ||
|
|
||
| // Decide if cargo or vehicle will be refueled | ||
| switch (true) do { | ||
| case (_canReceive && {!_isContainer || {_sink == _source}}): { | ||
| // is not a refueling vehicle or refueling vehicle tries to refuel itself | ||
| if ([_unit, _nozzle, false] call FUNC(canTurnOn)) then { | ||
| [_unit, _nozzle, false] call FUNC(turnOn); | ||
| } else { | ||
| [localize LSTRING(CouldNotTurnOn)] call EFUNC(common,displayText); | ||
| }; | ||
| }; | ||
| case (!_canReceive && _isContainer): { | ||
| if ([_unit, _nozzle, true] call FUNC(canTurnOn)) then { | ||
| [_unit, _nozzle, true] call FUNC(turnOn); | ||
| } else { | ||
| [localize LSTRING(CouldNotTurnOn)] call EFUNC(common,displayText); | ||
| }; | ||
| }; | ||
| default { | ||
| /* Target is a refueling vehicle, let user manually decide if he wants to refuel cargo or vehicle itself */ | ||
| }; | ||
| }; | ||
| }, | ||
| "", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,10 +1,10 @@ | ||||||
| #include "script_component.hpp" | ||||||
| /* | ||||||
| * Author: GitHawk | ||||||
| * Disconnect a fuel nozzle and make unit pick it up. | ||||||
| * | ||||||
| * Arguments: | ||||||
| * 0: Unit <OBJECT> (optional) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * 1: Nozzle <OBJECT> | ||||||
| * | ||||||
| * Return Value: | ||||||
|
|
@@ -27,4 +27,6 @@ _nozzle setVariable [QGVAR(sink), nil, true]; | |||||
| _nozzle setVariable [QGVAR(isConnected), false, true]; | ||||||
| [objNull, _nozzle, true] call FUNC(dropNozzle); | ||||||
|
|
||||||
| if (!isNull _unit) then { | ||||||
| [_unit, _nozzle] call FUNC(takeNozzle); | ||||||
| }; | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ if (isServer) then { | |
| }; | ||
| _target setVariable [QGVAR(jerryCan), true]; | ||
| _target setVariable [QGVAR(source), _target]; | ||
| _target setVariable [QGVAR(capacity), _fuelAmount]; | ||
|
|
||
| // Main Action | ||
| private _action = [QGVAR(Refuel), | ||
|
|
@@ -64,6 +65,18 @@ _action = [QGVAR(TurnOn), | |
| REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); | ||
| [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); | ||
|
|
||
| // Add turnOn container | ||
| _action = [QGVAR(TurnOn_Container), | ||
| localize LSTRING(TurnOn_Container), | ||
| QPATHTOF(ui\icon_refuel_interact.paa), | ||
| {[_player, _target, true] call FUNC(turnOn)}, | ||
| {[_player, _target, true] call FUNC(canTurnOn)}, | ||
| {}, | ||
| [], | ||
| [0, 0, 0], | ||
| REFUEL_ACTION_DISTANCE] call EFUNC(interact_menu,createAction); | ||
| [_target, 0, ["ACE_MainActions", QGVAR(Refuel)], _action] call EFUNC(interact_menu,addActionToObject); | ||
|
|
||
| // Add turnOff | ||
| _action = [QGVAR(TurnOff), | ||
| localize LSTRING(TurnOff), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,10 +42,16 @@ private _virtualPosASL = (eyePos _unit) vectorAdd (positionCameraToWorld [0,0,0. | |
| if (cameraView == "EXTERNAL") then { | ||
| _virtualPosASL = _virtualPosASL vectorAdd ((positionCameraToWorld [0.3,0,0]) vectorDiff (positionCameraToWorld [0,0,0])); | ||
| }; | ||
|
|
||
| private _canReceive = _cursorObject getVariable [ | ||
| QGVAR(jerryCan), // Jerry cans can always be refueled | ||
| getNumber (configFile >> "CfgVehicles" >> (typeOf _cursorObject) >> QGVAR(canReceive)) == 1 | ||
| ]; | ||
|
|
||
| if ( | ||
| !isNull _cursorObject | ||
| && {_distance < REFUEL_NOZZLE_ACTION_DISTANCE} | ||
| && {_canReceive} | ||
| && {isNull (_cursorObject getVariable [QGVAR(nozzle), objNull])} | ||
| && {!lineIntersects [eyePos _unit, _virtualPosASL, _unit]} | ||
| ) then { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this not also be removed? I don't think anyone could have included this file from a built mod as it has config in it, it had to be copied, so it's safe to remove.