Reconfigured inventory back to normal, fixed a typo.

This commit is contained in:
BeniS 2012-08-18 20:50:51 +12:00
parent ab7400c51d
commit 03d46baddf
2 changed files with 47 additions and 12 deletions

View File

@ -39,8 +39,8 @@ function debugContainersItems()
id:]] ..item:getId() .. [[, id:]] ..item:getId() .. [[,
stackable:]] ..tostring(item:isStackable()) .. [[, stackable:]] ..tostring(item:isStackable()) .. [[,
marketable:]] ..tostring(item:isMarketable()) .. [[, marketable:]] ..tostring(item:isMarketable()) .. [[,
nvocation:]]..(item:getMarketData() and item:getMarketData().restrictVocation or 'none') ..[[, vocation:]]..(item:getMarketData() and item:getMarketData().restrictVocation or 'none') ..[[,
ncloth slot:]] ..item:getClothSlot() .. [[ cloth slot:]] ..item:getClothSlot() .. [[
]] ]]
g_tooltip.display(text) g_tooltip.display(text)
end end

View File

@ -1,5 +1,4 @@
InventoryItem < Item InventoryItem < Item
margin: 0 1
HeadSlot < InventoryItem HeadSlot < InventoryItem
id: slot1 id: slot1
@ -55,23 +54,59 @@ MiniWindow
id: inventoryWindow id: inventoryWindow
!text: tr('Inventory') !text: tr('Inventory')
icon: inventory.png icon: inventory.png
height: 95 height: 480
@onClose: modules.game_inventory.onMiniWindowClose() @onClose: modules.game_inventory.onMiniWindowClose()
&save: true &save: true
MiniWindowContents MiniWindowContents
padding: 4 5
layout:
type: grid
num-columns: 5
cell-size: 36 34
HeadSlot HeadSlot
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
margin-top: 4
BodySlot BodySlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 5
LegSlot LegSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 5
FeetSlot FeetSlot
BackSlot anchors.top: prev.bottom
LeftSlot anchors.horizontalCenter: prev.horizontalCenter
RightSlot margin-top: 5
NeckSlot NeckSlot
anchors.top: parent.top
anchors.right: slot1.left
margin-top: 10
margin-right: 5
LeftSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 5
FingerSlot FingerSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 5
BackSlot
anchors.top: parent.top
anchors.left: slot1.right
margin-top: 10
margin-left: 5
RightSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 5
AmmoSlot AmmoSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 5