mirror of
https://github.com/valmojr/armatak.git
synced 2026-06-13 17:33:30 +00:00
Merge branch 'main' into wings_of_liberty
This commit is contained in:
@@ -10,5 +10,5 @@ if (!isNull _digitalPointer) then {
|
||||
|
||||
_dpCot = [_link_uid, _contact_callsign, _digitalPointerPosition select 1, _digitalPointerPosition select 2, _digitalPointerPosition select 3];
|
||||
|
||||
"armatak" callExtension ["tcp_socket:send_digital_pointer_cot", [_dpCot]];
|
||||
"armatak" callExtension ["tcp_socket:cot:digital_pointer", [_dpCot]];
|
||||
};
|
||||
|
||||
@@ -12,4 +12,4 @@ _callsign = _unit call armatak_fnc_extract_marker_callsign;
|
||||
|
||||
_marker_cot = [_uuid, _type, _unit_position select 1, _unit_position select 2, _unit_position select 3, _callsign, _unit_position select 5, _unit_position select 6];
|
||||
|
||||
"armatak" callExtension ["tcp_socket:send_marker_cot", [_marker_cot]];
|
||||
"armatak" callExtension ["tcp_socket:cot:marker", [_marker_cot]];
|
||||
|
||||
@@ -9,4 +9,4 @@ _position = _unit call armatak_client_fnc_extractClientPosition;
|
||||
_uuid = _unit call armatak_fnc_extract_uuid;
|
||||
|
||||
_eud_cot = [_uuid, _position select 1, _position select 2, _position select 3, _callsign, _group_name, _group_role, _position select 5, _position select 6];
|
||||
"armatak" callExtension ["tcp_socket:send_eud_cot", [_eud_cot]];
|
||||
"armatak" callExtension ["tcp_socket:cot:eud", [_eud_cot]];
|
||||
|
||||
@@ -10,4 +10,4 @@ _uuid = _unit call armatak_fnc_extract_uuid;
|
||||
|
||||
_marker_cot = [_uuid, _type, _unit_position select 1, _unit_position select 2, _unit_position select 3, _callsign, _unit_position select 5, _unit_position select 6];
|
||||
|
||||
"armatak" callExtension ["tcp_socket:send_marker_cot", [_marker_cot]];
|
||||
"armatak" callExtension ["tcp_socket:cot:marker", [_marker_cot]];
|
||||
|
||||
@@ -9,8 +9,10 @@ private _type = "G";
|
||||
private _role = "a-f-G-U-C-I";
|
||||
private _side = side _unit;
|
||||
|
||||
if (isNil {_unit getVariable "armatak_current_side"}) then {
|
||||
_side = _unit getVariable "armatak_current_side";
|
||||
if (isNil {
|
||||
_unit getVariable "armatak_current_side"
|
||||
}) then {
|
||||
_side = _unit getVariable "armatak_current_side";
|
||||
};
|
||||
|
||||
switch (str _side) do {
|
||||
@@ -27,7 +29,7 @@ switch (str _side) do {
|
||||
_affiliation = "u";
|
||||
};
|
||||
default {
|
||||
_affiliation = "f";
|
||||
_affiliation = "u";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -3,15 +3,25 @@ params["_unit"];
|
||||
_target = getSensorTargets (_unit);
|
||||
|
||||
{
|
||||
_unit = _x select 0;
|
||||
_position = _x select 1;
|
||||
_status = _x select 2;
|
||||
_unit = _x select 0;
|
||||
_position = _x select 1;
|
||||
_status = _x select 2;
|
||||
|
||||
if (isNil {_unit getVariable "armatak_current_side"}) then {
|
||||
_unit setVariable ["armatak_current_side", side _unit];
|
||||
};
|
||||
if (isNil {
|
||||
_unit getVariable "armatak_current_side"
|
||||
}) then {
|
||||
_unit setVariable ["armatak_current_side", side _unit];
|
||||
};
|
||||
|
||||
if (_status != "destroyed") then {
|
||||
_unit call armatak_fnc_send_enemy_cot;
|
||||
};
|
||||
if (_status != "destroyed" && !(_unit in armatak_server_syncedUnits)) then {
|
||||
_unit_position = _unit call armatak_client_fnc_extractClientPosition;
|
||||
|
||||
_uuid = _unit call armatak_fnc_extract_uuid;
|
||||
_type = _unit call armatak_fnc_extract_role;
|
||||
_callsign = getText (configOf _unit >> "displayName");
|
||||
|
||||
_marker_cot = [_uuid, _type, _unit_position select 1, _unit_position select 2, _unit_position select 3, _callsign, _unit_position select 5, _unit_position select 6];
|
||||
|
||||
"armatak" callExtension ["tcp_socket:cot:marker", [_marker_cot]];
|
||||
};
|
||||
} forEach _target;
|
||||
|
||||
Reference in New Issue
Block a user