From 4f6b0e684efb222af9d248c588e8dc3e5173f8be Mon Sep 17 00:00:00 2001
From: Valmo Trindade <val_mo_jr@hotmail.com>
Date: Mon, 19 Aug 2024 01:37:07 -0300
Subject: [PATCH] added extract_uuid sqf function and refactored other extract
 info functions to handle the

---
 addons/main/CfgFunctions.hpp                     |  3 +++
 .../functions/extract_data/fn_extract_info.sqf   |  6 +++---
 .../functions/extract_data/fn_extract_role.sqf   | 16 +---------------
 .../functions/extract_data/fn_extract_uuid.sqf   | 10 ++++++++++
 4 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 addons/main/functions/extract_data/fn_extract_uuid.sqf

diff --git a/addons/main/CfgFunctions.hpp b/addons/main/CfgFunctions.hpp
index acd2e36..cb38a97 100644
--- a/addons/main/CfgFunctions.hpp
+++ b/addons/main/CfgFunctions.hpp
@@ -17,6 +17,9 @@ class CfgFunctions {
 			class extract_info {
 				file = "\armatak\armatak\armatak_main\functions\extract_data\fn_extract_info.sqf";
 			};
+			class extract_uuid {
+				file = "\armatak\armatak\armatak_main\functions\extract_data\fn_extract_uuid.sqf";
+			};
 
 			class convert_location {
 				file = "\armatak\armatak\armatak_main\functions\map\fn_convert_location.sqf";
diff --git a/addons/main/functions/extract_data/fn_extract_info.sqf b/addons/main/functions/extract_data/fn_extract_info.sqf
index 65e7159..63cc058 100644
--- a/addons/main/functions/extract_data/fn_extract_info.sqf
+++ b/addons/main/functions/extract_data/fn_extract_info.sqf
@@ -5,16 +5,16 @@
 params["_unit"];
 private _location = [_unit] call armatak_fnc_convert_location;
 
-private _atak_uid = _unit getVariable "_atak_uid";
+private _atak_uid = [_unit] call armatak_fnc_extract_uuid;
 private _atak_latitude = _location select 0;
 private _atak_longitude = _location select 1;
-private _atak_side = [_unit] call armatak_fnc_extract_side;
+private _atak_speed = speed _unit;
 private _atak_bearing = parseNumber ((getDir _unit) toFixed 0);
 private _atak_role = [_unit] call armatak_fnc_extract_role;
 private _atak_callsign = [_unit] call armatak_fnc_extract_callsign;
 private _atak_server_instance = missionNamespace getVariable "_atak_server_instance";
 private _atak_server_instance_token = missionNamespace getVariable "_atak_server_instance_token";
 
-_unit_info = [_atak_uid, _atak_latitude, _atak_longitude, _atak_side, _atak_bearing, _atak_role, _atak_callsign, _atak_server_instance, _atak_server_instance_token];
+_unit_info = [_atak_uid, _atak_latitude, _atak_longitude, _atak_speed, _atak_bearing, _atak_role, _atak_callsign, _atak_server_instance, _atak_server_instance_token];
 
 _unit_info
\ No newline at end of file
diff --git a/addons/main/functions/extract_data/fn_extract_role.sqf b/addons/main/functions/extract_data/fn_extract_role.sqf
index b99ef87..0f3e8b8 100644
--- a/addons/main/functions/extract_data/fn_extract_role.sqf
+++ b/addons/main/functions/extract_data/fn_extract_role.sqf
@@ -1,18 +1,4 @@
 params["_unit"];
-private _role = "Gnd Combat Infantry Rifleman";
-
-if (vehicle _unit != _unit) then {
-	if (vehicle _unit isKindOf "StaticWeapon") then {
-		_role = "Gnd Combat Infantry Mortar";
-	};
-};
-
-if ([_unit] call ace_common_fnc_isMedic) then {
-	_role = "Gnd Combat Infantry Medic";
-};
-
-if ([_unit] call ace_common_fnc_isEngineer || [_unit] call ace_common_fnc_isEOD) then {
-	_role = "Gnd Combat Infantry Engineer";
-};
+private _role = "a-f-G";
 
 _role
\ No newline at end of file
diff --git a/addons/main/functions/extract_data/fn_extract_uuid.sqf b/addons/main/functions/extract_data/fn_extract_uuid.sqf
new file mode 100644
index 0000000..09b016e
--- /dev/null
+++ b/addons/main/functions/extract_data/fn_extract_uuid.sqf
@@ -0,0 +1,10 @@
+params["_unit"];
+
+_uuid = _unit getVariable "_atak_uid";
+
+if (_uuid == "") then {
+	_uuid = "armatak" callExtension "get_uid";
+	_unit setVariable ["_atak_uid", _uuid];
+};
+
+_uuid
\ No newline at end of file