PlayerInventory & PlayerInventoryUI: adding a compact inventory form and changing the tab switching system. #34
@@ -718,7 +718,7 @@ end
|
|||||||
---
|
---
|
||||||
---**Elements:** `image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>]` or
|
---**Elements:** `image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>]` or
|
||||||
---`image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>;<noclip>;<drawborder>;<pressed texture name>]`
|
---`image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>;<noclip>;<drawborder>;<pressed texture name>]`
|
||||||
---@overload fun(x:number, y:number, w:number, h:number, textureName:string, name:string, label:string)
|
---@overload fun(x:number, y:number, w:number, h:number, textureName:string, name:string, label:string?):Formspec
|
||||||
---@param x number
|
---@param x number
|
||||||
---@param y number
|
---@param y number
|
||||||
---@param w number
|
---@param w number
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ local require = Mod.getInfo('smc__ui__player_inventory').require
|
|||||||
|
|
||||||
---@alias PlayerInventoryUI.TabName 'select_tab_menu'|'bag_tab'|'craft_tab'|'equip_tab'|'ref_tab'
|
---@alias PlayerInventoryUI.TabName 'select_tab_menu'|'bag_tab'|'craft_tab'|'equip_tab'|'ref_tab'
|
||||||
|
|
||||||
---@type PlayerInventoryUI.getTabFunc
|
|
||||||
local getSelectTabMenu = require('PlayerInventoryUI.getSelectTabMenu')
|
|
||||||
---@type PlayerInventoryUI.getTabFunc
|
---@type PlayerInventoryUI.getTabFunc
|
||||||
local getBagTab = require('PlayerInventoryUI.getBagTab')
|
local getBagTab = require('PlayerInventoryUI.getBagTab')
|
||||||
---@type PlayerInventoryUI.getTabFunc
|
---@type PlayerInventoryUI.getTabFunc
|
||||||
@@ -22,13 +20,40 @@ local getRefTab = require('PlayerInventoryUI.getRefTab')
|
|||||||
|
|
||||||
---@type table<PlayerInventoryUI.TabName, PlayerInventoryUI.getTabFunc>
|
---@type table<PlayerInventoryUI.TabName, PlayerInventoryUI.getTabFunc>
|
||||||
local tabs = {
|
local tabs = {
|
||||||
['select_tab_menu'] = getSelectTabMenu,
|
|
||||||
['bag_tab'] = getBagTab,
|
['bag_tab'] = getBagTab,
|
||||||
['craft_tab'] = getCraftTab,
|
['craft_tab'] = getCraftTab,
|
||||||
['equip_tab'] = getEquipTab,
|
['equip_tab'] = getEquipTab,
|
||||||
['ref_tab'] = getRefTab,
|
['ref_tab'] = getRefTab,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local selectTabButtonTexture, unselectTabButtonTexture = 'player_inventory_select_tab_button.png', 'player_inventory_select_tab_button_unselected.png'
|
||||||
|
local tabButtonTextures = {
|
||||||
|
['craft_tab'] = {
|
||||||
|
selectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture
|
||||||
|
},
|
||||||
|
['equip_tab'] = {
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
selectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture
|
||||||
|
},
|
||||||
|
['bag_tab'] = {
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
selectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture
|
||||||
|
},
|
||||||
|
['ref_tab'] = {
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
unselectTabButtonTexture,
|
||||||
|
selectTabButtonTexture
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
---@param tabName PlayerInventoryUI.TabName
|
---@param tabName PlayerInventoryUI.TabName
|
||||||
local function getTab(tabName)
|
local function getTab(tabName)
|
||||||
if tabName == nil then
|
if tabName == nil then
|
||||||
@@ -45,37 +70,100 @@ end
|
|||||||
---@param self PlayerInventoryUI
|
---@param self PlayerInventoryUI
|
||||||
---@param playerName string
|
---@param playerName string
|
||||||
---@return string
|
---@return string
|
||||||
local function getFormSpecString(self, playerName)
|
local function getCompactForm(self, playerName)
|
||||||
---@type PlayerInventoryUI.TabName
|
---@type PlayerInventoryUI.TabName
|
||||||
local leftTabName = self:getContex(playerName, 'left_tab_name') or 'select_tab_menu'
|
local leftTabName = self:getContex(playerName, 'left_tab_name') or 'craft_tab'
|
||||||
|
|
||||||
|
local leftTabIsBlock = self:getContex(playerName, 'left_tab_is_block')
|
||||||
|
|
||||||
|
local InventoryForm = Formspec:new({
|
||||||
|
size = {x=14, y=12.5},
|
||||||
|
position = {x=0.5, y=0.55},
|
||||||
|
noPrepend = true,
|
||||||
|
})
|
||||||
|
|
||||||
|
local leftTabButtonTextures = tabButtonTextures[leftTabName]
|
||||||
|
|
||||||
|
InventoryForm:
|
||||||
|
bgcolor('#00000000', 'neither'):
|
||||||
|
background(0, 0.5, 14, 12.5, 'player_inventory_compact_middle_background.png', false):
|
||||||
|
listColors('#00000000', '#e1b69150'):
|
||||||
|
imageButton(13, 9.75, 0.5, 1, 'player_inventory_compact_mode_button_on.png', 'change_compact_mode'):
|
||||||
|
list('current_player', 'main', 1.5,9.75, 9,1):
|
||||||
|
list('current_player', 'main', 1.5,11.25, 9,1, 9):
|
||||||
|
container(tabs[leftTabName](self, playerName, 'left'), 1.5, 0.5):
|
||||||
|
-- Selection buttons for the left panel:
|
||||||
|
imageButton(1.5,0,2,0.5, leftTabButtonTextures[1],'select_left_craft_tab', core.colorize('#e1b691','craft')):
|
||||||
|
imageButton(3.5,0,2,0.5, leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip')):
|
||||||
|
imageButton(5.5,0,2,0.5, leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags')):
|
||||||
|
imageButton(7.5,0,2,0.5, leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs'))
|
||||||
|
|
||||||
|
return InventoryForm:toString()
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param self PlayerInventoryUI
|
||||||
|
---@param playerName string
|
||||||
|
---@return string
|
||||||
|
local function getFullForm(self, playerName)
|
||||||
---@type PlayerInventoryUI.TabName
|
---@type PlayerInventoryUI.TabName
|
||||||
local rightTabName = self:getContex(playerName, 'right_tab_name') or 'select_tab_menu'
|
local leftTabName = self:getContex(playerName, 'left_tab_name') or 'craft_tab'
|
||||||
|
---@type PlayerInventoryUI.TabName
|
||||||
|
local rightTabName = self:getContex(playerName, 'right_tab_name') or 'craft_tab'
|
||||||
|
|
||||||
local leftTabIsBlock = self:getContex(playerName, 'left_tab_is_block')
|
local leftTabIsBlock = self:getContex(playerName, 'left_tab_is_block')
|
||||||
local rightTabIsBlock = self:getContex(playerName, 'right_tab_is_block')
|
local rightTabIsBlock = self:getContex(playerName, 'right_tab_is_block')
|
||||||
|
|
||||||
local InventoryForm = Formspec:new({
|
local InventoryForm = Formspec:new({
|
||||||
size = {x=22, y=12},
|
size = {x=22, y=12.5},
|
||||||
position = {x=0.5, y=0.5},
|
position = {x=0.5, y=0.55},
|
||||||
noPrepend = true,
|
noPrepend = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
local leftTabButtonTextures = tabButtonTextures[leftTabName]
|
||||||
|
local rightTabButtonTextures = tabButtonTextures[rightTabName]
|
||||||
|
|
||||||
InventoryForm:
|
InventoryForm:
|
||||||
bgcolor('#00000000', 'neither'):
|
bgcolor('#00000000', 'neither'):
|
||||||
|
background(0, 9.5, 22, 3, 'player_inventory_middle_background.png', false):
|
||||||
listColors('#00000000', '#e1b69150'):
|
listColors('#00000000', '#e1b69150'):
|
||||||
list('current_player', 'main', 5.5,9.25, 9,1):
|
imageButton(17, 9.75, 0.5, 1, 'player_inventory_compact_mode_button_off.png', 'change_compact_mode'):
|
||||||
list('current_player', 'main', 5.5,10.75, 9,1, 9):
|
list('current_player', 'main', 5.5,9.75, 9,1):
|
||||||
background(0, 9, 22, 3, 'player_inventory_middle_background.png', false):
|
list('current_player', 'main', 5.5,11.25, 9,1, 9):
|
||||||
container(tabs[leftTabName](self, playerName, 'left'), 0, 0):
|
container(tabs[leftTabName](self, playerName, 'left'), 0, 0.5):
|
||||||
container(tabs[rightTabName](self, playerName, 'right'), 11, 0):
|
container(tabs[rightTabName](self, playerName, 'right'), 11, 0.5):
|
||||||
button(10.25, 0.25, .5, .5, 'close_left_tab', 'x'):
|
-- Selection buttons for the left panel:
|
||||||
button(21.25, 0.25, .5, .5, 'close_right_tab', 'x')
|
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')):
|
||||||
|
imageButton(11,0,2,0.5, rightTabButtonTextures[1],'select_right_craft_tab', core.colorize('#e1b691','craft')):
|
||||||
|
imageButton(13,0,2,0.5, rightTabButtonTextures[2], 'select_right_equip_tab', core.colorize('#e1b691','equip')):
|
||||||
|
imageButton(15,0,2,0.5, rightTabButtonTextures[3], 'select_right_bag_tab', core.colorize('#e1b691','bags')):
|
||||||
|
imageButton(17,0,2,0.5, rightTabButtonTextures[4], 'select_right_ref_tab', core.colorize('#e1b691','refs'))
|
||||||
|
|
||||||
return InventoryForm:toString()
|
return InventoryForm:toString()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param self PlayerInventoryUI
|
||||||
|
---@param playerName string
|
||||||
|
---@return string
|
||||||
|
local function getFormSpecString(self, playerName)
|
||||||
|
---@type boolean
|
||||||
|
local compactMode = self:getContex(playerName, 'compact_mode')
|
||||||
|
if compactMode == nil then
|
||||||
|
compactMode = true
|
||||||
|
end
|
||||||
|
|
||||||
|
if compactMode then
|
||||||
|
return getCompactForm(self, playerName)
|
||||||
|
else
|
||||||
|
return getFullForm(self, playerName)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---@alias PlayerInventoryUI.ContexKey
|
---@alias PlayerInventoryUI.ContexKey
|
||||||
|
--- 'compact_mode'|
|
||||||
|
---
|
||||||
--- 'left_tab_name'|
|
--- 'left_tab_name'|
|
||||||
--- 'right_tab_name'|
|
--- 'right_tab_name'|
|
||||||
--- 'left_tab_is_block'|
|
--- 'left_tab_is_block'|
|
||||||
@@ -108,10 +196,15 @@ function PlayerInventoryUI:showForm(playerName)
|
|||||||
return showForm(self, playerName)
|
return showForm(self, playerName)
|
||||||
end
|
end
|
||||||
|
|
||||||
PlayerInventoryUI:registerOnFormFieldAction('close_left_tab', function(player, fieldName, fieldValue)
|
PlayerInventoryUI:registerOnFormFieldAction('change_compact_mode', function(player, fieldName, fieldValue)
|
||||||
local playerName = player:get_player_name()
|
local playerName = player:get_player_name()
|
||||||
|
|
||||||
PlayerInventoryUI:setContex(playerName, 'left_tab_name', 'select_tab_menu')
|
local compactMode = PlayerInventoryUI:getContex(playerName, 'compact_mode')
|
||||||
|
if compactMode == nil then
|
||||||
|
compactMode = true
|
||||||
|
end
|
||||||
|
|
||||||
|
PlayerInventoryUI:setContex(playerName, 'compact_mode', (not compactMode))
|
||||||
PlayerInventoryUI:showForm(playerName)
|
PlayerInventoryUI:showForm(playerName)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
local Formspec = Smc.requireFormspec()
|
|
||||||
|
|
||||||
---@param self PlayerInventoryUI
|
|
||||||
---@param playerName string
|
|
||||||
---@param tabType PlayerInventoryUI.TabType
|
|
||||||
---@return Formspec
|
|
||||||
local function getSelectTabMenu(self, playerName, tabType)
|
|
||||||
local selectTabMenu = Formspec:new()
|
|
||||||
|
|
||||||
selectTabMenu:
|
|
||||||
image(0, 0, 11, 9, 'player_inventory_tab_background.png'):
|
|
||||||
button(3.5,2.5,2,2,'select_'..tabType..'_bag_tab', 'bag'):
|
|
||||||
button(5.5,2.5,2,2,'select_'..tabType..'_craft_tab', 'craft'):
|
|
||||||
button(3.5,4.5,2,2,'select_'..tabType..'_equip_tab', 'equip'):
|
|
||||||
button(5.5,4.5,2,2,'select_'..tabType..'_ref_tab', 'ref')
|
|
||||||
|
|
||||||
return selectTabMenu
|
|
||||||
end
|
|
||||||
|
|
||||||
return getSelectTabMenu
|
|
||||||
|
After Width: | Height: | Size: 176 KiB |
|
After Width: | Height: | Size: 709 B |
|
After Width: | Height: | Size: 709 B |
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.2 KiB |