From 50326e9a9c62810f65314db58a5982c5ce39cea7 Mon Sep 17 00:00:00 2001 From: jaj22 Date: Wed, 16 Feb 2022 19:49:03 +0000 Subject: [PATCH] Fix AI/HC dismiss, remote control and garrison commands (#2257) --- A3A/addons/core/dialogs.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/A3A/addons/core/dialogs.hpp b/A3A/addons/core/dialogs.hpp index 1e1319af8d..0b0fbedf7f 100644 --- a/A3A/addons/core/dialogs.hpp +++ b/A3A/addons/core/dialogs.hpp @@ -1607,7 +1607,7 @@ class AI_management { w = 0.175015 * safezoneW; h = 0.0560125 * safezoneH; tooltip = $STR_antistasi_dialogs_AI_management_AI_control_tooltip; - action = "closeDialog 0; if ((count groupselectedUnits player > 0) and (count hcSelected player > 0)) exitWith {[""AI Control"", ""You must select from HC or Squad Bars, not both.""] call A3A_fnc_customHint;}; if (count groupselectedUnits player == 1) then {nul = [groupselectedUnits player] spawn A3A_fnc_controlunit""}; if (count hcSelected player == 1) then {nul = [hcSelected player] spawn A3A_fnc_controlHCsquad"";};"; + action = "closeDialog 0; if ((count groupselectedUnits player > 0) and (count hcSelected player > 0)) exitWith {[""AI Control"", ""You must select from HC or Squad Bars, not both.""] call A3A_fnc_customHint;}; if (count groupselectedUnits player == 1) then {nul = [groupselectedUnits player] spawn A3A_fnc_controlunit}; if (count hcSelected player == 1) then {nul = [hcSelected player] spawn A3A_fnc_controlHCsquad;};"; }; class 8slots_R1: A3A_core_BattleMenuRedButton { @@ -1651,7 +1651,7 @@ class AI_management { w = 0.175015 * safezoneW; h = 0.0560125 * safezoneH; tooltip = $STR_antistasi_dialogs_AI_management_garrison_tooltip; - action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_addToGarrison""} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_addToGarrison""}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Garrison"", ""No units or squads selected""] call A3A_fnc_customHint;}"; + action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_addToGarrison} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_addToGarrison}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Garrison"", ""No units or squads selected""] call A3A_fnc_customHint;}"; }; class 8slots_R3: A3A_core_BattleMenuRedButton { @@ -1673,7 +1673,7 @@ class AI_management { w = 0.175015 * safezoneW; h = 0.0560125 * safezoneH; tooltip = $STR_antistasi_dialogs_AI_management_dismiss_units_tooltip; - action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_dismissPlayerGroup""} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_dismissSquad""}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Dismiss Squad"", ""No units or squads selected""] call A3A_fnc_customHint;}"; + action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_dismissPlayerGroup} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_dismissSquad}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Dismiss Squad"", ""No units or squads selected""] call A3A_fnc_customHint;}"; }; class 8slots_R4: A3A_core_BattleMenuRedButton { @@ -1925,7 +1925,7 @@ class dismiss_menu { w = 0.175015 * safezoneW; h = 0.0560125 * safezoneH; tooltip = $STR_antistasi_dialogs_dismiss_menu_dismiss_tooltip; - action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_dismissPlayerGroup""} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_dismissSquad""}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Garrison Squad"", ""No units or squads selected.""] call A3A_fnc_customHint;}"; + action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_dismissPlayerGroup} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_dismissSquad}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Garrison Squad"", ""No units or squads selected.""] call A3A_fnc_customHint;}"; }; class HQ_button_Gstatic: A3A_core_BattleMenuRedButton { @@ -1936,7 +1936,7 @@ class dismiss_menu { w = 0.175015 * safezoneW; h = 0.0560125 * safezoneH; tooltip = $STR_antistasi_dialogs_dismiss_menu_garrison_tooltip; - action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_addToGarrison""} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_addToGarrison""}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Garrison Static"", ""No units or squads selected.""] call A3A_fnc_customHint;}"; + action = "closeDialog 0;if (count groupselectedUnits player > 0) then {nul = [groupselectedUnits player] spawn A3A_fnc_addToGarrison} else {if (count (hcSelected player) > 0) then {nul = [hcSelected player] spawn A3A_fnc_addToGarrison}}; if ((count groupselectedUnits player == 0) and (count hcSelected player == 0)) then {[""Garrison Static"", ""No units or squads selected.""] call A3A_fnc_customHint;}"; }; /* class HQ_button_Gremove: A3A_core_BattleMenuRedButton