restore some game functionallity

* i'm gradually restoring game functionality with the new modules design, though still a lot to do
* you can reload all scripts and modules using Ctrl+R shortcut while playing (finally! this is the reason of all this rework)
* a bunch of fixes, but new regression too :P
* fix performance issue that could lead freezes in the client in older machines
* completely new game module with new design
* fix crashs in map render
* remove uigame.cpp (now every game input is via lua)
* enable DEBUG macro by default, with it you are able to view any possible lua leak while running

modules/game/const.lua

@@ -0,0 +1,24 @@
+SkullNone = 0
+SkullYellow = 1
+SkullGreen = 2
+SkullWhite = 3
+SkullRed = 4
+SkullBlack = 5
+SkullOrange = 6
+
+ShieldNone = 0
+ShieldWhiteYellow = 1
+ShieldWhiteBlue = 2
+ShieldBlue = 3
+ShieldYellow = 4
+ShieldBlueSharedExp = 5
+ShieldYellowSharedExp = 6
+ShieldBlueNoSharedExpBlink = 7
+ShieldYellowNoSharedExpBlink = 8
+ShieldBlueNoSharedExp = 9
+ShieldYellowNoSharedExp = 10
+
+EmblemNone = 0
+EmblemGreen = 1
+EmblemRed = 2
+EmblemBlue = 3

modules/game/creature.lua

@@ -25,51 +25,51 @@ EmblemBlue = 3
 
 function getSkullImagePath(skullId)
   if skullId == SkullYellow then
-    return 'images/skull_yellow.png'
+    return 'icons/skull_yellow.png'
   elseif skullId == SkullGreen then
-    return 'images/skull_green.png'
+    return 'icons/skull_green.png'
   elseif skullId == SkullWhite then
-    return 'images/skull_white.png'
+    return 'icons/skull_white.png'
   elseif skullId == SkullRed then
-    return 'images/skull_red.png'
+    return 'icons/skull_red.png'
   elseif skullId == SkullBlack then
-    return 'images/skull_black.png'
+    return 'icons/skull_black.png'
   elseif skullId == SkullOrange then
-    return 'images/skull_orange.png'
+    return 'icons/skull_orange.png'
   end
 end
 
 function getShieldImagePathAndBlink(shieldId)
   if shieldId == ShieldWhiteYellow then
-    return 'images/shield_yellow_white.png', false
+    return 'icons/shield_yellow_white.png', false
   elseif shieldId == ShieldWhiteBlue then
-    return 'images/shield_blue_white.png', false
+    return 'icons/shield_blue_white.png', false
   elseif shieldId == ShieldBlue then
-    return 'images/shield_blue.png', false
+    return 'icons/shield_blue.png', false
   elseif shieldId == ShieldYellow then
-    return 'images/shield_yellow.png', false
+    return 'icons/shield_yellow.png', false
   elseif shieldId == ShieldBlueSharedExp then
-    return 'images/shield_blue_shared.png', false
+    return 'icons/shield_blue_shared.png', false
   elseif shieldId == ShieldYellowSharedExp then
-    return 'images/shield_yellow_shared.png', false
+    return 'icons/shield_yellow_shared.png', false
   elseif shieldId == ShieldBlueNoSharedExpBlink then
-    return 'images/shield_blue_not_shared.png', true
+    return 'icons/shield_blue_not_shared.png', true
   elseif shieldId == ShieldYellowNoSharedExpBlink then
-    return 'images/shield_yellow_not_shared.png', true
+    return 'icons/shield_yellow_not_shared.png', true
   elseif shieldId == ShieldBlueNoSharedExp then
-    return 'images/shield_blue_not_shared.png', false
+    return 'icons/shield_blue_not_shared.png', false
   elseif shieldId == ShieldYellowNoSharedExp then
-    return 'images/shield_yellow_not_shared.png', false
+    return 'icons/shield_yellow_not_shared.png', false
   end
 end
 
 function getEmblemImagePath(emblemId)
   if emblemId == EmblemGreen then
-    return 'images/emblem_green.png'
+    return 'icons/emblem_green.png'
   elseif emblemId == EmblemRed then
-    return 'images/emblem_red.png'
+    return 'icons/emblem_red.png'
   elseif emblemId == EmblemBlue then
-    return 'images/emblem_blue.png'
+    return 'icons/emblem_blue.png'
   end
 end
 

