Merge branch 'main' into wings_of_liberty

This commit is contained in:
Valmo Trindade
2025-10-12 22:10:13 -03:00
4 changed files with 7 additions and 3 deletions

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;

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": {

View File

@@ -1,5 +1,6 @@
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";
@@ -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

View File

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