Browse Source

Fix params ordering, and simplify action

m3ales 3 years ago
parent
commit
645214a32a

+ 6 - 8
addons - Copy/RD501_Main/XEH_postinit.sqf

@@ -17,16 +17,14 @@ call macro_fnc_name(nightvision);
 // Drone Recharge
 RD501_DRONE_BATTERY = "RD501_r2_charge_pack_x10_mag";
 private _refuelAction = [
-	"RD501_Drone_Refuel", 
-	"Refuel Drone", 
-	"", 
-	rd501_fnc_refuelUAVDrone, 
-	rd501_fnc_canRefuel,[], 
-	{call ace_interaction_fnc_getVehiclePos}, 
-	4
+	"RD501_Drone_Refuel",
+	"Refuel Drone",
+	"",
+	{ _this call rd501_fnc_refuelUAVDrone },
+	{ _this call rd501_fnc_canRefuel }
 ] call ACE_interact_menu_fnc_createAction;
 
-["RD501_Drone_Clone_Recon_Droid", 0, ["ACE_MainActions"], _refuelAction, true] call ACE_interact_menu_fnc_addActionToClass;
+["RD501_drone_Clone_Recon_Droid", 0, ["ACE_MainActions"], _refuelAction] call ACE_interact_menu_fnc_addActionToClass;
 
 //Force Walk
 RD501_FORCE_WALK_WEAPONS = [macro_quote(macro_new_weapon_nofam(z1000))];

+ 1 - 1
addons - Copy/RD501_Main/functions/infantry_uav/fnc_canRefuel.sqf

@@ -1,2 +1,2 @@
-params ["_player", "_target", "_params"];
+params["_target", "_player", "_params"];
 (RD501_DRONE_BATTERY in (magazines _player)) && {(fuel _target) < 1} && {(speed _target) < 1} && {!(isEngineOn _target)} && {(_target distance _player) <= 4}

+ 4 - 4
addons - Copy/RD501_Main/functions/infantry_uav/fnc_refuelUAVDrone.sqf

@@ -1,18 +1,18 @@
-params["_player", "_target", "_params"];
+params["_target", "_player", "_params"];
 if (!(_this call rd501_fnc_canRefuel)) exitWith {};
 
 private _onFinish = {
-    (_this select 0) params ["_player", "_target"];
+    (_this select 0) params ["_target", "_player"];
     _player removeItem "ACE_UAVBattery";
 	["ace_common_setFuel", [_target, 1], [_target]] call CBA_fnc_targetEvent;
 	[format["Refuelled %1", _target], true, 2, 0] call ace_common_fnc_displayText;
 };
 
 private _onFailure = {
-    (_this select 0) params ["_player", "_target"];
+    (_this select 0) params ["_target", "_player"];
     [_player, "AmovPknlMstpSrasWrflDnon", 1] call ace_common_fnc_doAnimation;
 };
 
 [_player, "AinvPknlMstpSnonWnonDr_medic5", 0] call ace_common_fnc_doAnimation;
 
-[10, [_player, _target], _onFinish, _onFailure, ("Refueling"), {(_this select 0) call rd501_fnc_canRefuel}] call ace_common_fnc_progressBar;
+[10, [_target, _player], _onFinish, _onFailure, ("Refueling"), {(_this select 0) call rd501_fnc_canRefuel}] call ace_common_fnc_progressBar;