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/old/game/game.lua

@@ -0,0 +1,90 @@
+-- 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/old/game/game.otmod

@@ -0,0 +1,17 @@
+Module
+  name: game
+  description: Create the game interface, where the ingame stuff starts
+  author: OTClient team
+  website: https://github.com/edubart/otclient
+  reloadable: true
+
+  dependencies:
+    - game_tibiafiles
+    //- game_shaders
+
+  onLoad: |
+    dofile 'game'
+    dofile 'thing'
+    dofile 'creature'
+    dofile 'player'
+    dofile 'map'

modules/old/game/game.otui

@@ -0,0 +1,33 @@
+UIGame
+  id: gameRootInterface
+  anchors.fill: parent
+  anchors.top: topMenu.bottom
+
+  InterfacePanel
+    id: gameRightPanel
+    width: 178
+    layout: verticalBox
+    anchors.right: parent.right
+    anchors.top: parent.top
+    anchors.bottom: parent.bottom
+
+  InterfacePanel2
+    id: gameBottomPanel
+    height: 170
+    anchors.left: parent.left
+    anchors.right: gameRightPanel.left
+    anchors.bottom: parent.bottom
+
+  Map
+    id: gameMapPanel
+    anchors.left: parent.left
+    anchors.right: gameRightPanel.left
+    anchors.top: parent.top
+    anchors.bottom: gameBottomPanel.top
+    focusable: false
+
+  UIWidget
+    id: mouseGrabber
+    focusable: false
+    visible: false
+

modules/old/game/map.lua

@@ -0,0 +1,57 @@
+function UIMap:onDragEnter(mousePos)
+  local tile = self:getTile(mousePos)
+  if not tile then return false end
+
+  local thing = tile:getTopMoveThing()
+  if not thing then return false end
+
+  self.parsed = false
+  self.currentDragThing = thing
+  Mouse.setTargetCursor()
+  return true
+end
+
+function UIMap:onDragLeave(droppedWidget, mousePos)
+  if not self.parsed then
+    self.currentDragThing = nil
+  end
+
+  Mouse.restoreCursor()
+  return true
+end
+
+function UIMap:onDrop(widget, mousePos)
+  if not widget or not widget.currentDragThing then return false end
+
+  local tile = self:getTile(mousePos)
+  if not tile then return false end
+
+  local count = widget.currentDragThing:getCount()
+  if widget.currentDragThing:isStackable() and count > 1 then
+    widget.parsed = true
+    local moveWindow = displayUI('/game/movewindow.otui')
+    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, tile:getPosition(), spinbox:getCurrentIndex())
+                         okButton:getParent():destroy()
+                         widget.currentDragThing = nil
+                       end
+    moveWindow.onEnter = okButton.onClick
+  else
+    g_game.move(widget.currentDragThing, tile:getPosition(), 1)
+  end
+
+  return true
+end
+
+function UIMap: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
+  return false
+end
+

modules/old/game/movewindow.otui

@@ -0,0 +1,40 @@
+CountWindow < MainWindow
+  text: Move Item
+  size: 196 112
+  @onEscape: self:destroy()
+
+  Label
+    text: Amount:
+    width: 64
+    anchors.left: parent.left
+    anchors.top: parent.top
+    margin-top: 2
+
+  SpinBox
+    id: spinbox
+    anchors.left: prev.right
+    anchors.right: parent.right
+    anchors.top: parent.top
+
+  HorizontalSeparator
+    id: separator
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: next.top
+    margin-bottom: 10
+
+  Button
+    id: buttonOk
+    text: Ok
+    width: 64
+    anchors.right: next.left
+    anchors.bottom: parent.bottom
+    margin-right: 10
+
+  Button
+    id: buttonCancel
+    text: Cancel
+    width: 64
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    @onClick: self:getParent():destroy()

modules/old/game/player.lua

@@ -0,0 +1,31 @@
+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/old/game/thing.lua

