valmojr/armatak
1
0
Fork 0
mirror of https://github.com/valmojr/armatak.git synced 2026-06-13 14:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'valmojr:main' into patch-2

Browse Source
This commit is contained in:
Rob Haddow
2025-10-13 11:30:43 -05:00
committed by GitHub
parent ef787a6a09 1242b1f79f
commit 9ede7237b8
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.hemtt/project.toml
View File

@@ -70,8 +70,6 @@ parameters = [
"-filePatching", "-filePatching",
] ]
executable = "/home/valmo/games/SteamLibrary/steamapps/common/Proton 8.0/proton run '/home/valmo/games/SteamLibrary/steamapps/common/Arma 3/arma3_x64.exe'"
[binarize] [binarize]
exclude = [ exclude = [
"*.jpg" "*.jpg"

3
addons/client/functions/fnc_convertClientLocation.sqf
View File

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

2
addons/main/functions/api/fn_send_drone_cot.sqf
View File

@@ -5,7 +5,7 @@
params["_drone"]; params["_drone"];
private _atak_role = "a-f-A"; 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 { switch (side _drone) do {
case "WEST": { case "WEST": {

7
addons/main/functions/extract_data/fn_extract_group_role.sqf
View File

@@ -1,9 +1,10 @@
params["_unit"]; params["_unit"];
_group = group _unit;
_group_roles = ["Team Member", "Team Lead", "HQ", "Sniper", "Medic", "Forward Observer", "RTO", "K9"]; _group_roles = ["Team Member", "Team Lead", "HQ", "Sniper", "Medic", "Forward Observer", "RTO", "K9"];
_group_role = "Team Member"; _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; _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; _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; _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"; _pre_defined_role = _unit getVariable "_atak_group_role";
if (!isNil "_pre_defined_role") then { if (!isNil "_pre_defined_role") then {
_callsign = _pre_defined_callsign; _callsign = _pre_defined_role;
}; };
_group_role _group_role

6
addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
View File

@@ -7,15 +7,15 @@ params["_unit"];
private _callsign = ""; private _callsign = "";
if ((([_unit] call BIS_fnc_objectType) select 0) == "Vehicle") then { 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 { 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 { if (unitIsUAV _unit) then {
_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName"); _callsign = getText (configOf _unit >> "displayName");
if (isUAVConnected _unit) then { if (isUAVConnected _unit) then {
_callsign = (_callsign) + "[ON]"; _callsign = (_callsign) + "[ON]";

2
addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
View File

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

2
addons/main/functions/fnc_logMessage.sqf
View File

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