Merge pull request #21 from Roborob1234/Rob's-tinkering

Stratis and Tanoa coordinate update

.hemtt/project.toml

@@ -25,8 +25,7 @@ include = [
   "LICENSE",
   "*.dll",
   "*.so",
-  "*.paa",
+  "*.paa"
-  "simtak.apk"
 ]
 
 [properties]
@@ -71,8 +70,6 @@ parameters = [
   "-filePatching",
 ]
 
-executable = "/home/valmo/.steam/steam/steamapps/common/Proton 8.0/proton run '/home/valmo/.steam/steam/steamapps/common/Arma 3/arma3_x64.exe'"
-
 [binarize]
 exclude = [
   "*.jpg"

addons/client/functions/fnc_convertClientLocation.sqf

@@ -74,6 +74,9 @@ switch (toLower worldName) do {
 	case "kunduz_valley": {
 		_realLocation = _position call armatak_fnc_convert_to_kunduz_valley;
 	};
+	case "tanoa": {
+		_realLocation = _position call armatak_fnc_convert_to_tanoa;
+	};
 	default {
 		_warning = format ["<t color='#FF8021'>ARMATAK</t><br/> %1", "Unsupported Map"];
 		[[_warning, 1.5]] call CBA_fnc_notify;

addons/main/functions/api/fn_send_drone_cot.sqf

@@ -5,7 +5,7 @@
 params["_drone"];
 
 private _atak_role = "a-f-A";
-private _atak_callsign = [_unit] call armatak_fnc_extract_unit_callsign;
+private _atak_callsign = [_drone] call armatak_fnc_extract_unit_callsign;
 
 switch (side _drone) do {
 	case "WEST": {

addons/main/functions/extract_data/fn_extract_group_role.sqf

@@ -1,9 +1,10 @@
 params["_unit"];
 
+_group = group _unit;
 _group_roles = ["Team Member", "Team Lead", "HQ", "Sniper", "Medic", "Forward Observer", "RTO", "K9"];
 _group_role = "Team Member";
 
-if (["SpecialOperative", (configFile >> "CfgVehicles" >> typeOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) then {
+if (["SpecialOperative", (configOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) then {
 	_group_role = _group_roles select 5;
 };
 
@@ -19,7 +20,7 @@ if (((backpack _unit) isKindOf "TFAR_Bag_Base") or (["radio", typeOf _unit, fals
 	_group_role = _group_roles select 6;
 };
 
-if ((["sniper", typeOf _unit, false] call BIS_fnc_inString) or (["marksman", (configFile >> "CfgVehicles" >> typeOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) or (["sharpshooter", typeOf _unit, false] call BIS_fnc_inString)) then {
+if ((["sniper", typeOf _unit, false] call BIS_fnc_inString) or (["marksman", (configOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) or (["sharpshooter", typeOf _unit, false] call BIS_fnc_inString)) then {
 	_group_role = _group_roles select 3;
 };
 
@@ -34,7 +35,7 @@ if (["officer", typeOf _unit, false] call BIS_fnc_inString) then {
 _pre_defined_role = _unit getVariable "_atak_group_role";
 
 if (!isNil "_pre_defined_role") then {
-	_callsign = _pre_defined_callsign;
+	_callsign = _pre_defined_role;
 };
 
 _group_role

addons/main/functions/extract_data/fn_extract_marker_callsign.sqf

@@ -7,15 +7,15 @@ params["_unit"];
 private _callsign = "";
 
 if ((([_unit] call BIS_fnc_objectType) select 0) == "Vehicle") then {
-	_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+	_callsign = getText (configOf _unit >> "displayName");
 
 	if (!isNull driver _unit) then {
-		_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName") + " | " + ([name (driver _unit)] call armatak_fnc_shorten_name);
+		_callsign = getText (configOf _unit >> "displayName") + " | " + ([name (driver _unit)] call armatak_fnc_shorten_name);
 	};
 };
 
 if (unitIsUAV _unit) then {
-	_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+	_callsign = getText (configOf _unit >> "displayName");
 
 	if (isUAVConnected _unit) then {
 		_callsign = (_callsign) + "[ON]";

addons/main/functions/extract_data/fn_extract_unit_callsign.sqf

@@ -12,7 +12,7 @@ if (roleDescription _unit != "") then {
 	_callsign = name _unit;
 
 	if (_callsign == "Error: No unit") then {
-		_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+		_callsign = getText (configOf _unit >> "displayName");
 	};
 };
 

addons/main/functions/fnc_logMessage.sqf

@@ -1,3 +1,3 @@
-params[_type, _message];
+params["_type", "_message"];
 
 "armatak" callExtension ["log", [_type, _message]]

addons/main/functions/map/fn_convert_to_stratis.sqf

@@ -1,19 +1,19 @@
 params ["_longitudeInGame", "_latitudeInGame", "_altitude"];
 
-private _mapWidth = 30720;
+private _mapWidth = 8192;
-private _mapHeight = 30720;
+private _mapHeight = 8192;
 
 //    SW corner (used as origin)
-private _SW_lat = 39.456910;
+private _SW_lat = 39.458019;
-private _SW_lon = 24.940792;
+private _SW_lon = 24.939314;
 
 //    SE corner
-private _SE_lat = 39.459151;
+private _SE_lat = 39.458019;
-private _SE_lon = 25.083440;
+private _SE_lon = 25.081992;
 
 //    NW corner
-private _NW_lat = 39.567714;
+private _NW_lat = 39.458019;
-private _NW_lon = 24.937866;
+private _NW_lon = 24.939314;
 
 private _edgeSE_lat = _SE_lat - _SW_lat;
 private _edgeSE_lon = _SE_lon - _SW_lon;

addons/main/functions/map/fn_convert_to_tanoa.sqf

@@ -1,19 +1,19 @@
 params ["_longitudeInGame", "_latitudeInGame", "_altitude"];
 
-private _mapWidth = 30720;
+private _mapWidth = 15360;
-private _mapHeight = 30720;
+private _mapHeight = 15360;
 
 //    SW corner (used as origin)
-private _SW_lat = -19.086825;
+private _SW_lat = -19.086803;
-private _SW_lon = 176.812772;
+private _SW_lon = 176.812619;
 
 //    SE corner
-private _SE_lat = -19.086825;
+private _SE_lat = -19.086803;
-private _SE_lon = 178.687920;
+private _SE_lon = 178.704583;
 
 //    NW corner
-private _NW_lat = -17.196898;
+private _NW_lat = -17.196900;
-private _NW_lon = 176.812622;
+private _NW_lon = 176.812619;
 
 private _edgeSE_lat = _SE_lat - _SW_lat;
 private _edgeSE_lon = _SE_lon - _SW_lon;