@@ -0,0 +1,193 @@
+
+function Thing:isInsideContainer()
+  local pos = self:getPosition()
+  return (pos and pos.x == 65535 and pos.y >= 64)
+end
+
+function Thing:getContainerId()
+  local pos = self:getPosition()
+  if not pos then return 0 end
+  return pos.y - 64
+end
+
+-- public functions
+function g_game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThing, useThing, creatureThing, multiUseThing)
+  local keyboardModifiers = g_window.getKeyboardModifiers()
+
+  if autoWalk and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseLeftButton then
+    -- todo auto walk
+    return true
+  end
+
+  if not Options.classicControl then
+    if keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
+      g_game.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
+      return true
+    elseif lookThing and keyboardModifiers == KeyboardShiftModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      g_game.look(lookThing)
+      return true
+    elseif useThing and keyboardModifiers == KeyboardCtrlModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      if useThing:isContainer() then
+        if useThing:isInsideContainer() then
+          g_game.open(useThing, useThing:getContainerId())
+          return true
+        else
+          g_game.open(useThing, Containers.getFreeContainerId())
+        return true
+        end
+      elseif useThing:isMultiUse() then
+        g_game.startUseWith(useThing)
+        return true
+      else
+        g_game.use(useThing)
+        return true
+      end
+      return true
+    elseif creatureThing and keyboardModifiers == KeyboardAltModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      g_game.attack(creatureThing)
+      return true
+    end
+  else
+    if multiUseThing and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
+      if multiUseThing:asCreature() then
+        g_game.attack(multiUseThing:asCreature())
+        return true
+      elseif multiUseThing:isContainer() then
+        if multiUseThing:isInsideContainer() then
+          g_game.open(multiUseThing, multiUseThing:getContainerId())
+          return true
+        else
+          g_game.open(multiUseThing, Containers.getFreeContainerId())
+          return true
+        end
+      elseif multiUseThing:isMultiUse() then
+        g_game.startUseWith(multiUseThing)
+        return true
+      else
+        g_game.use(multiUseThing)
+      end
+      return true
+    elseif lookThing and keyboardModifiers == KeyboardShiftModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      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)
+      return true
+    elseif creatureThing and keyboardModifiers == KeyboardAltModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      g_game.attack(creatureThing)
+      return true
+    end
+  end
+
+  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)
+end
+

modules/old/game_console/channelswindow.otui

@@ -1,56 +0,0 @@
-ChannelListLabel < Label
-  font: verdana-11px-monochrome
-  background-color: alpha
-  text-offset: 2 0
-  focusable: true
-
-  $focus:
-    background-color: #ffffff22
-    color: #ffffff
-
-MainWindow
-  id: channelsWindow
-  text: Channels
-  size: 250 238
-  @onEscape: self:destroy()
-
-  TextList
-    id: channelList
-    anchors.fill: parent
-    anchors.bottom: next.top
-    margin-bottom: 10
-    padding: 1
-    focusable: false
-
-  Label
-    id: openPrivateChannelWithLabel
-    text: Open a private message channel:
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.bottom: next.top
-    text-align: center
-    margin-bottom: 2
-
-  LineEdit
-    id: openPrivateChannelWith
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.bottom: next.top
-    margin-bottom: 10
-
-  Button
-    id: buttonOpen
-    text: Open
-    width: 64
-    anchors.right: next.left
-    anchors.bottom: parent.bottom
-    margin-right: 10
-    @onClick: self:getParent():onEnter()
-
-  Button
-    id: buttonCancel
-    text: Cancel
-    width: 64
-    anchors.right: parent.right
-    anchors.bottom: parent.bottom
-    @onClick: self:getParent():destroy()

modules/old/game_console/console.lua

