Browse Source

Reconfigured inventory back to normal, fixed a typo.

BeniS 8 years ago
parent
commit
03d46baddf
2 changed files with 47 additions and 12 deletions
  1. 2
    2
      modules/client_terminal/commands.lua
  2. 45
    10
      modules/game_inventory/inventory.otui

+ 2
- 2
modules/client_terminal/commands.lua View File

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

+ 45
- 10
modules/game_inventory/inventory.otui View File

@@ -1,5 +1,4 @@
1 1
 InventoryItem < Item
2
-  margin: 0 1
3 2
 
4 3
 HeadSlot < InventoryItem
5 4
   id: slot1
@@ -55,23 +54,59 @@ MiniWindow
55 54
   id: inventoryWindow
56 55
   !text: tr('Inventory')
57 56
   icon: inventory.png
58
-  height: 95
57
+  height: 480
59 58
   @onClose: modules.game_inventory.onMiniWindowClose()
60 59
   &save: true
61 60
 
62 61
   MiniWindowContents
63
-    padding: 4 5
64
-    layout:
65
-      type: grid
66
-      num-columns: 5
67
-      cell-size: 36 34
68 62
     HeadSlot
63
+      anchors.top: parent.top
64
+      anchors.horizontalCenter: parent.horizontalCenter
65
+      margin-top: 4
66
+
69 67
     BodySlot
68
+      anchors.top: prev.bottom
69
+      anchors.horizontalCenter: prev.horizontalCenter
70
+      margin-top: 5
71
+
70 72
     LegSlot
73
+      anchors.top: prev.bottom
74
+      anchors.horizontalCenter: prev.horizontalCenter
75
+      margin-top: 5
76
+
71 77
     FeetSlot
72
-    BackSlot
73
-    LeftSlot
74
-    RightSlot
78
+      anchors.top: prev.bottom
79
+      anchors.horizontalCenter: prev.horizontalCenter
80
+      margin-top: 5
81
+
75 82
     NeckSlot
83
+      anchors.top: parent.top
84
+      anchors.right: slot1.left
85
+      margin-top: 10
86
+      margin-right: 5
87
+
88
+    LeftSlot
89
+      anchors.top: prev.bottom
90
+      anchors.horizontalCenter: prev.horizontalCenter
91
+      margin-top: 5
92
+
76 93
     FingerSlot
94
+      anchors.top: prev.bottom
95
+      anchors.horizontalCenter: prev.horizontalCenter
96
+      margin-top: 5
97
+
98
+    BackSlot
99
+      anchors.top: parent.top
100
+      anchors.left: slot1.right
101
+      margin-top: 10
102
+      margin-left: 5
103
+
104
+    RightSlot
105
+      anchors.top: prev.bottom
106
+      anchors.horizontalCenter: prev.horizontalCenter
107
+      margin-top: 5
108
+
77 109
     AmmoSlot
110
+      anchors.top: prev.bottom
111
+      anchors.horizontalCenter: prev.horizontalCenter
112
+      margin-top: 5

Loading…
Cancel
Save