modules/game/game.lua

@@ -1,90 +0,0 @@
--- private variables
-local m_mouseGrabberWidget
-
--- private functions
-local function onGameKeyPress(self, keyCode, keyboardModifiers)
-  if keyboardModifiers == KeyboardCtrlModifier then
-    if keyCode == KeyG then
-      CharacterList.show()
-      return true
-    elseif keyCode == KeyQ then
-      g_game.safeLogout()
-      return true
-    end
-  end
-  return false
-end
-
-local function onUseWithMouseRelease(self, mousePosition, mouseButton)
-  if g_game.selectedThing == nil then return false end
-  if mouseButton == MouseLeftButton then
-    local clickedWidget = g_game.gameUi:recursiveGetChildByPos(mousePosition)
-    if clickedWidget then
-      if clickedWidget:getClassName() == 'UIMap' then
-        local tile = clickedWidget:getTile(mousePosition)
-        if tile then
-          g_game.useWith(g_game.selectedThing, tile:getTopMultiUseThing())
-        end
-      elseif clickedWidget:getClassName() == 'UIItem' and not clickedWidget:isVirtual() then
-        g_game.useWith(g_game.selectedThing, clickedWidget:getItem())
-      elseif clickedWidget.isBattleButton then
-        g_game.useWith(g_game.selectedThing, clickedWidget.creature)
-      end
-    end
-  end
-  g_game.selectedThing = nil
-  Mouse.restoreCursor()
-  self:ungrabMouse()
-  return true
-end
-
--- public functions
-function g_game.startUseWith(thing)
-  g_game.selectedThing = thing
-  m_mouseGrabberWidget:grabMouse()
-  Mouse.setTargetCursor()
-end
-
-function g_game.createInterface()
-
-  rootWidget:moveChildToIndex(g_game.gameUi, 1)
-  g_game.gameMapPanel = g_game.gameUi:getChildById('gameMapPanel')
-  g_game.gameRightPanel = g_game.gameUi:getChildById('gameRightPanel')
-  g_game.gameBottomPanel = g_game.gameUi:getChildById('gameBottomPanel')
-  m_mouseGrabberWidget = g_game.gameUi:getChildById('mouseGrabber')
-  connect(g_game.gameUi, { onKeyPress = onGameKeyPress })
-  connect(m_mouseGrabberWidget, { onMouseRelease = onUseWithMouseRelease })
-end
-
-function g_game.destroyInterface()
-  if g_game.gameUi then
-    g_game.gameUi:destroy()
-    g_game.gameUi = nil
-  end
-  Background.show()
-  CharacterList.show()
-end
-
-function g_game.show()
-  g_game.gameUi:show()
-  g_game.gameUi:focus()
-  g_game.gameMapPanel:focus()
-end
-
-function g_game.hide()
-  g_game.gameUi:hide()
-end
-
--- hooked events
-
-local function onApplicationClose()
-  if g_game.isOnline() then
-    g_game.forceLogout()
-  else
-    exit()
-  end
-end
-
-setonclose(onApplicationClose)
-connect(g_game, { onGameStart = g_game.createInterface }, true)
-connect(g_game, { onGameEnd = g_game.destroyInterface })

modules/game/game.otmod

@@ -7,11 +7,26 @@ Module
 
   dependencies:
     - game_tibiafiles
+    - client_background
     //- game_shaders
 
-  onLoad: |
-    dofile 'game'
-    dofile 'thing'
+  load-later:
+    - game_textmessage
+    - game_console
+
+  @onLoad: |
+    importStyle 'styles/items.otui'
+    importStyle 'styles/creatures.otui'
+    importStyle 'styles/miniwindow.otui'
+    importStyle 'styles/countwindow.otui'
+
+    dofile 'const'
+
+    dofile 'widgets/uigamemap'
+
+    dofile 'gameinterface'
     dofile 'creature'
-    dofile 'player'
-    dofile 'map'
+    GameInterface.init()
+
+  @onUnload: |
+    GameInterface.terminate()

modules/game/gameinterface.lua

@@ -1,17 +1,209 @@
+GameInterface = {}
 