@@ -1,373 +0,0 @@
-Console = {}
-
--- private variables
-local SpeakTypesSettings = {
-  say = { speakType = SpeakSay, color = '#FFFF00' },
-  whisper = { speakType = SpeakWhisper, color = '#FFFF00' },
-  yell = { speakType = SpeakYell, color = '#FFFF00' },
-  broadcast = { speakType = SpeakBroadcast, color = '#F55E5E' },
-  private = { speakType = SpeakPrivate, color = '#5FF7F7', private = true },
-  privateRed = { speakType = SpeakPrivateRed, color = '#F55E5E', private = true },
-  privatePlayerToPlayer = { speakType = SpeakPrivate, color = '#9F9DFD', private = true },
-  privatePlayerToNpc = { speakType = SpeakPrivatePlayerToNpc, color = '#9F9DFD', private = true, npcChat = true },
-  privateNpcToPlayer = { speakType = SpeakPrivateNpcToPlayer, color = '#5FF7F7', private = true, npcChat = true },
-  channelYellow = { speakType = SpeakChannelYellow, color = '#FFFF00' },
-  channelWhite = { speakType = SpeakChannelWhite, color = '#FFFFFF' },
-  channelRed = { speakType = SpeakChannelRed, color = '#F55E5E' },
-  channelOrange = { speakType = SpeakChannelOrange, color = '#FE6500' },
-  monsterSay = { speakType = SpeakMonsterSay, color = '#FE6500', hideInConsole = true},
-  monsterYell = { speakType = SpeakMonsterYell, color = '#FE6500', hideInConsole = true},
-}
-
-local SpeakTypes = {
-  [SpeakSay] = SpeakTypesSettings.say,
-  [SpeakWhisper] = SpeakTypesSettings.whisper,
-  [SpeakYell] = SpeakTypesSettings.yell,
-  [SpeakBroadcast] = SpeakTypesSettings.broadcast,
-  [SpeakPrivate] = SpeakTypesSettings.private,
-  [SpeakPrivateRed] = SpeakTypesSettings.privateRed,
-  [SpeakPrivatePlayerToNpc] = SpeakTypesSettings.privatePlayerToNpc,
-  [SpeakPrivateNpcToPlayer] = SpeakTypesSettings.privateNpcToPlayer,
-  [SpeakChannelYellow] = SpeakTypesSettings.channelYellow,
-  [SpeakChannelWhite] = SpeakTypesSettings.channelWhite,
-  [SpeakChannelRed] = SpeakTypesSettings.channelRed,
-  [SpeakChannelOrange] = SpeakTypesSettings.channelOrange,
-  [SpeakMonsterSay] = SpeakTypesSettings.monsterSay,
-  [SpeakMonsterYell] = SpeakTypesSettings.monsterYell,
-}
-
-local SayModes = {
-  [1] = { speakTypeDesc = 'whisper', icon = '/core_styles/icons/whisper.png' },
-  [2] = { speakTypeDesc = 'say', icon = '/core_styles/icons/say.png' },
-  [3] = { speakTypeDesc = 'yell', icon = '/core_styles/icons/yell.png' }
-}
-
-local consolePanel
-local consoleBuffer
-local consoleTabBar
-local consoleLineEdit
-local channels
-local messageHistory = { }
-local currentMessageIndex = 0
-local MaxHistory = 1000
-
--- private functions
-local function navigateMessageHistory(step)
-  local numCommands = #messageHistory
-  if numCommands > 0 then
-    currentMessageIndex = math.min(math.max(currentMessageIndex + step, 0), numCommands)
-    if currentMessageIndex > 0 then
-      local command = messageHistory[numCommands - currentMessageIndex + 1]
-      consoleLineEdit:setText(command)
-    else
-      consoleLineEdit:clearText()
-    end
-  end
-end
-
-function applyMessagePrefixies(name, level, message)
-  if name then
-    if Options.showLevelsInConsole and level > 0 then
-      message = name .. ' [' .. level .. ']: ' .. message
-    else
-      message = name .. ': ' .. message
-    end
-  end
-  return message
-end
-
--- public functions
-function Console.create()
-  consolePanel = displayUI('console.otui', g_game.gameBottomPanel)
-  consoleLineEdit = consolePanel:getChildById('consoleLineEdit')
-  consoleBuffer = consolePanel:getChildById('consoleBuffer')
-  consoleTabBar = consolePanel:getChildById('consoleTabBar')
-  consoleTabBar:setContentWidget(consoleBuffer)
-  channels = {}
-
-  Console.addChannel('Default', 0)
-  Console.addTab('Server Log', false)
-
-  Keyboard.bindKeyDown('Shift+Up', function() navigateMessageHistory(1) end, consolePanel)
-  Keyboard.bindKeyDown('Shift+Down', function() navigateMessageHistory(-1) end, consolePanel)
-  Keyboard.bindKeyDown('Tab', function() consoleTabBar:selectNextTab() end, consolePanel)
-  Keyboard.bindKeyDown('Shift+Tab', function() consoleTabBar:selectPrevTab() end, consolePanel)
-  Keyboard.bindKeyDown('Enter', Console.sendCurrentMessage, consolePanel)
-
-  -- apply buttom functions after loaded
-  connect(consolePanel:getChildById('nextChannelButton'), { onClick = function() consoleTabBar:selectNextTab() end } )
-  connect(consolePanel:getChildById('prevChannelButton'), { onClick = function() consoleTabBar:selectPrevTab() end } )
-  connect(consoleTabBar, { onTabChange = Console.onTabChange })
-
-  -- tibia like hotkeys
-  Keyboard.bindKeyDown('Ctrl+O', g_game.requestChannels)
-  Keyboard.bindKeyDown('Ctrl+E', Console.removeCurrentTab)
-end
-
-function Console.destroy()
-  consolePanel:destroy()
-  consolePanel = nil
-end
-
-function Console.setLineEditText(text)
-  consoleLineEdit:setText(text)
-end
-
-function Console.addTab(name, focus)
-  local tab = consoleTabBar:addTab(name)
-  if focus then
-    consoleTabBar:selectTab(tab)
-  else
-    consoleTabBar:blinkTab(tab)
-  end
-  return tab
-end
-
-function Console.onTabChange(tabBar, tab)
-  if tab:getText() == "Default" or tab:getText() == "Server Log" then
-    consolePanel:getChildById('closeChannelButton'):disable()
-  else
-    consolePanel:getChildById('closeChannelButton'):enable()
-  end
-end
-
-function Console.removeCurrentTab()
-  local tab = consoleTabBar:getCurrentTab()
-  if tab:getText() == "Default" or tab:getText() == "Server Log" then return end
-
-  consoleTabBar:removeTab(tab)
-
-  -- notificate the server that we are leaving the channel
-  if tab.channelId then
-    g_game.leaveChannel(tab.channelId)
-  elseif tab:getText() == "NPCs" then
-    g_game.closeNpcChannel()
-  end
-end
-
-function Console.getTab(name)
-  return consoleTabBar:getTab(name)
-end
-
-function Console.getCurrentTab()
-  return consoleTabBar:getCurrentTab()
-end
-
-function Console.addChannel(name, id)
-  channels[id] = name
-  local tab = Console.addTab(name, true)
-  tab.channelId = id
-  return tab
-end
-
-function Console.addPrivateText(text, speaktype, name, isPrivateCommand)
-  local focus = false
-  if speaktype.speakType == SpeakPrivateNpcToPlayer then
-    name = 'NPCs'
-    focus = true
-  end
-
-  local privateTab = Console.getTab(name)
-  if privateTab == nil then
-    if Options.showPrivateMessagesInConsole or (isPrivateCommand and not privateTab) then
-      privateTab = Console.getTab('Default')
-    else
-      privateTab = Console.addTab(name, focus)
-    end
-    privateTab.npcChat = speaktype.npcChat
-  elseif focus then
-    consoleTabBar:selectTab(privateTab)
-  end
-  Console.addTabText(text, speaktype, privateTab)
-end
-
-function Console.addText(text, speaktype, tabName)
-  local tab = Console.getTab(tabName)
-  if tab ~= nil then
-    Console.addTabText(text, speaktype, tab)
-  end
-end
-
-function Console.addTabText(text, speaktype, tab)
-  if Options.showTimestampsInConsole then
-    text = os.date('%H:%M') .. ' ' .. text
-  end
-
-  local panel = consoleTabBar:getTabPanel(tab)
-  local label = createWidget('ConsoleLabel', panel)
-  label:setText(text)
-  label:setColor(speaktype.color)
-  consoleTabBar:blinkTab(tab)
-
-  if panel:getChildCount() > 10 then
-    panel:removeChild(panel:getFirstChild())
-  end
-end
-
-function Console.sendCurrentMessage()
-  local message = consoleLineEdit:getText()
-  if #message == 0 then return end
-  consoleLineEdit:clearText()
-
-  -- get current channel
-  local tab = Console.getCurrentTab()
-
-  -- handling chat commands
-  local originalMessage = message
-  local chatCommandSayMode
-  local chatCommandPrivate
-  local chatCommandPrivateReady
-
-  local chatCommandMessage = message:match("^%#y (.*)")
-  if chatCommandMessage ~= nil then chatCommandSayMode = 'yell' end -- player used yell command
-  message = chatCommandMessage or message
-
-  local chatCommandMessage = message:match("^%#w (.*)")
-  if chatCommandMessage ~= nil then chatCommandSayMode = 'whisper' end -- player used whisper
-  message = chatCommandMessage or message
-
-  local findIni, findEnd, chatCommandInitial, chatCommandPrivate, chatCommandEnd, chatCommandMessage = message:find("([%*%@])(.+)([%*%@])(.*)")
-  if findIni ~= nil and findIni == 1 then -- player used private chat command
-    if chatCommandInitial == chatCommandEnd then
-      chatCommandPrivateRepeat = false
-      if chatCommandInitial == "*" then
-        consoleLineEdit:setText('*'.. chatCommandPrivate .. '* ')
-      end
-      message = chatCommandMessage:trim()
-      chatCommandPrivateReady = true
-    end
-  end
-
-  message = message:gsub("^(%s*)(.*)","%2") -- remove space characters from message init
-  if #message == 0 then return end
-
-  -- add new command to history
-  currentMessageIndex = 0
-  table.insert(messageHistory, originalMessage)
-  if #messageHistory > MaxHistory then
-    table.remove(messageHistory, 1)
-  end
-
-  -- when talking on server log, the message goes to default channel
-  local name = tab:getText()
-  if name == 'Server Log' then
-    tab = Console.getTab('Default')
-    name = 'Default'
-  end
-  local speaktypedesc
-
-  if tab.channelId and not chatCommandPrivateReady then
-    if tab.channelId == 0 then
-      speaktypedesc = chatCommandSayMode or SayModes[consolePanel:getChildById('sayModeButton').sayMode].speakTypeDesc
-      if speaktypedesc ~= 'say' then Console.sayModeChange(2) end -- head back to say mode
-    else
-      speaktypedesc = 'channelYellow'
-    end
-
-    g_game.talkChannel(SpeakTypesSettings[speaktypedesc].speakType, tab.channelId, message)
-    return
-  else
-    local isPrivateCommand = false
-    if chatCommandPrivateReady then
-      speaktypedesc = 'privatePlayerToPlayer'
-      name = chatCommandPrivate
-      isPrivateCommand = true
-    elseif tab.npcChat then
-      speaktypedesc = 'privatePlayerToNpc'
-    else
-      speaktypedesc = 'privatePlayerToPlayer'
-    end
-
-
-    local speaktype = SpeakTypesSettings[speaktypedesc]
-    local player = g_game.getLocalPlayer()
-    g_game.talkPrivate(speaktype.speakType, name, message)
-
-    message = applyMessagePrefixies(player:getName(), player:getLevel(), message)
-    Console.addPrivateText(message, speaktype, name, isPrivateCommand)
-  end
-end
-
-function Console.sayModeChange(sayMode)
-  local buttom = consolePanel:getChildById('sayModeButton')
-  if sayMode == nil then
-    sayMode = buttom.sayMode + 1
-  end
-
-  if sayMode > #SayModes then sayMode = 1 end
-
-  buttom:setIcon(SayModes[sayMode].icon)
-  buttom.sayMode = sayMode
-end
-
--- hooked events
-local function onCreatureSpeak(name, level, speaktype, message, channelId, creaturePos)
-  speaktype = SpeakTypes[speaktype]
-  if speaktype.hideInConsole then return end
-
-  message = applyMessagePrefixies(name, level, message)
-
-  if speaktype.private then
-    Console.addPrivateText(message, speaktype, name, false)
-  else
-    local channel = channels[channelId]
-
-    if channel then
-      Console.addText(message, speaktype, channel)
-    else
-      -- server sent a message on a channel that we are not aware of, must leave it
-      g_game.leaveChannel(channelId)
-    end
-  end
-end
-
-local function onOpenChannel(channelId, channelName)
-  Console.addChannel(channelName, channelId)
-end
-
-local function onOpenPrivateChannel(receiver)
-  local privateTab = Console.getTab(receiver)
-  if privateTab == nil then
-    Console.addTab(receiver, true)
-  end
-end
-
-local function doChannelListSubmit(channelsWindow)
-  local channelListPanel = channelsWindow:getChildById('channelList')
-  local openPrivateChannelWith = channelsWindow:getChildById('openPrivateChannelWith'):getText()
-  if openPrivateChannelWith ~= '' then
-    g_game.openPrivateChannel(openPrivateChannelWith)
-  else
-    local selectedChannelLabel = channelListPanel:getFocusedChild()
-    if not selectedChannelLabel then return end
-    g_game.joinChannel(selectedChannelLabel.channelId)
-  end
-  channelsWindow:destroy()
-end
-
-local function onChannelList(channelList)
-  local channelsWindow = displayUI('channelswindow.otui')
-  local channelListPanel = channelsWindow:getChildById('channelList')
-  connect(channelsWindow, { onEnter = function () doChannelListSubmit(channelsWindow) end } )
-
-  for k,v in pairs(channelList) do
-    local channelId = v[1]
-    local channelName = v[2]
-
-    if channelId ~= 0 and #channelName > 0 then
-      local label = createWidget('ChannelListLabel', channelListPanel)
-      label.channelId = channelId
-      label:setText(channelName)
-
-      label:setPhantom(false)
-      connect(label, { onDoubleClick = function () doChannelListSubmit(channelsWindow) end } )
-    end
-  end
-end
-
-connect(g_game, { onGameStart = Console.create,
-                onGameEnd = Console.destroy,
-                onCreatureSpeak = onCreatureSpeak,
-                onChannelList = onChannelList,
-                onOpenChannel = onOpenChannel,
-                onOpenPrivateChannel = onOpenPrivateChannel})

