Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Item handling #714

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Item handling #714

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
942c1ef
Improved jerryRefuel.sqf
Edward-Bakker Jun 6, 2020
34abe29
pt.2
Edward-Bakker Jun 6, 2020
6bf6a5e
Dom's OCD
Edward-Bakker Jun 6, 2020
42398ab
Merge branch 'master' into item-handling
Edward-Bakker Jun 6, 2020
4f44983
Merge branch 'master' into item-handling
Edward-Bakker Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 21 additions & 35 deletions Altis_Life.Altis/core/items/fn_jerryRefuel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,28 @@
Description:
Refuels the vehicle if the player has a fuel can.
*/
private ["_vehicle","_displayName","_upp","_ui","_progress","_pgText","_cP","_previousState"];
_vehicle = cursorObject;
private _vehicle = cursorObject;
life_interrupted = false;

if (isNull _vehicle) exitWith {hint localize "STR_ISTR_Jerry_NotLooking"};
if (!(_vehicle isKindOF "LandVehicle") && !(_vehicle isKindOf "Air") && !(_vehicle isKindOf "Ship")) exitWith {};
if (player distance _vehicle > 7.5) exitWith {hint localize "STR_ISTR_Jerry_NotNear"};

if (!([false,"fuelFull",1] call life_fnc_handleInv)) exitWith {};
life_action_inUse = true;

_displayName = FETCH_CONFIG2(getText,"CfgVehicles",(typeOf _vehicle),"displayName");
private _displayName = FETCH_CONFIG2(getText,"CfgVehicles",(typeOf _vehicle),"displayName");

_upp = format [localize "STR_ISTR_Jerry_Process",_displayName];
private _upp = format [localize "STR_ISTR_Jerry_Process",_displayName];

//Setup our progress bar.
disableSerialization;
"progressBar" cutRsc ["life_progress","PLAIN"];
_ui = uiNamespace getVariable "life_progress";
_progress = _ui displayCtrl 38201;
_pgText = _ui displayCtrl 38202;
private _ui = uiNamespace getVariable "life_progress";
private _progress = _ui displayCtrl 38201;
private _pgText = _ui displayCtrl 38202;
_pgText ctrlSetText format ["%2 (1%1)...","%",_upp];
_progress progressSetPosition 0.01;
_cP = 0.01;
private _cP = 0.01;

for "_i" from 0 to 1 step 0 do {
if (animationState player != "AinvPknlMstpSnonWnonDnon_medic_1") then {
Expand All @@ -55,33 +53,21 @@ life_action_inUse = false;
"progressBar" cutText ["","PLAIN"];
player playActionNow "stop";
if (!alive player) exitWith {};
if (life_interrupted) exitWith {life_interrupted = false; titleText[localize "STR_NOTF_ActionCancel","PLAIN"]; [true,"fuelFull",1] call life_fnc_handleInv;};
if (life_interrupted) exitWith {life_interrupted = false; titleText[localize "STR_NOTF_ActionCancel","PLAIN"];};
if !([false,"fuelFull",1] call life_fnc_handleInv) exitWith {};

private _fuelAmount = call {
if (_vehicle isKindOf "LandVehicle") exitWith {0.5};
if (_vehicle isKindOf "Air") exitWith {0.2};
0.35
};
private _newFuel = (fuel _vehicle) + _fuelAmount;

switch (true) do {
case (_vehicle isKindOF "LandVehicle"): {
if (!local _vehicle) then {
[_vehicle,(Fuel _vehicle) + 0.5] remoteExecCall ["life_fnc_setFuel",_vehicle];
} else {
_vehicle setFuel ((Fuel _vehicle) + 0.5);
};
};

case (_vehicle isKindOf "Air"): {
if (!local _vehicle) then {
[_vehicle,(Fuel _vehicle) + 0.2] remoteExecCall ["life_fnc_setFuel",_vehicle];
} else {
_vehicle setFuel ((Fuel _vehicle) + 0.2);
};
};

case (_vehicle isKindOf "Ship"): {
if (!local _vehicle) then {
[_vehicle,(Fuel _vehicle) + 0.35] remoteExecCall ["life_fnc_setFuel",_vehicle];
} else {
_vehicle setFuel ((Fuel _vehicle) + 0.35);
};
};
if (local _vehicle) then {
_vehicle setFuel _newFuel;
} else {
[_vehicle,_newFuel] remoteExecCall ["life_fnc_setFuel",_vehicle];
};

titleText[format [localize "STR_ISTR_Jerry_Success",_displayName],"PLAIN"];
[true,"fuelEmpty",1] call life_fnc_handleInv;
[true,"fuelEmpty",1] call life_fnc_handleInv;