Merge branch 'main' into wings_of_liberty

This commit is contained in:
Valmo Trindade
2025-11-15 06:48:29 -03:00
3 changed files with 38 additions and 32 deletions

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 = [_drone] call armatak_fnc_extract_unit_callsign; private _atak_callsign = [_drone] call armatak_fnc_extract_marker_callsign;
switch (side _drone) do { switch (side _drone) do {
case "WEST": { case "WEST": {
@@ -25,4 +25,10 @@ switch (side _drone) do {
}; };
}; };
_pre_defined_role = _drone getVariable "_atak_group_role";
if (!isNil "_pre_defined_role") then {
_callsign = _pre_defined_role;
};
_cot = [_drone, _atak_role, _atak_callsign] call armatak_fnc_send_marker_cot; _cot = [_drone, _atak_role, _atak_callsign] call armatak_fnc_send_marker_cot;

View File

@@ -49,15 +49,12 @@ if (isServer) exitWith {
_atak_type = [_x] call armatak_fnc_extract_role; _atak_type = [_x] call armatak_fnc_extract_role;
_callsign = [_x] call armatak_fnc_extract_marker_callsign; _callsign = [_x] call armatak_fnc_extract_marker_callsign;
[_x, _atak_type, _callsign] call armatak_fnc_send_marker_cot; [_x, _atak_type, _callsign] call armatak_fnc_send_drone_cot;
[_x] call armatak_fnc_send_digital_pointer_cot;
}; };
}; };
if (unitIsUAV _x) then {
[_x] call armatak_fnc_send_drone_cot;
[_x] call armatak_fnc_send_digital_pointer_cot;
};
} forEach GVAR(syncedUnits); } forEach GVAR(syncedUnits);
}, 2, []] call CBA_fnc_addPerFrameHandler; }, 0.5, []] call CBA_fnc_addPerFrameHandler;
}; };
true; true;

View File

@@ -27,34 +27,37 @@ _syncUnits = [];
missionNamespace setVariable ["armatak_server_syncedUnits", _syncUnits]; missionNamespace setVariable ["armatak_server_syncedUnits", _syncUnits];
GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits";
[{
GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits"; GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits";
{ [{
_objectType = _x call BIS_fnc_objectType; GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits";
switch (true) do {
case ((_objectType select 0) == "Soldier"): {
_callsign = [_x] call armatak_fnc_extract_unit_callsign;
_group_name = [group _x] call armatak_fnc_extract_group_color;
_group_role = [_x] call armatak_fnc_extract_group_role;
[_x, _callsign, _group_name, _group_role] call armatak_fnc_send_eud_cot; {
[_x] call armatak_fnc_send_digital_pointer_cot; _objectType = _x call BIS_fnc_objectType;
}; switch (true) do {
case ((_objectType select 0) == "Vehicle"): { case ((_objectType select 0) == "Soldier"): {
_atak_type = [_x] call armatak_fnc_extract_role; _callsign = [_x] call armatak_fnc_extract_unit_callsign;
_callsign = [_x] call armatak_fnc_extract_marker_callsign; _group_name = [group _x] call armatak_fnc_extract_group_color;
_group_role = [_x] call armatak_fnc_extract_group_role;
[_x, _atak_type, _callsign] call armatak_fnc_send_marker_cot; [_x, _callsign, _group_name, _group_role] call armatak_fnc_send_eud_cot;
[_x] call armatak_fnc_send_digital_pointer_cot;
};
case ((_objectType select 0) == "Vehicle"): {
_atak_type = [_x] call armatak_fnc_extract_role;
_callsign = [_x] call armatak_fnc_extract_marker_callsign;
[_x, _atak_type, _callsign] call armatak_fnc_send_marker_cot;
};
case ((_objectType select 0) == "VehicleAutonomous"): {
_atak_type = [_x] call armatak_fnc_extract_role;
_callsign = [_x] call armatak_fnc_extract_marker_callsign;
[_x, _atak_type, _callsign] call armatak_fnc_send_drone_cot;
[_x] call armatak_fnc_send_digital_pointer_cot;
};
}; };
}; } forEach GVAR(syncedUnits);
if (unitIsUAV _x) then { }, 2, []] call CBA_fnc_addPerFrameHandler;
[_x] call armatak_fnc_send_drone_cot;
[_x] call armatak_fnc_send_digital_pointer_cot;
};
} forEach GVAR(syncedUnits);
}, 2, []] call CBA_fnc_addPerFrameHandler;
deleteVehicle _logic; deleteVehicle _logic;
closeDialog 1; closeDialog 1;