modules/old/game_console/console.otmod

@@ -1,7 +0,0 @@
-Module
-  name: game_console
-  description: Manage chat window
-  author: OTClient team
-  website: https://github.com/edubart/otclient
-  onLoad: |
-    dofile 'console'

modules/old/game_console/console.otui

@@ -1,95 +0,0 @@
-ConsoleLabel < UILabel
-  font: verdana-11px-antialised
-  height: 14
-  color: yellow
-
-ConsoleTabBar < TabBar
-ConsoleTabBarPanel < TabBarPanel
-  layout:
-    type: verticalBox
-    align-bottom: true
-ConsoleTabBarButton < TabBarButton
-
-Panel
-  id: consolePanel
-  anchors.fill: parent
-
-  ConsoleButton
-    id: prevChannelButton
-    icon: /core_styles/icons/leftarrow.png
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin-left: 6
-    margin-top: 6
-
-  ConsoleTabBar
-    id: consoleTabBar
-    height: 20
-    anchors.left: prev.right
-    anchors.top: prev.top
-    anchors.right: next.left
-    margin-left: 5
-
-  ConsoleButton
-    id: nextChannelButton
-    icon: /core_styles/icons/rightarrow.png
-    anchors.right: next.left
-    anchors.top: parent.top
-    margin-right: 5
-    margin-top: 6
-
-  ConsoleButton
-    id: closeChannelButton
-    tooltip: Close this channel (Ctrl+E)
-    icon: /core_styles/icons/closechannel.png
-    anchors.right: next.left
-    anchors.top: parent.top
-    enabled: false
-    margin-right: 5
-    margin-top: 6
-    @onClick: Console.removeCurrentTab()
-
-  ConsoleButton
-    id: channelsButton
-    tooltip: Open new channel (Ctrl+O)
-    icon: /core_styles/icons/channels.png
-    anchors.right: parent.right
-    anchors.top: parent.top
-    margin-right: 5
-    margin-top: 6
-    @onClick: g_game.requestChannels()
-
-  Panel
-    id: consoleBuffer
-    anchors.top: prev.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.bottom: consoleLineEdit.top
-    margin-right: 6
-    margin-left: 6
-    margin-bottom: 4
-    margin-top: 4
-    focusable: false
-
-  ConsoleButton
-    id: sayModeButton
-    icon: /core_styles/icons/say.png
-    tooltip: Adjust volume
-    &sayMode: 2
-    size: 20 20
-    anchors.left: parent.left
-    anchors.bottom: parent.bottom
-    margin-left: 6
-    margin-bottom: 6
-    @onClick: Console.sayModeChange()
-
-  LineEdit
-    id: consoleLineEdit
-    anchors.left: sayModeButton.right
-    anchors.right: parent.right
-    anchors.bottom: parent.bottom
-    margin-right: 6
-    margin-left: 6
-    margin-bottom: 6
-    always-active: true
-    focusable: false

