From 1877f46c096588c96c99f20ea637df1874a938e4 Mon Sep 17 00:00:00 2001 From: He-Man Date: Thu, 30 Jul 2020 18:42:03 +0200 Subject: [PATCH] Service Point / Rearm Config tweak --- .../compile/servicepoint/EPOCH_SP_Start.sqf | 10 +---- .../CfgActionMenu/CfgActionMenu_self.hpp | 39 ++++++++++++++----- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Sources/epoch_code/compile/servicepoint/EPOCH_SP_Start.sqf b/Sources/epoch_code/compile/servicepoint/EPOCH_SP_Start.sqf index 62648d2e..99b560f2 100644 --- a/Sources/epoch_code/compile/servicepoint/EPOCH_SP_Start.sqf +++ b/Sources/epoch_code/compile/servicepoint/EPOCH_SP_Start.sqf @@ -18,10 +18,7 @@ private ["_Ignatz_SP_Array","_AmmoConfig","_VehiclesWithAmmo","_VehicleAmmo","_a //[[[end]]] Ignatz_Refuel = nil; Ignatz_Repair = nil; -Ignatz_Rearm0 = nil; -Ignatz_Rearm1 = nil; -Ignatz_Rearm2 = nil; -Ignatz_Rearm3 = nil; +Ignatz_Rearm = []; params ["_myturret"]; @@ -106,8 +103,5 @@ if (player == driver _vehicle) then { _actionTitle = [format['Repair %1',getText (configFile >> 'Cfgvehicles' >> typeOf _vehicle >> 'displayName')], _costs] call _fnc_actionTitle; Ignatz_Repair = [_actionTitle,[_vehicle,[_costs, _repairTime]]]; }; -if (count _Ignatz_SP_Array > 0) then {Ignatz_Rearm0 = _Ignatz_SP_Array select 0;}; -if (count _Ignatz_SP_Array > 1) then {Ignatz_Rearm1 = _Ignatz_SP_Array select 1;}; -if (count _Ignatz_SP_Array > 2) then {Ignatz_Rearm2 = _Ignatz_SP_Array select 2;}; -if (count _Ignatz_SP_Array > 3) then {Ignatz_Rearm3 = _Ignatz_SP_Array select 3;}; +Ignatz_Rearm = _Ignatz_SP_Array; true diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp index 2afd7bc7..e7b45b6c 100644 --- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp +++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp @@ -150,24 +150,45 @@ class ServicePoint }; class Rearm0 { - condition = "!isnil 'Ignatz_Rearm0'"; - action = "(Ignatz_Rearm0 select 1) call EPOCH_SP_Rearm"; + condition = "count Ignatz_Rearm > 0"; + action = "(Ignatz_Rearm select 0 select 1) call EPOCH_SP_Rearm"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\Rearm.paa"; - tooltipcode = "Ignatz_Rearm0 select 0"; + tooltipcode = "Ignatz_Rearm select 0 select 0"; }; class Rearm1 { - condition = "!isnil 'Ignatz_Rearm1'"; - action = "(Ignatz_Rearm1 select 1) call EPOCH_SP_Rearm"; + condition = "count Ignatz_Rearm > 1"; + action = "(Ignatz_Rearm select 1 select 1) call EPOCH_SP_Rearm"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\Rearm.paa"; - tooltipcode = "Ignatz_Rearm1 select 0"; + tooltipcode = "Ignatz_Rearm select 1 select 0"; }; class Rearm2 { - condition = "!isnil 'Ignatz_Rearm2'"; - action = "(Ignatz_Rearm2 select 1) call EPOCH_SP_Rearm"; + condition = "count Ignatz_Rearm > 2"; + action = "(Ignatz_Rearm select 2 select 1) call EPOCH_SP_Rearm"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\Rearm.paa"; - tooltipcode = "Ignatz_Rearm2 select 0"; + tooltipcode = "Ignatz_Rearm select 2 select 0"; + }; + class Rearm3 + { + condition = "count Ignatz_Rearm > 3"; + action = "(Ignatz_Rearm select 3 select 1) call EPOCH_SP_Rearm"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\Rearm.paa"; + tooltipcode = "Ignatz_Rearm select 3 select 0"; + }; + class Rearm4 + { + condition = "count Ignatz_Rearm > 4"; + action = "(Ignatz_Rearm select 4 select 1) call EPOCH_SP_Rearm"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\Rearm.paa"; + tooltipcode = "Ignatz_Rearm select 4 select 0"; + }; + class Rearm5 + { + condition = "count Ignatz_Rearm > 5"; + action = "(Ignatz_Rearm select 5 select 1) call EPOCH_SP_Rearm"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\Rearm.paa"; + tooltipcode = "Ignatz_Rearm select 5 select 0"; }; }; class veh_Rearm1