Skip to content

Commit 80d4ef5

Browse files
DarrellJMartinDarrellJMartin
committed
[SUP_COMBATSUPPORT] Updated SPE GUER utilisation of SPE_leFH18
1 parent 3163b97 commit 80d4ef5

File tree

9 files changed

+126
-135
lines changed

9 files changed

+126
-135
lines changed

‎addons/sup_combatsupport/scripts/NEO_radio/functions/misc/fn_getSitrep.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,21 @@ switch (toUpper _task) do
4545

4646
_artyUnitLb = _display displayCtrl 655594;
4747

48-
private ["_artyArray","_count"];
49-
_newArtyArray = [];
48+
_has_SPE_leFH18 = false;
49+
{
50+
if(_x select 1 == "SPE_leFH18") then {
51+
_has_SPE_leFH18 = true;
52+
}
53+
} forEach SUP_ARTYARRAYS;
54+
5055
_artyArray = [];
51-
_count = 0;
52-
{
53-
_thisPlayerSide = playerSide;
54-
if (_x find "SPE_leFH18" != -1) then {
55-
if (playerSide != WEST) then {
56-
_thisPlayerSide = WEST;
57-
};
58-
};
59-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
60-
_newArtyArray append ([_artyArray select _count]);
61-
_count = _count +1;
62-
} forEach SUP_ARTYARRAYS;
63-
_artyArray = _newArtyArray;
56+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
57+
58+
if (_has_SPE_leFH18) then {
59+
if (playerSide != WEST) then {
60+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
61+
};
62+
};
6463

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

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyBaseButton.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@ private ["_display", "_artyUnitLb", "_artyArray", "_battery", "_callsign", "_cal
22
_display = findDisplay 655555;
33
_artyUnitLb = _display displayCtrl 655594;
44

5-
private ["_artyArray","_count"];
6-
_newArtyArray = [];
5+
_has_SPE_leFH18 = false;
6+
{
7+
if(_x select 1 == "SPE_leFH18") then {
8+
_has_SPE_leFH18 = true;
9+
}
10+
} forEach SUP_ARTYARRAYS;
11+
712
_artyArray = [];
8-
_count = 0;
9-
{
10-
_thisPlayerSide = playerSide;
11-
if (_x find "SPE_leFH18" != -1) then {
12-
if (playerSide != WEST) then {
13-
_thisPlayerSide = WEST;
14-
};
15-
};
16-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
17-
_newArtyArray append ([_artyArray select _count]);
18-
_count = _count +1;
19-
} forEach SUP_ARTYARRAYS;
20-
_artyArray = _newArtyArray;
13+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
14+
15+
if (_has_SPE_leFH18) then {
16+
if (playerSide != WEST) then {
17+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
18+
};
19+
};
2120

2221
_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 };
2322
_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 };

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyConfirmButton.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,21 @@ private
66
];
77
_display = findDisplay 655555;
88

9-
private ["_artyArray","_count"];
10-
_newArtyArray = [];
9+
_has_SPE_leFH18 = false;
10+
{
11+
if(_x select 1 == "SPE_leFH18") then {
12+
_has_SPE_leFH18 = true;
13+
}
14+
} forEach SUP_ARTYARRAYS;
15+
1116
_artyArray = [];
12-
_count = 0;
13-
{
14-
_thisPlayerSide = playerSide;
15-
if (_x find "SPE_leFH18" != -1) then {
16-
if (playerSide != WEST) then {
17-
_thisPlayerSide = WEST;
18-
};
19-
};
20-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
21-
_newArtyArray append ([_artyArray select _count]);
22-
_count = _count +1;
23-
} forEach SUP_ARTYARRAYS;
24-
_artyArray = _newArtyArray;
17+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
18+
19+
if (_has_SPE_leFH18) then {
20+
if (playerSide != WEST) then {
21+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
22+
};
23+
};
2524

