Skip to content

Commit

Permalink
[SUP_COMBATSUPPORT] Updated SPE GUER utilisation of SPE_leFH18
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarrellJMartin
DarrellJMartin committed Aug 10, 2023
1 parent 3163b97 commit 80d4ef5
Show file tree
Hide file tree
Showing 9 changed files with 126 additions and 135 deletions.
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/misc/fn_getSitrep.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,21 @@ switch (toUpper _task) do

_artyUnitLb = _display displayCtrl 655594;

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

if ((lbCurSel _artyUnitLb) < 0) exitwith {};

Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyBaseButton.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,21 @@ private ["_display", "_artyUnitLb", "_artyArray", "_battery", "_callsign", "_cal
_display = findDisplay 655555;
_artyUnitLb = _display displayCtrl 655594;

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

_battery = _artyArray select (lbCurSel _artyUnitLb) select 0; if (!isNil { NEO_radioLogic getVariable "NEO_radioTalkWithArty" }) then { _battery = ((NEO_radioLogic getVariable "NEO_radioTalkWithArty") getVariable "NEO_radioArtyModule") select 0 };
_callsign = _artyArray select (lbCurSel _artyUnitLb) select 2; if (!isNil { NEO_radioLogic getVariable "NEO_radioTalkWithArty" }) then { _callsign = ((NEO_radioLogic getVariable "NEO_radioTalkWithArty") getVariable "NEO_radioArtyModule") select 1 };
Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyConfirmButton.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,21 @@ private
];
_display = findDisplay 655555;

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

_audio = NEO_radioLogic getVariable format ["combatsupport_audio", true];
_artyConfirmButton = _display displayCtrl 655597;
Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyConfirmButtonEnable.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ private
];
_display = findDisplay 655555;

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

_artyConfirmButton = _display displayCtrl 655597;
_artyUnitLb = _display displayCtrl 655594;
Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyMoveButtons.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ _artyMoveButton = _display displayCtrl 655606;
_artyDontMoveButton = _display displayCtrl 655607;
_artyUnitLb = _display displayCtrl 655594;

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

_battery = _artyArray select (lbCurSel _artyUnitLb) select 0; if (!isNil { NEO_radioLogic getVariable "NEO_radioTalkWithArty" }) then { _battery = ((NEO_radioLogic getVariable "NEO_radioTalkWithArty") getVariable "NEO_radioArtyModule") select 0 };

Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyOrdLbSelChanged.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ private
"_battery", "_ord", "_count", "_countArray"
];

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

_display = findDisplay 655555;
_artyOrdnanceTypeLb = _this select 0;
Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyUnitLbSelChanged.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,21 @@ private
"_supportMarker", "_artyMarkers", "_battery", "_status", "_class", "_ord"
];

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

_artyUnitLb = _display displayCtrl 655594;
_artyUnitText = _display displayCtrl 655595;
Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/fn_radioLbSelChanged.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,22 +173,21 @@ switch (toUpper (_lb lbText _index)) do
{


private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};


if ((count _artyArray > 0) && (isNil { NEO_radioLogic getVariable "NEO_radioTalkWithPilot" })) then
Expand Down
29 changes: 14 additions & 15 deletions addons/sup_combatsupport/scripts/NEO_radio/functions/ui/fn_radioOnLoad.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,21 @@ _available = [];
_transportArray = NEO_radioLogic getVariable format ["NEO_radioTrasportArray_%1", playerSide];
_casArray = NEO_radioLogic getVariable format ["NEO_radioCasArray_%1", playerSide];

private ["_artyArray","_count"];
_newArtyArray = [];
_has_SPE_leFH18 = false;
{
if(_x select 1 == "SPE_leFH18") then {
_has_SPE_leFH18 = true;
}
} forEach SUP_ARTYARRAYS;

_artyArray = [];
_count = 0;
{
_thisPlayerSide = playerSide;
if (_x find "SPE_leFH18" != -1) then {
if (playerSide != WEST) then {
_thisPlayerSide = WEST;
};
};
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
_newArtyArray append ([_artyArray select _count]);
_count = _count +1;
} forEach SUP_ARTYARRAYS;
_artyArray = _newArtyArray;
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);

if (_has_SPE_leFH18) then {
if (playerSide != WEST) then {
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
};
};

//Available Supports
if (count _transportArray > 0) then { _available pushback (["TRANSPORT", "\a3\Ui_f\data\GUI\Cfg\CommunicationMenu\transport_ca.paa"]) };
Expand Down

0 comments on commit 80d4ef5

Please sign in to comment.