diff --git a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua index 950be5c..713c985 100644 --- a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua +++ b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua @@ -113,17 +113,21 @@ local function getCompactForm(self, playerName) :imageButton(12.75, 10, 1, 0.5, 'player_inventory_compact_mode_button_on.png', 'change_compact_mode') -- Tab: :container(leftTab(self, playerName, 'left'), 0, 0.5) - -- Selection buttons for the (left) panel: - :imageButton(0,0,2,0.5, leftTabButtonTextures[1],'select_left_craft_tab', core.colorize('#e1b691','craft')) - :imageButton(2,0,2,0.5, leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip')) - :imageButton(4,0,2,0.5, leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags')) - :imageButton(6,0,2,0.5, leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs')) + + -- Selection buttons for the (left) panel + local leftTabs = { + { leftTabButtonTextures[1], 'select_left_craft_tab', core.colorize('#e1b691','craft') }, + { leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip') }, + { leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags') }, + { leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs') } + } if self:getContex(playerName, 'node_tab') ~= nil then - InventoryForm - :imageButton(8,0,2,0.5, leftTabButtonTextures[5], 'select_left_node_tab', core.colorize('#e1b691','node')) + tableInsert(leftTabs, { leftTabButtonTextures[5], 'select_left_node_tab', core.colorize('#e1b691','node') }) end + InventoryForm:imageButtonRow(0, 0, 2, 0.5, leftTabs) + return InventoryForm:toString() end @@ -185,23 +189,31 @@ local function getFullForm(self, playerName) -- Tabs: :container(leftTab(self, playerName, 'left'), 0, 0.5) :container(rightTab(self, playerName, 'right'), 14, 0.5) - -- Selection buttons for the left panel: - :imageButton(0,0,2,0.5, leftTabButtonTextures[1],'select_left_craft_tab', core.colorize('#e1b691','craft')) - :imageButton(2,0,2,0.5, leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip')) - :imageButton(4,0,2,0.5, leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags')) - :imageButton(6,0,2,0.5, leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs')) - -- Selection buttons for the right panel: - :imageButton(14,0,2,0.5, rightTabButtonTextures[1],'select_right_craft_tab', core.colorize('#e1b691','craft')) - :imageButton(16,0,2,0.5, rightTabButtonTextures[2], 'select_right_equip_tab', core.colorize('#e1b691','equip')) - :imageButton(18,0,2,0.5, rightTabButtonTextures[3], 'select_right_bag_tab', core.colorize('#e1b691','bags')) - :imageButton(20,0,2,0.5, rightTabButtonTextures[4], 'select_right_ref_tab', core.colorize('#e1b691','refs')) + + -- Selection buttons for the (left) panel + local leftTabs = { + { leftTabButtonTextures[1], 'select_left_craft_tab', core.colorize('#e1b691','craft') }, + { leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip') }, + { leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags') }, + { leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs') } + } + + -- Selection buttons for the (right) panel + local rightTabs = { + { rightTabButtonTextures[1], 'select_right_craft_tab', core.colorize('#e1b691','craft') }, + { rightTabButtonTextures[2], 'select_right_equip_tab', core.colorize('#e1b691','equip') }, + { rightTabButtonTextures[3], 'select_right_bag_tab', core.colorize('#e1b691','bags') }, + { rightTabButtonTextures[4], 'select_right_ref_tab', core.colorize('#e1b691','refs') } + } if self:getContex(playerName, 'node_tab') ~= nil then - InventoryForm - :imageButton(8,0,2,0.5, leftTabButtonTextures[5], 'select_left_node_tab', core.colorize('#e1b691','node')) - :imageButton(22,0,2,0.5, rightTabButtonTextures[5], 'select_right_node_tab', core.colorize('#e1b691','node')) + tableInsert(leftTabs, { leftTabButtonTextures[5], 'select_left_node_tab', core.colorize('#e1b691','node') }) + tableInsert(rightTabs, { rightTabButtonTextures[5], 'select_right_node_tab', core.colorize('#e1b691','node') }) end + InventoryForm:imageButtonRow(0, 0, 2, 0.5, leftTabs) + InventoryForm:imageButtonRow(14, 0, 2, 0.5, rightTabs) + return InventoryForm:toString() end