2625
_audio = NEO_radioLogic getVariable format ["combatsupport_audio", true];
2726
_artyConfirmButton = _display displayCtrl 655597;

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyConfirmButtonEnable.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ private
55
];
66
_display = findDisplay 655555;
77

8-
private ["_artyArray","_count"];
9-
_newArtyArray = [];
8+
_has_SPE_leFH18 = false;
9+
{
10+
if(_x select 1 == "SPE_leFH18") then {
11+
_has_SPE_leFH18 = true;
12+
}
13+
} forEach SUP_ARTYARRAYS;
14+
1015
_artyArray = [];
11-
_count = 0;
12-
{
13-
_thisPlayerSide = playerSide;
14-
if (_x find "SPE_leFH18" != -1) then {
15-
if (playerSide != WEST) then {
16-
_thisPlayerSide = WEST;
17-
};
18-
};
19-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
20-
_newArtyArray append ([_artyArray select _count]);
21-
_count = _count +1;
22-
} forEach SUP_ARTYARRAYS;
23-
_artyArray = _newArtyArray;
16+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
17+
18+
if (_has_SPE_leFH18) then {
19+
if (playerSide != WEST) then {
20+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
21+
};
22+
};
2423

2524
_artyConfirmButton = _display displayCtrl 655597;
2625
_artyUnitLb = _display displayCtrl 655594;

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyMoveButtons.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ _artyMoveButton = _display displayCtrl 655606;
55
_artyDontMoveButton = _display displayCtrl 655607;
66
_artyUnitLb = _display displayCtrl 655594;
77

8-
private ["_artyArray","_count"];
9-
_newArtyArray = [];
8+
_has_SPE_leFH18 = false;
9+
{
10+
if(_x select 1 == "SPE_leFH18") then {
11+
_has_SPE_leFH18 = true;
12+
}
13+
} forEach SUP_ARTYARRAYS;
14+
1015
_artyArray = [];
11-
_count = 0;
12-
{
13-
_thisPlayerSide = playerSide;
14-
if (_x find "SPE_leFH18" != -1) then {
15-
if (playerSide != WEST) then {
16-
_thisPlayerSide = WEST;
17-
};
18-
};
19-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
20-
_newArtyArray append ([_artyArray select _count]);
21-
_count = _count +1;
22-
} forEach SUP_ARTYARRAYS;
23-
_artyArray = _newArtyArray;
16+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
17+
18+
if (_has_SPE_leFH18) then {
19+
if (playerSide != WEST) then {
20+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
21+
};
22+
};
2423

2524
_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 };
2625

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyOrdLbSelChanged.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ private
55
"_battery", "_ord", "_count", "_countArray"
66
];
77

8-
private ["_artyArray","_count"];
9-
_newArtyArray = [];
8+
_has_SPE_leFH18 = false;
9+
{
10+
if(_x select 1 == "SPE_leFH18") then {
11+
_has_SPE_leFH18 = true;
12+
}
13+
} forEach SUP_ARTYARRAYS;
14+
1015
_artyArray = [];
11-
_count = 0;
12-
{
13-
_thisPlayerSide = playerSide;
14-
if (_x find "SPE_leFH18" != -1) then {
15-
if (playerSide != WEST) then {
16-
_thisPlayerSide = WEST;
17-
};
18-
};
19-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
20-
_newArtyArray append ([_artyArray select _count]);
21-
_count = _count +1;
22-
} forEach SUP_ARTYARRAYS;
23-
_artyArray = _newArtyArray;
16+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
17+
18+
if (_has_SPE_leFH18) then {
19+
if (playerSide != WEST) then {
20+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
21+
};
22+
};
2423

2524
_display = findDisplay 655555;
2625
_artyOrdnanceTypeLb = _this select 0;

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/arty/fn_artyUnitLbSelChanged.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,21 @@ private
1010
"_supportMarker", "_artyMarkers", "_battery", "_status", "_class", "_ord"
1111
];
1212