modules/old/game_hotkeys/hotkeys_manager.lua

@@ -455,4 +455,4 @@ function HotkeysManager.hotkeyCapture(widget, keyCode, keyboardModifiers)
   hotkeysWindow:getChildById('assignWindow'):getChildById('addButton'):enable()
 
   return true
-end
+end

modules/old/game_hotkeys/hotkeys_manager.otui

@@ -156,4 +156,4 @@ MainWindow
     width: 64
     anchors.right: parent.right
     anchors.bottom: parent.bottom
-    @onClick: HotkeysManager.hide()
+    @onClick: HotkeysManager.hide()

modules/old/game_interface/gameinterface.otui

@@ -1,14 +1,14 @@
 GameSidePanel < UIMiniWindowContainer
-  image-source: /core_styles/styles/images/sidepanel.png
+  image-source: images/sidepanel.png
   image-border: 4
 
 GameBottomPanel < Panel
-  image-source: /core_styles/styles/images/bottompanel.png
+  image-source: images/bottompanel.png
   image-border: 4
 
 GameMapPanel < UIMap
   padding: 4
-  image-source: /core_styles/styles/images/mappanel.png
+  image-source: images/mappanel.png
   image-border: 4
 
 UIGame
@@ -16,7 +16,7 @@ UIGame
   anchors.fill: parent
   anchors.top: topMenu.bottom
 