-function Thing:isInsideContainer()
-  local pos = self:getPosition()
-  return (pos and pos.x == 65535 and pos.y >= 64)
+local WALK_AUTO_REPEAT_DELAY = 90
+local gameRootPanel
+local gameMapPanel
+local gameRightPanel
+local gameLeftPanel
+local gameBottomPanel
+local logoutButton
+
+function GameInterface.init()
+  connect(g_game, { onGameStart = GameInterface.show }, true)
+  connect(g_game, { onGameEnd = GameInterface.hide }, true)
+
+  gameRootPanel = displayUI('gameinterface.otui')
+  gameRootPanel:hide()
+  gameRootPanel:lower()
+
+  gameMapPanel = gameRootPanel:getChildById('gameMapPanel')
+  gameRightPanel = gameRootPanel:getChildById('gameRightPanel')
+  gameLeftPanel = gameRootPanel:getChildById('gameLeftPanel')
+  gameBottomPanel = gameRootPanel:getChildById('gameBottomPanel')
+
+  logoutButton = TopMenu.addRightButton('logoutButton', 'Logout', 'images/logout.png', GameInterface.tryLogout)
+  logoutButton:hide()
+
+  Keyboard.bindKeyPress('Up', function() g_game.walk(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Right', function() g_game.walk(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Down', function() g_game.walk(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Left', function() g_game.walk(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad8', function() g_game.walk(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad9', function() g_game.walk(NorthEast) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad6', function() g_game.walk(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad3', function() g_game.walk(SouthEast) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad2', function() g_game.walk(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad1', function() g_game.walk(SouthWest) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad4', function() g_game.walk(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Numpad7', function() g_game.walk(NorthWest) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Up', function() g_game.turn(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Right', function() g_game.turn(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Down', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Left', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Numpad8', function() g_game.turn(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Numpad6', function() g_game.turn(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  Keyboard.bindKeyPress('Escape', function() g_game.cancelAttackAndFollow() end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+
+  if g_game.isOnline() then
+    GameInterface.show()
+  end
 end
 
-function Thing:getContainerId()
-  local pos = self:getPosition()
-  if not pos then return 0 end
-  return pos.y - 64
+function GameInterface.terminate()
+  disconnect(g_game, { onGameStart = GameInterface.show })
+  disconnect(g_game, { onGameEnd = GameInterface.hide })
+
+  logoutButton:destroy()
+  logoutButton = nil
+  gameRootPanel:destroy()
+  gameRootPanel = nil
+  gameMapPanel = nil
+  gameRightPanel = nil
+  gameLeftPanel = nil
+  gameBottomPanel = nil
+  GameInterface = nil
 end
 
--- public functions
-function g_game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThing, useThing, creatureThing, multiUseThing)
+function GameInterface.show()
+  g_app.onClose = GameInterface.tryExit
+  logoutButton:show()
+  Background.hide()
+  gameRootPanel:show()
+  gameRootPanel:focus()
+  gameMapPanel:followCreature(g_game.getLocalPlayer())
+end
+
+function GameInterface.hide()
+  gameRootPanel:hide()
+  logoutButton:hide()
+  Background.show()
+  g_app.onClose = nil
+end
+
+function GameInterface.tryExit()
+  if g_game.isOnline() then
+    g_game.forceLogout()
+    scheduleEvent(exit, 10)
+  end
+end
+
+function GameInterface.tryLogout()
+  if g_game.isOnline() then
+    g_game.safeLogout()
+    return true
+  end
+end
+
+function GameInterface.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
+  local menu = createWidget('PopupMenu')
+
+  if lookThing then
+    menu:addOption('Look', function() g_game.look(lookThing) end)
+  end
+
+  if useThing then
+    if useThing:isContainer() then
+      if useThing:isInsideContainer() then
+        menu:addOption('Open', function() g_game.open(useThing, useThing:getContainerId()) end)
+        menu:addOption('Open in new window', function() g_game.open(useThing, Containers.getFreeContainerId()) end)
+      else
+        menu:addOption('Open', function() g_game.open(useThing, Containers.getFreeContainerId()) end)
+      end
+    else
+      if useThing:isMultiUse() then
+        menu:addOption('Use with ...', function() g_game.startUseWith(useThing) end)
+      else
+        menu:addOption('Use', function() g_game.use(useThing) end)
+      end
+    end
+
+    if useThing:isRotateable() then
+      menu:addOption('Rotate', function() g_game.rotate(useThing) end)
+    end
+
+  end
+
+  if lookThing and not lookThing:asCreature() and not lookThing:isNotMoveable() and lookThing:isPickupable() then
+    menu:addSeparator()
+    menu:addOption('Trade with ...', function() print('trade with') end)
+  end
+
+  -- check for move up
+
+  if creatureThing then
+    menu:addSeparator()
+
+    if creatureThing:asLocalPlayer() then
+      menu:addOption('Set Outfit', function() g_game.requestOutfit() end)
+
+      if creatureThing:isPartyMember() --[[and not fighting]] then
+        if creatureThing:isPartyLeader() then
+          if creatureThing:isPartySharedExperienceActive() then
+            menu:addOption('Disable Shared Experience', function() g_game.partyShareExperience(false) end)
+          else
+            menu:addOption('Enable Shared Experience', function() g_game.partyShareExperience(true) end)
+          end
+        end
+        menu:addOption('Leave Party', function() g_game.partyLeave() end)
+      end
+
+    else
+      local localPlayer = g_game.getLocalPlayer()
+      if localPlayer then
+        if g_game.getAttackingCreature() ~= creatureThing then
+          menu:addOption('Attack', function() g_game.attack(creatureThing) end)
+        else
+          menu:addOption('Stop Attack', function() g_game.cancelAttack() end)
+        end
+
+        if g_game.getFollowingCreature() ~= creatureThing then
+          menu:addOption('Follow', function() g_game.follow(creatureThing) end)
+        else
+          menu:addOption('Stop Follow', function() g_game.cancelFollow() end)
+        end
+
+        if creatureThing:asPlayer() then
+          menu:addSeparator()
+          menu:addOption('Message to ' .. creatureThing:getName(), function() print('message') end)
+          menu:addOption('Add to VIP list', function() g_game.addVip(creatureThing:getName()) end)
+
+          local localPlayerShield = localPlayer:asCreature():getShield()
+          local creatureShield = creatureThing:getShield()
+
+          if localPlayerShield == ShieldNone or localPlayerShield == ShieldWhiteBlue then
+            if creatureShield == ShieldWhiteYellow then
+              menu:addOption('Join ' .. creatureThing:getName() .. '\'s Party', function() g_game.partyJoin(creatureThing:getId()) end)
+            else
+              menu:addOption('Invite to Party', function() g_game.partyInvite(creatureThing:getId()) end)
+            end
+          elseif localPlayerShield == ShieldWhiteYellow then
+            if creatureShield == ShieldWhiteBlue then
+              menu:addOption('Revoke ' .. creatureThing:getName() .. '\'s Invitation', function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
+            end
+          elseif localPlayerShield == ShieldYellow or localPlayerShield == ShieldYellowSharedExp or localPlayerShield == ShieldYellowNoSharedExpBlink or localPlayerShield == ShieldYellowNoSharedExp then
+            if creatureShield == ShieldWhiteBlue then
+              menu:addOption('Revoke ' .. creatureThing:getName() .. '\'s Invitation', function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
+            elseif creatureShield == ShieldBlue or creatureShield == ShieldBlueSharedExp or creatureShield == ShieldBlueNoSharedExpBlink or creatureShield == ShieldBlueNoSharedExp then
+              menu:addOption('Pass Leadership to ' .. creatureThing:getName(), function() g_game.partyPassLeadership(creatureThing:getId()) end)
+            else
+              menu:addOption('Invite to Party', function() g_game.partyInvite(creatureThing:getId()) end)
+            end
+          end
+        end
+      end
+    end
+
+    menu:addSeparator()
+    menu:addOption('Copy Name', function() g_window.setClipboardText(creatureThing:getName()) end)
+
+  end
+
+  menu:display(menuPosition)
+end
+
+function GameInterface.processMouseAction(menuPosition, mouseButton, autoWalk, lookThing, useThing, creatureThing, multiUseThing)
   local keyboardModifiers = g_window.getKeyboardModifiers()
 
   if autoWalk and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseLeftButton then
@@ -21,7 +213,7 @@ function g_game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThin
 
   if not Options.classicControl then
     if keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
-      g_game.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
+      GameInterface.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       return true
     elseif lookThing and keyboardModifiers == KeyboardShiftModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
       g_game.look(lookThing)
@@ -71,7 +263,7 @@ function g_game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThin
       g_game.look(lookThing)
       return true
     elseif useThing and keyboardModifiers == KeyboardCtrlModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
-      g_game.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
+      GameInterface.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       return true
     elseif creatureThing and keyboardModifiers == KeyboardAltModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
       g_game.attack(creatureThing)
@@ -82,112 +274,22 @@ function g_game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThin
   return false
 end
 
-
-function g_game.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
-  local menu = createWidget('PopupMenu')
-
-  if lookThing then
-    menu:addOption('Look', function() g_game.look(lookThing) end)
-  end
-
-  if useThing then
-    if useThing:isContainer() then
-      if useThing:isInsideContainer() then
-        menu:addOption('Open', function() g_game.open(useThing, useThing:getContainerId()) end)
-        menu:addOption('Open in new window', function() g_game.open(useThing, Containers.getFreeContainerId()) end)
-      else
-        menu:addOption('Open', function() g_game.open(useThing, Containers.getFreeContainerId()) end)
-      end
-    else
-      if useThing:isMultiUse() then
-        menu:addOption('Use with ...', function() g_game.startUseWith(useThing) end)
-      else
-        menu:addOption('Use', function() g_game.use(useThing) end)
-      end
-    end
-
-    if useThing:isRotateable() then
-      menu:addOption('Rotate', function() g_game.rotate(useThing) end)
-    end
-
-  end
-
-  if lookThing and not lookThing:asCreature() and not lookThing:isNotMoveable() and lookThing:isPickupable() then
-    menu:addSeparator()
-    menu:addOption('Trade with ...', function() print('trade with') end)
-  end
-
-  -- check for move up
-
-  if creatureThing then
-    menu:addSeparator()
-
-    if creatureThing:asLocalPlayer() then
-      menu:addOption('Set Outfit', function() g_game.requestOutfit() end)
-
-      if creatureThing:asPlayer():isPartyMember() --[[and not fighting]] then
-        if creatureThing:asPlayer():isPartyLeader() then
-          if creatureThing:asPlayer():isPartySharedExperienceActive() then
-            menu:addOption('Disable Shared Experience', function() g_game.partyShareExperience(false) end)
-          else
-            menu:addOption('Enable Shared Experience', function() g_game.partyShareExperience(true) end)
-          end
-        end
-        menu:addOption('Leave Party', function() g_game.partyLeave() end)
-      end
-
-    else
-      local localPlayer = g_game.getLocalPlayer()
-      if localPlayer then
-        if g_game.getAttackingCreature() ~= creatureThing then
-          menu:addOption('Attack', function() g_game.attack(creatureThing) end)
-        else
-          menu:addOption('Stop Attack', function() g_game.cancelAttack() end)
-        end
-
-        if g_game.getFollowingCreature() ~= creatureThing then
-          menu:addOption('Follow', function() g_game.follow(creatureThing) end)
-        else
-          menu:addOption('Stop Follow', function() g_game.cancelFollow() end)
-        end
-
-        if creatureThing:asPlayer() then
-          menu:addSeparator()
-          menu:addOption('Message to ' .. creatureThing:getName(), function() print('message') end)
-          menu:addOption('Add to VIP list', function() g_game.addVip(creatureThing:getName()) end)
-          menu:addOption('Ignore ' .. creatureThing:getName(), function() print('ignore') end)
-
-          local localPlayerShield = localPlayer:asCreature():getShield()
-          local creatureShield = creatureThing:getShield()
-
-          if localPlayerShield == ShieldNone or localPlayerShield == ShieldWhiteBlue then
-            if creatureShield == ShieldWhiteYellow then
-              menu:addOption('Join ' .. creatureThing:getName() .. '\'s Party', function() g_game.partyJoin(creatureThing:getId()) end)
-            else
-              menu:addOption('Invite to Party', function() g_game.partyInvite(creatureThing:getId()) end)
-            end
-          elseif localPlayerShield == ShieldWhiteYellow then
-            if creatureShield == ShieldWhiteBlue then
-              menu:addOption('Revoke ' .. creatureThing:getName() .. '\'s Invitation', function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
-            end
-          elseif localPlayerShield == ShieldYellow or localPlayerShield == ShieldYellowSharedExp or localPlayerShield == ShieldYellowNoSharedExpBlink or localPlayerShield == ShieldYellowNoSharedExp then
-            if creatureShield == ShieldWhiteBlue then
-              menu:addOption('Revoke ' .. creatureThing:getName() .. '\'s Invitation', function() g_game.partyRevokeInvitation(creatureThing:getId()) end)
-            elseif creatureShield == ShieldBlue or creatureShield == ShieldBlueSharedExp or creatureShield == ShieldBlueNoSharedExpBlink or creatureShield == ShieldBlueNoSharedExp then
-              menu:addOption('Pass Leadership to ' .. creatureThing:getName(), function() g_game.partyPassLeadership(creatureThing:getId()) end)
-            else
-              menu:addOption('Invite to Party', function() g_game.partyInvite(creatureThing:getId()) end)
-            end
-          end
-        end
-      end
-    end
-
-    menu:addSeparator()
-    menu:addOption('Copy Name', function() g_window.setClipboardText(creatureThing:getName()) end)
-
-  end
-
-  menu:display(menuPosition)
+function GameInterface.getRootPanel()
+  return gameRootPanel
 end
 
+function GameInterface.getMapPanel()
+  return gameMapPanel
+end
+
+function GameInterface.getRightPanel()
+  return gameRightPanel
+end
+
+function GameInterface.getLeftPanel()
+  return gameLeftPanel
+end
+
+function GameInterface.getBottomPanel()
+  return gameBottomPanel
+end

modules/game/gameinterface.otui

@@ -1,26 +1,47 @@
-UIGame
-  id: gameRootInterface
+GameSidePanel < Panel
+  image-source: images/sidepanel.png
+  image-border: 4
+
+GameBottomPanel < Panel
+  image-source: images/bottompanel.png
+  image-border: 4
+
+GameMapPanel < UIGameMap
+  padding: 4
+  image-source: images/mappanel.png
+  image-border: 4
+
+UIWidget
+  id: gameRootPanel
   anchors.fill: parent
   anchors.top: topMenu.bottom
 
-  InterfacePanel
+  GameSidePanel
     id: gameRightPanel
-    width: 178
+    width: 190
     layout: verticalBox
     anchors.right: parent.right
     anchors.top: parent.top
     anchors.bottom: parent.bottom
 
-  InterfacePanel2
+  GameSidePanel
+    id: gameLeftPanel
+    width: 190
+    layout: verticalBox
+    anchors.left: parent.left
+    anchors.top: parent.top
+    anchors.bottom: parent.bottom
+
+  GameBottomPanel
     id: gameBottomPanel
     height: 170
-    anchors.left: parent.left
+    anchors.left: gameLeftPanel.right
     anchors.right: gameRightPanel.left
     anchors.bottom: parent.bottom
 
-  Map
+  GameMapPanel
     id: gameMapPanel
-    anchors.left: parent.left
+    anchors.left: gameLeftPanel.right
     anchors.right: gameRightPanel.left
     anchors.top: parent.top
     anchors.bottom: gameBottomPanel.top
@@ -30,4 +51,3 @@ UIGame
     id: mouseGrabber
     focusable: false
     visible: false
-

modules/game/player.lua

@@ -1,31 +0,0 @@
-function Player:isPartyLeader()
-  local shield = self:getShield()
-  return (shield == ShieldWhiteYellow or
-          shield == ShieldYellow or
-          shield == ShieldYellowSharedExp or
-          shield == ShieldYellowNoSharedExpBlink or
-          shield == ShieldYellowNoSharedExp)
-end
-
-function Player:isPartyMember()
-  local shield = self:getShield()
-  return (shield == ShieldWhiteYellow or 
-          shield == ShieldYellow or 
-          shield == ShieldYellowSharedExp or 
-          shield == ShieldYellowNoSharedExpBlink or 
-          shield == ShieldYellowNoSharedExp or
-          shield == ShieldBlueSharedExp or
-          shield == ShieldBlueNoSharedExpBlink or
-          shield == ShieldBlueNoSharedExp or
-          shield == ShieldBlue)
-end
-
-function Player:isPartySharedExperienceActive()
-  local shield = self:getShield()
-  return (shield == ShieldYellowSharedExp or 
-          shield == ShieldYellowNoSharedExpBlink or 
-          shield == ShieldYellowNoSharedExp or
-          shield == ShieldBlueSharedExp or
-          shield == ShieldBlueNoSharedExpBlink or
-          shield == ShieldBlueNoSharedExp)
-end

modules/game/styles/countwindow.otui

@@ -1,5 +1,6 @@
-MainWindow
-  text: Move Item
+CountWindow < MainWindow
+  id: countWindow
+  text: Move Staackable Item
   size: 196 112
   @onEscape: self:destroy()
 

modules/game/styles/creatures.otui

@@ -0,0 +1,5 @@
+Creature < UICreature
+  size: 80 80
+  padding: 1
+  image-source: /core_styles/styles/images/panel_flat.png
+  image-border: 1

modules/game/styles/items.otui

@@ -0,0 +1,5 @@
+Item < UIItem
+  size: 34 34
+  image-source: /core_styles/styles/images/item.png
+  font: verdana-11px-rounded
+  border-color: white

modules/game/styles/miniwindow.otui

@@ -0,0 +1,20 @@
+MiniWindow < UIMiniWindow
+  font: verdana-11px-antialised
+  //icon: /core_styles/icons/login.png
+  icon-rect: 4 4 16 16
+  width: 192
+  height: 200
+  text-offset: 26 5
+  text-align: topLeft
+  margin-top: 2
+  margin-left: 6
+  margin-right: 6
+  move-policy: free updated
+  image-source: /core_styles/styles/images/mini_window.png
+  image-border: 4
+  image-border-top: 23
+  padding: 25 8 2 8
+
+  $on:
+    height: 24
+    image-border-bottom: 1

modules/game/uiminiwindow.lua

@@ -0,0 +1,36 @@
+UIMiniWindow = extends(UIWindow)
+
+function UIMiniWindow.create()
+  local miniwindow = UIMiniWindow.internalCreate()
+  return miniwindow
+end
+
+function UIMiniWindow:onDragEnter(mousePos)
+  local parent = self:getParent()
+  if not parent then return false end
+
+  if parent:getClassName() == 'UIMiniWindowContainer' then
+    local containerParent = parent:getParent()
+    parent:removeChild(self)
+    containerParent:addChild(self)
+  end
+
+  local oldPos = self:getPosition()
+  self.movingReference = { x = mousePos.x - oldPos.x, y = mousePos.y - oldPos.y }
+  self:setPosition(oldPos)
+  return true
+end
+
+function UIMiniWindow:onDragLeave(droppedWidget, mousePos)
+  -- TODO: drop on other interfaces
+end
+
+function UIMiniWindow:onFocusChange(focused)
+  -- miniwindows only raises when its outside MiniWindowContainers
+  if not focused then return end
+  local parent = self:getParent()
+  if parent and parent:getClassName() ~= 'UIMiniWindowContainer' then
+    self:raise()
+  end
+end
+

modules/game/widgets/uicountwindow.lua

@@ -0,0 +1,2 @@
+UICountWindow = {}
+

modules/game/widgets/uigamemap.lua

@@ -1,4 +1,12 @@
-function UIMap:onDragEnter(mousePos)
+UIGameMap = extends(UIMap)
+
+function UIGameMap.create()
+  local gameMap = UIGameMap.internalCreate()
+  return gameMap
+end
+
+
+function UIGameMap:onDragEnter(mousePos)
   local tile = self:getTile(mousePos)
   if not tile then return false end
 
@@ -11,7 +19,7 @@ function UIMap:onDragEnter(mousePos)
   return true
 end
 
-function UIMap:onDragLeave(droppedWidget, mousePos)
+function UIGameMap:onDragLeave(droppedWidget, mousePos)
   if not self.parsed then
     self.currentDragThing = nil
   end
@@ -20,7 +28,7 @@ function UIMap:onDragLeave(droppedWidget, mousePos)
   return true
 end
 
-function UIMap:onDrop(widget, mousePos)
+function UIGameMap:onDrop(widget, mousePos)
   if not widget or not widget.currentDragThing then return false end
 
   local tile = self:getTile(mousePos)
@@ -29,7 +37,7 @@ function UIMap:onDrop(widget, mousePos)
   local count = widget.currentDragThing:getCount()
   if widget.currentDragThing:isStackable() and count > 1 then
     widget.parsed = true
-    local moveWindow = displayUI('/game/movewindow.otui')
+    local moveWindow = createWidget('CountWindow', rootWidget)
     local spinbox = moveWindow:getChildById('spinbox')
     spinbox:setMaximum(count)
     spinbox:setMinimum(1)
@@ -37,10 +45,10 @@ function UIMap:onDrop(widget, mousePos)
 
     local okButton = moveWindow:getChildById('buttonOk')
     okButton.onClick = function()
-                         g_game.move(widget.currentDragThing, tile:getPosition(), spinbox:getCurrentIndex())
-                         okButton:getParent():destroy()
-                         widget.currentDragThing = nil
-                       end
+      g_game.move(widget.currentDragThing, tile:getPosition(), spinbox:getCurrentIndex())
+      okButton:getParent():destroy()
+      widget.currentDragThing = nil
+    end
     moveWindow.onEnter = okButton.onClick
   else
     g_game.move(widget.currentDragThing, tile:getPosition(), 1)
@@ -49,9 +57,8 @@ function UIMap:onDrop(widget, mousePos)
   return true
 end
 
-function UIMap:onMouseRelease(mousePosition, mouseButton)
+function UIGameMap:onMouseRelease(mousePosition, mouseButton)
   local tile = self:getTile(mousePosition)
-  if tile and g_game.processMouseAction(mousePosition, mouseButton, nil, tile:getTopLookThing(), tile:getTopUseThing(), tile:getTopCreature(), tile:getTopMultiUseThing()) then return true end
+  if tile and GameInterface.processMouseAction(mousePosition, mouseButton, nil, tile:getTopLookThing(), tile:getTopUseThing(), tile:getTopCreature(), tile:getTopMultiUseThing()) then return true end
   return false
 end
-

modules/game/widgets/uiitem.lua

@@ -0,0 +1,78 @@
+function UIItem:onDragEnter(mousePos)
+  if self:isVirtual() then return false end
+
+  local item = self:getItem()
+  if not item then return false end
+
+  self:setBorderWidth(1)
+
+  self.parsed = false
+  self.currentDragThing = item
+  Mouse.setTargetCursor()
+  return true
+end
+
+function UIItem:onDragLeave(droppedWidget, mousePos)
+  if self:isVirtual() then return false end
+
+  if not self.parsed then
+    self.currentDragThing = nil
+  end
+
+  Mouse.restoreCursor()
+  self:setBorderWidth(0)
+  return true
+end
+
+function UIItem:onDrop(widget, mousePos)
+  if self:isVirtual() then return false end
+
+  if not widget or not widget.currentDragThing then return true end
+
+  local pos = self.position
+  local count = widget.currentDragThing:getCount()
+  if widget.currentDragThing:isStackable() and count > 1 then
+    widget.parsed = true
+    local countWindow = createWidget('CountWindow', rootWidget)
+    local spinbox = moveWindow:getChildById('spinbox')
+    spinbox:setMaximum(count)
+    spinbox:setMinimum(1)
+    spinbox:setCurrentIndex(count)
+
+    local okButton = moveWindow:getChildById('buttonOk')
+    okButton.onClick = function()
+      g_game.move(widget.currentDragThing, pos, spinbox:getCurrentIndex()) okButton:getParent():destroy()
+      widget.currentDragThing = nil
+    end
+    moveWindow.onEnter = okButton.onClick
+  else
+    g_game.move(widget.currentDragThing, pos, 1)
+  end
+
+  self:setBorderWidth(0)
+  return true
+end
+
+function UIItem:onHoverChange(hovered)
+  if self:isVirtual() then return end
+
+  local draggingWidget = g_ui.getDraggingWidget()
+  if draggingWidget and self ~= draggingWidget then
+    local gotMap = draggingWidget:getClassName() == 'UIMap'
+    local gotItem = draggingWidget:getClassName() == 'UIItem' and not draggingWidget:isVirtual()
+    if hovered and (gotItem or gotMap) then
+      self:setBorderWidth(1)
+    else
+      self:setBorderWidth(0)
+    end
+  end
+end
+
+function UIItem:onMouseRelease(mousePosition, mouseButton)
+  if self:isVirtual() then return false end
+
+  local item = self:getItem()
+  if not item or not self:containsPoint(mousePosition) then return false end
+  return g_game.processMouseAction(mousePosition, mouseButton, nil, item, item, nil, item)
+end
+

modules/game/widgets/uiminiwindowcontainer.lua

@@ -0,0 +1,12 @@
+UIMiniWindowContainer = extends(UIWidget)
+
+function UIMiniWindowContainer.create()
+  local container = UIMiniWindowContainer.internalCreate()
+  container:setFocusable(false)
+  container:setPhantom(true)
+  return container
+end
+
+function UIMiniWindowContainer:getClassName()
+  return 'UIMiniWindowContainer'
+end