13-
private ["_artyArray","_count"];
14-
_newArtyArray = [];
13+
_has_SPE_leFH18 = false;
14+
{
15+
if(_x select 1 == "SPE_leFH18") then {
16+
_has_SPE_leFH18 = true;
17+
}
18+
} forEach SUP_ARTYARRAYS;
19+
1520
_artyArray = [];
16-
_count = 0;
17-
{
18-
_thisPlayerSide = playerSide;
19-
if (_x find "SPE_leFH18" != -1) then {
20-
if (playerSide != WEST) then {
21-
_thisPlayerSide = WEST;
22-
};
23-
};
24-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
25-
_newArtyArray append ([_artyArray select _count]);
26-
_count = _count +1;
27-
} forEach SUP_ARTYARRAYS;
28-
_artyArray = _newArtyArray;
21+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
22+
23+
if (_has_SPE_leFH18) then {
24+
if (playerSide != WEST) then {
25+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
26+
};
27+
};
2928

3029
_artyUnitLb = _display displayCtrl 655594;
3130
_artyUnitText = _display displayCtrl 655595;

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/fn_radioLbSelChanged.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,22 +173,21 @@ switch (toUpper (_lb lbText _index)) do
173173
{
174174

175175

176-
private ["_artyArray","_count"];
177-
_newArtyArray = [];
176+
_has_SPE_leFH18 = false;
177+
{
178+
if(_x select 1 == "SPE_leFH18") then {
179+
_has_SPE_leFH18 = true;
180+
}
181+
} forEach SUP_ARTYARRAYS;
182+
178183
_artyArray = [];
179-
_count = 0;
180-
{
181-
_thisPlayerSide = playerSide;
182-
if (_x find "SPE_leFH18" != -1) then {
183-
if (playerSide != WEST) then {
184-
_thisPlayerSide = WEST;
185-
};
186-
};
187-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
188-
_newArtyArray append ([_artyArray select _count]);
189-
_count = _count +1;
190-
} forEach SUP_ARTYARRAYS;
191-
_artyArray = _newArtyArray;
184+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
185+
186+
if (_has_SPE_leFH18) then {
187+
if (playerSide != WEST) then {
188+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
189+
};
190+
};
192191

193192

194193
if ((count _artyArray > 0) && (isNil { NEO_radioLogic getVariable "NEO_radioTalkWithPilot" })) then

‎addons/sup_combatsupport/scripts/NEO_radio/functions/ui/fn_radioOnLoad.sqf‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,21 @@ _available = [];
4646
_transportArray = NEO_radioLogic getVariable format ["NEO_radioTrasportArray_%1", playerSide];
4747
_casArray = NEO_radioLogic getVariable format ["NEO_radioCasArray_%1", playerSide];
4848

49-
private ["_artyArray","_count"];
50-
_newArtyArray = [];
49+
_has_SPE_leFH18 = false;
50+
{
51+
if(_x select 1 == "SPE_leFH18") then {
52+
_has_SPE_leFH18 = true;
53+
}
54+
} forEach SUP_ARTYARRAYS;
55+
5156
_artyArray = [];
52-
_count = 0;
53-
{
54-
_thisPlayerSide = playerSide;
55-
if (_x find "SPE_leFH18" != -1) then {
56-
if (playerSide != WEST) then {
57-
_thisPlayerSide = WEST;
58-
};
59-
};
60-
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", _thisPlayerSide]);
61-
_newArtyArray append ([_artyArray select _count]);
62-
_count = _count +1;
63-
} forEach SUP_ARTYARRAYS;
64-
_artyArray = _newArtyArray;
57+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", playerSide]);
58+
59+
if (_has_SPE_leFH18) then {
60+
if (playerSide != WEST) then {
61+
_artyArray append (NEO_radioLogic getVariable format ["NEO_radioArtyArray_%1", WEST]);
62+
};
63+
};
6564

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

0 commit comments

Comments
 (0)