-  InterfacePanel
+  GameSidePanel
     id: gameRightPanel
     width: 190
     layout: verticalBox

modules/old/game_interface/uiitem.lua

@@ -1,75 +0,0 @@
-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 moveWindow = displayUI('/game/movewindow.otui')
-    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/old/game_interface/uiminiwindow.lua

@@ -1,36 +0,0 @@
-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/old/game_interface/uiminiwindowcontainer.lua

@@ -1,12 +0,0 @@
-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

modules/old/game_textmessage/textmessage.lua

@@ -1,117 +0,0 @@
-TextMessage = {}
-
--- require styles
-importStyle 'textmessage.otui'
-
--- private variables
-local MessageTypes = {
-  consoleRed      = { color = '#F55E5E', consoleTab = 'Default' },
-  consoleOrange   = { color = '#FE6500', consoleTab = 'Default' },
-  consoleBlue     = { color = '#9F9DFD', consoleTab = 'Default' },
-  warning         = { color = '#F55E5E', consoleTab = 'Server Log', labelId = 'centerWarning', wrap = true },
-  infoDescription = { color = '#00EB00', consoleTab = 'Server Log', labelId = 'centerInfo', consoleOption = 'showInfoMessagesInConsole', wrap = true },
-  eventAdvance    = { color = '#FFFFFF', consoleTab = 'Server Log', labelId = 'centerAdvance', consoleOption = 'showEventMessagesInConsole', wrap = true },
-  eventDefault    = { color = '#FFFFFF', consoleTab = 'Server Log', labelId = 'bottomStatus', consoleOption = 'showEventMessagesInConsole' },
-  statusDefault   = { color = '#FFFFFF', consoleTab = 'Server Log', labelId = 'bottomStatus', consoleOption = 'showStatusMessagesInConsole' },
-  statusSmall     = { color = '#FFFFFF', labelId = 'bottomStatus' },
-}
-
-local centerTextMessagePanel
-local centerLabel
-
--- private functions
-local function displayMessage(msgtype, msg, time)
-  if not g_game.isOnline() then return end
-
-  if msgtype.consoleTab ~= nil then
-    if msgtype.consoleOption == nil or Options[msgtype.consoleOption] then
-      Console.addText(msg, msgtype, msgtype.consoleTab)
-    end
-  end
-
-  if msgtype.labelId  then
-    local label = g_game.gameMapPanel:recursiveGetChildById(msgtype.labelId)
-
-    label:setVisible(true)
-    label:setText(msg)
-    label:setColor(msgtype.color)
-    label:resizeToText()
-
-    if msgtype.wrap then
-      label:setWidth(label:getParent():getWidth())
-      label:wrapText()
-      label:setHeight(label:getTextSize().height)
-    end
-
-    if not time then
-      time = math.max(#msg * 100, 4000)
-    else
-      time = time * 1000
-    end
-    removeEvent(label.hideEvent)
-    label.hideEvent = scheduleEvent(function() label:setVisible(false) end, time)
-  end
-end
-
-local function createTextMessageLabel(id, parent)
-  local label = createWidget('UILabel', parent)
-  label:setFont('verdana-11px-rounded')
-  label:setTextAlign(AlignCenter)
-  label:setId(id)
-  label:setMarginBottom(2)
-  label:setVisible(false)
-  return label
-end
-
--- public functions
-
-function TextMessage.create()
-  centerTextMessagePanel = createWidget('Panel', g_game.gameMapPanel)
-  centerTextMessagePanel:setId('centerTextMessagePanel')
-  local layout = UIVerticalLayout.create(centerTextMessagePanel)
-  layout:setFitChildren(true)
-  centerTextMessagePanel:setLayout(layout)
-  centerTextMessagePanel:setWidth(360)
-  centerTextMessagePanel:centerIn('parent')
-
-  createTextMessageLabel('centerWarning', centerTextMessagePanel)
-  createTextMessageLabel('centerAdvance', centerTextMessagePanel)
-  createTextMessageLabel('centerInfo', centerTextMessagePanel)
-
-  bottomStatusLabel = createTextMessageLabel('bottomStatus', g_game.gameMapPanel)
-  bottomStatusLabel:setHeight(16)
-  bottomStatusLabel:addAnchor(AnchorBottom, 'parent', AnchorBottom)
-  bottomStatusLabel:addAnchor(AnchorLeft, 'parent', AnchorLeft)
-  bottomStatusLabel:addAnchor(AnchorRight, 'parent', AnchorRight)
-end
-
-function TextMessage.displayStatus(msg, time)
-  displayMessage(MessageTypes.warning, msg)
-end
-
-function TextMessage.displayEventAdvance(msg, time)
-  displayMessage(MessageTypes.eventAdvance, msg, time)
-end
-
-function TextMessage.display(msgtypedesc, msg)
-  local msgtype = MessageTypes[msgtypedesc]
-  if msgtype then
-    displayMessage(msgtype, msg)
-  end
-end
-
--- hooked events
-local function onGameDeath()
-  local advanceLabel = g_game.gameMapPanel:recursiveGetChildById('centerAdvance')
-  if advanceLabel:isVisible() then return end
-  TextMessage.displayEventAdvance('You are dead.')
-end
-
-local function onGameTextMessage(msgtypedesc, msg)
-  TextMessage.display(msgtypedesc, msg)
-end
-
-connect(g_game, { onGameStart = TextMessage.create,
-                onGameEnd = TextMessage.destroy,
-                onDeath = onGameDeath,
-                onTextMessage = onGameTextMessage })

modules/old/game_textmessage/textmessage.otmod

@@ -1,7 +0,0 @@
-Module
-  name: game_textmessage
-  description: Manage game text messages
-  author: OTClient team
-  website: https://github.com/edubart/otclient
-  onLoad: |
-    dofile 'textmessage'

modules/old/game_textmessage/textmessage.otui

@@ -1,15 +0,0 @@
-CenterLabel < GameLabel
-  font: verdana-11px-rounded
-  height: 64
-  text-align: center
-  anchors.centerIn: parent
-  size: 360 264
-
-BottomLabel < GameLabel
-  font: verdana-11px-rounded
-  height: 16
-  text-align: center
-  margin-bottom: 2
-  anchors.bottom: parent.bottom
-  anchors.left: parent.left
-  anchors.right: parent.right