From 91a5ccf06ab3d01e3bc244956d35033ed3854336 Mon Sep 17 00:00:00 2001
From: A Man <AirwavesMan@users.noreply.github.com>
Date: Fri, 1 Nov 2019 16:07:39 +0100
Subject: [PATCH] Add proper medic anim

The medic animation can be interrupted now. Also clean up the script from redundant code.
---
 SQF/dayz_code/actions/refuel.sqf | 71 ++++++++++----------------------
 1 file changed, 22 insertions(+), 49 deletions(-)

diff --git a/SQF/dayz_code/actions/refuel.sqf b/SQF/dayz_code/actions/refuel.sqf
index 85fa6b513..8c037cafd 100644
--- a/SQF/dayz_code/actions/refuel.sqf
+++ b/SQF/dayz_code/actions/refuel.sqf
@@ -1,8 +1,8 @@
 if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
 dayz_actionInProgress = true;
 
-private ["_vehicle","_canSize","_configVeh","_capacity","_nameType","_curFuel","_newFuel","_dis","_sfx","_fueling","_array","_cantype",
-"_emptycan","_started","_finished","_animState","_isRefuel","_type"];
+private ["_vehicle","_canSize","_configVeh","_capacity","_nameType","_curFuel","_newFuel","_dis","_sfx","_array","_cantype",
+"_emptycan","_finished","_type"];
 
 _array = _this select 3;
 _cantype = _array select 0;
@@ -15,68 +15,41 @@ _capacity = getNumber(_configVeh >> "fuelCapacity");
 _nameType = getText(_configVeh >> "displayName");
 _curFuel = ((fuel _vehicle) * _capacity);
 _newFuel = (_curFuel + _canSize);
-_fueling = player getVariable ["fueling",false];
 
-if (fuel _vehicle == 1 || !(_canType in magazines player)) exitWith {dayz_actionInProgress = false;};
+if (fuel _vehicle == 1 || {!(_canType in magazines player)}) exitWith {dayz_actionInProgress = false;};
 
 player removeAction s_player_fillfuel + _capacity;
-player setVariable ["fueling", true];
 
-if (!_fueling) then {
-	[player] allowGetIn false;
+_dis=5;
+_sfx = "refuel";
+[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
+[player,_dis,true,(getPosATL player)] call player_alertZombies;
 
+_finished = ["Medic",1] call fn_loopAction;
+
+if (_finished) then {
 	if (_newFuel > _capacity) then {_newFuel = _capacity};
 	_newFuel = (_newFuel / _capacity);
 
 	player removeMagazine _cantype;
 	player addMagazine _emptycan;
-	player playActionNow "Medic";
-
-	_dis=5;
-	_sfx = "refuel";
-	[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
-	[player,_dis,true,(getPosATL player)] call player_alertZombies;
-
 	// Added Nutrition-Factor for work
 	["Working",0,[0,1,3,0]] call dayz_NutritionSystem;
-
-	r_doLoop = true;
-	_started = false;
-	_finished = false;
-	while {r_doLoop} do {
-		_animState = animationState player;
-		_isRefuel = ["medic",_animState] call fnc_inString;
-		if (_isRefuel or dayz_isSwimming) then {
-			_started = true;
-		};
-		if (_started and !_isRefuel) then {
-			r_doLoop = false;
-			_finished = true;
-		};
-		uiSleep 0.1;
+	if ((_type == "Generator_DZ") && {!(_vehicle getVariable ["GeneratorFilled", false])}) then {
+			_vehicle setVariable ["GeneratorFilled", true, true];
 	};
-	r_doLoop = false;
-
-	if (_finished) then {
-		if ((_type == "Generator_DZ") && {!(_vehicle getVariable ["GeneratorFilled", false])}) then {
-				_vehicle setVariable ["GeneratorFilled", true, true];
-		};
-		if (local _vehicle) then {
-			[_vehicle,_newFuel] call local_setFuel;
-		} else {
-			PVDZ_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]];
-			publicVariableServer "PVDZ_send";
-		};
-
-		format[localize "str_player_05",_nameType,_canSize] call dayz_rollingMessages;
-		uiSleep 1;
-		call fnc_usec_medic_removeActions;
+	if (local _vehicle) then {
+		[_vehicle,_newFuel] call local_setFuel;
+	} else {
+		PVDZ_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]];
+		publicVariableServer "PVDZ_send";
 	};
-	[player] allowGetIn true;
+
+	format[localize "str_player_05",_nameType,_canSize] call dayz_rollingMessages;
+	uiSleep 1;
+	call fnc_usec_medic_removeActions;
 } else {
-	localize "str_refuel_fail" call dayz_rollingMessages;
+	localize "str_epoch_player_26" call dayz_rollingMessages;
 };
 
-r_action = false;
-player setVariable ["fueling", false];
 dayz_actionInProgress = false;