fix: freight missions not failing on mission store (#472)

fixes #471
Scarso327 · Dec 17, 2024 · fe52321 · fe52321
1 parent bc13cea
commit fe52321
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/Client Side/Framework/CfgFunctions.hpp b/Client Side/Framework/CfgFunctions.hpp
@@ -807,6 +807,7 @@ class CfgFunctions {
 			file = "Functions\Freight";
 			class claimFreight {};
 			class finishFreight {};
+			class onEachFrameFreight {};
 		};
 
 		class Shipwreck {

diff --git a/Client Side/Framework/Functions/Freight/fn_claimFreight.sqf b/Client Side/Framework/Functions/Freight/fn_claimFreight.sqf
@@ -33,9 +33,10 @@ if (_near isEqualTo []) exitWith {
 [(findDisplay getNumber(configFile >> "RscDisplayMission" >> "idd")), (_near apply { 
 	([typeOf _x] call ULP_fnc_vehicleCfg) params [  "", "", "_picture", "_name" ]; 
 	[_picture, _name, _x call BIS_fnc_netId, 0];
-}), ["Fill", "Cancel"], [_trader], {
+}), ["Fill", "Cancel"], [_trader, _mission], {
 	_this params [
 		["_trader", objNull, [objNull]],
+		["_mission", "Kavala_Freight", [""]],
 		["_display", displayNull, [displayNull]]
 	];
 

diff --git a/Client Side/Framework/Functions/Freight/fn_onEachFrameFreight.sqf b/Client Side/Framework/Functions/Freight/fn_onEachFrameFreight.sqf
@@ -0,0 +1,29 @@
+/*
+** Author: Jack "Scarso" Farhall
+** Description: 
+*/
+#include "..\..\script_macros.hpp"
+scopeName "fn_onEachFrameFreight";
+
+_this params [ "_location", "_pos" ];
+
+private _vehicle = (missionNamespace getVariable ["ULP_FreightVehicle", [objNull, 0]]) param [0, objNull];
+
+if (isNull _vehicle || { !(alive _vehicle) }) exitWith {
+	private _freightMission = ULP_Missions getOrDefault ["CorporateFreight", []];
+
+	if !(_freightMission isEqualTo []) then {
+		_freightMission params [
+			"_task", "_reward", "_eachFrame"
+		];
+
+		_task setTaskState "Failed";
+		player removeSimpleTask _task;
+
+		ULP_Missions deleteAt "CorporateFreight";
+
+		["Your vehicle was lost and your freight mission has failed."] call ULP_fnc_hint;
+	};
+
+	[_thisEventHandler] call ULP_fnc_removeEachFrame;
+};
diff --git a/Client Side/Framework/Functions/Missions/CfgMissions.hpp b/Client Side/Framework/Functions/Missions/CfgMissions.hpp
@@ -362,7 +362,7 @@ class CfgMissions {
 		description = "You need to deliver the given corporate freight to %1";
 		factions[] = { "Civilian" };
 		condition = "[""Freight""] call ULP_fnc_hasGroupPerk";
-		eachFrame = "";
+		eachFrame = "_this call ULP_fnc_onEachFrameFreight";
 		onClaimed = "";
 		onFinished = "_this call ULP_fnc_finishFreight";
 		class Locations {

diff --git a/Client Side/Framework/Functions/Selects/fn_selectObject.sqf b/Client Side/Framework/Functions/Selects/fn_selectObject.sqf
@@ -3,7 +3,7 @@
 ** Description: 
 */
 #include "..\..\script_macros.hpp"
-scopeName "fn_selectVehicles";
+scopeName "fn_selectObject";
 
 _this params [
 	["_parent", displayNull, [displayNull]],