Use client version instead of entergame

* Added better walk key binding (for other uses, like the sample given WASD).
* Made string.ends part of the string meta table rather than parameter based.

.gitignore

@@ -1,4 +1,3 @@
-/modules/.project
 build*
 CMakeCache.txt
 CMakeFiles
@@ -37,3 +36,6 @@ otclient.layout
 LOCALTODO
 tags
 Thumbs.db
+.directory
+src/framework/graphics/dx/
+modules/.project/modules.sublime-workspace

CMakeLists.txt

@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 project(otclient)
 
-set(VERSION "0.6.1")
+set(VERSION "0.6.3")
+
+option(FRAMEWORK_SOUND "Use SOUND " ON)
+option(FRAMEWORK_GRAPHICS "Use GRAPHICS " ON)
+option(FRAMEWORK_XML "Use XML " ON)
+option(FRAMEWORK_NET "Use NET " ON)
+option(FRAMEWORK_SQL "Use SQL" OFF)
 
-set(FRAMEWORK_SOUND ON)
-set(FRAMEWORK_GRAPHICS ON)
-set(FRAMEWORK_XML ON)
-set(FRAMEWORK_NET ON)
 include(src/framework/CMakeLists.txt)
 include(src/client/CMakeLists.txt)
 

data/fonts/terminus-10px.otfont

@@ -0,0 +1,8 @@
+Font
+  name: terminus-10px
+  texture: terminus-10px
+  height: 12
+  y-offset: 0
+  glyph-size: 16 16
+  fixed-glyph-width: 6
+  space-width: 6

data/locales/pt.lua

@@ -5,6 +5,7 @@ locale = {
 
   -- As tradu<64><75>es devem vir sempre em ordem alfab<61>tica.
   translation = {
+    ["%d of experience per hour"] = "%d de experi<72>ncia por hora",
     ["%s of experience left"] = "%s de experi<72>ncia faltando",
     ["%s: (use object on target)"] = "%s: (usar objeto no alvo)",
     ["%s: (use object on yourself)"] = "%s: (usar objeto em si)",
@@ -33,6 +34,7 @@ locale = {
     ["Account name"] = "Nome da conta",
     ["Account Status"] = "Estado da Conta",
     ["Action"] = "A<EFBFBD><EFBFBD>o",
+    ["Add new server"] = "Adicionar novo servidor",
     ["Add new VIP"] = "Adicionar nova VIP",
     ["Add to VIP list"] = "Adicionar a lista VIP",
     ["Add"] = "Adicionar",
@@ -89,6 +91,7 @@ locale = {
     ["Comment"] = "Coment<EFBFBD>rio",
     ["Connecting to game server..."] = "Conectando no servidor do jogo...",
     ["Connecting to login server..."] = "Conectando no servidor de autentica<63><61>o...",
+    ["Connection Error"] = "Erro de Conex<65>o",
     ["Console"] = "Console",
     ["Cooldown"] = "Cooldown",
     ["Cooldowns"] = "Cooldowns",
@@ -122,6 +125,7 @@ locale = {
     ["Edit List"] = "Editar lista",
     ["Edit Text"] = "Editar Texto",
     ["Enable audio"] = "Ativar <20>udio",
+    ["Enable dash walking"] = "Ativar andar r<>pido",
     ["Enable lights"] = "Ativar luzes",
     ["Enable music sound"] = "Ativar m<>sica",
     ["Enable music"] = "Ativar musica",
@@ -169,6 +173,7 @@ locale = {
     ["Hide spells for other vocations"] = "Esconder feiti<74>os de outras voca<63><61>es",
     ["Hit Points"] = "Pontos de Vida",
     ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = "Segure o bot<6F>o esquerdo para navegar\nGire o bot<6F>o do centro do mouse para ampliar\nClique com o bot<6F>o direito do mouse para criar marcas",
+    ["Host"] = "Host",
     ["Hotkeys"] = "Atalhos",
     ["If you shut down the program, your character might stay in the game.\nClick on 'Logout' to ensure that you character leaves the game properly.\nClick on 'Exit' if you want to exit the program without logging out your character."] = "Se voc<6F> desligar o programa o seu personagem pode continuar no jogo.\nClique em 'Sair' para assegurar que seu personagem saia do jogo adequadamente.\nClique em 'For<6F>ar Saida' para fechar o programa sem desconectar seu personagem.",
     ["Ignore capacity"] = "Ignorar capacidade",
@@ -221,6 +226,8 @@ locale = {
     ["Name Report + Banishment"] = "Reportar Nome + Banimento",
     ["Name Report"] = "Reportar Nome",
     ["Name"] = "Nome",
+    ["New Server"] = "Novo Servidor",
+    ["Next level in %d hours and %d minutes"] = "Pr<EFBFBD>ximo n<>vel em %d horas e %d minutos",
     ["No graphics card detected, everything will be drawn using the CPU,\nthus the performance will be really bad.\nPlease update your graphics driver to have a better performance."] = false,
     ["No item selected."] = "Nenhum item selecionado",
     ["No Mount"] = "Sem montaria",
@@ -287,12 +294,16 @@ locale = {
     ["Select object"] = "Selecionar objeto",
     ["Select Outfit"] = "Selecionar Roupa",
     ["Select your language"] = "Selecione sua l<>ngua",
+    ["Select"] = "Selecionar",
+    ["Sell All"] = "Vender Todos",
     ["Sell Now"] = "Vender agora",
     ["Sell Offers"] = "Ofertas de venda",
     ["Sell"] = "Vender",
     ["Send automatically"] = "Enviar automaticamente",
     ["Send Message"] = "Enviar Mensagem",
     ["Send"] = "Enviar",
+    ["Server List"] = "Lista de Servidores",
+    ["Server list"] = "Lista de servidores",
     ["Server Log"] = "Registro do servidor",
     ["Server"] = "Servidor",
     ["Set Outfit"] = "Escolher Roupa",
@@ -337,8 +348,9 @@ locale = {
     ["Trade"] = "Trocar",
     ["Trying to reconnect in %s seconds."] = "Tentando reconectar em %s segundos.",
     ["Type"] = "Tipo",
-    ["Unable to load dat file, please place a valid dat in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo dat, por favor coloque um arquivo v<>lido em %s",
-    ["Unable to load spr file, please place a valid spr in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo spr, por favor coloque um arquivo v<>lido em %s",
+    ["Unable to establish a connection. (err: %d)"] = "N<EFBFBD>o foi poss<73>vel estabilizar a conex<65>. (err: %d)",
+    ["Unable to load dat file, please place a valid dat in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo DAT, por favor coloque um arquivo v<>lido em %s",
+    ["Unable to load spr file, please place a valid spr in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo SPR, por favor coloque um arquivo v<>lido em %s",
     ["Unable to logout."] = "N<EFBFBD>o <20> possivel sair",
     ["Unignore"] = "Designorar",
     ["Unload"] = "Descarregar",
@@ -354,6 +366,7 @@ locale = {
     ["Waiting List"] = "Lista de espera",
     ["Website"] = "Website",
     ["Weight"] = "Peso",
+    ["Will boost your walk on high speed characters"] = "Ir<EFBFBD> melhorar o andar de persnagens r<>pidos",
     ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectar quando usar o passo diagonal\nbaseado nas teclas pressionadas",
     ["With crosshair"] = "Com mira",
     ["Yes"] = "Sim",
@@ -388,6 +401,7 @@ locale = {
     ["Your Capacity"] = "Sua capacidade",
     ["Your character health is %d out of %d."] = "A vida do seu personagem <20> %d de %d.",
     ["Your character mana is %d out of %d."] = "A mana do seu personagem <20> %d de %d.",
+    ["Your connection has been lost. (err: %d)"] = "A sua conex<65>o foi perdida. (err: %d)",
     ["Your Money"] = "Seu dinheiro",
   }
 }

data/styles/10-buttons.otui

@@ -66,4 +66,18 @@ PreviousButton < UIButton
     image-clip: 0 21 12 21
 
   $disabled:
-    image-color: #ffffff55
+    image-color: #ffffff55
+
+AddButton < UIButton
+  size: 20 20
+  image-source: /images/ui/icon_add
+  image-color: #ffffffff
+
+  $hover !disabled:
+    image-color: #ffffff99
+
+  $pressed:
+    image-color: #ffffff44
+
+  $disabled:
+    image-color: #ffffff55

data/styles/10-creaturebuttons.otui

@@ -38,7 +38,7 @@ CreatureButton < UICreatureButton
     margin-left: 2
     phantom: true
 
-  ProgressBar
+  LifeProgressBar
     id: lifeBar
     height: 5
     anchors.left: spacer.right

data/styles/10-items.otui

@@ -4,3 +4,7 @@ Item < UIItem
   image-source: /images/ui/item
   font: verdana-11px-rounded
   border-color: white
+  color: white
+
+  $disabled:
+    color: #646464

data/styles/10-labels.otui

@@ -21,45 +21,3 @@ MenuLabel < Label
 GameLabel < UILabel
   font: verdana-11px-antialised
   color: #bbbbbb
-
-FrameCounterLabel < Label
-  font: verdana-11px-rounded
-  @onSetup: |
-    self.updateEvent = cycleEvent(function()
-      local text = 'FPS: ' .. g_app.getBackgroundPaneFps()
-      self:setText(text)
-    end, 1000)
-  @onDestroy: self.updateEvent:cancel()
-
-PingLabel < Label
-  font: verdana-11px-rounded
-  @onSetup: |
-    self.updateEvent = cycleEvent(function()
-      if g_game.isOnline() and modules.client_options.getOption('showPing') then
-        local ping = -1
-        if g_game.getFeature(GameClientPing) or g_game.getFeature(GameExtendedClientPing) then
-          ping = g_game.getPing()
-        else
-          ping = g_game.getLocalPlayer():getWalkPing()
-        end
-        local text = 'Ping: '
-        if ping < 0 then
-          text = text .. "??"
-          self:setColor('yellow')
-        else
-          text = text .. ping .. ' ms'
-          if ping >= 500 then
-            self:setColor('red')
-          elseif ping >= 250 then
-            self:setColor('yellow')
-          else
-            self:setColor('green')
-          end
-        end
-        self:setText(text)
-        self:show()
-      else
-        self:hide()
-      end
-    end, 1000)
-  @onDestroy: self.updateEvent:cancel()

data/styles/10-listboxes.otui

@@ -11,3 +11,9 @@ HorizontalList < UIScrollArea
   border-width: 1
   border-color: #1d222b
   background-color: #222833
+
+VerticalList < UIScrollArea
+  layout: verticalBox
+  border-width: 1
+  border-color: #1d222b
+  background-color: #222833

data/styles/10-progressbars.otui

@@ -1,12 +1,10 @@
 ProgressBar < UIProgressBar
   height: 16
   background-color: red
-  border: 1 black
   image-source: /images/ui/progressbar
   image-border: 1
   font: verdana-11px-rounded
   text-offset: 0 2
-  on: true
 
   $!on:
     visible: false
@@ -14,6 +12,14 @@ ProgressBar < UIProgressBar
     margin-bottom: 0
     height: 0
 
+LifeProgressBar < UIProgressBar
+  height: 16
+  background-color: green
+  border: 1 black
+  font: verdana-11px-rounded
+  text-offset: 0 2
+  margin: 2
+
 ProgressRect < UIProgressRect
   anchors.fill: parent
   phantom: true

data/styles/10-scrollbars.otui

@@ -5,7 +5,7 @@ ScrollBarSlider < UIButton
   image-source: /images/ui/scrollbar
   image-clip: 0 26 13 13
   image-border: 2
-  image-color: #ffffffbb
+  image-color: #ffffffff
   $hover:
     image-clip: 13 26 13 13
   $pressed:
@@ -14,6 +14,12 @@ ScrollBarSlider < UIButton
   $disabled:
     image-color: #ffffff66
 
+ScrollBarValueLabel < Label
+  id: valueLabel
+  anchors.fill: parent
+  color: white
+  text-align: center
+
 VerticalScrollBar < UIScrollBar
   orientation: vertical
   width: 13
@@ -55,6 +61,8 @@ VerticalScrollBar < UIScrollBar
 
   ScrollBarSlider
 
+  ScrollBarValueLabel
+
 HorizontalScrollBar < UIScrollBar
   orientation: horizontal
   height: 13
@@ -97,3 +105,5 @@ HorizontalScrollBar < UIScrollBar
       image-color: #ffffff66
 
   ScrollBarSlider
+
+  ScrollBarValueLabel

data/styles/20-spinboxes.otui

@@ -1,7 +1,9 @@
 SpinBox < TextEdit
   __class: UISpinBox
+  text-align: left
   size: 86 20
   padding: 0
+  padding-left: 2
 
   Button
     id: up
@@ -11,7 +13,6 @@ SpinBox < TextEdit
     image-clip: 0 0 10 10
     anchors.top: parent.top
     anchors.right: parent.right
-    @onClick: self:getParent():up()
 
     $hover:
       image-clip: 0 10 10 10
@@ -26,7 +27,6 @@ SpinBox < TextEdit
     image-clip: 0 0 10 10
     anchors.bottom: parent.bottom
     anchors.right: parent.right
-    @onClick: self:getParent():down()
 
     $hover:
       image-clip: 0 10 10 10

data/styles/20-topmenu.otui

@@ -46,7 +46,11 @@ TopMenuPanel < Panel
   image-repeated: true
   focusable: false
 
-TopMenuFrameCounterLabel < FrameCounterLabel
+TopMenuFrameCounterLabel < Label
+  font: verdana-11px-rounded
   color: white
   margin-top: 4
   margin-left: 5
+
+TopMenuPingLabel < Label
+  font: verdana-11px-rounded

data/styles/30-messageboxes.otui

@@ -1,8 +1,9 @@
 MessageBoxLabel < Label
   id: messageBoxLabel
-  text-auto-resize: true
   anchors.horizontalCenter: parent.horizontalCenter
   anchors.top: parent.top
+  text-wrap: true
+  text-auto-resize: true
 
 MessageBoxButtonHolder < UIWidget
   id: buttonHolder

data/styles/30-minimap.otui

@@ -1,10 +1,12 @@
 MinimapFlag < UIWidget
   size: 11 11
-  anchors.left: parent.left
-  anchors.top: parent.top
+  focusable: false
 
-MinimapFlags < UIWidget
-  anchors.fill: parent
+MinimapCross < UIWidget
+  focusable: false
+  phantom: true
+  image: /images/game/minimap/cross
+  size: 16 16
 
 MinimapFloorUpButton < Button
   size: 20 20
@@ -61,12 +63,7 @@ Minimap < UIMinimap
   draggable: true
   focusable: false
   cross: true
-  @onGeometryChange: self:updateFlags()
-
-  MinimapFlags
-    id: flags
-    phantom: true
-    focusable: false
+  color: black
 
   MinimapFloorUpButton
     id: floorUp
@@ -245,22 +242,3 @@ MinimapFlagWindow < MainWindow
     width: 64
     anchors.right: parent.right
     anchors.bottom: parent.bottom
-
-// Minimap Full Panel
-
-MinimapFullPanel < FlatPanel
-  phantom: false
-  anchors.fill: parent
-  anchors.top: topMenu.bottom
-
-  ImageView
-    id: image
-    anchors.fill: parent
-
-  Button
-    !text: tr('Close')
-    margin-right: 4
-    margin-top: 4
-    anchors.right: parent.right
-    anchors.top: parent.top
-    @onClick: self:getParent():destroy()

modules/.project/modules.sublime-project

@@ -0,0 +1,10 @@
+{
+	"folders":
+	[
+		{
+			"path": "..",
+			"folder_exclude_patterns": [".*", "*.*~"],
+			"file_exclude_patterns": [".*", "*.*~"]
+		}
+	]
+}

modules/client/client.lua

@@ -11,7 +11,7 @@ function setMusic(filename)
 end
 
 function reloadScripts()
-  g_textures.clearTexturesCache()
+  g_textures.clearCache()
   g_modules.reloadModules()
 
   local script = '/' .. g_app.getCompactName() .. 'rc'
@@ -55,7 +55,7 @@ end
 function init()
   connect(g_app, { onRun = startup, 
                    onExit = exit })
-                   
+
   g_window.setMinimumSize({ width = 600, height = 480 })
   g_sounds.preload(musicFilename)
 
@@ -104,11 +104,6 @@ function terminate()
   g_settings.set('window-size', g_window.getUnmaximizedSize())
   g_settings.set('window-pos', g_window.getUnmaximizedPos())
   g_settings.set('window-maximized', g_window.isMaximized())
-
-  local protocolVersion = g_game.getProtocolVersion()
-  if protocolVersion ~= 0 then
-    g_settings.set('protocol-version', protocolVersion)
-  end
 end
 
 function exit()

modules/client/client.otmod

@@ -12,11 +12,11 @@ Module
   load-later:
     - client_styles
     - client_locales
-    //- client_particles
     - client_topmenu
     - client_background
-    - client_entergame
     - client_options
+    - client_entergame
     - client_terminal
     - client_modulemanager
-    //- client_stats
+    - client_serverlist
+    - client_stats

modules/client_background/background.lua

@@ -1,18 +1,19 @@
 -- private variables
 local background
+local clientVersionLabel
 
 -- public functions
 function init()
   background = g_ui.displayUI('background')
   background:lower()
 
-  local clientVersionLabel = background:getChildById('clientVersionLabel')
+  clientVersionLabel = background:getChildById('clientVersionLabel')
   clientVersionLabel:setText(g_app.getName() .. ' ' .. g_app.getVersion() .. '\n' ..
                              'Rev  ' .. g_app.getBuildRevision() .. ' ('.. g_app.getBuildCommit() .. ')\n' ..
                              'Built on ' .. g_app.getBuildDate())
 
   if not g_game.isOnline() then
-    g_effects.fadeIn(clientVersionLabel, 1500)
+    addEvent(function() g_effects.fadeIn(clientVersionLabel, 1500) end)
   end
 
   connect(g_game, { onGameStart = hide })
@@ -40,3 +41,7 @@ end
 function hideVersionLabel()
   background:getChildById('clientVersionLabel'):hide()
 end
+
+function setVersionText(text)
+  clientVersionLabel:setText(text)
+end

modules/client_entergame/characterlist.lua

@@ -111,7 +111,8 @@ end
 
 function onGameConnectionError(message, code)
   CharacterList.destroyLoadBox()
-  errorBox = displayErrorBox(tr("Login Error"), message)
+  local text = translateNetworkError(code, g_game.getProtocolGame() and g_game.getProtocolGame():isConnecting(), message)
+  errorBox = displayErrorBox(tr("Connection Error"), text)
   errorBox.onOk = function()
     errorBox = nil
     CharacterList.showAgain()

modules/client_entergame/entergame.lua

@@ -6,8 +6,9 @@ local enterGame
 local motdWindow
 local motdButton
 local enterGameButton
-local protocolBox
+local clientBox
 local protocolLogin
+local motdEnabled = true
 
 -- private functions
 local function onError(protocol, message, errorCode)
@@ -27,15 +28,31 @@ end
 local function onMotd(protocol, motd)
   G.motdNumber = tonumber(motd:sub(0, motd:find("\n")))
   G.motdMessage = motd:sub(motd:find("\n") + 1, #motd)
-  motdButton:show()
+  if motdEnabled then
+    motdButton:show()
+  end
 end
 
 local function onCharacterList(protocol, characters, account, otui)
+  -- Try add server to the server list
+  ServerList.add(G.host, G.port, g_game.getProtocolVersion())
+
   if enterGame:getChildById('rememberPasswordBox'):isChecked() then
-    g_settings.set('account', g_crypt.encrypt(G.account))
-    g_settings.set('password', g_crypt.encrypt(G.password))
+    local account = g_crypt.encrypt(G.account)
+    local password = g_crypt.encrypt(G.password)
+
+    g_settings.set('account', account)
+    g_settings.set('password', password)
+
+    ServerList.setServerAccount(G.host, account)
+    ServerList.setServerPassword(G.host, password)
+
     g_settings.set('autologin', enterGame:getChildById('autoLoginBox'):isChecked())
   else
+    -- reset server list account/password
+    ServerList.setServerAccount(G.host, '')
+    ServerList.setServerPassword(G.host, '')
+
     EnterGame.clearAccountFields()
   end
 
@@ -45,20 +62,17 @@ local function onCharacterList(protocol, characters, account, otui)
   CharacterList.create(characters, account, otui)
   CharacterList.show()
 
-  local lastMotdNumber = g_settings.getNumber("motd")
-  if G.motdNumber and G.motdNumber ~= lastMotdNumber then
-    g_settings.set("motd", motdNumber)
-    motdWindow = displayInfoBox(tr('Message of the day'), G.motdMessage)
-    connect(motdWindow, { onOk = function() CharacterList.show() motdWindow = nil end })
-    CharacterList.hide()
+  if motdEnabled then
+    local lastMotdNumber = g_settings.getNumber("motd")
+    if G.motdNumber and G.motdNumber ~= lastMotdNumber then
+      g_settings.set("motd", motdNumber)
+      motdWindow = displayInfoBox(tr('Message of the day'), G.motdMessage)
+      connect(motdWindow, { onOk = function() CharacterList.show() motdWindow = nil end })
+      CharacterList.hide()
+    end
   end
 end
 
-local function onChangeProtocol(combobox, option)
-  local clients = g_game.getSupportedClients(option)
-  protocolBox:setTooltip("Supports Client" .. (#clients > 1 and "s" or "") .. ": " .. table.tostring(clients))
-end
-
 local function onUpdateNeeded(protocol, signature)
   loadBox:destroy()
   loadBox = nil
@@ -81,36 +95,32 @@ function EnterGame.init()
   motdButton:hide()
   g_keyboard.bindKeyDown('Ctrl+G', EnterGame.openWindow)
 
-  if G.motdNumber then
+  if motdEnabled and G.motdNumber then
     motdButton:show()
   end
 
-  local account = g_crypt.decrypt(g_settings.get('account'))
-  local password = g_crypt.decrypt(g_settings.get('password'))
+  local account = g_settings.get('account')
+  local password = g_settings.get('password')
   local host = g_settings.get('host')
   local port = g_settings.get('port')
   local autologin = g_settings.getBoolean('autologin')
-  local protocolVersion = g_settings.getInteger('protocol-version')
+  local clientVersion = g_settings.getInteger('client-version')
+  if clientVersion == 0 then clientVersion = 860 end
 
   if port == nil or port == 0 then port = 7171 end
 
-  enterGame:getChildById('accountNameTextEdit'):setText(account)
-  enterGame:getChildById('accountNameTextEdit'):setCursorPos(-1)
-  enterGame:getChildById('accountPasswordTextEdit'):setText(password)
+  EnterGame.setAccountName(account)
+  EnterGame.setPassword(password)
+
   enterGame:getChildById('serverHostTextEdit'):setText(host)
   enterGame:getChildById('serverPortTextEdit'):setText(port)
   enterGame:getChildById('autoLoginBox'):setChecked(autologin)
-  enterGame:getChildById('rememberPasswordBox'):setChecked(#account > 0)
 
-  protocolBox = enterGame:getChildById('protocolComboBox')
-  protocolBox.onOptionChange = onChangeProtocol  
-  for _i, proto in pairs(g_game.getSupportedProtocols()) do
-    protocolBox:addOption(proto)
-  end
-
-  if protocolVersion then
-    protocolBox:setCurrentOption(protocolVersion)
+  clientBox = enterGame:getChildById('clientComboBox')
+  for _, proto in pairs(g_game.getSupportedClients()) do
+    clientBox:addOption(proto)
   end
+  clientBox:setCurrentOption(clientVersion)
 
   enterGame:hide()
 
@@ -127,18 +137,20 @@ function EnterGame.firstShow()
   local host = g_settings.get('host')
   local autologin = g_settings.getBoolean('autologin')
   if #host > 0 and #password > 0 and #account > 0 and autologin then
-    autoLoginEvent = addEvent(EnterGame.doLogin)
+    addEvent(function()
+      if not g_settings.getBoolean('autologin') then return end
+      EnterGame.doLogin()
+    end)
   end
 end
 
 function EnterGame.terminate()
   g_keyboard.unbindKeyDown('Ctrl+G')
-  removeEvent(autoLoginEvent)
   enterGame:destroy()
   enterGame = nil
   enterGameButton:destroy()
   enterGameButton = nil
-  protocolBox = nil
+  clientBox = nil
   if motdWindow then
     motdWindow:destroy()
     motdWindow = nil
@@ -177,6 +189,18 @@ function EnterGame.openWindow()
   end
 end
 
+function EnterGame.setAccountName(account)
+  local account = g_crypt.decrypt(account)
+  enterGame:getChildById('accountNameTextEdit'):setText(account)
+  enterGame:getChildById('accountNameTextEdit'):setCursorPos(-1)
+  enterGame:getChildById('rememberPasswordBox'):setChecked(#account > 0)
+end
+
+function EnterGame.setPassword(password)
+  local password = g_crypt.decrypt(password)
+  enterGame:getChildById('accountPasswordTextEdit'):setText(password)
+end
+
 function EnterGame.clearAccountFields()
   enterGame:getChildById('accountNameTextEdit'):clearText()
   enterGame:getChildById('accountPasswordTextEdit'):clearText()
@@ -186,13 +210,11 @@ function EnterGame.clearAccountFields()
 end
 
 function EnterGame.doLogin()
-  autoLoginEvent = nil
   G.account = enterGame:getChildById('accountNameTextEdit'):getText()
   G.password = enterGame:getChildById('accountPasswordTextEdit'):getText()
   G.host = enterGame:getChildById('serverHostTextEdit'):getText()
   G.port = tonumber(enterGame:getChildById('serverPortTextEdit'):getText())
-  local protocolVersion = tonumber(protocolBox:getText())
-  local clientVersions = g_game.getSupportedClients(protocolVersion)
+  local clientVersion = tonumber(clientBox:getText())
   EnterGame.hide()
 
   if g_game.isOnline() then
@@ -203,9 +225,10 @@ function EnterGame.doLogin()
 
   g_settings.set('host', G.host)
   g_settings.set('port', G.port)
+  g_settings.set('client-version', clientVersion) 
 
   protocolLogin = ProtocolLogin.create()
-  protocolLogin.onError = onError
+  protocolLogin.onLoginError = onError
   protocolLogin.onMotd = onMotd
   protocolLogin.onCharacterList = onCharacterList
   protocolLogin.onUpdateNeeded = onUpdateNeeded
@@ -218,10 +241,8 @@ function EnterGame.doLogin()
                                 end })
 
   g_game.chooseRsa(G.host)
-  g_game.setProtocolVersion(protocolVersion)
-  if #clientVersions > 0 then
-    g_game.setClientVersion(clientVersions[#clientVersions])
-  end
+  g_game.setClientVersion(clientVersion)
+  g_game.setProtocolVersion(g_game.getProtocolVersionForClient(clientVersion))
 
   if modules.game_things.isLoaded() then
     protocolLogin:login(G.host, G.port, G.account, G.password)
@@ -242,20 +263,16 @@ end
 function EnterGame.setDefaultServer(host, port, protocol)
   local hostTextEdit = enterGame:getChildById('serverHostTextEdit')
   local portTextEdit = enterGame:getChildById('serverPortTextEdit')
-  local protocolLabel = enterGame:getChildById('protocolLabel')
+  local clientLabel = enterGame:getChildById('clientLabel')
   local accountTextEdit = enterGame:getChildById('accountNameTextEdit')
   local passwordTextEdit = enterGame:getChildById('accountPasswordTextEdit')
 
   if hostTextEdit:getText() ~= host then
     hostTextEdit:setText(host)
     portTextEdit:setText(port)
-    protocolBox:setCurrentOption(protocol)
+    clientBox:setCurrentOption(protocol)
     accountTextEdit:setText('')
     passwordTextEdit:setText('')
-
-    if autoLoginEvent then
-      autoLoginEvent:cancel()
-    end
   end
 end
 
@@ -269,9 +286,9 @@ function EnterGame.setUniqueServer(host, port, protocol, windowWidth, windowHeig
   portTextEdit:setVisible(false)
   portTextEdit:setHeight(0)
 
-  protocolBox:setCurrentOption(protocol)
-  protocolBox:setVisible(false)
-  protocolBox:setHeight(0)
+  clientBox:setCurrentOption(protocol)
+  clientBox:setVisible(false)
+  clientBox:setHeight(0)
 
   local serverLabel = enterGame:getChildById('serverLabel')
   serverLabel:setVisible(false)
@@ -279,9 +296,14 @@ function EnterGame.setUniqueServer(host, port, protocol, windowWidth, windowHeig
   local portLabel = enterGame:getChildById('portLabel')
   portLabel:setVisible(false)
   portLabel:setHeight(0)
-  local protocolLabel = enterGame:getChildById('protocolLabel')
-  protocolLabel:setVisible(false)
-  protocolLabel:setHeight(0)
+  local clientLabel = enterGame:getChildById('clientLabel')
+  clientLabel:setVisible(false)
+  clientLabel:setHeight(0)
+
+  local serverListButton = enterGame:getChildById('serverListButton')
+  serverListButton:setVisible(false)
+  serverListButton:setHeight(0)
+  serverListButton:setWidth(0)
 
   local rememberPasswordBox = enterGame:getChildById('rememberPasswordBox')
   rememberPasswordBox:setMarginTop(-5)
@@ -297,3 +319,7 @@ function EnterGame.setServerInfo(message)
   label:setText(message)
 end
 
+function EnterGame.disableMotd()
+  motdEnabled = false
+  motdButton:hide()
+end

modules/client_entergame/entergame.otui

@@ -1,9 +1,26 @@
 EnterGameWindow < MainWindow
+  !text: tr('Enter Game')
+  size: 236 274
+
+EnterGameButton < Button
+  width: 64
+
+ServerListButton < UIButton
+  size: 17 17
+  image-source: /images/topbuttons/minimap
+  image-color: #ffffffff
+
+  $hover !disabled:
+    image-color: #ffffff99
+
+  $pressed:
+    image-color: #ffffff44
+
+  $disabled:
+    image-color: #ffffff55
 
 EnterGameWindow
   id: enterGame
-  !text: tr('Enter Game')
-  size: 236 274
   @onEnter: EnterGame.doLogin()
 
   MenuLabel
@@ -41,17 +58,26 @@ EnterGameWindow
     margin-top: 8
     text-auto-resize: true
 
-  TextEdit
-    id: serverHostTextEdit
-    !tooltip: tr('Make sure that your client uses\nthe correct game protocol version')
-    anchors.left: parent.left
+  ServerListButton
+    id: serverListButton
+    !tooltip: tr('Server list')
     anchors.right: parent.right
     anchors.top: serverLabel.bottom
+    margin-top: 3
+    @onClick: ServerList.show()
+
+  TextEdit
+    id: serverHostTextEdit
+    !tooltip: tr('Make sure that your client uses\nthe correct game client version')
+    anchors.left: parent.left
+    anchors.right: serverListButton.left
+    anchors.top: serverLabel.bottom
     margin-top: 2
+    margin-right: 4
 
   MenuLabel
-    id: protocolLabel
-    !text: tr('Protocol')
+    id: clientLabel
+    !text: tr('Client Version')
     anchors.left: parent.left
     anchors.top: serverHostTextEdit.bottom
     text-auto-resize: true
@@ -59,10 +85,10 @@ EnterGameWindow
     margin-top: 8
 
   ComboBox
-    id: protocolComboBox
+    id: clientComboBox
     anchors.left: parent.left
     anchors.right: parent.horizontalCenter
-    anchors.top: protocolLabel.bottom
+    anchors.top: clientLabel.bottom
     margin-top: 2
     margin-right: 3
     width: 90
@@ -80,7 +106,7 @@ EnterGameWindow
     text: 7171
     anchors.right: parent.right
     anchors.left: parent.horizontalCenter
-    anchors.top: protocolComboBox.top
+    anchors.top: clientComboBox.top
     margin-left: 3
 
   CheckBox
@@ -103,9 +129,8 @@ EnterGameWindow
     anchors.top: prev.bottom
     margin-top: 2
 
-  Button
+  EnterGameButton
     !text: tr('Ok')
-    width: 64
     anchors.right: parent.right
     anchors.bottom: parent.bottom
     @onClick: EnterGame.doLogin()

modules/client_entergame/waitinglist.otui

@@ -1,7 +1,7 @@
 MainWindow
   id: waitingWindow
   !text: tr('Waiting List')
-  size: 260 160
+  size: 260 180
   @onEscape: CharacterList.cancelWait()
 
   Label

modules/client_locales/locales.lua

@@ -121,7 +121,7 @@ function installLocale(locale)
     end
 
     if updatesNeeded > 0 then
-      pwarning('Locale \'' .. locale.name .. '\' is missing ' .. updatesNeeded .. ' translations.')
+      pdebug('Locale \'' .. locale.name .. '\' is missing ' .. updatesNeeded .. ' translations.')
     end
   end
 
@@ -146,6 +146,9 @@ function setLocale(name)
     pwarning("Locale " .. name .. ' does not exist.')
     return false
   end
+  if currentLocale then
+    sendLocale(locale.name)
+  end
   currentLocale = locale
   g_settings.set('locale', name)
   if onLocaleChanged then onLocaleChanged(name) end
@@ -179,7 +182,7 @@ function _G.tr(text, ...)
       if not translation then
         if translation == nil then
           if currentLocale.name ~= defaultLocaleName then
-            pwarning('Unable to translate: \"' .. text .. '\"')
+            pdebug('Unable to translate: \"' .. text .. '\"')
           end
         end
         translation = text

modules/client_locales/locales.otmod

@@ -5,6 +5,5 @@ Module
   website: www.otclient.info
   sandboxed: true
   scripts: [ locales ]
-  dependencies: [ client_topmenu ]
   @onLoad: init()
   @onUnload: terminate()

modules/client_modulemanager/modulemanager.lua

@@ -137,7 +137,7 @@ function unloadCurrentModule()
     local module = g_modules.getModule(focusedChild:getText())
     if module then
       module:unload()
-      if ModuleManager == nil then return end
+      if modules.client_modulemanager == nil then return end
       updateModuleInfo(module:getName())
       refreshLoadedModules()
     end

modules/client_options/audio.otui

@@ -1,11 +1,3 @@
-VolumeScrollbar < HorizontalScrollBar
-  step: 1
-  @onValueChange: modules.client_options.setOption(self:getId(), self:getValue())
-  @onSetup: |
-    UIScrollBar.onSetup(self)
-    local value = modules.client_options.getOption(self:getId())
-    self:setValue(value)
-
 Panel
   OptionCheckBox
     id: enableAudio
@@ -26,7 +18,7 @@ Panel
       local value = modules.client_options.getOption('musicSoundVolume')
       self:setText(tr('Music volume: %d', value))
 
-  VolumeScrollbar
+  OptionScrollbar
     id: musicSoundVolume
     anchors.left: parent.left
     anchors.right: parent.right

modules/client_options/game.otui

@@ -12,6 +12,11 @@ Panel
     !text: tr('Enable smart walking')
     !tooltip: tr('Will detect when to use diagonal step based on the\nkeys you are pressing')
 
+  OptionCheckBox
+    id: dashWalk
+    !text: tr('Enable dash walking')
+    !tooltip: tr('Will boost your walk on high speed characters')
+
   OptionCheckBox
     id: showPing
     !text: tr('Show connection ping')

modules/client_options/graphics.otui

@@ -1,12 +1,3 @@
-FrameRateScrollbar < HorizontalScrollBar
-  step: 1
-  @onValueChange: modules.client_options.setOption(self:getId(), self:getValue())
-  @onSetup: |
-    UIScrollBar.onSetup(self)
-    local value = modules.client_options.getOption(self:getId())
-    if value == 0 then value = self:getMaximum() end
-    self:setValue(value)
-
 Panel
   ButtonBox
     id: opengl1
@@ -65,7 +56,7 @@ Panel
 
       self:setText(tr('Game framerate limit: %s', text))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: backgroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
@@ -89,7 +80,7 @@ Panel
 
       self:setText(tr('Interface framerate limit: %s', text))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: foregroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
@@ -108,7 +99,7 @@ Panel
       local value = modules.client_options.getOption('ambientLight')
       self:setText(tr('Ambient light: %s%%', value))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: ambientLight
     anchors.left: parent.left
     anchors.right: parent.right

modules/client_options/options.lua

@@ -5,6 +5,7 @@ local defaultOptions = {
   fullscreen = false,
   classicControl = false,
   smartWalk = false,
+  dashWalk = false,
   autoChaseOverride = true,
   showStatusMessagesInConsole = true,
   showEventMessagesInConsole = true,
@@ -81,45 +82,20 @@ local function setupGraphicsEngines()
 end
 
 function init()
+  for k,v in pairs(defaultOptions) do
+    g_settings.setDefault(k, v)
+    options[k] = v
+  end
+
   optionsWindow = g_ui.displayUI('options')
   optionsWindow:hide()
-  optionsButton = modules.client_topmenu.addLeftButton('optionsButton', tr('Options'), '/images/topbuttons/options', toggle)
 
   optionsTabBar = optionsWindow:getChildById('optionsTabBar')
   optionsTabBar:setContentWidget(optionsWindow:getChildById('optionsTabContent'))
 
-  addEvent(function() setup() end)
-
   g_keyboard.bindKeyDown('Ctrl+Shift+F', function() toggleOption('fullscreen') end)
   g_keyboard.bindKeyDown('Ctrl+N', toggleDisplays)
 
-  audioButton = modules.client_topmenu.addLeftButton('audioButton', tr('Audio'), '/images/topbuttons/audio', function() toggleOption('enableAudio') end)
-end
-
-function terminate()
-  g_keyboard.unbindKeyDown('Ctrl+Shift+F')
-  g_keyboard.unbindKeyDown('Ctrl+N')
-  optionsWindow:destroy()
-  optionsButton:destroy()
-  audioButton:destroy()
-  optionsTabBar = nil
-  generalPanel = nil
-  consolePanel = nil
-  graphicsPanel = nil
-  audioPanel = nil
-end
-
-function setup()
-  -- load options
-  for k,v in pairs(defaultOptions) do
-    g_settings.setDefault(k, v)
-    if type(v) == 'boolean' then
-      setOption(k, g_settings.getBoolean(k))
-    elseif type(v) == 'number' then
-      setOption(k, g_settings.getNumber(k))
-    end
-  end
-
   generalPanel = g_ui.loadUI('game')
   optionsTabBar:addTab(tr('Game'), generalPanel, '/images/optionstab/game')
 
@@ -132,7 +108,31 @@ function setup()
   audioPanel = g_ui.loadUI('audio')
   optionsTabBar:addTab(tr('Audio'), audioPanel, '/images/optionstab/audio')
 
+  optionsButton = modules.client_topmenu.addLeftButton('optionsButton', tr('Options'), '/images/topbuttons/options', toggle)
+  audioButton = modules.client_topmenu.addLeftButton('audioButton', tr('Audio'), '/images/topbuttons/audio', function() toggleOption('enableAudio') end)
+
+  addEvent(function() setup() end)
+end
+
+function terminate()
+  g_keyboard.unbindKeyDown('Ctrl+Shift+F')
+  g_keyboard.unbindKeyDown('Ctrl+N')
+  optionsWindow:destroy()
+  optionsButton:destroy()
+  audioButton:destroy()
+end
+
+function setup()
   setupGraphicsEngines()
+
+  -- load options
+  for k,v in pairs(defaultOptions) do
+    if type(v) == 'boolean' then
+      setOption(k, g_settings.getBoolean(k), true)
+    elseif type(v) == 'number' then
+      setOption(k, g_settings.getNumber(k), true)
+    end
+  end
 end
 
 function toggle()
@@ -171,106 +171,70 @@ function toggleOption(key)
   setOption(key, not getOption(key))
 end
 
-function setOption(key, value)
-  if options[key] == value then return end
+function setOption(key, value, force)
+  if not force and options[key] == value then return end
   local gameMapPanel = modules.game_interface.getMapPanel()
 
-  local panel = nil
   if key == 'vsync' then
     g_window.setVerticalSync(value)
   elseif key == 'showFps' then
-    addEvent(function()
-      local frameCounter = rootWidget:recursiveGetChildById('frameCounter')
-      if frameCounter then frameCounter:setVisible(value) end
-    end)
+    modules.client_topmenu.setFpsVisible(value)
   elseif key == 'showPing' then
-    addEvent(function()
-      local ping = rootWidget:recursiveGetChildById('pingLabel')
-      if ping then ping:setVisible(value) end
-    end)
+    modules.client_topmenu.setPingVisible(value)
   elseif key == 'fullscreen' then
     g_window.setFullscreen(value)
-    panel = graphicsPanel
   elseif key == 'enableAudio' then
     g_sounds.setAudioEnabled(value)
-    addEvent(function()
-      if value then
-        audioButton:setIcon('/images/topbuttons/audio')
-      else
-        audioButton:setIcon('/images/topbuttons/audio_mute')
-      end
-    end)
-    panel = audioPanel
+    if value then
+      audioButton:setIcon('/images/topbuttons/audio')
+    else
+      audioButton:setIcon('/images/topbuttons/audio_mute')
+    end
   elseif key == 'enableMusicSound' then
     g_sounds.getChannel(SoundChannels.Music):setEnabled(value)
   elseif key == 'musicSoundVolume' then
     g_sounds.getChannel(SoundChannels.Music):setGain(value/100)
-    if audioPanel then
-      audioPanel:getChildById('musicSoundVolumeLabel'):setText(tr('Music volume: %d', value))
-    end
+    audioPanel:getChildById('musicSoundVolumeLabel'):setText(tr('Music volume: %d', value))
   elseif key == 'showLeftPanel' then
-    addEvent(function()
-      modules.game_interface.getLeftPanel():setOn(value)
-    end)
+    modules.game_interface.getLeftPanel():setOn(value)
   elseif key == 'backgroundFrameRate' then
-    local text = value
-    if value <= 0 or value >= 201 then
-      text = 'max'
-      value = 0
-    end
-
-    if graphicsPanel then
-      graphicsPanel:getChildById('backgroundFrameRateLabel'):setText(tr('Game framerate limit: %s', text))
-    end
-    g_app.setBackgroundPaneMaxFps(value)
+    local text, v = value, value
+    if value <= 0 or value >= 201 then text = 'max' v = 0 end
+    graphicsPanel:getChildById('backgroundFrameRateLabel'):setText(tr('Game framerate limit: %s', text))
+    g_app.setBackgroundPaneMaxFps(v)
   elseif key == 'foregroundFrameRate' then
-    local text = value
-    if value <= 0 or value >= 61 then
-      text = 'max'
-      value = 0
-    end
-
-    if graphicsPanel then
-      graphicsPanel:getChildById('foregroundFrameRateLabel'):setText(tr('Interface framerate limit: %s', text))
-    end
-    g_app.setForegroundPaneMaxFps(value)
+    local text, v = value, value
+    if value <= 0 or value >= 61 then  text = 'max' v = 0 end
+    graphicsPanel:getChildById('foregroundFrameRateLabel'):setText(tr('Interface framerate limit: %s', text))
+    g_app.setForegroundPaneMaxFps(v)
   elseif key == 'enableLights' then
-    addEvent(function()
-      local map = modules.game_interface.getMapPanel()
-      map:setDrawLights(value and options['ambientLight'] < 100)
-
-      if graphicsPanel then
-        graphicsPanel:getChildById('ambientLight'):setEnabled(value)
-        graphicsPanel:getChildById('ambientLightLabel'):setEnabled(value)
-      end
-    end)
+    gameMapPanel:setDrawLights(value and options['ambientLight'] < 100)
+    graphicsPanel:getChildById('ambientLight'):setEnabled(value)
+    graphicsPanel:getChildById('ambientLightLabel'):setEnabled(value)
   elseif key == 'ambientLight' then
-    addEvent(function()
-      local map = modules.game_interface.getMapPanel()
-      if graphicsPanel then
-        graphicsPanel:getChildById('ambientLightLabel'):setText(tr('Ambient light: %s%%', value))
-      end
-      map:setMinimumAmbientLight(value/100)
-      map:setDrawLights(options['enableLights'] and value < 100)
-    end)
+    graphicsPanel:getChildById('ambientLightLabel'):setText(tr('Ambient light: %s%%', value))
+    gameMapPanel:setMinimumAmbientLight(value/100)
+    gameMapPanel:setDrawLights(options['enableLights'] and value < 100)
   elseif key == 'painterEngine' then
     g_graphics.selectPainterEngine(value)
   elseif key == 'displayNames' then
     gameMapPanel:setDrawNames(value)
-    panel = generalPanel
   elseif key == 'displayHealth' then
     gameMapPanel:setDrawHealthBars(value)
-    panel = generalPanel
   elseif key == 'displayText' then
     gameMapPanel:setDrawTexts(value)
-    panel = generalPanel
   end
 
   -- change value for keybind updates
-  if panel then
+  for _,panel in pairs(optionsTabBar:getTabsPanel()) do
     local widget = panel:recursiveGetChildById(key)
-    if widget and widget:getStyle().__class == 'UICheckBox' then
-      widget:setChecked(value)
+    if widget then
+      if widget:getStyle().__class == 'UICheckBox' then
+        widget:setChecked(value)
+      elseif widget:getStyle().__class == 'UIScrollBar' then
+        widget:setValue(value)
+      end
+      break
     end
   end
 

modules/client_options/options.otmod

@@ -4,7 +4,6 @@ Module
   author: edubart, BeniS
   website: www.otclient.info
   sandboxed: true
-  dependencies: [ client_topmenu ]
   scripts: [ options ]
   @onLoad: init()
   @onUnload: terminate()

modules/client_options/options.otui

@@ -1,6 +1,5 @@
 OptionCheckBox < CheckBox
   @onCheckChange: modules.client_options.setOption(self:getId(), self:isChecked())
-  @onSetup: self:setChecked(modules.client_options.getOption(self:getId()))
   height: 16
 
   $first:
@@ -14,6 +13,10 @@ OptionCheckBox < CheckBox
     anchors.top: prev.bottom
     margin-top: 2
 
+OptionScrollbar < HorizontalScrollBar
+  step: 1
+  @onValueChange: modules.client_options.setOption(self:getId(), self:getValue())
+
 MainWindow
   id: optionsWindow
   !text: tr('Options')

modules/client_serverlist/addserver.lua

@@ -0,0 +1,38 @@
+AddServer = {}
+
+-- private variables
+local addServerWindow = nil
+
+-- public functions
+function AddServer.init()
+  addServerWindow = g_ui.displayUI('addserver')
+end
+
+function AddServer.terminate()
+  addServerWindow:destroy()
+end
+
+function AddServer.add()
+  local host = addServerWindow:getChildById('host'):getText()
+  local port = addServerWindow:getChildById('port'):getText()
+  local protocol = addServerWindow:getChildById('protocol'):getCurrentOption().text
+
+  local added, error = ServerList.add(host, port, protocol)
+  if not added then
+    displayErrorBox(tr('Add Error'), tr(error))
+  else
+    AddServer.hide()
+  end
+end
+
+function AddServer.show()
+  addServerWindow:show()
+  addServerWindow:raise()
+  addServerWindow:focus()
+  addServerWindow:lock()
+end
+
+function AddServer.hide()
+  addServerWindow:hide()
+  addServerWindow:unlock()
+end

modules/client_serverlist/addserver.otui

@@ -0,0 +1,72 @@
+MainWindow
+  id: addServerWindow
+  !text: tr('New Server')
+  size: 180 180
+  visible: false
+  @onEscape: AddServer.hide()
+  @onEnter: AddServer.add()
+
+  Label
+    id: hostLabel
+    !text: tr('Host') .. ':'
+    anchors.top: parent.top
+    anchors.left: parent.left
+    margin-bottom: 2
+
+  TextEdit
+    id: host
+    anchors.top: hostLabel.bottom
+    anchors.left: hostLabel.left
+    anchors.right: parent.right
+    auto-focus: first
+
+  Label
+    id: portLabel
+    !text: tr('Port') .. ':'
+    anchors.top: host.bottom
+    anchors.left: host.left
+    margin-top: 3
+    margin-bottom: 2
+
+  TextEdit
+    id: port
+    text: 7171
+    anchors.top: portLabel.bottom
+    anchors.left: portLabel.left
+    anchors.right: host.right
+
+  Label
+    id: protocolLabel
+    !text: tr('Protocol') .. ':'
+    anchors.top: port.bottom
+    anchors.left: port.left
+    margin-top: 3
+    margin-bottom: 2
+
+  ComboBox
+    id: protocol
+    anchors.top: protocolLabel.bottom
+    anchors.left: protocolLabel.left
+    anchors.right: port.right
+    @onSetup: |
+      for _, proto in pairs(g_game.getSupportedClients()) do
+        self:addOption(proto)
+      end
+
+  Button
+    id: buttonAdd
+    !text: tr('Add')
+    width: 64
+    anchors.right: parent.horizontalCenter
+    anchors.bottom: parent.bottom
+    margin-right: 2
+    @onClick: AddServer.add()
+
+  Button
+    id: buttonCancel
+    !text: tr('Cancel')
+    width: 64
+    anchors.left: parent.horizontalCenter
+    anchors.bottom: parent.bottom
+    margin-left: 2
+    @onClick: AddServer.hide()

modules/client_serverlist/serverlist.lua

@@ -0,0 +1,128 @@
+ServerList = {}
+
+-- private variables
+local serverListWindow = nil
+local serverTextList = nil
+local removeWindow = nil
+local servers = {}
+
+-- public functions
+function ServerList.init()
+  serverListWindow = g_ui.displayUI('serverlist')
+  serverTextList = serverListWindow:getChildById('serverList')
+
+  servers = g_settings.getNode('ServerList') or {}
+  ServerList.load()
+end
+
+function ServerList.terminate()
+  ServerList.destroy()
+
+  g_settings.setNode('ServerList', servers)
+
+  ServerList = nil
+end
+
+function ServerList.load()
+  for k,server in pairs(servers) do
+    ServerList.add(k, server.port, server.protocol, true)
+  end
+end
+
+function ServerList.select()
+  local selected = serverTextList:getFocusedChild()
+  if selected then
+    local server = servers[selected:getId()]
+    if server then
+      EnterGame.setDefaultServer(selected:getId(), server.port, server.protocol)
+      EnterGame.setAccountName(server.account)
+      EnterGame.setPassword(server.password)
+      ServerList.hide()
+    end
+  end
+end
+
+function ServerList.add(host, port, protocol, load)
+  if not load and servers[host] then
+    return false, 'Server already exists'
+  elseif host == '' or port == '' then
+    return false, 'Required fields are missing'
+  end
+  local widget = g_ui.createWidget('ServerWidget', serverTextList)
+  widget:setId(host)
+  
+  if not load then
+    servers[host] = {
+      port = port,
+      protocol = protocol,
+      account = '',
+      password = ''
+    }
+  end
+
+  local details = widget:getChildById('details')
+  details:setText(host..':'..port)
+
+  local proto = widget:getChildById('protocol')
+  proto:setText(protocol)
+
+  connect(widget, { onDoubleClick = function () ServerList.select() return true end } )
+  return true
+end
+
+function ServerList.remove(widget)
+  local host = widget:getId()
+
+  if removeWindow then
+    return
+  end
+
+  local yesCallback = function()
+    widget:destroy()
+    servers[host] = nil
+    removeWindow:destroy()
+    removeWindow=nil
+  end
+  local noCallback = function()
+    removeWindow:destroy()
+    removeWindow=nil
+  end
+
+  removeWindow = displayGeneralBox(tr('Remove'), tr('Remove '..host..'?'), {
+      { text=tr('Yes'), callback=yesCallback },
+      { text=tr('No'), callback=noCallback },
+      anchor=AnchorHorizontalCenter}, yesCallback, noCallback)
+end
+
+function ServerList.destroy()
+  if serverListWindow then
+    serverTextList = nil
+    serverListWindow:destroy()
+    serverListWindow = nil
+  end
+end
+
+function ServerList.show()
+  if g_game.isOnline() then
+    return
+  end
+  serverListWindow:show()
+  serverListWindow:raise()
+  serverListWindow:focus()
+end
+
+function ServerList.hide()
+  serverListWindow:hide()
+end
+
+function ServerList.setServerAccount(host, account)
+  if servers[host] then
+    servers[host].account = account
+  end
+end
+
+function ServerList.setServerPassword(host, password)
+  if servers[host] then
+    servers[host].password = password
+  end
+end

modules/client_serverlist/serverlist.otmod

@@ -0,0 +1,18 @@
+Module
+  name: client_serverlist
+  description: Manages a server list of previously entered servers
+  author: BeniS
+  website: www.otclient.info
+
+  dependencies:
+    - client_entergame
+
+  @onLoad: |
+    dofile 'serverlist'
+    dofile 'addserver'
+    ServerList.init()
+    AddServer.init()
+
+  @onUnload: |
+    ServerList.terminate()
+    AddServer.terminate()

modules/client_serverlist/serverlist.otui

@@ -0,0 +1,110 @@
+ServerWidget < UIWidget
+  height: 14
+  background-color: alpha
+  &updateOnStates: |
+    function(self)
+      local children = self:getChildren()
+      for i=1,#children do
+        children[i]:setOn(self:isFocused())
+      end
+    end
+  @onFocusChange: self:updateOnStates()
+  @onSetup: self:updateOnStates()
+
+  $focus:
+    background-color: #ffffff22
+
+  Label
+    id: details
+    color: #aaaaaa
+    anchors.top: parent.top
+    anchors.left: parent.left
+    font: verdana-11px-monochrome
+    text-auto-resize: true
+    background-color: alpha
+    text-offset: 2 0
+
+    $on:
+      color: #ffffff
+
+  Label
+    id: protocol
+    color: #ffffff
+    color: #aaaaaa
+    anchors.top: parent.top
+    anchors.right: next.left
+    margin-right: 5
+    font: verdana-11px-monochrome
+    text-auto-resize: true
+    background-color: alpha
+    &baseText: '(%s)'
+
+    $on:
+      color: #ffffff
+
+  Button
+    id: remove
+    text: x
+    width: 12
+    height: 12
+    anchors.top: parent.top
+    anchors.right: parent.right
+    margin-right: 4
+    margin-top: 1
+    @onClick: ServerList.remove(self:getParent())
+
+MainWindow
+  id: serverListWindow
+  !text: tr('Server List')
+  size: 340 290
+  visible: false
+  @onEnter: ServerList.select()
+  @onEscape: ServerList.hide()
+  @onSetup: |
+    g_keyboard.bindKeyPress('Up', function() self:getChildById('serverList'):focusPreviousChild(KeyboardFocusReason) end, self)
+    g_keyboard.bindKeyPress('Down', function() self:getChildById('serverList'):focusNextChild(KeyboardFocusReason) end, self)
+
+  TextList
+    id: serverList
+    anchors.top: parent.top
+    anchors.left: parent.left
+    anchors.right: serverListScrollBar.left
+    anchors.bottom: buttonOk.top
+    margin-bottom: 5
+    padding: 1
+    focusable: false
+    vertical-scrollbar: serverListScrollBar
+    auto-focus: first
+
+  VerticalScrollBar
+    id: serverListScrollBar
+    anchors.top: parent.top
+    anchors.bottom: buttonOk.top
+    anchors.right: parent.right
+    margin-bottom: 5
+    step: 14
+    pixels-scroll: true
+
+  AddButton
+    id: buttonAdd
+    !tooltip: tr('Add new server')
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
+    @onClick: AddServer.show()
+
+  Button
+    id: buttonOk
+    !text: tr('Select')
+    width: 64
+    anchors.right: next.left
+    anchors.bottom: parent.bottom
+    margin-right: 10
+    @onClick: ServerList.select()
+
+  Button
+    id: buttonCancel
+    !text: tr('Cancel')
+    width: 64
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    @onClick: ServerList.hide()

modules/client_stats/stats.lua

@@ -25,6 +25,8 @@ end
 function terminate()
   disconnect(g_game, { onGameStart = onGameStart,
                        onGameEnd = onGameEnd })
+  removeEvent(firstReportEvent)
+  removeEvent(sendReportEvent)
 end
 
 function configure(host, port, delay)
@@ -45,13 +47,15 @@ end
 
 function onGameStart()
   if not HOST then return end
+  removeEvent(firstReportEvent)
+  removeEvent(sendReportEvent)
   firstReportEvent = addEvent(sendReport, FIRST_REPORT_DELAY*1000)
   sendReportEvent = cycleEvent(sendReport, REPORT_DELAY*1000)
 end
 
 function onGameEnd()
-  removeEvent(sendReportEvent)
   removeEvent(firstReportEvent)
+  removeEvent(sendReportEvent)
 end
 
 function onConnect(protocol)
@@ -84,6 +88,7 @@ function onConnect(protocol)
   post = post .. '&cpu='               .. g_platform.getCPUName()
   post = post .. '&mem='               .. g_platform.getTotalSystemMemory()
   post = post .. '&os_name='           .. g_platform.getOSName()
+  post = post .. getAdditionalData()
 
   local message = ''
   message = message .. "POST /report HTTP/1.1\r\n"
@@ -98,6 +103,10 @@ function onConnect(protocol)
   protocol:recv()
 end
 
+function getAdditionalData()
+  return ''
+end
+
 function onRecv(protocol, message)
   if string.find(message, 'HTTP/1.1 200 OK') then
     --pinfo('Stats sent to server successfully!')

modules/client_terminal/commands.lua

@@ -1,94 +1,177 @@
-function dumpWidgets(widget, level)
-  widget = widget or rootWidget
-  level = level or 0
-  for i=1,widget:getChildCount() do
-    local child = widget:getChildByIndex(i)
-    if child:isVisible() then
-      local name = child:getId()
-      if name:match('widget%d+') == nil then
-        print(string.rep(' ', level) .. name)
-      end
-      if child:getId() ~= 'terminalBuffer' then
-        dumpWidgets(child, level+1)
-      end
+local function pcolored(text, color)
+  color = color or 'white'
+  modules.client_terminal.addLine(tostring(text), color)
+end
+
+function draw_debug_boxes()
+  g_ui.setDebugBoxesDrawing(not g_ui.isDrawingDebugBoxes())
+end
+
+function hide_map()
+  modules.game_interface.getMapPanel():hide()
+end
+
+function show_map()
+  modules.game_interface.getMapPanel():show()
+end
+
+function live_textures_reload()
+  g_textures.liveReload()
+end
+
+function live_module_reload(name)
+  if not name then
+    pcolored('ERROR: missing module name', 'red')
+    return
+  end
+
+  local module = g_modules.getModule(name)
+  if not module then
+    pcolored('ERROR: unable to find module ' .. name, 'red')
+    return
+  end
+
+  if not module:isReloadble() then
+    pcolored('ERROR: that module is not reloadable', 'red')
+    return
+  end
+
+  if not module:canReload() then
+    pcolored('ERROR: some other modules requires this module, cannot reload now', 'red')
+    return
+  end
+
+  local files = {}
+  local hasFile = false
+  for _,file in pairs(g_resources.listDirectoryFiles('/' .. name)) do
+    local filepath = '/' .. name .. '/' .. file
+    local time = g_resources.getFileTime(filepath)
+    if time > 0 then
+      files[filepath] = time
+      hasFile = true
     end
   end
-end
 
-function drawDebugBoxes(enable)
-  if enable == nil then enable = true end
-  g_ui.setDebugBoxesDrawing(enable)
-end
+  if not hasFile then
+    pcolored('ERROR: unable to find any file for module', 'red')
+    return
+  end
 
-function hideMap()
-  local map = rootWidget:recursiveGetChildById('gameMapPanel')
-  if map then map:hide() end
-end
+  cycleEvent(function()
+    for filepath,time in pairs(files) do
+      local newtime = g_resources.getFileTime(filepath)
+      if newtime > time then
+        pcolored('Reloading ' .. name, 'green')
+        modules.client_terminal.flushLines()
+        module:reload()
+        files[filepath] = newtime
 
-function showMap()
-  local map = rootWidget:recursiveGetChildById('gameMapPanel')
-  if map then map:show() end
-end
-
-function debugContainersItems()
-  function UIItem:onHoverChange(hovered)
-    if hovered then
-      local item = self:getItem()
-      if item then
-        local text = "id: " ..item:getId() .. 
-                     "\n stackable: " ..tostring(item:isStackable()) ..
-                     "\n marketable: " ..tostring(item:isMarketable()) ..
-                     "\n vocation: "..(item:getMarketData() and item:getMarketData().restrictVocation or 'none') ..
-                     "\n cloth slot: " ..item:getClothSlot()
-        g_tooltip.display(text)
+        if name == 'client_terminal' then
+          modules.client_terminal.show()
+        end
+        break
       end
-    else
-      g_tooltip.hide()
+    end
+  end, 1000)
+end
+
+function live_sprites_reload()
+  local files = {}
+  for _,file in pairs(g_resources.listDirectoryFiles('/things')) do
+    local filepath = '/things/' .. file
+    local time = g_resources.getFileTime(filepath)
+    if time > 0 then
+      files[filepath] = time
+      hasFile = true
     end
   end
+
+  if not hasFile then
+    pcolored('ERROR: unable to find things file for module', 'red')
+    return
+  end
+
+  cycleEvent(function()
+    for filepath,time in pairs(files) do
+      local newtime = g_resources.getFileTime(filepath)
+      if newtime > time then
+        pcolored('Reloading sprites...', 'green')
+        modules.client_terminal.flushLines()
+        modules.game_things.load()
+        files[filepath] = newtime
+
+        if name == 'client_terminal' then
+          modules.client_terminal.show()
+        end
+        break
+      end
+    end
+  end, 1000)
 end
 
-function debugPosition(enable)
-  if enable == nil then enable = true end
-  local label = rootWidget:getChildById('debugPositionLabel')
-  if not label then
-    label = g_ui.createWidget('GameLabel', rootWidget)
-    label:setColor('pink')
-    label:setFont('terminus-14px-bold')
-    label:setId('debugPositionLabel')
-    label:setPosition({x= 10, y = 40 })
-    label:setPhantom(true)
-    label:setTextAutoResize(true)
-  end
-  if enable then
-    label.event = cycleEvent(function()
-      local player = g_game.getLocalPlayer()
-      if player then
-        local pos = g_game.getLocalPlayer():getPosition()
-        label:show()
-        label:setText('x: ' .. pos.x .. '\ny: ' .. pos.y .. '\nz: ' .. pos.z)
-      else
-        label:hide()
-      end
-    end, 100)
+local pinging = false
+local function pingBack(ping)
+  if ping < 300 then color = 'green'
+  elseif ping < 600 then color = 'yellow'
+  else color = 'red' end
+  pcolored(g_game.getWorldName() .. ' => ' .. ping .. ' ms', color)
+end
+function ping()
+  if pinging then
+    pcolored('Ping stopped.')
+    g_game.setPingDelay(1000)
+    disconnect(g_game, 'onPingBack', pingBack)
   else
-    removeEvent(label.event)
-    label.event = nil
-    label:hide()
+    if not (g_game.getFeature(GameClientPing) or g_game.getFeature(GameExtendedClientPing)) then
+      pcolored('this server does not support ping', 'red')
+      return
+    elseif not g_game.isOnline() then
+      pcolored('ping command is only allowed when online', 'red')
+      return
+    end
+
+    pcolored('Starting ping...')
+    g_game.setPingDelay(0)
+    connect(g_game, 'onPingBack', pingBack)
+  end
+  pinging = not pinging
+end
+
+function clear()
+  modules.client_terminal.clear()
+end
+
+function ls(path)
+  path = path or '/'
+  local files = g_resources.listDirectoryFiles(path)
+  for k,v in pairs(files) do
+    if g_resources.directoryExists(path .. v) then
+      pcolored(path .. v, 'blue')
+    else
+      pcolored(path .. v)
+    end
   end
 end
 
-function autoReloadModule(name)
-  local function reloadEvent()
-    reloadModule(name)
-    scheduleEvent(reloadEvent, 1000)
-  end
-  reloadEvent()
+function about_version()
+  pcolored(g_app.getName() .. ' ' .. g_app.getVersion() .. '\n' ..
+        'Rev  ' .. g_app.getBuildRevision() .. ' ('.. g_app.getBuildCommit() .. ')\n' ..
+        'Built on ' .. g_app.getBuildDate())
 end
 
-function createDebugUIItem(id)
-  local uiitem = g_ui.createWidget('Item', rootWidget)
-  uiitem:setPosition({x= 200, y = 200 })
-  uiitem:setItemId(id)
-  uiitem:show()
+function about_graphics()
+  pcolored('Vendor ' .. g_graphics.getVendor() )
+  pcolored('Renderer' .. g_graphics.getRenderer())
+  pcolored('Version' .. g_graphics.getVersion())
+end
+
+function about_modules()
+  for k,m in pairs(g_modules.getModules()) do
+    local loadedtext
+    if m:isLoaded() then
+      pcolored(m:getName() .. ' => loaded', 'green')
+    else
+      pcolored(m:getName() .. ' => not loaded', 'red')
+    end
+  end
 end

modules/client_terminal/terminal.lua

@@ -1,21 +1,32 @@
 -- configs
-local LogColors = { [LogInfo] = 'white',
+local LogColors = { [LogDebug] = 'pink',
+                    [LogInfo] = 'white',
                     [LogWarning] = 'yellow',
                     [LogError] = 'red' }
-local MaxLogLines = 80
-local LabelHeight = 16
+local MaxLogLines = 128
 local MaxHistory = 1000
 
+local oldenv = getfenv(0)
+setfenv(0, _G)
+_G.commandEnv = runinsandbox('commands')
+setfenv(0, oldenv)
+
 -- private variables
 local terminalWindow
 local terminalButton
 local logLocked = false
-local commandEnv = {}
-setmetatable(commandEnv, { __index = getfenv() } )
 local commandTextEdit
 local terminalBuffer
 local commandHistory = { }
 local currentHistoryIndex = 0
+local poped = false
+local oldPos
+local oldSize
+local firstShown = false
+local flushEvent
+local cachedLines = {}
+local disabled = false
+local allLines = {}
 
 -- private functions
 local function navigateCommand(step)
@@ -96,9 +107,7 @@ local function doCommand()
 end
 
 local function onLog(level, message, time)
-  -- debug messages are ignored
-  if level == LogDebug then return end
-
+  if disabled then return end
   -- avoid logging while reporting logs (would cause a infinite loop)
   if logLocked then return end
 
@@ -112,22 +121,7 @@ function init()
   terminalWindow = g_ui.displayUI('terminal')
   terminalWindow:setVisible(false)
 
-  local poped = false
-  terminalWindow.onDoubleClick = function(self)
-    if poped then
-      self:fill('parent')
-      self:getChildById('bottomResizeBorder'):disable()
-      self:getChildById('rightResizeBorder'):disable()
-      poped = false
-    else
-      self:breakAnchors()
-      self:resize(g_window.getWidth()/2, g_window.getHeight()/2)
-      self:move(g_window.getWidth()/2, g_window.getHeight()/2)
-      self:getChildById('bottomResizeBorder'):enable()
-      self:getChildById('rightResizeBorder'):enable()
-      poped = true
-    end
-  end
+  terminalWindow.onDoubleClick = popWindow
 
   terminalButton = modules.client_topmenu.addLeftButton('terminalButton', tr('Terminal') .. ' (Ctrl + T)', '/images/topbuttons/terminal', toggle)
   g_keyboard.bindKeyDown('Ctrl+T', toggle)
@@ -137,32 +131,105 @@ function init()
   commandTextEdit = terminalWindow:getChildById('commandTextEdit')
   g_keyboard.bindKeyPress('Up', function() navigateCommand(1) end, commandTextEdit)
   g_keyboard.bindKeyPress('Down', function() navigateCommand(-1) end, commandTextEdit)
+  g_keyboard.bindKeyPress('Ctrl+C', 
+    function() 
+      if commandTextEdit:hasSelection() or not terminalSelectText:hasSelection() then return false end
+      g_window.setClipboardText(terminalSelectText:getSelection())
+    return true 
+    end, commandTextEdit)
   g_keyboard.bindKeyDown('Tab', completeCommand, commandTextEdit)
   g_keyboard.bindKeyDown('Enter', doCommand, commandTextEdit)
   g_keyboard.bindKeyDown('Escape', hide, terminalWindow)
 
   terminalBuffer = terminalWindow:getChildById('terminalBuffer')
+  terminalSelectText = terminalWindow:getChildById('terminalSelectText')
+  terminalSelectText.onDoubleClick = popWindow
+  terminalSelectText.onMouseWheel = function(a,b,c) terminalBuffer:onMouseWheel(b,c) end
+  terminalBuffer.onScrollChange = function(self, value) terminalSelectText:setTextVirtualOffset(value) end
+
   g_logger.setOnLog(onLog)
-  g_logger.fireOldMessages()
+
+  if not g_app.isRunning() then
+    g_logger.fireOldMessages()
+  elseif _G.terminalLines then
+    for _,line in pairs(_G.terminalLines) do
+      addLine(line.text, line.color)
+    end
+  end
 end
 
 function terminate()
   g_settings.setList('terminal-history', commandHistory)
+
+  removeEvent(flushEvent)
+
+  if poped then
+    oldPos = terminalWindow:getPosition()
+    oldSize = terminalWindow:getSize()
+  end
+  local settings = {
+    size = oldSize,
+    pos = oldPos,
+    poped = poped
+  }
+  g_settings.setNode('terminal-window', settings)
+
   g_keyboard.unbindKeyDown('Ctrl+T')
   g_logger.setOnLog(nil)
   terminalWindow:destroy()
   terminalButton:destroy()
   commandEnv = nil
+  _G.terminalLines = allLines
 end
 
 function hideButton()
   terminalButton:hide()
 end
 
+function popWindow()
+  if poped then
+    oldPos = terminalWindow:getPosition()
+    oldSize = terminalWindow:getSize()
+    terminalWindow:fill('parent')
+    terminalWindow:setOn(false)
+    terminalWindow:getChildById('bottomResizeBorder'):disable()
+    terminalWindow:getChildById('rightResizeBorder'):disable()
+    terminalWindow:getChildById('titleBar'):hide()
+    terminalWindow:getChildById('terminalScroll'):setMarginTop(0)
+    terminalWindow:getChildById('terminalScroll'):setMarginBottom(0)
+    terminalWindow:getChildById('terminalScroll'):setMarginRight(0)
+    poped = false
+  else
+    terminalWindow:breakAnchors()
+    terminalWindow:setOn(true)
+    local size = oldSize or { width = g_window.getWidth()/2, height = g_window.getHeight()/2 }
+    terminalWindow:setSize(size)
+    local pos = oldPos or { x = (g_window.getWidth() - terminalWindow:getWidth())/2, y = (g_window.getHeight() - terminalWindow:getHeight())/2 }
+    terminalWindow:setPosition(pos)
+    terminalWindow:getChildById('bottomResizeBorder'):enable()
+    terminalWindow:getChildById('rightResizeBorder'):enable()
+    terminalWindow:getChildById('titleBar'):show()
+    terminalWindow:getChildById('terminalScroll'):setMarginTop(18)
+    terminalWindow:getChildById('terminalScroll'):setMarginBottom(1)
+    terminalWindow:getChildById('terminalScroll'):setMarginRight(1)
+    terminalWindow:bindRectToParent()
+    poped = true
+  end
+end
+
 function toggle()
   if terminalWindow:isVisible() then
     hide()
   else
+    if not firstShow then
+      local settings = g_settings.getNode('terminal-window')
+      if settings then
+        if settings.size then  oldSize = size end
+        if settings.pos then oldPos = settings.pos end
+        if settings.poped then popWindow() end
+      end
+      firstShown = true
+    end
     show()
   end
 end
@@ -180,36 +247,56 @@ end
 function disable()
   terminalButton:hide()
   g_keyboard.unbindKeyDown('Ctrl+T')
+  disabled = true
+end
+
+function flushLines()
+  local numLines = terminalBuffer:getChildCount() + #cachedLines
+  local fulltext = terminalSelectText:getText()
+
+  for _,line in pairs(cachedLines) do
+    -- delete old lines if needed
+    if numLines > MaxLogLines then
+      local firstChild = terminalBuffer:getChildByIndex(1)
+      if firstChild then
+        local len = #firstChild:getText()
+        firstChild:destroy()
+        table.remove(allLines, 1)
+        fulltext = string.sub(fulltext, len)
+      end
+    end
+
+    local label = g_ui.createWidget('TerminalLabel', terminalBuffer)
+    label:setId('terminalLabel' .. numLines)
+    label:setText(line.text)
+    label:setColor(line.color)
+
+    table.insert(allLines, {text=line.text,color=line.color})
+
+    fulltext = fulltext .. '\n' .. line.text
+  end
+
+  terminalSelectText:setText(fulltext)
+
+  cachedLines = {}
+  removeEvent(flushEvent)
+  flushEvent = nil
 end
 
 function addLine(text, color)
-  -- delete old lines if needed
-  local numLines = terminalBuffer:getChildCount() + 1
-  if numLines > MaxLogLines then
-    terminalBuffer:getChildByIndex(1):destroy()
+  if not flushEvent then
+    flushEvent = scheduleEvent(flushLines, 10)
   end
 
-  -- create new line label
-  local label = g_ui.createWidget('TerminalLabel', terminalBuffer)
-  label:setId('terminalLabel' .. numLines)
-  label:setText(text)
-  label:setColor(color)
+  text = string.gsub(text, '\t', '    ')
+  table.insert(cachedLines, {text=text, color=color})
 end
 
 function executeCommand(command)
   if command == nil or #command == 0 then return end
 
-  logLocked = true
-  g_logger.log(LogInfo, '> ' .. command)
-  logLocked = false
-
-  -- detect and convert commands with simple syntax
-  local realCommand
-  if string.sub(command, 1, 1) == '=' then
-    realCommand = 'print(' .. string.sub(command,2) .. ')'
-  else
-    realCommand = command
-  end
+  -- add command line
+  addLine("> " .. command, "#ffffff")
 
   -- reset current history index
   currentHistoryIndex = 0
@@ -222,15 +309,33 @@ function executeCommand(command)
     end
   end
 
-  -- add command line
-  --addLine(">> " .. command, "#ffffff")
+  -- detect and convert commands with simple syntax
+  local realCommand
+  if string.sub(command, 1, 1) == '=' then
+    realCommand = 'print(' .. string.sub(command,2) .. ')'
+  else
+    realCommand = command
+  end
 
-  -- load command buffer
   local func, err = loadstring(realCommand, "@")
 
+  -- detect terminal commands
+  if not func then
+    local command_name = command:match('^([%w_]+)[%s]*.*')
+    if command_name then
+      local args = string.split(command:match('^[%w_]+[%s]*(.*)'), ' ')
+      if commandEnv[command_name] and type(commandEnv[command_name]) == 'function' then
+        func = function() modules.client_terminal.commandEnv[command_name](unpack(args)) end
+      elseif command_name == command then
+        addLine('ERROR: command not found', 'red')
+        return
+      end
+    end
+  end
+
   -- check for syntax errors
   if not func then
-    g_logger.log(LogError, 'incorrect lua syntax: ' .. err:sub(5))
+    addLine('ERROR: incorrect lua syntax: ' .. err:sub(5), 'red')
     return
   end
 
@@ -241,8 +346,15 @@ function executeCommand(command)
   local ok, ret = pcall(func)
   if ok then
     -- if the command returned a value, print it
-    if ret then print(ret) end
+    if ret then addLine(ret, 'white') end
   else
-    g_logger.log(LogError, 'command failed: ' .. ret)
+    addLine('ERROR: command failed: ' .. ret, 'red')
   end
 end
+
+function clear()
+  terminalBuffer:destroyChildren()
+  terminalSelectText:setText('')
+  cachedLines = {}
+  allLines = {}
+end

modules/client_terminal/terminal.otmod

@@ -3,7 +3,7 @@ Module
   description: Terminal for executing lua functions
   author: edubart
   website: www.otclient.info
-  scripts: [ terminal, commands ]
+  scripts: [ terminal ]
   sandboxed: true
   @onLoad: init()
   @onUnload: terminate()

modules/client_terminal/terminal.otui

@@ -1,7 +1,21 @@
 TerminalLabel < UILabel
-  font: terminus-14px-bold
+  font: terminus-10px
   text-wrap: true
   text-auto-resize: true
+  phantom: true
+
+TerminalSelectText < UITextEdit
+  font: terminus-10px
+  text-wrap: true
+  text-align: bottomLeft
+  editable: false
+  change-cursor-image: false
+  cursor-visible: false
+  selection-color: black
+  selection-background-color: white
+  color: alpha
+  focusable: false
+  auto-scroll: false
 
 UIWindow
   id: terminalWindow
@@ -9,36 +23,69 @@ UIWindow
   opacity: 0.85
   clipping: true
   anchors.fill: parent
+  border: 0 white
+  $on:
+    border: 1 black
 
-  Panel
-    id: terminalBuffer
-    layout:
-      type: verticalBox
-      fit-children: true
-    focusable: false
+  Label
+    id: titleBar
+    !text: tr('Terminal')
+    border: 1 black
+    color: white
+    anchors.top: parent.top
     anchors.left: parent.left
     anchors.right: parent.right
+    background-color: #ffffff11
+    text-align: left
+    text-offset: 4 0
+    height: 18
+    visible: false
+
+  ScrollablePanel
+    id: terminalBuffer
+    focusable: false
+    anchors.left: parent.left
+    anchors.right: terminalScroll.left
+    anchors.top: terminalScroll.top
     anchors.bottom: commandSymbolLabel.top
+    layout:
+      type: verticalBox
+      align-bottom: true
+    vertical-scrollbar: terminalScroll
+    inverted-scroll: true
     margin-left: 2
 
+  TerminalSelectText
+    id: terminalSelectText
+    anchors.fill: terminalBuffer
+    focusable: false
+
+  VerticalScrollBar
+    id: terminalScroll
+    anchors.top: parent.top
+    anchors.bottom: parent.bottom
+    anchors.right: parent.right
+    step: 48
+    pixels-scroll: true
+
   UILabel
     id: commandSymbolLabel
-    size: 12 16
+    size: 12 12
     fixed-size: true
     anchors.bottom: parent.bottom
     anchors.left: parent.left
     margin-left: 2
-    font: terminus-14px-bold
+    font: terminus-10px
     text: >
 
   UITextEdit
     id: commandTextEdit
-    height: 16
+    height: 12
     anchors.bottom: parent.bottom
     anchors.left: commandSymbolLabel.right
     anchors.right: parent.right
-    margin-left: 5
-    font: terminus-14px-bold
+    margin-left: 1
+    font: terminus-10px
     selection-color: black
     selection-background-color: white
 

modules/client_topmenu/topmenu.lua

@@ -37,8 +37,10 @@ end
 
 -- public functions
 function init()
-  connect(g_game, { onGameStart = showGameButtons,
-                    onGameEnd = hideGameButtons })
+  connect(g_game, { onGameStart = online,
+                    onGameEnd = offline,
+                    onPingBack = updatePing })
+  connect(g_app, { onFps = updateFps })
 
   topMenu = g_ui.displayUI('topmenu')
 
@@ -46,20 +48,73 @@ function init()
   rightButtonsPanel = topMenu:getChildById('rightButtonsPanel')
   leftGameButtonsPanel = topMenu:getChildById('leftGameButtonsPanel')
   rightGameButtonsPanel = topMenu:getChildById('rightGameButtonsPanel')
+  pingLabel = topMenu:getChildById('pingLabel')
+  fpsLabel = topMenu:getChildById('fpsLabel')
 
   if g_game.isOnline() then
-    leftGameButtonsPanel:show()
-    rightGameButtonsPanel:show()
+    online()
   end
 end
 
 function terminate()
-  disconnect(g_game, { onGameStart = showGameButtons,
-                       onGameEnd = hideGameButtons })
+  disconnect(g_game, { onGameStart = online,
+                       onGameEnd = offline,
+                       onPingBack = updatePing })
+  disconnect(g_app, { onFps = updateFps })
 
   topMenu:destroy()
 end
 
+function online()
+  showGameButtons()
+
+  addEvent(function()
+    if modules.client_options.getOption('showPing') and (g_game.getFeature(GameClientPing) or g_game.getFeature(GameExtendedClientPing)) then
+      pingLabel:show()
+    else
+      pingLabel:hide()
+    end
+  end)
+end
+
+function offline()
+  hideGameButtons()
+  pingLabel:hide()
+end
+
+function updateFps(fps)
+  text = 'FPS: ' .. fps
+  fpsLabel:setText(text)
+end
+
+function updatePing(ping)
+  local text = 'Ping: '
+  local color
+  if ping < 0 then
+    text = text .. "??"
+    color = 'yellow'
+  else
+    text = text .. ping .. ' ms'
+    if ping >= 500 then
+      color = 'red'
+    elseif ping >= 250 then
+      color = 'yellow'
+    else
+      color = 'green'
+    end
+  end
+  pingLabel:setColor(color)
+  pingLabel:setText(text)
+end
+
+function setPingVisible(enable)
+  pingLabel:setVisible(enable)
+end
+
+function setFpsVisible(enable)
+  fpsLabel:setVisible(enable)
+end
+
 function addLeftButton(id, description, icon, callback, front)
   return addButton(id, description, icon, callback, leftButtonsPanel, false, front)
 end
@@ -92,16 +147,16 @@ function addRightGameToggleButton(id, description, icon, callback, front)
   return addButton(id, description, icon, callback, rightGameButtonsPanel, true, front)
 end
 
-function hideGameButtons()
-  leftGameButtonsPanel:hide()
-  rightGameButtonsPanel:hide()
-end
-
 function showGameButtons()
   leftGameButtonsPanel:show()
   rightGameButtonsPanel:show()
 end
 
+function hideGameButtons()
+  leftGameButtonsPanel:hide()
+  rightGameButtonsPanel:hide()
+end
+
 function getButton(id)
   return topMenu:recursiveGetChildById(id)
 end

modules/client_topmenu/topmenu.otui

@@ -18,17 +18,17 @@ TopMenuPanel
     visible: false
 
   TopMenuFrameCounterLabel
-    id: frameCounter
+    id: fpsLabel
     text-auto-resize: true
     anchors.top: parent.top
     anchors.left: leftGameButtonsPanel.right
 
-  PingLabel
+  TopMenuPingLabel
     color: white
     id: pingLabel
     text-auto-resize: true
-    anchors.top: frameCounter.bottom
-    anchors.left: frameCounter.left
+    anchors.top: fpsLabel.bottom
+    anchors.left: fpsLabel.left
 
   TopMenuButtonsPanel
     id: rightButtonsPanel

modules/corelib/const.lua

@@ -317,4 +317,5 @@ NetworkMessageTypes = {
 SoundChannels = {
   Music = 1,
   Ambient = 2,
+  Effect = 3,
 }

modules/corelib/corelib.otmod

@@ -17,6 +17,7 @@ Module
     dofile 'settings'
     dofile 'keyboard'
     dofile 'mouse'
+    dofile 'net'
 
     dofiles 'ui'
 

modules/corelib/keyboard.lua

@@ -4,7 +4,6 @@ g_keyboard = {}
 -- private functions
 function translateKeyCombo(keyCombo)
   if not keyCombo or #keyCombo == 0 then return nil end
-  table.sort(keyCombo)
   local keyComboDesc = ''
   for k,v in pairs(keyCombo) do
     local keyDesc = KeyCodeDescs[v]
@@ -65,47 +64,29 @@ function determineKeyComboDesc(keyCode, keyboardModifiers)
     end
     table.insert(keyCombo, keyCode)
   end
-  table.sort(keyCombo)
   return translateKeyCombo(keyCombo)
 end
 
 local function onWidgetKeyDown(widget, keyCode, keyboardModifiers)
   if keyCode == KeyUnknown then return false end
   local callback = widget.boundAloneKeyDownCombos[determineKeyComboDesc(keyCode, KeyboardNoModifier)]
-  if callback then
-    callback(widget, keyCode)
-  end
+  signalcall(callback, widget, keyCode)
   callback = widget.boundKeyDownCombos[determineKeyComboDesc(keyCode, keyboardModifiers)]
-  if callback then
-    callback(widget, keyCode)
-    return true
-  end
-  return false
+  return signalcall(callback, widget, keyCode)
 end
 
 local function onWidgetKeyUp(widget, keyCode, keyboardModifiers)
   if keyCode == KeyUnknown then return false end
   local callback = widget.boundAloneKeyUpCombos[determineKeyComboDesc(keyCode, KeyboardNoModifier)]
-  if callback then
-    callback(widget, keyCode)
-  end
+  signalcall(callback, widget, keyCode)
   callback = widget.boundKeyUpCombos[determineKeyComboDesc(keyCode, keyboardModifiers)]
-  if callback then
-    callback(widget, keyCode)
-    return true
-  end
-  return false
+  return signalcall(callback, widget, keyCode)
 end
 
 local function onWidgetKeyPress(widget, keyCode, keyboardModifiers, autoRepeatTicks)
   if keyCode == KeyUnknown then return false end
-  local keyComboDesc = determineKeyComboDesc(keyCode, keyboardModifiers)
-  local comboConf = widget.boundKeyPressCombos[keyComboDesc]
-  if comboConf and (autoRepeatTicks >= comboConf.autoRepeatDelay or autoRepeatTicks == 0) and comboConf.callback then
-    comboConf.callback(widget, keyCode)
-    return true
-  end
-  return false
+  local callback = widget.boundKeyPressCombos[determineKeyComboDesc(keyCode, keyboardModifiers)]
+  return signalcall(callback, widget, keyCode, autoRepeatTicks)
 end
 
 local function connectKeyDownEvent(widget)
@@ -133,13 +114,10 @@ function g_keyboard.bindKeyDown(keyComboDesc, callback, widget, alone)
   widget = widget or rootWidget
   connectKeyDownEvent(widget)
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
-  if widget.boundKeyDownCombos[keyComboDesc] then
-    pwarning('KeyDown event \'' .. keyComboDesc .. '\' redefined on widget ' .. widget:getId())
-  end
   if alone then
-    widget.boundAloneKeyDownCombos[keyComboDesc] = callback
+    connect(widget.boundAloneKeyDownCombos, keyComboDesc, callback)
   else
-    widget.boundKeyDownCombos[keyComboDesc] = callback
+    connect(widget.boundKeyDownCombos, keyComboDesc, callback)
   end
 end
 
@@ -147,53 +125,50 @@ function g_keyboard.bindKeyUp(keyComboDesc, callback, widget, alone)
   widget = widget or rootWidget
   connectKeyUpEvent(widget)
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
-  if widget.boundKeyUpCombos[keyComboDesc] then
-    pwarning('KeyUp event \'' .. keyComboDesc .. '\' redefined on widget ' .. widget:getId())
-  end
   if alone then
-    widget.boundAloneKeyUpCombos[keyComboDesc] = callback
+    connect(widget.boundAloneKeyUpCombos, keyComboDesc, callback)
   else
-    widget.boundKeyUpCombos[keyComboDesc] = callback
+    connect(widget.boundKeyUpCombos, keyComboDesc, callback)
   end
 end
 
-function g_keyboard.bindKeyPress(keyComboDesc, callback, widget, autoRepeatDelay)
-  autoRepeatDelay = autoRepeatDelay or 500
+function g_keyboard.bindKeyPress(keyComboDesc, callback, widget)
   widget = widget or rootWidget
   connectKeyPressEvent(widget)
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
-  if widget.boundKeyPressCombos[keyComboDesc] then
-    pwarning('KeyPress event \'' .. keyComboDesc .. '\' redefined on widget ' .. widget:getId())
-  end
-  widget.boundKeyPressCombos[keyComboDesc] = { callback = callback, autoRepeatDelay = autoRepeatDelay }
-  widget:setAutoRepeatDelay(math.min(autoRepeatDelay, widget:getAutoRepeatDelay()))
+  connect(widget.boundKeyPressCombos, keyComboDesc, callback)
 end
 
-function g_keyboard.unbindKeyDown(keyComboDesc, widget)
+local function getUnbindArgs(arg1, arg2)
+  local callback
+  local widget
+  if type(arg1) == 'function' then callback = arg1
+  elseif type(arg2) == 'function' then callback = arg2 end
+  if type(arg1) == 'userdata' then widget = arg1
+  elseif type(arg2) == 'userdata' then widget = arg2 end
   widget = widget or rootWidget
+  return callback, widget
+end
+
+function g_keyboard.unbindKeyDown(keyComboDesc, arg1, arg2)
+  local callback, widget = getUnbindArgs(arg1, arg2)
   if widget.boundKeyDownCombos == nil then return end
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
-  if keyComboDesc then
-    widget.boundKeyDownCombos[keyComboDesc] = nil
-  end
+  disconnect(widget.boundKeyDownCombos, keyComboDesc, callback)
 end
 
 function g_keyboard.unbindKeyUp(keyComboDesc, widget)
-  widget = widget or rootWidget
+  local callback, widget = getUnbindArgs(arg1, arg2)
   if widget.boundKeyUpCombos == nil then return end
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
-  if keyComboDesc then
-    widget.boundKeyUpCombos[keyComboDesc] = nil
-  end
+  disconnect(widget.boundKeyUpCombos, keyComboDesc, callback)
 end
 
-function g_keyboard.unbindKeyPress(keyComboDesc, widget)
-  widget = widget or rootWidget
+function g_keyboard.unbindKeyPress(keyComboDesc, widget, callback)
+  local callback, widget = getUnbindArgs(arg1, arg2)
   if widget.boundKeyPressCombos == nil then return end
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
-  if keyComboDesc then
-    widget.boundKeyPressCombos[keyComboDesc] = nil
-  end
+  disconnect(widget.boundKeyPressCombos, keyComboDesc, callback)
 end
 
 function g_keyboard.getModifiers()

modules/corelib/net.lua

@@ -0,0 +1,16 @@
+function translateNetworkError(errcode, connecting, errdesc)
+  local text
+  if errcode == 111 then
+    text = tr('Connection refused, the server might be offline or restarting.\nPlease try again later.')
+  elseif errcode == 110 then
+    text = tr('Connection timed out. Either your network is failing or the server is offline.')
+  elseif errcode == 1 then
+    text = tr('Connection failed, the server address does not exist.')
+  elseif connecting then
+    text = tr('Connection failed.')
+  else
+    text = tr('Your connection has been lost.\nEither your network or the server went down.')
+  end
+  text = text .. ' ' .. tr('(ERROR %d)', errcode)
+  return text
+end

modules/corelib/string.lua

@@ -20,8 +20,8 @@ function string:starts(start)
   return string.sub(self, 1, #start) == start
 end
 
-function string.ends(s, test)
-   return test =='' or string.sub(s,-string.len(test)) == test
+function string:ends(test)
+   return test =='' or string.sub(self,-string.len(test)) == test
 end
 
 function string:trim()

modules/corelib/table.lua

@@ -13,6 +13,12 @@ function table.dump(t, depth)
   end
 end
 
+function table.clear(t)
+  for k,v in pairs(t) do
+    t[k] = nil
+  end
+end
+
 function table.copy(t)
   local res = {}
   for k,v in pairs(t) do
@@ -138,6 +144,15 @@ function table.findbyfield(t, fieldname, fieldvalue)
   return nil
 end
 
+function table.size(t)
+  local size = 0
+  for i, n in pairs(t) do
+    size = size + 1
+  end
+ 
+  return size
+end
+
 function table.tostring(t)
   local maxn = #t
   local str = ""
@@ -152,3 +167,17 @@ function table.tostring(t)
   end
   return str
 end
+
+function table.collect(t, func)
+  local res = {}
+  for k,v in pairs(t) do
+    local a,b = func(k,v)
+    if a and b then
+      res[a] = b
+    elseif a ~= nil then
+      table.insert(res,a)
+    end
+  end
+  return res
+end
+

modules/corelib/ui/uiminiwindow.lua

@@ -166,9 +166,10 @@ end
 
 function UIMiniWindow:onDragLeave(droppedWidget, mousePos)
   if self.movedWidget then
-    self.setMovedChildMargin(0)
+    self.setMovedChildMargin(self.movedOldMargin or 0)
     self.movedWidget = nil
     self.setMovedChildMargin = nil
+    self.movedOldMargin = nil
     self.movedIndex = nil
   end
 
@@ -190,14 +191,16 @@ function UIMiniWindow:onDragMove(mousePos, mouseMoved)
       end
 
       if self.movedWidget then
-        self.setMovedChildMargin(0)
+        self.setMovedChildMargin(self.movedOldMargin or 0)
         self.setMovedChildMargin = nil
       end
 
       if mousePos.y < childCenterY then
+        self.movedOldMargin = child:getMarginTop()
         self.setMovedChildMargin = function(v) child:setMarginTop(v) end
         self.movedIndex = 0
       else
+        self.movedOldMargin = child:getMarginBottom()
         self.setMovedChildMargin = function(v) child:setMarginBottom(v) end
         self.movedIndex = 1
       end
@@ -209,7 +212,7 @@ function UIMiniWindow:onDragMove(mousePos, mouseMoved)
   end
 
   if not overAnyWidget and self.movedWidget then
-    self.setMovedChildMargin(0)
+    self.setMovedChildMargin(self.movedOldMargin or 0)
     self.movedWidget = nil
   end
 

modules/corelib/ui/uiminiwindowcontainer.lua

@@ -127,7 +127,7 @@ end
 function UIMiniWindowContainer:scheduleInsert(widget, index)
   if index - 1 > self:getChildCount() then
     if self.scheduledWidgets[index] then
-      pwarning('replacing scheduled widget id ' .. widget:getId())
+      pdebug('replacing scheduled widget id ' .. widget:getId())
     end
     self.scheduledWidgets[index] = widget
   else

modules/corelib/ui/uimovabletabbar.lua

@@ -83,10 +83,17 @@ local function onTabDragMove(tab, mousePos, mouseMoved)
   end
 end
 
-local function tabBlink(tab)
-  if not tab.blinking then return end
+local function tabBlink(tab, step)
+  step = step or 0
   tab:setOn(not tab:isOn())
-  tab.blinkEvent = scheduleEvent(function() tabBlink(tab) end, 500)
+
+  removeEvent(tab.blinkEvent)
+  if step < 4 then
+    tab.blinkEvent = scheduleEvent(function() tabBlink(tab, step+1) end, 500)
+  else
+    tab:setOn(true)
+    tab.blinkEvent = nil
+  end
 end
 
 -- public functions
@@ -240,7 +247,7 @@ function UIMoveableTabBar:selectPrevTab()
 end
 
 function UIMoveableTabBar:blinkTab(tab)
-  if tab:isChecked() or tab.blinking then return end
+  if tab:isChecked() then return end
   tab.blinking = true
   tabBlink(tab)
 end

modules/corelib/ui/uiprogressbar.lua

@@ -4,6 +4,7 @@ UIProgressBar = extends(UIWidget)
 function UIProgressBar.create()
   local progressbar = UIProgressBar.internalCreate()
   progressbar:setFocusable(false)
+  progressbar:setOn(true)
   progressbar.min = 0
   progressbar.max = 100
   progressbar.value = 0

modules/corelib/ui/uiscrollarea.lua

@@ -73,23 +73,23 @@ end
 
 function UIScrollArea:setVerticalScrollBar(scrollbar)
   self.verticalScrollBar = scrollbar
-  self.verticalScrollBar.onValueChange = function(scrollbar, value)
+  connect(self.verticalScrollBar, 'onValueChange', function(scrollbar, value)
     local virtualOffset = self:getVirtualOffset()
     virtualOffset.y = value
     self:setVirtualOffset(virtualOffset)
-    if self.onScrollbarChange then self:onScrollbarChange(value) end
-  end
+    signalcall(self.onScrollChange, self, virtualOffset)
+  end)
   self:updateScrollBars()
 end
 
 function UIScrollArea:setHorizontalScrollBar(scrollbar)
   self.horizontalScrollBar = scrollbar
-  self.horizontalScrollBar.onValueChange = function(scrollbar, value)
+  connect(self.horizontalScrollBar, 'onValueChange', function(scrollbar, value)
     local virtualOffset = self:getVirtualOffset()
     virtualOffset.x = value
     self:setVirtualOffset(virtualOffset)
-    if self.onScrollbarChange then self:onScrollbarChange(value) end
-  end
+    signalcall(self.onScrollChange, self, virtualOffset)
+  end)
   self:updateScrollBars()
 end
 
@@ -135,7 +135,7 @@ function UIScrollArea:ensureChildVisible(child)
       if deltaY > 0 then
         self.verticalScrollBar:increment(deltaY)
       end
-    else
+    elseif self.horizontalScrollBar then
       local deltaX = paddingRect.x - child:getX()
       if deltaX > 0 then
         self.horizontalScrollBar:decrement(deltaX)

modules/corelib/ui/uiscrollbar.lua

@@ -55,8 +55,7 @@ local function updateValueDisplay(widget)
   if widget == nil then return end
 
   if widget:getShowValue() then
-    local symbol = widget:getSymbol()
-    widget:setText(widget:getValue()..(symbol and symbol or ''))
+    widget:setText(widget:getValue() .. (widget:getSymbol() or ''))
   end
 end
 
@@ -171,7 +170,10 @@ end
 
 function UIScrollBar:setMaximum(maximum)
   if maximum == self.maximum then return end
-  self.maximum  = maximum
+  self.maximum = maximum
+  if self.minimum > maximum then
+    self:setMinimum(maximum)
+  end
   if self.value > maximum then
     self:setValue(maximum)
   else
@@ -182,6 +184,9 @@ end
 function UIScrollBar:setMinimum(minimum)
   if minimum == self.minimum then return end
   self.minimum = minimum
+  if self.maximum < minimum then
+    self:setMaximum(minimum)
+  end
   if self.value < minimum then
     self:setValue(minimum)
   else
@@ -217,6 +222,13 @@ function UIScrollBar:setOrientation(orientation)
   self.orientation = orientation
 end
 
+function UIScrollBar:setText(text)
+  local valueLabel = self:getChildById('valueLabel')
+  if valueLabel then
+    valueLabel:setText(text)
+  end
+end
+
 function UIScrollBar:onGeometryChange()
   updateSlider(self)
 end
@@ -225,7 +237,7 @@ function UIScrollBar:onMouseWheel(mousePos, mouseWheel)
   if not self.mouseScroll then
     return false
   end
-  if mouseWheel == MouseWheelDown then
+  if mouseWheel == MouseWheelUp then
     if self.orientation == 'vertical' then
       self:decrement()
     else

modules/corelib/ui/uispinbox.lua

@@ -15,6 +15,11 @@ function UISpinBox.create()
   return spinbox
 end
 
+function UISpinBox:onSetup()
+  g_mouse.bindAutoPress(self:getChildById('up'), function() self:up() end, 300)
+  g_mouse.bindAutoPress(self:getChildById('down'), function() self:down() end, 300)
+end
+
 function UISpinBox:onMouseWheel(mousePos, direction)
   if direction == MouseWheelUp then
     self:up()

modules/corelib/ui/uitabbar.lua

@@ -110,7 +110,9 @@ function UITabBar:selectTab(tab)
   tab:setOn(false)
 
   local parent = tab:getParent()
-  parent:focusChild(tab, MouseFocusReason)
+  if parent then
+    parent:focusChild(tab, MouseFocusReason)
+  end
 end
 
 function UITabBar:selectNextTab()
@@ -144,3 +146,11 @@ end
 function UITabBar:getCurrentTab()
   return self.currentTab
 end
+
+function UITabBar:getTabs()
+  return self.tabs
+end
+
+function UITabBar:getTabsPanel()
+  return table.collect(self.tabs, function(_,tab) return tab.tabPanel end)
+end

modules/corelib/ui/uitextedit.lua

@@ -19,14 +19,15 @@ function UITextEdit:onMouseWheel(mousePos, mouseWheel)
     else
       self.verticalScrollBar:increment()
     end
+    return true
   elseif self.horizontalScrollBar then
     if mouseWheel == MouseWheelUp then
       self.horizontalScrollBar:increment()
     else
       self.horizontalScrollBar:decrement()
     end
+    return true
   end
-  return true
 end
 
 function UITextEdit:onTextAreaUpdate(virtualOffset, virtualSize, totalSize)

modules/corelib/util.lua

@@ -67,6 +67,11 @@ function connect(object, arg1, arg2, arg3)
     elseif type(object[signal]) == 'function' then
       object[signal] = { object[signal] }
     end
+
+    if type(slot) ~= 'function' then
+      perror(debug.traceback('unable to connect a non function value'))
+    end
+
     if type(object[signal]) == 'table' then
       if pushFront then
         table.insert(object[signal], 1, slot)
@@ -80,9 +85,15 @@ end
 function disconnect(object, arg1, arg2)
   local signalsAndSlots
   if type(arg1) == 'string' then
+    if arg2 == nil then
+      object[arg1] = nil
+      return
+    end
     signalsAndSlots = { [arg1] = arg2 }
-  else
+  elseif type(arg1) == 'table' then
     signalsAndSlots = arg1
+  else
+    perror(debug.traceback('unable to disconnect'))
   end
 
   for signal,slot in pairs(signalsAndSlots) do

modules/game_battle/battle.lua

@@ -1,11 +1,16 @@
 battleWindow = nil
 battleButton = nil
 battlePanel = nil
+filterPanel = nil
+toggleFilterButton = nil
 lastBattleButtonSwitched = nil
 battleButtonsByCreaturesList = {}
+creatureAgeList = {}
 
 mouseWidget = nil
 
+sortTypeBox = nil
+sortOrderBox = nil
 hidePlayersButton = nil
 hideNPCsButton = nil
 hideMonstersButton = nil
@@ -25,6 +30,15 @@ function init()
 
   battlePanel = battleWindow:recursiveGetChildById('battlePanel')
 
+  filterPanel = battleWindow:recursiveGetChildById('filterPanel')
+  toggleFilterButton = battleWindow:recursiveGetChildById('toggleFilterButton')
+  
+  if isHidingFilters() then
+    hideFilterPanel()
+  end
+  
+  sortTypeBox = battleWindow:recursiveGetChildById('sortTypeBox')
+  sortOrderBox = battleWindow:recursiveGetChildById('sortOrderBox')
   hidePlayersButton = battleWindow:recursiveGetChildById('hidePlayers')
   hideNPCsButton = battleWindow:recursiveGetChildById('hideNPCs')
   hideMonstersButton = battleWindow:recursiveGetChildById('hideMonsters')
@@ -38,6 +52,18 @@ function init()
 
   battleWindow:setContentMinimumHeight(80)
 
+  sortTypeBox:addOption('Name', 'name')
+  sortTypeBox:addOption('Distance', 'distance')
+  sortTypeBox:addOption('Age', 'age')
+  sortTypeBox:addOption('Health', 'health')
+  sortTypeBox:setCurrentOptionByData(getSortType())
+  sortTypeBox.onOptionChange = onChangeSortType
+
+  sortOrderBox:addOption('Asc.', 'asc')
+  sortOrderBox:addOption('Desc.', 'desc')
+  sortOrderBox:setCurrentOptionByData(getSortOrder())
+  sortOrderBox.onOptionChange = onChangeSortOrder
+  
   connect(Creature, {
     onSkullChange = updateCreatureSkull,
     onEmblemChange = updateCreatureEmblem,
@@ -47,6 +73,10 @@ function init()
     onAppear = onCreatureAppear,
     onDisappear = onCreatureDisappear
   })
+  
+  connect(LocalPlayer, {
+    onPositionChange = onCreaturePositionChange
+  })
 
   connect(g_game, {
     onAttackingCreatureChange = onAttack,
@@ -75,6 +105,10 @@ function terminate()
     onDisappear = onCreatureDisappear
   })
 
+  disconnect(LocalPlayer, {
+    onPositionChange = onCreaturePositionChange
+  })
+  
   disconnect(g_game, {
     onAttackingCreatureChange = onAttack,
     onFollowingCreatureChange = onFollow,
@@ -96,6 +130,93 @@ function onMiniWindowClose()
   battleButton:setOn(false)
 end
 
+function getSortType()
+  local settings = g_settings.getNode('BattleList')
+  if not settings then
+    return 'name'
+  end
+  return settings['sortType']
+end
+
+function setSortType(state)
+  settings = {}
+  settings['sortType'] = state
+  g_settings.mergeNode('BattleList', settings)
+
+  checkCreatures()
+end
+
+function getSortOrder()
+  local settings = g_settings.getNode('BattleList')
+  if not settings then
+    return 'asc'
+  end
+  return settings['sortOrder']
+end
+
+function setSortOrder(state)
+  settings = {}
+  settings['sortOrder'] = state
+  g_settings.mergeNode('BattleList', settings)
+
+  checkCreatures()
+end
+
+function isSortAsc()
+    return getSortOrder() == 'asc'
+end
+
+function isSortDesc()
+    return getSortOrder() == 'desc'
+end
+
+function isHidingFilters()
+  local settings = g_settings.getNode('BattleList')
+  if not settings then
+    return false
+  end
+  return settings['hidingFilters']
+end
+
+function setHidingFilters(state)
+  settings = {}
+  settings['hidingFilters'] = state
+  g_settings.mergeNode('BattleList', settings)
+end
+
+function hideFilterPanel()
+  filterPanel.originalHeight = filterPanel:getHeight()
+  filterPanel:setHeight(0)
+  toggleFilterButton:getParent():setMarginTop(0)
+  toggleFilterButton:setImageClip(torect("0 0 21 12"))
+  setHidingFilters(true)
+  filterPanel:setVisible(false)
+end
+
+function showFilterPanel()
+  toggleFilterButton:getParent():setMarginTop(5)
+  filterPanel:setHeight(filterPanel.originalHeight)
+  toggleFilterButton:setImageClip(torect("21 0 21 12"))
+  setHidingFilters(false)
+  filterPanel:setVisible(true)
+end
+
+function toggleFilterPanel()
+  if filterPanel:isVisible() then
+    hideFilterPanel()
+  else
+    showFilterPanel()
+  end
+end
+
+function onChangeSortType(comboBox, option)
+  setSortType(option:lower())
+end
+
+function onChangeSortOrder(comboBox, option)
+  setSortOrder(option:lower():gsub('[.]', ''))  -- Replace dot in option name
+end
+
 function checkCreatures()
   removeAllCreatures()
 
@@ -151,15 +272,42 @@ end
 function onCreatureHealthPercentChange(creature, health)
   local battleButton = battleButtonsByCreaturesList[creature:getId()]
   if battleButton then
+    if getSortType() == 'health' then
+      removeCreature(creature)
+      addCreature(creature)
+      return
+    end
     battleButton:setLifeBarPercent(creature:getHealthPercent())
   end
 end
 
+local function getDistanceBetween(p1, p2)
+    return math.max(math.abs(p1.x - p2.x), math.abs(p1.y - p2.y))
+end
+
 function onCreaturePositionChange(creature, newPos, oldPos)
   if creature:isLocalPlayer() then
     if oldPos and newPos and newPos.z ~= oldPos.z then
       checkCreatures()
     else
+      -- Distance will change when moving, recalculate and move to correct index
+      if getSortType() == 'distance' then
+        local distanceList = {}
+        for id, creatureButton in pairs(battleButtonsByCreaturesList) do
+          table.insert(distanceList, {distance = getDistanceBetween(newPos, creatureButton.creature:getPosition()), widget = creatureButton})
+        end
+  
+        if isSortAsc() then
+          table.sort(distanceList, function(a, b) return a.distance < b.distance end)
+        else
+          table.sort(distanceList, function(a, b) return a.distance > b.distance end)    
+        end
+        
+        for i = 1, #distanceList do
+          battlePanel:moveChildToIndex(distanceList[i].widget, i)
+        end
+      end    
+
       for id, creatureButton in pairs(battleButtonsByCreaturesList) do
         addCreature(creatureButton.creature)
       end
@@ -170,6 +318,9 @@ function onCreaturePositionChange(creature, newPos, oldPos)
     if has and not fit then
       removeCreature(creature)
     elseif fit then
+      if has and getSortType() == 'distance' then
+        removeCreature(creature)
+      end
       addCreature(creature)
     end
   end
@@ -201,8 +352,13 @@ function addCreature(creature)
   local creatureId = creature:getId()
   local battleButton = battleButtonsByCreaturesList[creatureId]
 
+  -- Register when creature is added to battlelist for the first time
+  if not creatureAgeList[creatureId] then
+    creatureAgeList[creatureId] = os.time()
+  end
+  
   if not battleButton then
-    battleButton = g_ui.createWidget('BattleButton', battlePanel)
+    battleButton = g_ui.createWidget('BattleButton')
     battleButton:setup(creature)
 
     battleButton.onHoverChange = onBattleButtonHoverChange
@@ -217,6 +373,77 @@ function addCreature(creature)
     if creature == g_game.getFollowingCreature() then
       onFollow(creature)
     end
+    
+    local inserted = false
+    local nameLower = creature:getName():lower()
+    local healthPercent = creature:getHealthPercent()
+    local playerPosition = g_game.getLocalPlayer():getPosition()
+    local distance = getDistanceBetween(playerPosition, creature:getPosition())
+    local age = creatureAgeList[creatureId]
+    
+    local childCount = battlePanel:getChildCount()
+    for i = 1, childCount do
+      local child = battlePanel:getChildByIndex(i)
+      local childName = child:getCreature():getName():lower()
+      local equal = false
+      if getSortType() == 'age' then
+        local childAge = creatureAgeList[child:getCreature():getId()]
+        if (age < childAge and isSortAsc()) or (age > childAge and isSortDesc()) then
+          battlePanel:insertChild(i, battleButton)
+          inserted = true
+          break
+        elseif age == childAge then
+          equal = true
+        end
+      elseif getSortType() == 'distance' then
+        local childDistance = getDistanceBetween(child:getCreature():getPosition(), playerPosition)
+        if (distance < childDistance and isSortAsc()) or (distance > childDistance and isSortDesc()) then
+          battlePanel:insertChild(i, battleButton)
+          inserted = true
+          break
+        elseif childDistance == distance then
+          equal = true
+        end
+      elseif getSortType() == 'health' then
+          local childHealth = child:getCreature():getHealthPercent()
+          if (healthPercent < childHealth and isSortAsc()) or (healthPercent > childHealth and isSortDesc()) then
+            battlePanel:insertChild(i, battleButton)
+            inserted = true
+            break
+          elseif healthPercent == childHealth then
+            equal = true
+          end            
+      end
+      
+      -- If any other sort type is selected and values are equal, sort it by name also
+      if getSortType() == 'name' or equal then
+          local length = math.min(childName:len(), nameLower:len())
+          for j=1,length do
+            if (nameLower:byte(j) < childName:byte(j) and isSortAsc()) or (nameLower:byte(j) > childName:byte(j) and isSortDesc()) then
+              battlePanel:insertChild(i, battleButton)
+              inserted = true
+              break
+            elseif (nameLower:byte(j) > childName:byte(j) and isSortAsc()) or (nameLower:byte(j) < childName:byte(j) and isSortDesc()) then
+              break
+            elseif j == nameLower:len() and isSortAsc() then 
+              battlePanel:insertChild(i, battleButton)
+              inserted = true
+            elseif j == childName:len() and isSortDesc() then
+              battlePanel:insertChild(i, battleButton)
+              inserted = true
+            end
+          end
+      end
+
+      if inserted then
+        break
+      end
+    end
+    
+    -- Insert at the end if no other place is found
+    if not inserted then
+      battlePanel:insertChild(childCount + 1, battleButton)
+    end
   else
     battleButton:setLifeBarPercent(creature:getHealthPercent())
   end
@@ -226,6 +453,7 @@ function addCreature(creature)
 end
 
 function removeAllCreatures()
+  creatureAgeList = {}
   for i, v in pairs(battleButtonsByCreaturesList) do
     removeCreature(v.creature)
   end

modules/game_battle/battle.otui

@@ -45,11 +45,12 @@ MiniWindow
   &save: true
 
   Panel
+    id: filterPanel
     margin-top: 26
     anchors.top: parent.top
     anchors.left: parent.left
     anchors.right: miniwindowScrollBar.left
-    height: 20
+    height: 45
 
     Panel
       anchors.top: parent.top
@@ -85,16 +86,56 @@ MiniWindow
         !tooltip: tr('Hide party members')
         @onCheckChange: modules.game_battle.checkCreatures()
 
-  HorizontalSeparator
+    Panel
+      anchors.top: prev.bottom
+      anchors.horizontalCenter: parent.horizontalCenter
+      height: 20
+      width: 128
+      margin-top: 6
+      
+      ComboBox
+        id: sortTypeBox
+        width: 74
+        anchors.top: parent.top
+        anchors.left: prev.right
+        anchors.horizontalCenter: parent.horizontalCenter
+        margin-left: -28
+
+      ComboBox
+        id: sortOrderBox
+        width: 54
+        anchors.top: parent.top
+        anchors.left: prev.right
+        margin-left: 4
+        
+  Panel
+    height: 18
     anchors.top: prev.bottom
     anchors.left: parent.left
     anchors.right: miniwindowScrollBar.left
-    margin-right: 1
-    margin-top: 4
+    margin-top: 5
 
+    UIWidget
+      id: toggleFilterButton
+      anchors.top: prev.top
+      width: 21
+      anchors.horizontalCenter: parent.horizontalCenter
+      image-source: /images/ui/arrow_vertical
+      image-rect: 0 0 21 12
+      image-clip: 21 0 21 12
+      @onClick: modules.game_battle.toggleFilterPanel()
+      phantom: false
+
+  HorizontalSeparator
+    anchors.top: prev.top
+    anchors.left: parent.left
+    anchors.right: miniwindowScrollBar.left
+    margin-right: 1
+    margin-top: 11
+    
   MiniWindowContents
     anchors.top: prev.bottom
-    margin-top: 0
+    margin-top: 6
 
     Panel
       id: battlePanel

modules/game_console/communicationwindow.otui

@@ -0,0 +1,206 @@
+IgnoreListLabel < Label
+  font: verdana-11px-monochrome
+  background-color: alpha
+  text-offset: 2 0
+  focusable: true
+  phantom: false
+
+  $focus:
+    background-color: #ffffff22
+    color: #ffffff
+
+WhiteListLabel < Label
+  font: verdana-11px-monochrome
+  background-color: alpha
+  text-offset: 2 0
+  focusable: true
+  phantom: false
+
+  $focus:
+    background-color: #ffffff22
+    color: #ffffff
+
+
+MainWindow
+  id: communicationWindow
+  !text: tr('Ignore List')
+  size: 515 410
+  @onEscape: self:destroy()
+
+  CheckBox
+    id: checkboxUseIgnoreList
+    !text: tr('Activate ignorelist')
+    anchors.left: parent.left
+    anchors.top: parent.top
+    width: 180
+  
+  Label
+    !text: tr('Ignored Players:')
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    margin-top: 10
+    
+  TextList
+    id: ignoreList
+    vertical-scrollbar: ignoreListScrollBar
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    height: 150
+    width: 230
+    margin-bottom: 10
+    margin-top: 3
+    padding: 1
+    focusable: false
+    
+  TextEdit
+    id: ignoreNameEdit
+    anchors.top: prev.bottom
+    anchors.left: parent.left
+    width: 110
+    margin-top: 5
+    
+  Button
+    id: buttonIgnoreAdd
+    !text: tr('Add')
+    width: 48
+    height: 20
+    margin-left: 5
+    anchors.top: prev.top
+    anchors.left: prev.right
+    
+  Button
+    id: buttonIgnoreRemove
+    !text: tr('Remove')
+    width: 64
+    height: 20
+    margin-left: 5
+    anchors.top: prev.top
+    anchors.left: prev.right
+
+  Label
+    !text: tr('Global ignore settings')
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    margin-top: 20
+
+  CheckBox
+    id: checkboxIgnorePrivateMessages
+    !text: tr('Ignore Private Messages')
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    width: 180
+    margin-top: 5
+    
+  CheckBox
+    id: checkboxIgnoreYelling
+    !text: tr('Ignore Yelling')
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    width: 180
+    margin-top: 5
+    
+  CheckBox
+    id: checkboxUseWhiteList
+    !text: tr('Activate whitelist')
+    anchors.top: parent.top
+    anchors.left: ignoreList.right
+    margin-left: 20
+    width: 180
+    
+  Label
+    !text: tr('Allowed Players:')
+    anchors.top: prev.bottom
+    anchors.left: prev.left
+    margin-top: 10
+    
+  TextList
+    id: whiteList
+    vertical-scrollbar: whiteListScrollBar
+    anchors.left: prev.left
+    anchors.top: prev.bottom
+    height: 150
+    width: 230
+    margin-bottom: 10
+    margin-top: 3
+    padding: 1
+    focusable: false
+    
+  TextEdit
+    id: whitelistNameEdit
+    anchors.top: prev.bottom
+    anchors.left: prev.left
+    width: 110
+    margin-top: 5
+    
+  Button
+    id: buttonWhitelistAdd
+    !text: tr('Add')
+    width: 48
+    height: 20
+    margin-left: 5
+    anchors.top: prev.top
+    anchors.left: prev.right
+    
+  Button
+    id: buttonWhitelistRemove
+    !text: tr('Remove')
+    width: 64
+    height: 20
+    margin-left: 5
+    anchors.top: prev.top
+    anchors.left: prev.right
+    
+  Label
+    !text: tr('Global whitelist settings')
+    anchors.left: whiteList.left
+    anchors.top: prev.bottom
+    margin-top: 20
+
+  CheckBox
+    id: checkboxAllowVIPs
+    !text: tr('Allow VIPs to message you')
+    anchors.left: prev.left
+    anchors.top: prev.bottom
+    width: 180
+    margin-top: 5
+    
+  Panel
+    anchors.bottom: parent.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: 30
+    
+    Panel
+      size: 160 30
+      anchors.horizontalCenter: parent.horizontalCenter
+    
+      Button
+        id: buttonSave
+        !text: tr('Save')
+        width: 75
+        anchors.top: parent.top
+        anchors.left: parent.left
+
+      Button
+        id: buttonCancel
+        !text: tr('Cancel')
+        width: 75
+        anchors.top: parent.top
+        anchors.left: prev.right
+        margin-left: 10
+
+  VerticalScrollBar
+    id: ignoreListScrollBar
+    anchors.top: ignoreList.top
+    anchors.bottom: ignoreList.bottom
+    anchors.right: ignoreList.right
+    step: 14
+    pixels-scroll: true
+    
+  VerticalScrollBar
+    id: whiteListScrollBar
+    anchors.top: whiteList.top
+    anchors.bottom: whiteList.bottom
+    anchors.right: whiteList.right
+    step: 14
+    pixels-scroll: true

modules/game_console/console.lua

@@ -51,7 +51,7 @@ SayModes = {
   [3] = { speakTypeDesc = 'yell', icon = '/images/game/console/yell' }
 }
 
-MAX_HISTORY = 1000
+MAX_HISTORY = 500
 MAX_LINES = 100
 HELP_CHANNEL = 9
 
@@ -61,7 +61,7 @@ consoleTabBar = nil
 consoleTextEdit = nil
 channels = nil
 channelsWindow = nil
-ignoreWindow = nil
+communicationWindow = nil
 ownPrivateName = nil
 messageHistory = {}
 currentMessageIndex = 0
@@ -72,26 +72,33 @@ violationsChannelId = nil
 violationWindow = nil
 violationReportTab = nil
 ignoredChannels = {}
+filters = {}
 
-local ignoreSettings = {
+local communicationSettings = {
+  useIgnoreList = true,
+  useWhiteList = true,
   privateMessages = false,
   yelling = false,
-  players = {}
+  allowVIPs = false,
+  ignoredPlayers = {},
+  whitelistedPlayers = {}
 }
 
 function init()
-  connect(g_game, { onTalk = onTalk,
-                    onChannelList = onChannelList,
-                    onOpenChannel = onOpenChannel,
-                    onOpenPrivateChannel = onOpenPrivateChannel,
-                    onOpenOwnPrivateChannel = onOpenOwnPrivateChannel,
-                    onCloseChannel = onCloseChannel,
-                    onRuleViolationChannel = onRuleViolationChannel,
-                    onRuleViolationRemove = onRuleViolationRemove,
-                    onRuleViolationCancel = onRuleViolationCancel,
-                    onRuleViolationLock = onRuleViolationLock,
-                    onGameStart = online,
-                    onGameEnd = offline })
+  connect(g_game, {
+    onTalk = onTalk,
+    onChannelList = onChannelList,
+    onOpenChannel = onOpenChannel,
+    onOpenPrivateChannel = onOpenPrivateChannel,
+    onOpenOwnPrivateChannel = onOpenOwnPrivateChannel,
+    onCloseChannel = onCloseChannel,
+    onRuleViolationChannel = onRuleViolationChannel,
+    onRuleViolationRemove = onRuleViolationRemove,
+    onRuleViolationCancel = onRuleViolationCancel,
+    onRuleViolationLock = onRuleViolationLock,
+    onGameStart = online,
+    onGameEnd = offline
+  })
 
   consolePanel = g_ui.loadUI('console', modules.game_interface.getBottomPanel())
   consoleTextEdit = consolePanel:getChildById('consoleTextEdit')
@@ -136,24 +143,75 @@ function init()
   g_keyboard.bindKeyDown('Ctrl+O', g_game.requestChannels)
   g_keyboard.bindKeyDown('Ctrl+E', removeCurrentTab)
   g_keyboard.bindKeyDown('Ctrl+H', openHelp)
+
+  consoleToggleChat = consolePanel:getChildById('toggleChat')
+  load()
+end
+
+function toggleChat()
+  if consoleToggleChat:isChecked() then
+    disableChat()
+  else
+    enableChat()
+  end
+end
+
+function enableChat()
+  local gameInterface = modules.game_interface
+
+  consoleTextEdit:setVisible(true)
+  consoleTextEdit:setText("")
+
+  g_keyboard.unbindKeyUp("Space")
+  g_keyboard.unbindKeyUp("Enter")
+
+  gameInterface.unbindWalkKey("W")
+  gameInterface.unbindWalkKey("D")
+  gameInterface.unbindWalkKey("S")
+  gameInterface.unbindWalkKey("A")
+
+  consoleToggleChat:setTooltip(tr("Disable chat mode, allow to walk using ASDW"))
+end
+
+function disableChat()
+  local gameInterface = modules.game_interface
   
-  -- Ignore List
-  loadIgnoreSettings()
+  consoleTextEdit:setVisible(false)
+  consoleTextEdit:setText("")
+
+  local quickFunc = function()
+    if consoleToggleChat:isChecked() then
+      consoleToggleChat:setChecked(false)
+    end
+    enableChat()
+  end
+  g_keyboard.bindKeyUp("Space", quickFunc)
+  g_keyboard.bindKeyUp("Enter", quickFunc)
+
+  gameInterface.bindWalkKey("W", North)
+  gameInterface.bindWalkKey("D", East)
+  gameInterface.bindWalkKey("S", South)
+  gameInterface.bindWalkKey("A", West)
+
+  consoleToggleChat:setTooltip(tr("Enable chat mode"))
 end
 
 function terminate()
-  disconnect(g_game, { onTalk = onTalk,
-                       onChannelList = onChannelList,
-                       onOpenChannel = onOpenChannel,
-                       onOpenPrivateChannel = onOpenPrivateChannel,
-                       onOpenOwnPrivateChannel = onOpenPrivateChannel,
-                       onCloseChannel = onCloseChannel,
-                       onRuleViolationChannel = onRuleViolationChannel,
-                       onRuleViolationRemove = onRuleViolationRemove,
-                       onRuleViolationCancel = onRuleViolationCancel,
-                       onRuleViolationLock = onRuleViolationLock,
-                       onGameStart = online,
-                       onGameEnd = offline })
+  save()
+  disconnect(g_game, {
+    onTalk = onTalk,
+    onChannelList = onChannelList,
+    onOpenChannel = onOpenChannel,
+    onOpenPrivateChannel = onOpenPrivateChannel,
+    onOpenOwnPrivateChannel = onOpenPrivateChannel,
+    onCloseChannel = onCloseChannel,
+    onRuleViolationChannel = onRuleViolationChannel,
+    onRuleViolationRemove = onRuleViolationRemove,
+    onRuleViolationCancel = onRuleViolationCancel,
+    onRuleViolationLock = onRuleViolationLock,
+    onGameStart = online,
+    onGameEnd = offline
+  })
 
   if g_game.isOnline() then clear() end
 
@@ -161,14 +219,14 @@ function terminate()
   g_keyboard.unbindKeyDown('Ctrl+E')
   g_keyboard.unbindKeyDown('Ctrl+H')
 
-  saveIgnoreSettings()
+  saveCommunicationSettings()
   
   if channelsWindow then
     channelsWindow:destroy()
   end
   
-  if ignoreWindow then
-    ignoreWindow:destroy()
+  if communicationWindow then
+    communicationWindow:destroy()
   end
 
   if violationWindow then
@@ -181,6 +239,20 @@ function terminate()
   Console = nil
 end
 
+function save()
+  local settings = {}
+  settings.messageHistory = messageHistory
+  g_settings.setNode('game_console', settings)
+end
+
+function load()
+  local settings = g_settings.getNode('game_console')
+  if settings then
+    messageHistory = settings.messageHistory or {}
+  end
+  loadCommunicationSettings()
+end
+
 function onTabChange(tabBar, tab)
   if tab == defaultTab or tab == serverTab then
     consolePanel:getChildById('closeChannelButton'):disable()
@@ -243,7 +315,6 @@ end
 
 function clearChannel(consoleTabBar)
   consoleTabBar:getCurrentTab().tabPanel:getChildById('consoleBuffer'):destroyChildren()
-  consoleTabBar:getCurrentTab().tabPanel:getChildById('consoleBufferHighlight'):destroyChildren()
 end
 
 function setTextEditText(text)
@@ -271,6 +342,7 @@ function openPlayerReportRuleViolationWindow()
     g_game.talkChannel(MessageModes.RVRChannel, 0, text)
     violationReportTab = addTab(tr('Report Rule') .. '...', true)
     addTabText(tr('Please wait patiently for a gamemaster to reply') .. '.', SpeakTypesSettings.privateRed, violationReportTab)
+    addTabText(applyMessagePrefixies(g_game.getCharacterName(), 0, text),  SpeakTypesSettings.say, violationReportTab, g_game.getCharacterName())
     violationReportTab.locked = true
     violationWindow:destroy()
     violationWindow = nil
@@ -295,15 +367,17 @@ function removeTab(tab)
     tab = consoleTabBar:getTab(tab)
   end
 
-  if tab == defaultTab or tab == serverTab then return end
+  if tab == defaultTab or tab == serverTab then
+    return
+  end
 
   if tab == violationReportTab then
     g_game.cancelRuleViolation()
     violationReportTab = nil
   elseif tab.violationChatName then
     g_game.closeRuleViolation(tab.violationChatName)
-  -- notificate the server that we are leaving the channel
   elseif tab.channelId then
+    -- notificate the server that we are leaving the channel
     for k, v in pairs(channels) do
       if (k == tab.channelId) then channels[k] = nil end
     end
@@ -316,8 +390,7 @@ function removeTab(tab)
 end
 
 function removeCurrentTab()
-  local tab = consoleTabBar:getCurrentTab()
-  removeTab(tab)
+  removeTab(consoleTabBar:getCurrentTab())
 end
 
 function getTab(name)
@@ -433,21 +506,20 @@ function addTabText(text, speaktype, tab, creatureName)
   consoleTabBar:blinkTab(tab)
 
   -- Overlay for consoleBuffer which shows highlighted words only
-  local consoleBufferHighlight = panel:getChildById('consoleBufferHighlight')
-  local labelHighlight = g_ui.createWidget('ConsolePhantomLabel', consoleBufferHighlight)
 
-  labelHighlight:setId('consoleLabel' .. consoleBufferHighlight:getChildCount())
-  labelHighlight:setColor("#1f9ffe")
-
-  if speaktype.npcChat and (g_game.getCharacterName() ~= creatureName or g_game.getCharacterName() == 'Account Manager') then  -- Check if it is the npc who is talking
+  if speaktype.npcChat and (g_game.getCharacterName() ~= creatureName or g_game.getCharacterName() == 'Account Manager') then
     local highlightData = getHighlightedText(text)
-    if #highlightData == 0 then
-      labelHighlight:setText("")
-    else
+    if #highlightData > 0 then
+      local labelHighlight = g_ui.createWidget('ConsolePhantomLabel', label)
+      labelHighlight:fill('parent')
+
+      labelHighlight:setId('consoleLabelHighlight' .. consoleBuffer:getChildCount())
+      labelHighlight:setColor("#1f9ffe")
+
       -- Remove the curly braces
       for i = 1, #highlightData / 3 do
         local dataBlock = { _start = highlightData[(i-1)*3+1], _end = highlightData[(i-1)*3+2], words = highlightData[(i-1)*3+3] }
-        text = text:gsub("{"..dataBlock.words.."}", dataBlock.words)
+        text = text:gsub("%{(.-)%}", dataBlock.words, 1)
 
         -- Recalculate positions as braces are removed
         highlightData[(i-1)*3+1] = dataBlock._start - ((i-1) * 2)
@@ -482,8 +554,6 @@ function addTabText(text, speaktype, tab, creatureName)
 
       labelHighlight:setText(tmpText)
     end
-  else
-    labelHighlight:setText("")
   end
 
   label.name = creatureName
@@ -494,10 +564,6 @@ function addTabText(text, speaktype, tab, creatureName)
   if consoleBuffer:getChildCount() > MAX_LINES then
     consoleBuffer:getFirstChild():destroy()
   end
-
-  if consoleBufferHighlight:getChildCount() > MAX_LINES then
-    consoleBufferHighlight:getFirstChild():destroy()
-  end
 end
 
 function removeTabLabelByName(tab, name)
@@ -579,10 +645,24 @@ function sendCurrentMessage()
   sendMessage(message)
 end
 
+function addFilter(filter)
+  table.insert(filters, filter)
+end
+
+function removeFilter(filter)
+  table.removevalue(filters, filter)
+end
+
 function sendMessage(message, tab)
   local tab = tab or getCurrentTab()
   if not tab then return end
 
+  for k,func in pairs(filters) do
+    if func(message) then
+      return true
+    end
+  end
+
   -- when talking on server log, the message goes to default channel
   local name = tab:getText()
   if tab == serverTab or tab == getRuleViolationsTab() then
@@ -591,18 +671,36 @@ function sendMessage(message, tab)
   end
 
   -- handling chat commands
+  local channel = tab.channelId
   local originalMessage = message
   local chatCommandSayMode
   local chatCommandPrivate
   local chatCommandPrivateReady
+  local chatCommandMessage
 
-  local chatCommandMessage = message:match("^%#y (.*)")
-  if chatCommandMessage ~= nil then chatCommandSayMode = 'yell' end -- player used yell command
-  message = chatCommandMessage or message
+  -- player used yell command
+  chatCommandMessage = message:match("^%#y (.*)")
+  if chatCommandMessage ~= nil then
+    chatCommandSayMode = 'yell'
+    channel = 0
+    message = chatCommandMessage
+  end
 
+   -- player used whisper
   local chatCommandMessage = message:match("^%#w (.*)")
-  if chatCommandMessage ~= nil then chatCommandSayMode = 'whisper' end -- player used whisper
-  message = chatCommandMessage or message
+  if chatCommandMessage ~= nil then
+    chatCommandSayMode = 'whisper'
+    message = chatCommandMessage
+    channel = 0
+  end
+
+  -- player say
+  local chatCommandMessage = message:match("^%#s (.*)")
+  if chatCommandMessage ~= nil then
+    chatCommandSayMode = 'say'
+    message = chatCommandMessage
+    channel = 0
+  end
 
   local findIni, findEnd, chatCommandInitial, chatCommandPrivate, chatCommandEnd, chatCommandMessage = message:find("([%*%@])(.+)([%*%@])(.*)")
   if findIni ~= nil and findIni == 1 then -- player used private chat command
@@ -629,15 +727,15 @@ function sendMessage(message, tab)
   end
 
   local speaktypedesc
-  if (tab.channelId or tab == defaultTab) and not chatCommandPrivateReady then
+  if (channel or tab == defaultTab) and not chatCommandPrivateReady then
     if tab == defaultTab then
       speaktypedesc = chatCommandSayMode or SayModes[consolePanel:getChildById('sayModeButton').sayMode].speakTypeDesc
       if speaktypedesc ~= 'say' then sayModeChange(2) end -- head back to say mode
     else
-      speaktypedesc = 'channelYellow'
+      speaktypedesc = chatCommandSayMode or 'channelYellow'
     end
 
-    g_game.talkChannel(SpeakTypesSettings[speaktypedesc].speakType, tab.channelId, message)
+    g_game.talkChannel(SpeakTypesSettings[speaktypedesc].speakType, channel, message)
     return
   else
     local isPrivateCommand = false
@@ -650,6 +748,10 @@ function sendMessage(message, tab)
     elseif tab.npcChat then
       speaktypedesc = 'privatePlayerToNpc'
     elseif tab == violationReportTab then
+      if violationReportTab.locked then
+        modules.game_textmessage.displayFailureMessage('Wait for a gamemaster reply.')
+        return
+      end
       speaktypedesc = 'rvrContinue'
       tabname = tr('Report Rule') .. '...'
     elseif tab.violationChatName then
@@ -730,7 +832,11 @@ function onTalk(name, level, mode, message, channelId, creaturePos)
     return
   end
 
-  if name ~= g_game.getCharacterName() then
+  local localPlayer = g_game.getLocalPlayer()
+  if name ~= g_game.getCharacterName()     
+      and isUsingIgnoreList()             
+        and not(isUsingWhiteList()) or (isUsingWhiteList() and not(isWhitelisted(name)) and not(isAllowingVIPs() and localPlayer:hasVip(name))) then
+    
     if mode == MessageModes.Yell and isIgnoringYelling() then
       return
     elseif speaktype.private and isIgnoringPrivate() and mode ~= MessageModes.NpcFrom then
@@ -857,6 +963,7 @@ end
 
 function onRuleViolationLock()
   if not violationReportTab then return end
+  violationReportTab.locked = false
   addTabText(tr('Your request has been closed') .. '.', SpeakTypesSettings.privateRed, violationReportTab)
   violationReportTab.locked = true
 end
@@ -907,107 +1014,221 @@ function onChannelList(channelList)
   end
 end
 
-function loadIgnoreSettings()
+function loadCommunicationSettings()
+  communicationSettings.whitelistedPlayers = {}
+  communicationSettings.ignoredPlayers = {}
+
   local ignoreNode = g_settings.getNode('IgnorePlayers')
   if ignoreNode then
     for i = 1, #ignoreNode do
-      table.insert(ignoreSettings.players, ignoreNode[i])
+      table.insert(communicationSettings.ignoredPlayers, ignoreNode[i])
     end
   end
-  ignoreSettings.privateMessages = g_settings.getBoolean('IgnorePrivateMessages')
-  ignoreSettings.yelling = g_settings.getBoolean('IgnoreYelling')
-end
 
-function saveIgnoreSettings()
-  local tmpSettings = {}
-  for i = 1, #ignoreSettings.players do    
-    table.insert(tmpSettings, ignoreSettings.players[i])
+  local whitelistNode = g_settings.getNode('WhitelistedPlayers')
+  if whitelistNode then
+    for i = 1, #whitelistNode do
+      table.insert(communicationSettings.whitelistedPlayers, whitelistNode[i])
+    end
   end
-  g_settings.set('IgnorePrivateMessages', ignoreSettings.privateMessages)
-  g_settings.set('IgnoreYelling', ignoreSettings.yelling)
-  g_settings.setNode('IgnorePlayers', tmpSettings)
+
+  communicationSettings.useIgnoreList = g_settings.getBoolean('UseIgnoreList')
+  communicationSettings.useWhiteList = g_settings.getBoolean('UseWhiteList')
+  communicationSettings.privateMessages = g_settings.getBoolean('IgnorePrivateMessages')
+  communicationSettings.yelling = g_settings.getBoolean('IgnoreYelling')
+  communicationSettings.allowVIPs = g_settings.getBoolean('AllowVIPs')
 end
 
+function saveCommunicationSettings()
+  local tmpIgnoreList = {}
+  local ignoredPlayers = getIgnoredPlayers()
+  for i = 1, #ignoredPlayers do    
+    table.insert(tmpIgnoreList, ignoredPlayers[i])
+  end
+
+  local tmpWhiteList = {}
+  local whitelistedPlayers = getWhitelistedPlayers()
+  for i = 1, #whitelistedPlayers do    
+    table.insert(tmpWhiteList, whitelistedPlayers[i])
+  end
+  
+  g_settings.set('UseIgnoreList', communicationSettings.useIgnoreList)
+  g_settings.set('UseWhiteList', communicationSettings.useWhiteList)
+  g_settings.set('IgnorePrivateMessages', communicationSettings.privateMessages)
+  g_settings.set('IgnoreYelling', communicationSettings.yelling)
+  g_settings.setNode('IgnorePlayers', tmpIgnoreList)
+  g_settings.setNode('WhitelistedPlayers', tmpWhiteList)
+end
+
+function getIgnoredPlayers()
+  return communicationSettings.ignoredPlayers
+end
+
+function getWhitelistedPlayers()
+  return communicationSettings.whitelistedPlayers
+end
+
+function isUsingIgnoreList()
+  return communicationSettings.useIgnoreList
+end
+
+function isUsingWhiteList()
+  return communicationSettings.useWhiteList
+end
 function isIgnored(name)
-  return table.find(ignoreSettings.players, name, true)
+  return table.find(communicationSettings.ignoredPlayers, name, true)
 end
 
 function addIgnoredPlayer(name)
-  if not isIgnored(name) then
-    table.insert(ignoreSettings.players, name)
-  end
+  if isIgnored(name) then return end
+  table.insert(communicationSettings.ignoredPlayers, name)
 end
 
 function removeIgnoredPlayer(name)
-  table.removevalue(ignoreSettings.players, name)
+  table.removevalue(communicationSettings.ignoredPlayers, name)
+end
+
+function isWhitelisted(name)
+  return table.find(communicationSettings.whitelistedPlayers, name, true)
+end
+
+function addWhitelistedPlayer(name)
+  if isWhitelisted(name) then return end
+  table.insert(communicationSettings.whitelistedPlayers, name)
+end
+
+function removeWhitelistedPlayer(name)
+  table.removevalue(communicationSettings.whitelistedPlayers, name)
 end
 
 function isIgnoringPrivate()
-  return ignoreSettings.privateMessages
+  return communicationSettings.privateMessages
 end
 
 function isIgnoringYelling()
-  return ignoreSettings.yelling
+  return communicationSettings.yelling
+end
+
+function isAllowingVIPs()
+  return communicationSettings.allowVIPs
 end
 
 function onClickIgnoreButton()
-  if ignoreWindow then return end
-  ignoreWindow = g_ui.displayUI('ignorewindow')
-  local ignoreListPanel = ignoreWindow:getChildById('ignoreList')
-  ignoreWindow.onDestroy = function() ignoreWindow = nil end
+  if communicationWindow then return end
+  communicationWindow = g_ui.displayUI('communicationwindow')
+  local ignoreListPanel = communicationWindow:getChildById('ignoreList')
+  local whiteListPanel = communicationWindow:getChildById('whiteList')
+  communicationWindow.onDestroy = function() communicationWindow = nil end
   
-  local removeButton = ignoreWindow:getChildById('buttonRemove')
-  removeButton:disable()
-  ignoreListPanel.onChildFocusChange = function() removeButton:enable() end
-  removeButton.onClick = function() 
-            local selection = ignoreListPanel:getFocusedChild() 
-            if selection then
-                ignoreListPanel:removeChild(selection)
-                selection:destroy()
-            end
-            if ignoreListPanel:getChildCount() == 0 then
-                removeButton:disable()
-            end
-        end
+  local useIgnoreListBox = communicationWindow:getChildById('checkboxUseIgnoreList')
+  useIgnoreListBox:setChecked(communicationSettings.useIgnoreList)
+  local useWhiteListBox = communicationWindow:getChildById('checkboxUseWhiteList')
+  useWhiteListBox:setChecked(communicationSettings.useWhiteList)
+
+  local removeIgnoreButton = communicationWindow:getChildById('buttonIgnoreRemove')
+  removeIgnoreButton:disable()
+  ignoreListPanel.onChildFocusChange = function() removeIgnoreButton:enable() end
+  removeIgnoreButton.onClick = function() 
+    local selection = ignoreListPanel:getFocusedChild() 
+    if selection then
+      ignoreListPanel:removeChild(selection)
+      selection:destroy()
+    end
+    removeIgnoreButton:disable()
+  end
+
+  local removeWhitelistButton = communicationWindow:getChildById('buttonWhitelistRemove')
+  removeWhitelistButton:disable()
+  whiteListPanel.onChildFocusChange = function() removeWhitelistButton:enable() end
+  removeWhitelistButton.onClick = function() 
+    local selection = whiteListPanel:getFocusedChild() 
+    if selection then
+      whiteListPanel:removeChild(selection)
+      selection:destroy()
+    end
+    removeWhitelistButton:disable()
+  end
   
   local newlyIgnoredPlayers = {}
-  local addName = ignoreWindow:getChildById('ignoreNameEdit')
-  local addButton = ignoreWindow:getChildById('buttonAdd')
-  local addFunction = function() 
-            if addName:getText() == '' then return end
-            if table.find(ignoreSettings.players, addName:getText()) then return end
-            if table.find(newlyIgnoredPlayers, addName:getText()) then return end
-            local label = g_ui.createWidget('IgnoreListLabel', ignoreListPanel)
-            label:setText(addName:getText())
-            table.insert(newlyIgnoredPlayers, addName:getText())
-            label:setPhantom(false)
-            addName:setText('')
-        end
-  addButton.onClick = addFunction
-  ignoreWindow.onEnter = addFunction
-    
-  local ignorePrivateMessageBox = ignoreWindow:getChildById('checkboxIgnorePrivateMessages')
-  ignorePrivateMessageBox:setChecked(ignoreSettings.privateMessages)
-  local ignoreYellingBox = ignoreWindow:getChildById('checkboxIgnoreYelling')
-  ignoreYellingBox:setChecked(ignoreSettings.yelling)
-    
-  local saveButton = ignoreWindow:getChildById('buttonSave')
-  saveButton.onClick = function()
-                ignoreSettings.players = {}
-                for i = 1, ignoreListPanel:getChildCount() do
-                    addIgnoredPlayer(ignoreListPanel:getChildByIndex(i):getText())
-                    --table.insert(ignoreSettings.players, ignoreListPanel:getChildByIndex(i):getText())
-                end
-                
-                ignoreSettings.yelling = ignoreYellingBox:isChecked()
-                ignoreSettings.privateMessages = ignorePrivateMessageBox:isChecked()
-                ignoreWindow:destroy()
-            end
-    
-  for _, name in pairs(ignoreSettings.players) do
+  local addIgnoreName = communicationWindow:getChildById('ignoreNameEdit')
+  local addIgnoreButton = communicationWindow:getChildById('buttonIgnoreAdd')
+  local addIgnoreFunction = function() 
+      local newEntry = addIgnoreName:getText()
+      if newEntry == '' then return end
+      if table.find(getIgnoredPlayers(), newEntry) then return end
+      if table.find(newlyIgnoredPlayers, newEntry) then return end
       local label = g_ui.createWidget('IgnoreListLabel', ignoreListPanel)
-      label:setText(name)
-      label:setPhantom(false)
+      label:setText(newEntry)
+      table.insert(newlyIgnoredPlayers, newEntry)
+      addIgnoreName:setText('')
+    end
+  addIgnoreButton.onClick = addIgnoreFunction
+
+  local newlyWhitelistedPlayers = {}
+  local addWhitelistName = communicationWindow:getChildById('whitelistNameEdit')
+  local addWhitelistButton = communicationWindow:getChildById('buttonWhitelistAdd')
+  local addWhitelistFunction = function()
+      local newEntry = addWhitelistName:getText()
+      if newEntry == '' then return end
+      if table.find(getWhitelistedPlayers(), newEntry) then return end
+      if table.find(newlyWhitelistedPlayers, newEntry) then return end
+      local label = g_ui.createWidget('WhiteListLabel', whiteListPanel)
+      label:setText(newEntry)
+      table.insert(newlyWhitelistedPlayers, newEntry)
+      addWhitelistName:setText('')
+    end
+  addWhitelistButton.onClick = addWhitelistFunction
+
+  communicationWindow.onEnter = function()
+      if addWhitelistName:isFocused() then
+        addWhitelistFunction()
+      elseif addIgnoreName:isFocused() then
+        addIgnoreFunction()
+      end
+    end
+    
+  local ignorePrivateMessageBox = communicationWindow:getChildById('checkboxIgnorePrivateMessages')
+  ignorePrivateMessageBox:setChecked(communicationSettings.privateMessages)
+  local ignoreYellingBox = communicationWindow:getChildById('checkboxIgnoreYelling')
+  ignoreYellingBox:setChecked(communicationSettings.yelling)
+  local allowVIPsBox = communicationWindow:getChildById('checkboxAllowVIPs')
+  allowVIPsBox:setChecked(communicationSettings.allowVIPs)
+    
+  local saveButton = communicationWindow:recursiveGetChildById('buttonSave')
+  saveButton.onClick = function()
+      communicationSettings.ignoredPlayers = {}
+      for i = 1, ignoreListPanel:getChildCount() do
+        addIgnoredPlayer(ignoreListPanel:getChildByIndex(i):getText())
+      end
+
+      communicationSettings.whitelistedPlayers = {}
+      for i = 1, whiteListPanel:getChildCount() do
+        addWhitelistedPlayer(whiteListPanel:getChildByIndex(i):getText())
+      end
+      
+      communicationSettings.useIgnoreList = useIgnoreListBox:isChecked()
+      communicationSettings.useWhiteList = useWhiteListBox:isChecked()
+      communicationSettings.yelling = ignoreYellingBox:isChecked()
+      communicationSettings.privateMessages = ignorePrivateMessageBox:isChecked()
+      communicationSettings.allowVIPs = allowVIPsBox:isChecked()
+      communicationWindow:destroy()
+    end
+            
+  local cancelButton = communicationWindow:recursiveGetChildById('buttonCancel')
+  cancelButton.onClick = function()
+      communicationWindow:destroy()
+    end
+    
+  local ignoredPlayers = getIgnoredPlayers()
+  for i = 1, #ignoredPlayers do
+    local label = g_ui.createWidget('IgnoreListLabel', ignoreListPanel)
+    label:setText(ignoredPlayers[i])
+  end
+    
+  local whitelistedPlayers = getWhitelistedPlayers()
+  for i = 1, #whitelistedPlayers do
+    local label = g_ui.createWidget('WhiteListLabel', whiteListPanel)
+    label:setText(whitelistedPlayers[i])
   end
 end
 
@@ -1039,4 +1260,4 @@ function offline()
     g_keyboard.unbindKeyDown('Ctrl+R')
   end
   clear()
-end
+end

modules/game_console/console.otui

@@ -15,13 +15,14 @@ ConsolePhantomLabel < UILabel
   font: verdana-11px-antialised
   height: 14
   color: yellow
-  margin-left: 2
   text-wrap: true
   text-auto-resize: true
   selection-color: #111416
   selection-background-color: #999999
 
 ConsoleTabBar < MoveableTabBar
+  height: 28
+
 ConsoleTabBarPanel < MoveableTabBarPanel
   id: consoleTab
 
@@ -39,29 +40,6 @@ ConsoleTabBarPanel < MoveableTabBarPanel
     inverted-scroll: true
     padding: 1
 
-  ScrollablePanel
-    id: consoleBufferHighlight
-    anchors.fill: parent
-    margin-right: 12
-    vertical-scrollbar: consoleScrollBarHighlight
-    layout:
-      type: verticalBox
-      align-bottom: true
-    inverted-scroll: true
-    padding: 1
-    @onScrollbarChange: |
-      local consoleScrollBar = self:getParent():getChildById('consoleScrollBar')
-      local consoleScrollBarHighlight = self:getParent():getChildById('consoleScrollBarHighlight')
-      consoleScrollBar:setValue(consoleScrollBarHighlight:getValue())
-
-  VerticalScrollBar
-    id: consoleScrollBarHighlight
-    anchors.top: parent.top
-    anchors.bottom: parent.bottom
-    anchors.right: parent.right
-    step: 14
-    pixels-scroll: true
-
   VerticalScrollBar
     id: consoleScrollBar
     anchors.top: parent.top
@@ -78,17 +56,25 @@ Panel
   id: consolePanel
   anchors.fill: parent
 
+  CheckBox
+    id: toggleChat
+    !tooltip: tr('Disable chat mode, allow to walk using ASDW')
+    anchors.left: parent.left
+    anchors.top: parent.top
+    margin-left: 13
+    margin-top: 8
+    @onCheckChange: toggleChat()
+
   TabButton
     id: prevChannelButton
     icon: /images/game/console/leftarrow
-    anchors.left: parent.left
+    anchors.left: toggleChat.right
     anchors.top: parent.top
-    margin-left: 6
+    margin-left: 3
     margin-top: 6
 
   ConsoleTabBar
     id: consoleTabBar
-    height: 28
     anchors.left: prev.right
     anchors.top: parent.top
     anchors.right: next.left

modules/game_console/ignorewindow.otui

@@ -1,98 +0,0 @@
-IgnoreListLabel < Label
-  font: verdana-11px-monochrome
-  background-color: alpha
-  text-offset: 2 0
-  focusable: true
-
-  $focus:
-    background-color: #ffffff22
-    color: #ffffff
-
-MainWindow
-  id: ignoreWindow
-  !text: tr('Ignore List')
-  size: 500 240
-  @onEscape: self:destroy()
-
-  Label
-    !text: tr('Ignored players:')
-    anchors.left: parent.left
-    anchors.top: parent.top
-    
-  TextList
-    id: ignoreList
-    vertical-scrollbar: ignoreListScrollBar
-    anchors.left: parent.left
-    anchors.top: prev.bottom
-    height: 150
-    width: 230
-    margin-bottom: 10
-    margin-top: 3
-    padding: 1
-    focusable: false
-
-  Button
-    id: buttonRemove
-    !text: tr('Remove')
-    width: 64
-    anchors.right: prev.right
-    anchors.bottom: parent.bottom
-    
-  TextEdit
-    id: ignoreNameEdit
-    anchors.left: ignoreList.right
-    anchors.top: ignoreList.top
-    width: 180
-    margin-left: 8
-    margin-right: 3
-    
-  Button
-    id: buttonAdd
-    !text: tr('Add')
-    width: 48
-    height: 20
-    anchors.right: parent.right
-    anchors.top: prev.top
-    
-  CheckBox
-    id: checkboxIgnorePrivateMessages
-    !text: tr('Ignore Private Messages')
-    anchors.left: ignoreList.right
-    anchors.top: ignoreList.top
-    width: 180
-    margin-top: 25
-    margin-left: 8
-    
-  CheckBox
-    id: checkboxIgnoreYelling
-    !text: tr('Ignore Yelling')
-    anchors.left: ignoreList.right
-    anchors.top: prev.top
-    width: 180
-    margin-top: 25
-    margin-left: 8
-    
-  Button
-    id: buttonSave
-    !text: tr('Save')
-    width: 64
-    anchors.right: next.left
-    anchors.bottom: parent.bottom
-    margin-right: 10
-    @onClick: self:getParent():onEnter()
-
-  Button
-    id: buttonCancel
-    !text: tr('Cancel')
-    width: 64
-    anchors.right: parent.right
-    anchors.bottom: parent.bottom
-    @onClick: self:getParent():destroy()
-
-  VerticalScrollBar
-    id: ignoreListScrollBar
-    anchors.top: ignoreList.top
-    anchors.bottom: ignoreList.bottom
-    anchors.right: ignoreList.right
-    step: 14
-    pixels-scroll: true

modules/game_console/violationwindow.otui

@@ -13,12 +13,14 @@ MainWindow
 
   TextEdit
     id: text
+    text-wrap: true
     multiline: true
     anchors.top: prev.bottom
     anchors.bottom: next.top
     anchors.left: parent.left
     anchors.right: parent.right
     margin: 8 0
+    max-length: 255
 
   Button
     id: buttonOk

modules/game_containers/containers.lua

@@ -29,11 +29,15 @@ end
 
 function clean()
   for containerid,container in pairs(g_game.getContainers()) do
-    if container.window then
-      container.window:destroy()
-      container.window = nil
-      container.itemsPanel = nil
-    end
+    destroy(container)
+  end
+end
+
+function destroy(container)
+  if container.window then
+    container.window:destroy()
+    container.window = nil
+    container.itemsPanel = nil
   end
 end
 
@@ -103,7 +107,7 @@ function onContainerOpen(container, previousContainer)
 end
 
 function onContainerClose(container)
-  if container.window then container.window:destroy() end
+  destroy(container)
 end
 
 function onContainerAddItem(container, slot, item)

modules/game_cooldown/cooldown.lua

@@ -6,7 +6,7 @@ local ProgressCallback = {
 cooldownWindow = nil
 cooldownButton = nil
 contentsPanel = nil
-spellCooldownPanel = nil
+cooldownPanel = nil
 lastPlayer = nil
 
 function init()
@@ -23,7 +23,12 @@ function init()
   cooldownWindow:setup() 
   
   contentsPanel = cooldownWindow:getChildById('contentsPanel')
-  spellCooldownPanel = contentsPanel:getChildById('spellCooldownPanel')
+  cooldownPanel = contentsPanel:getChildById('cooldownPanel')
+
+  -- preload cooldown images
+  for k,v in pairs(SpelllistSettings) do
+    g_textures.preload(v.iconFile)
+  end
 
   if g_game.isOnline() then
     online()
@@ -39,6 +44,24 @@ function terminate()
   cooldownButton:destroy()
 end
 
+function loadIcon(iconId)
+  local spell, profile, spellName = Spells.getSpellByIcon(iconId)
+  if not spellName then return end
+  
+  clientIconId = Spells.getClientId(spellName)
+  if not clientIconId then return end
+  
+  local icon = cooldownPanel:getChildById(iconId)
+  if not icon then
+    icon = g_ui.createWidget('SpellIcon')
+    icon:setId(iconId)
+  end
+
+  icon:setImageSource(SpelllistSettings[profile].iconFile)
+  icon:setImageClip(Spells.getImageClip(clientIconId, profile))
+  return icon
+end
+
 function onMiniWindowClose()
   cooldownButton:setOn(false)
 end
@@ -68,7 +91,7 @@ function online()
 end
 
 function refresh()
-  spellCooldownPanel:destroyChildren()
+  cooldownPanel:destroyChildren()
 end
 
 function removeCooldown(progressRect)
@@ -105,36 +128,28 @@ function initCooldown(progressRect, updateCallback, finishCallback)
   updateCallback()
 end
 
-function updateCooldown(progressRect, interval)
-  progressRect:setPercent(progressRect:getPercent() + 5)
+function updateCooldown(progressRect, duration)
+  progressRect:setPercent(progressRect:getPercent() + 10000/duration)
   
   if progressRect:getPercent() < 100 then
     removeEvent(progressRect.event)
-    progressRect.event = scheduleEvent(function() progressRect.callback[ProgressCallback.update]() end, interval)
+    progressRect.event = scheduleEvent(function() progressRect.callback[ProgressCallback.update]() end, 100)
   else
     progressRect.callback[ProgressCallback.finish]()
   end
 end
 
 function onSpellCooldown(iconId, duration)
-  local spell, profile, spellName = Spells.getSpellByIcon(iconId)
-  if not spellName then return end
-  
-  clientIconId = Spells.getClientId(spellName)
-  if not clientIconId then return end
-  
-  local icon = spellCooldownPanel:getChildById(spellName)
+  local icon = loadIcon(iconId)
   if not icon then
-    icon = g_ui.createWidget('SpellIcon', spellCooldownPanel)
-    icon:setId(spellName)
+    return
   end
-  icon:setImageSource('/images/game/spells/' .. SpelllistSettings[profile].iconFile)
-  icon:setImageClip(Spells.getImageClip(clientIconId, profile))
+  icon:setParent(cooldownPanel)
 
-  local progressRect = icon:getChildById(spellName)
+  local progressRect = icon:getChildById(iconId)
   if not progressRect then
     progressRect = g_ui.createWidget('SpellProgressRect', icon)
-    progressRect:setId(spellName)
+    progressRect:setId(iconId)
     progressRect.icon = icon
     progressRect:fill('parent')
   else
@@ -143,7 +158,7 @@ function onSpellCooldown(iconId, duration)
   progressRect:setTooltip(spellName)
 
   local updateFunc = function()
-    updateCooldown(progressRect, duration/19)
+    updateCooldown(progressRect, duration)
   end
   local finishFunc = function()
     removeCooldown(progressRect)
@@ -165,7 +180,7 @@ function onSpellGroupCooldown(groupId, duration)
   if progressRect then
     removeEvent(progressRect.event)
     local updateFunc = function()
-      updateCooldown(progressRect, duration/19)
+      updateCooldown(progressRect, duration)
     end
     local finishFunc = function()
       turnOffCooldown(progressRect)

modules/game_cooldown/cooldown.otui

@@ -87,7 +87,7 @@ MiniWindow
       !tooltip: tr('Special')
 
     Panel
-      id: spellCooldownPanel
+      id: cooldownPanel
       layout:
         type: horizontalBox
       height: 30
@@ -98,4 +98,3 @@ MiniWindow
       anchors.right: parent.right
       background-color: #ffffff11
       
-      

modules/game_healthinfo/healthinfo.lua

@@ -48,6 +48,11 @@ function init()
   soulLabel = healthInfoWindow:recursiveGetChildById('soulLabel')
   capLabel = healthInfoWindow:recursiveGetChildById('capLabel')
 
+  -- load condition icons
+  for k,v in pairs(Icons) do
+    g_textures.preload(v.path)
+  end
+
   if g_game.isOnline() then
     local localPlayer = g_game.getLocalPlayer()
     onHealthChange(localPlayer, localPlayer:getHealth(), localPlayer:getMaxHealth())
@@ -92,13 +97,19 @@ function toggleIcon(bitChanged)
   if icon then
     icon:destroy()
   else
-    icon = g_ui.createWidget('ConditionWidget', content)
-    icon:setId(Icons[bitChanged].id)
-    icon:setImageSource(Icons[bitChanged].path)
-    icon:setTooltip(Icons[bitChanged].tooltip)
+    icon = loadIcon(bitChanged)
+    icon:setParent(content)
   end
 end
 
+function loadIcon(bitChanged)
+  local icon = g_ui.createWidget('ConditionWidget', content)
+  icon:setId(Icons[bitChanged].id)
+  icon:setImageSource(Icons[bitChanged].path)
+  icon:setTooltip(Icons[bitChanged].tooltip)
+  return icon
+end
+
 function offline()
   healthInfoWindow:recursiveGetChildById('conditionPanel'):destroyChildren()
 end
@@ -164,12 +175,27 @@ end
 
 function setHealthTooltip(tooltip)
   healthTooltip = tooltip
+
+  local localPlayer = g_game.getLocalPlayer()
+  if localPlayer then
+    healthBar:setTooltip(tr(healthTooltip, localPlayer:getHealth(), localPlayer:getMaxHealth()))
+  end
 end
 
 function setManaTooltip(tooltip)
   manaTooltip = tooltip
+
+  local localPlayer = g_game.getLocalPlayer()
+  if localPlayer then
+    manaBar:setTooltip(tr(manaTooltip, localPlayer:getMana(), localPlayer:getMaxMana()))
+  end
 end
 
 function setExperienceTooltip(tooltip)
   experienceTooltip = tooltip
+
+  local localPlayer = g_game.getLocalPlayer()
+  if localPlayer then
+    experienceBar:setTooltip(tr(experienceTooltip, localPlayer:getLevelPercent(), localPlayer:getLevel()+1))
+  end
 end

modules/game_healthinfo/healthinfo.otui

@@ -4,6 +4,7 @@ HealthBar < ProgressBar
   anchors.top: parent.top
   anchors.left: parent.left
   anchors.right: parent.right
+  margin: 1
 
 ManaBar < ProgressBar
   id: manaBar
@@ -11,6 +12,7 @@ ManaBar < ProgressBar
   anchors.top: prev.bottom
   anchors.left: parent.left
   anchors.right: parent.right
+  margin: 1
   margin-top: 3
   
 ExperienceBar < ProgressBar
@@ -19,9 +21,8 @@ ExperienceBar < ProgressBar
   anchors.top: prev.bottom
   anchors.left: parent.left
   anchors.right: parent.right
+  margin: 1
   margin-top: 3
-  //margin-top: 6
-  //height: 12
 
 SoulLabel < GameLabel
   id: soulLabel
@@ -66,7 +67,7 @@ MiniWindow
   icon: /images/topbuttons/healthinfo
   id: healthInfoWindow
   !text: tr('Health Info')
-  height: 121
+  height: 123
   @onClose: modules.game_healthinfo.onMiniWindowClose()
   &save: true
 

modules/game_hotkeys/hotkeys_manager.lua

@@ -34,6 +34,7 @@ perCharacter = true
 mouseGrabberWidget = nil
 useRadioGroup = nil
 currentHotkeys = nil
+boundCombosCallback = {}
 hotkeysList = {}
 
 -- public functions
@@ -75,6 +76,8 @@ function init()
     onGameStart = online,
     onGameEnd = offline
   })
+
+  load()
 end
 
 function terminate()
@@ -95,6 +98,7 @@ end
 function configure(savePerServer, savePerCharacter)
   perServer = savePerServer
   perCharacter = savePerCharacter
+  reload()
 end
 
 function online()
@@ -108,6 +112,9 @@ function offline()
 end
 
 function show()
+  if not g_game.isOnline() then
+    return
+  end
   hotkeysWindow:show()
   hotkeysWindow:raise()
   hotkeysWindow:focus()
@@ -138,7 +145,7 @@ end
 function load(forceDefaults)
   hotkeysManagerLoaded = false
 
-  local hotkeySettings = g_settings.getNode('hotkeys')
+  local hotkeySettings = g_settings.getNode('game_hotkeys')
   local hotkeys = {}
 
   if not table.empty(hotkeySettings) then hotkeys = hotkeySettings end
@@ -149,6 +156,7 @@ function load(forceDefaults)
   if not forceDefaults then
     if not table.empty(hotkeys) then
       for keyCombo, setting in pairs(hotkeys) do
+        keyCombo = tostring(keyCombo)
         addKeyCombo(keyCombo, setting)
         hotkeyList[keyCombo] = setting
       end
@@ -163,12 +171,13 @@ function load(forceDefaults)
 end
 
 function unload()
-  for _,child in pairs(currentHotkeys:getChildren()) do
-    g_keyboard.unbindKeyPress(child.keyCombo)
+  for keyCombo,callback in pairs(boundCombosCallback) do
+    g_keyboard.unbindKeyPress(keyCombo, callback)
   end
+  boundCombosCallback = {}
   currentHotkeys:destroyChildren()
   currentHotkeyLabel = nil
-  updateHotkeyForm()
+  updateHotkeyForm(true)
   hotkeyList = {}
 end
 
@@ -183,19 +192,26 @@ function reload()
 end
 
 function save()
-  local hotkeySettings = g_settings.getNode('hotkeys') or {}
+  local hotkeySettings = g_settings.getNode('game_hotkeys') or {}
   local hotkeys = hotkeySettings
 
   if perServer then
-    hotkeys[G.host] = {}
+    if not hotkeys[G.host] then
+      hotkeys[G.host] = {}
+    end
     hotkeys = hotkeys[G.host]
   end
 
   if perCharacter then
-    hotkeys[g_game.getCharacterName()] = {}
-    hotkeys = hotkeys[g_game.getCharacterName()]
+    local char = g_game.getCharacterName()
+    if not hotkeys[char] then
+      hotkeys[char] = {}
+    end
+    hotkeys = hotkeys[char]
   end
 
+  table.clear(hotkeys)
+
   for _,child in pairs(currentHotkeys:getChildren()) do
     hotkeys[child.keyCombo] = {
       autoSend = child.autoSend,
@@ -206,8 +222,8 @@ function save()
   end
 
   hotkeyList = hotkeys
-  g_settings.setNode('hotkeys', hotkeySettings)
-  --g_settings.save()
+  g_settings.setNode('game_hotkeys', hotkeySettings)
+  g_settings.save()
 end
 
 function loadDefautComboKeys()
@@ -258,7 +274,7 @@ function onChooseItemMouseRelease(self, mousePosition, mouseButton)
     currentHotkeyLabel.value = nil
     currentHotkeyLabel.autoSend = false
     updateHotkeyLabel(currentHotkeyLabel)
-    updateHotkeyForm()
+    updateHotkeyForm(true)
   end
 
   show()
@@ -281,7 +297,7 @@ function clearObject()
   currentHotkeyLabel.autoSend = nil
   currentHotkeyLabel.value = nil
   updateHotkeyLabel(currentHotkeyLabel)
-  updateHotkeyForm()
+  updateHotkeyForm(true)
 end
 
 function addHotkey()
@@ -294,6 +310,7 @@ function addHotkey()
 end
 
 function addKeyCombo(keyCombo, keySettings, focus)
+  if keyCombo == nil or #keyCombo == 0 then return end
   if not keyCombo then return end
   local hotkeyLabel = currentHotkeys:getChildById(keyCombo)
   if not hotkeyLabel then
@@ -321,27 +338,28 @@ function addKeyCombo(keyCombo, keySettings, focus)
     if keySettings then
       currentHotkeyLabel = hotkeyLabel
       hotkeyLabel.keyCombo = keyCombo
-      hotkeyLabel.autoSend = keySettings.autoSend
-      hotkeyLabel.itemId = keySettings.itemId
+      hotkeyLabel.autoSend = toboolean(keySettings.autoSend)
+      hotkeyLabel.itemId = tonumber(keySettings.itemId)
       hotkeyLabel.useType = tonumber(keySettings.useType)
-      hotkeyLabel.value = keySettings.value
+      if keySettings.value then hotkeyLabel.value = tostring(keySettings.value) end
     else
       hotkeyLabel.keyCombo = keyCombo
-      hotkeyLabel.autoSend = nil
+      hotkeyLabel.autoSend = false
       hotkeyLabel.itemId = nil
       hotkeyLabel.useType = nil
-      hotkeyLabel.value = nil
+      hotkeyLabel.value = ''
     end
 
     updateHotkeyLabel(hotkeyLabel)
 
-    g_keyboard.bindKeyPress(keyCombo, function() doKeyCombo(keyCombo) end, nil, 350)
+    boundCombosCallback[keyCombo] = function() doKeyCombo(keyCombo) end
+    g_keyboard.bindKeyPress(keyCombo, boundCombosCallback[keyCombo])
   end
 
   if focus then
     currentHotkeys:focusChild(hotkeyLabel)
     currentHotkeys:ensureChildVisible(hotkeyLabel)
-    updateHotkeyForm()
+    updateHotkeyForm(true)
   end
 end
 
@@ -357,7 +375,7 @@ function doKeyCombo(keyCombo)
       modules.game_console.setTextEditText(hotKey.value)
     end
   elseif hotKey.useType == HOTKEY_MANAGER_USE then
-    g_game.useInventoryItemWith(hotKey.itemId)
+    g_game.useInventoryItem(hotKey.itemId)
   elseif hotKey.useType == HOTKEY_MANAGER_USEONSELF then
     g_game.useInventoryItemWith(hotKey.itemId, g_game.getLocalPlayer())
   elseif hotKey.useType == HOTKEY_MANAGER_USEONTARGET then
@@ -398,7 +416,7 @@ function updateHotkeyLabel(hotkeyLabel)
   end
 end
 
-function updateHotkeyForm()
+function updateHotkeyForm(reset)
   if currentHotkeyLabel then
     removeHotkeyButton:enable()
     if currentHotkeyLabel.itemId ~= nil then
@@ -435,8 +453,10 @@ function updateHotkeyForm()
       hotkeyText:enable()
       hotkeyText:focus()
       hotKeyTextLabel:enable()
+      if reset then
+        hotkeyText:setCursorPos(-1)
+      end
       hotkeyText:setText(currentHotkeyLabel.value)
-      hotkeyText:setCursorPos(-1)
       sendAutomatically:setChecked(currentHotkeyLabel.autoSend)
       sendAutomatically:setEnabled(currentHotkeyLabel.value and #currentHotkeyLabel.value > 0)
       selectObjectButton:enable()
@@ -461,7 +481,8 @@ end
 
 function removeHotkey()
   if currentHotkeyLabel == nil then return end
-  g_keyboard.unbindKeyPress(currentHotkeyLabel.keyCombo)
+  g_keyboard.unbindKeyPress(currentHotkeyLabel.keyCombo, boundCombosCallback[currentHotkeyLabel.keyCombo])
+  boundCombosCallback[currentHotkeyLabel.keyCombo] = nil
   currentHotkeyLabel:destroy()
   currentHotkeyLabel = nil
 end
@@ -504,7 +525,7 @@ end
 
 function onSelectHotkeyLabel(hotkeyLabel)
   currentHotkeyLabel = hotkeyLabel
-  updateHotkeyForm()
+  updateHotkeyForm(true)
 end
 
 function hotkeyCapture(assignWindow, keyCode, keyboardModifiers)

modules/game_interface/gameinterface.lua

@@ -1,4 +1,3 @@
-WALK_REPEAT_DELAY = 90
 WALK_STEPS_RETRY = 10
 
 gameRootPanel = nil
@@ -16,16 +15,15 @@ limitZoom = false
 currentViewMode = 0
 smartWalkDirs = {}
 smartWalkDir = nil
-walkFunction = g_game.walk
+walkFunction = nil
 
 function init()
   g_ui.importStyle('styles/countwindow')
 
   connect(g_game, {
     onGameStart = onGameStart,
-    onGMActions = onGMActions,
     onGameEnd = onGameEnd,
-    onLoginAdvice = onLoginAdvice
+    onLoginAdvice = onLoginAdvice,
   }, true)
 
   gameRootPanel = g_ui.displayUI('gameinterface')
@@ -44,11 +42,13 @@ function init()
   gameBottomPanel = gameRootPanel:getChildById('gameBottomPanel')
   connect(gameLeftPanel, { onVisibilityChange = onLeftPanelVisibilityChange })
 
-  logoutButton = modules.client_topmenu.addLeftButton('logoutButton', tr('Exit'), '/images/topbuttons/logout', tryLogout, true)
+  logoutButton = modules.client_topmenu.addLeftButton('logoutButton', tr('Exit'), 
+    '/images/topbuttons/logout', tryLogout, true)
 
   setupViewMode(0)
 
   bindKeys()
+  load()
 
   if g_game.isOnline() then
     show()
@@ -56,68 +56,58 @@ function init()
 end
 
 function bindKeys()
-  g_keyboard.bindKeyDown('Up', function() changeWalkDir(North) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Right', function() changeWalkDir(East) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Down', function() changeWalkDir(South) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Left', function() changeWalkDir(West) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad8', function() changeWalkDir(North) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad9', function() changeWalkDir(NorthEast) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad6', function() changeWalkDir(East) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad3', function() changeWalkDir(SouthEast) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad2', function() changeWalkDir(South) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad1', function() changeWalkDir(SouthWest) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad4', function() changeWalkDir(West) end, gameRootPanel, true)
-  g_keyboard.bindKeyDown('Numpad7', function() changeWalkDir(NorthWest) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Up', function() changeWalkDir(North, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Right', function() changeWalkDir(East, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Down', function() changeWalkDir(South, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Left', function() changeWalkDir(West, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad8', function() changeWalkDir(North, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad9', function() changeWalkDir(NorthEast, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad6', function() changeWalkDir(East, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad3', function() changeWalkDir(SouthEast, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad2', function() changeWalkDir(South, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad1', function() changeWalkDir(SouthWest, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad4', function() changeWalkDir(West, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyUp('Numpad7', function() changeWalkDir(NorthWest, true) end, gameRootPanel, true)
-  g_keyboard.bindKeyPress('Up', function() smartWalk(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Right', function() smartWalk(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Down', function() smartWalk(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Left', function() smartWalk(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad8', function() smartWalk(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad9', function() smartWalk(NorthEast) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad6', function() smartWalk(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad3', function() smartWalk(SouthEast) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad2', function() smartWalk(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad1', function() smartWalk(SouthWest) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad4', function() smartWalk(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Numpad7', function() smartWalk(NorthWest) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
+  gameRootPanel:setAutoRepeatDelay(250)
 
-  g_keyboard.bindKeyPress('Ctrl+Up', function() g_game.turn(North) changeWalkDir(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Right', function() g_game.turn(East) changeWalkDir(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Down', function() g_game.turn(South) changeWalkDir(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Left', function() g_game.turn(West) changeWalkDir(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Numpad8', function() g_game.turn(North) changeWalkDir(North) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Numpad6', function() g_game.turn(East) changeWalkDir(East) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) changeWalkDir(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) changeWalkDir(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Escape', function() g_game.cancelAttackAndFollow() end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  g_keyboard.bindKeyPress('Ctrl+=', function() gameMapPanel:zoomIn() end, gameRootPanel, 250)
-  g_keyboard.bindKeyPress('Ctrl+-', function() gameMapPanel:zoomOut() end, gameRootPanel, 250)
-  g_keyboard.bindKeyDown('Ctrl+Q', logout, gameRootPanel)
-  g_keyboard.bindKeyDown('Ctrl+L', logout, gameRootPanel)
+  bindWalkKey('Up', North)
+  bindWalkKey('Right', East)
+  bindWalkKey('Down', South)
+  bindWalkKey('Left', West)
+  bindWalkKey('Numpad8', North)
+  bindWalkKey('Numpad9', NorthEast)
+  bindWalkKey('Numpad6', East)
+  bindWalkKey('Numpad3', SouthEast)
+  bindWalkKey('Numpad2', South)
+  bindWalkKey('Numpad1', SouthWest)
+  bindWalkKey('Numpad4', West)
+  bindWalkKey('Numpad7', NorthWest)
+
+  g_keyboard.bindKeyPress('Ctrl+Up', function() g_game.turn(North) changeWalkDir(North) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Right', function() g_game.turn(East) changeWalkDir(East) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Down', function() g_game.turn(South) changeWalkDir(South) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Left', function() g_game.turn(West) changeWalkDir(West) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Numpad8', function() g_game.turn(North) changeWalkDir(North) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Numpad6', function() g_game.turn(East) changeWalkDir(East) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) changeWalkDir(South) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) changeWalkDir(West) end, gameRootPanel)
+  g_keyboard.bindKeyPress('Escape', function() g_game.cancelAttackAndFollow() end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+=', function() gameMapPanel:zoomIn() end, gameRootPanel)
+  g_keyboard.bindKeyPress('Ctrl+-', function() gameMapPanel:zoomOut() end, gameRootPanel)
+  g_keyboard.bindKeyDown('Ctrl+Q', function() tryLogout(false) end, gameRootPanel)
+  g_keyboard.bindKeyDown('Ctrl+L', function() tryLogout(false) end, gameRootPanel)
   g_keyboard.bindKeyDown('Ctrl+W', function() g_map.cleanTexts() modules.game_textmessage.clearMessages() end, gameRootPanel)
   g_keyboard.bindKeyDown('Ctrl+.', nextViewMode, gameRootPanel)
 end
 
+function bindWalkKey(key, dir)
+  g_keyboard.bindKeyDown(key, function() changeWalkDir(dir) end)
+  g_keyboard.bindKeyUp(key, function() changeWalkDir(dir, true) end)
+  g_keyboard.bindKeyPress(key, function() smartWalk(dir) end)
+end
+
+function unbindWalkKey(key)
+  g_keyboard.unbindKeyDown(key)
+  g_keyboard.unbindKeyUp(key)
+  g_keyboard.unbindKeyPress(key)
+end
+
 function terminate()
+  save()
   hide()
 
   stopSmartWalk()
 
   disconnect(g_game, {
     onGameStart = onGameStart,
-    onGMActions = onGMActions,
     onGameEnd = onGameEnd,
     onLoginAdvice = onLoginAdvice
   })
@@ -137,6 +127,16 @@ function onGameStart()
   else
     g_game.disableFeature(GameForceFirstAutoWalkStep)
   end
+
+  addEvent(function()
+    if not limitZoom or g_game.isGM() then
+      gameMapPanel:setMaxZoomOut(513)
+      gameMapPanel:setLimitVisibleRange(false)
+    else
+      gameMapPanel:setMaxZoomOut(11)
+      gameMapPanel:setLimitVisibleRange(true)
+    end
+  end)
 end
 
 function onGameEnd()
@@ -150,8 +150,6 @@ function show()
   gameRootPanel:show()
   gameRootPanel:focus()
   gameMapPanel:followCreature(g_game.getLocalPlayer())
-  gameMapPanel:setMaxZoomOut(11)
-  gameMapPanel:setLimitVisibleRange(true)
   setupViewMode(0)
   updateStretchShrink()
   logoutButton:setTooltip(tr('Logout'))
@@ -177,11 +175,27 @@ function hide()
   modules.client_background.show()
 end
 
+function save()
+  local settings = {}
+  settings.splitterMarginBottom = bottomSplitter:getMarginBottom()
+  g_settings.setNode('game_interface', settings)
+end
+
+function load()
+  local settings = g_settings.getNode('game_interface')
+  if settings then
+    if settings.splitterMarginBottom then
+      bottomSplitter:setMarginBottom(settings.splitterMarginBottom)
+    end
+  end
+end
+
 function onLoginAdvice(message)
   displayInfoBox(tr("For Your Information"), message)
 end
 
 function forceExit()
+  g_game.cancelLogin()
   scheduleEvent(exit, 10)
   return true
 end
@@ -191,8 +205,8 @@ function tryExit()
     return true
   end
 
-  local exitFunc = function() logout() forceExit() end
-  local logoutFunc = function() logout() exitWindow:destroy() exitWindow = nil end
+  local exitFunc = function() g_game.safeLogout() forceExit() end
+  local logoutFunc = function() g_game.safeLogout() exitWindow:destroy() exitWindow = nil end
   local cancelFunc = function() exitWindow:destroy() exitWindow = nil end
 
   exitWindow = displayGeneralBox(tr('Exit'), tr("If you shut down the program, your character might stay in the game.\nClick on 'Logout' to ensure that you character leaves the game properly.\nClick on 'Exit' if you want to exit the program without logging out your character."),
@@ -204,29 +218,55 @@ function tryExit()
   return true
 end
 
-function logout()
-  if g_game.isOnline() then
-    g_game.safeLogout()
-    return true
+function tryLogout(prompt)
+  if type(prompt) ~= "boolean" then
+    prompt = true
   end
-end
-
-function tryLogout()
   if not g_game.isOnline() then
     exit()
+    return
   end
 
   if logoutWindow then
     return
   end
 
-  local yesCallback = function() logout() logoutWindow:destroy() logoutWindow=nil end
-  local noCallback = function() logoutWindow:destroy() logoutWindow=nil end
+  local msg, yesCallback
+  if not g_game.isConnectionOk() then
+    msg = 'Your connection is failing, if you logout now your character will be still online, do you want to force logout?'
 
-  logoutWindow = displayGeneralBox(tr('Logout'), tr('Are you sure you want to logout?'), {
-    { text=tr('Yes'), callback=yesCallback },
-    { text=tr('No'), callback=noCallback },
-    anchor=AnchorHorizontalCenter}, yesCallback, noCallback)
+    yesCallback = function() 
+      g_game.forceLogout()
+      if logoutWindow then
+        logoutWindow:destroy()
+        logoutWindow=nil
+      end
+    end
+  else
+    msg = 'Are you sure you want to logout?'
+
+    yesCallback = function()
+      g_game.safeLogout()
+      if logoutWindow then
+        logoutWindow:destroy()
+        logoutWindow=nil
+      end
+    end
+  end
+
+  local noCallback = function()
+    logoutWindow:destroy()
+    logoutWindow=nil
+  end
+
+  if prompt then
+    logoutWindow = displayGeneralBox(tr('Logout'), tr(msg), {
+      { text=tr('Yes'), callback=yesCallback },
+      { text=tr('No'), callback=noCallback },
+      anchor=AnchorHorizontalCenter}, yesCallback, noCallback)
+  else
+     yesCallback()
+  end
 end
 
 function stopSmartWalk()
@@ -267,11 +307,16 @@ end
 
 function smartWalk(dir)
   if g_keyboard.getModifiers() == KeyboardNoModifier then
-    if smartWalkDir then
-      walkFunction(smartWalkDir)
-    else
-      walkFunction(dir)
+    local func = walkFunction
+    if not func then
+      if modules.client_options.getOption('dashWalk') then
+        func = g_game.dashWalk
+      else
+        func = g_game.walk
+      end
     end
+    local dire = smartWalkDir or dir
+    func(dire)
     return true
   end
   return false
@@ -433,17 +478,20 @@ function createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       end
 
     else
+      local localPosition = localPlayer:getPosition()
       if not classic then shortcut = '(Alt)' else shortcut = nil end
-      if g_game.getAttackingCreature() ~= creatureThing then
-        menu:addOption(tr('Attack'), function() g_game.attack(creatureThing) end, shortcut)
-      else
-        menu:addOption(tr('Stop Attack'), function() g_game.cancelAttack() end, shortcut)
-      end
-
-      if g_game.getFollowingCreature() ~= creatureThing then
-        menu:addOption(tr('Follow'), function() g_game.follow(creatureThing) end)
-      else
-        menu:addOption(tr('Stop Follow'), function() g_game.cancelFollow() end)
+      if creatureThing:getPosition().z == localPosition.z then
+        if g_game.getAttackingCreature() ~= creatureThing then
+          menu:addOption(tr('Attack'), function() g_game.attack(creatureThing) end, shortcut)
+        else
+          menu:addOption(tr('Stop Attack'), function() g_game.cancelAttack() end, shortcut)
+        end
+  
+        if g_game.getFollowingCreature() ~= creatureThing then
+          menu:addOption(tr('Follow'), function() g_game.follow(creatureThing) end)
+        else
+          menu:addOption(tr('Stop Follow'), function() g_game.cancelFollow() end)
+        end
       end
 
       if creatureThing:isPlayer() then
@@ -489,7 +537,7 @@ function createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       end
     end
 
-    if modules.game_ruleviolation.hasWindowAccess() then
+    if modules.game_ruleviolation.hasWindowAccess() and creatureThing:isPlayer() then
       menu:addSeparator()
       menu:addOption(tr('Rule Violation'), function() modules.game_ruleviolation.show(creatureThing:getName()) end)
     end
@@ -501,7 +549,7 @@ function createThingMenu(menuPosition, lookThing, useThing, creatureThing)
   menu:display(menuPosition)
 end
 
-function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, useThing, creatureThing)
+function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, useThing, creatureThing, attackCreature)
   local keyboardModifiers = g_keyboard.getModifiers()
 
   if not modules.client_options.getOption('classicControl') then
@@ -527,7 +575,10 @@ function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, u
         return true
       end
       return true
-    elseif creatureThing and g_keyboard.isAltPressed() and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+    elseif attackCreature and g_keyboard.isAltPressed() and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      g_game.attack(attackCreature)
+      return true
+    elseif creatureThing and creatureThing:getPosition().z == autoWalkPos.z and g_keyboard.isAltPressed() and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
       g_game.attack(creatureThing)
       return true
     end
@@ -536,7 +587,10 @@ function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, u
   else
     if useThing and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton and not g_mouse.isPressed(MouseLeftButton) then
       local player = g_game.getLocalPlayer()
-      if creatureThing and creatureThing ~= player then
+      if attackCreature and attackCreature ~= player then
+        g_game.attack(attackCreature)
+        return true
+      elseif creatureThing and creatureThing ~= player and creatureThing:getPosition().z == autoWalkPos.z then
         g_game.attack(creatureThing)
         return true
       elseif useThing:isContainer() then
@@ -564,7 +618,10 @@ function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, u
     elseif useThing and keyboardModifiers == KeyboardCtrlModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
       createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       return true
-    elseif creatureThing and g_keyboard.isAltPressed() and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+    elseif attackCreature and g_keyboard.isAltPressed() and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
+      g_game.attack(attackCreature)
+      return true
+    elseif creatureThing and creatureThing:getPosition().z == autoWalkPos.z and g_keyboard.isAltPressed() and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
       g_game.attack(creatureThing)
       return true
     end
@@ -574,7 +631,6 @@ function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, u
   player:stopAutoWalk()
 
   if autoWalkPos and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseLeftButton then
-    player.onAutoWalkFail = function() modules.game_textmessage.displayFailureMessage(tr('There is no way.')) end
     player:autoWalk(autoWalkPos)
     return true
   end
@@ -626,6 +682,8 @@ function moveStackableItem(item, toPos)
   end
   g_keyboard.bindKeyPress("Up", function() check() spinbox:up() end, spinbox)
   g_keyboard.bindKeyPress("Down", function() check() spinbox:down() end, spinbox)
+  g_keyboard.bindKeyPress("Right", function() check() spinbox:up() end, spinbox)
+  g_keyboard.bindKeyPress("Left", function() check() spinbox:down() end, spinbox)
   g_keyboard.bindKeyPress("PageUp", function() check() spinbox:setValue(spinbox:getValue()+10) end, spinbox)
   g_keyboard.bindKeyPress("PageDown", function() check() spinbox:setValue(spinbox:getValue()-10) end, spinbox)
 
@@ -744,9 +802,3 @@ end
 function limitZoom()
   limitZoom = true
 end
-
-function onGMActions()
-  if not limitZoom then return end
-  gameMapPanel:setMaxZoomOut(513)
-  gameMapPanel:setLimitVisibleRange(false)
-end

modules/game_interface/styles/countwindow.otui

@@ -6,11 +6,11 @@ CountWindow < MainWindow
   SpinBox
     id: spinBox
     anchors.left: parent.left
-    anchors.top: parent.bottom
-    width: 0
-    height: 0
+    anchors.top: parent.top
+    width: 1
+    height: 1
     phantom: true
-    padding-bottom: -40
+    margin-top: 2
     focusable: true
 
   Item

modules/game_interface/widgets/uigamemap.lua

@@ -78,15 +78,21 @@ function UIGameMap:onMouseRelease(mousePosition, mouseButton)
   local useThing
   local creatureThing
   local multiUseThing
+  local attackCreature
 
   local tile = self:getTile(mousePosition)
   if tile then
     lookThing = tile:getTopLookThing()
     useThing = tile:getTopUseThing()
     creatureThing = tile:getTopCreature()
+  end 
+   
+  local autoWalkTile = g_map.getTile(autoWalkPos)
+  if autoWalkTile then
+    attackCreature = autoWalkTile:getTopCreature()
   end
 
-  local ret = modules.game_interface.processMouseAction(mousePosition, mouseButton, autoWalkPos, lookThing, useThing, creatureThing)
+  local ret = modules.game_interface.processMouseAction(mousePosition, mouseButton, autoWalkPos, lookThing, useThing, creatureThing, attackCreature)
   if ret then
     self.allowNextRelease = false
   end

modules/game_interface/widgets/uiitem.lua

@@ -86,7 +86,7 @@ function UIItem:onMouseRelease(mousePosition, mouseButton)
     g_game.look(item)
     self.cancelNextRelease = true
     return true
-  elseif modules.game_interface.processMouseAction(mousePosition, mouseButton, nil, item, item, nil, item) then
+  elseif modules.game_interface.processMouseAction(mousePosition, mouseButton, nil, item, item, nil, nil) then
     return true
   end
   return false

modules/game_market/market.lua

@@ -76,6 +76,8 @@ currentItems = {}
 lastCreatedOffer = 0
 fee = 0
 
+loaded = false
+
 local offerTableHeader = {
   {['text'] = 'Player Name', ['width'] = 100},
   {['text'] = 'Amount', ['width'] = 60},
@@ -126,10 +128,7 @@ local function isItemValid(item, category, searchFilter)
     return false
   end
   if searchFilter then
-    local checkString = marketData.name:lower()
-    if not checkString:find(searchFilter) then
-      return false
-    end
+    return marketData.name:lower():find(searchFilter)
   end
   return true
 end
@@ -580,22 +579,30 @@ local function onAmountChange()
 end
 
 local function initMarketItems(category)
-  -- initialize market category
-  marketItems[category] = {}
+  for c = MarketCategory.First, MarketCategory.Last do
+    marketItems[c] = {}
+  end
 
   -- populate all market items
   local types = g_things.findThingTypeByAttr(ThingAttrMarket, 0)
   for i = 1, #types do
     local t = types[i]
+
     local newItem = Item.create(t:getId())
     if newItem then
       local marketData = t:getMarketData()
-      if not table.empty(marketData) and marketData.category == category then
-        local item = {
-          ptr = newItem,
-          marketData = marketData
-        }
-        marketItems[marketData.category][#marketItems[category]+1] = item
+      if not table.empty(marketData) then
+        if marketData.category == category or category == MarketCategory.All then
+
+          -- create new item block
+          local item = {
+            ptr = newItem,
+            marketData = marketData
+          }
+
+          -- add new market item
+          table.insert(marketItems[marketData.category], item)
+        end
       end
     end
   end
@@ -733,9 +740,6 @@ function init()
   marketWindow:hide()
 
   initInterface() -- build interface
-  for category = MarketCategory.First, MarketCategory.Last do
-    initMarketItems(category)
-  end
 end
 
 function terminate()
@@ -904,19 +908,14 @@ end
 
 
 function Market.loadMarketItems(category)
-  if table.empty(marketItems[category]) then
-    initMarketItems(category)
-  end
   clearItems()
 
   -- check search filter
-  local searchFilter = searchEdit:getText():lower()
-  if not searchFilter or searchFilter:len() < 3 then
-    searchFilter = nil
-  end
-  local filterSearchAll = filterButtons[MarketFilters.SearchAll]:isChecked()
-  if filterSearchAll and searchFilter then
-    category = MarketCategory.All
+  local searchFilter = searchEdit:getText()
+  if searchFilter and searchFilter:len() > 2 then
+    if filterButtons[MarketFilters.SearchAll]:isChecked() then
+      category = MarketCategory.All
+    end
   end
 
   if category == MarketCategory.All then
@@ -1070,6 +1069,11 @@ end
 -- protocol callback functions
 
 function Market.onMarketEnter(depotItems, offers, balance, vocation)
+  if not loaded then
+    initMarketItems(MarketCategory.All)
+    loaded = true
+  end
+
   Market.clearSelectedItem()
   updateBalance(balance)
   
@@ -1078,7 +1082,7 @@ function Market.onMarketEnter(depotItems, offers, balance, vocation)
   if player then
     information.player = player
   end
-  if vocation < 0 then
+  if vocation == -1 then
     if player then
       information.vocation = player:getVocation()
     end

modules/game_market/ui/general/amountwindow.otui

@@ -1,7 +1,7 @@
 AmountWindow < MainWindow
   id: amountWindow
   !text: tr('Amount')
-  size: 196 80
+  size: 270 80
 
   Item
     id: item
@@ -21,7 +21,6 @@ AmountWindow < MainWindow
     anchors.top: prev.top
     margin-left: 10
     margin-top: -2
-    focusable: false
 
   Button
     id: buttonCancel

modules/game_market/ui/marketoffers.otui

@@ -102,6 +102,7 @@ Panel
     width: 75
     minimum: 1
     maximum: 999999999
+    focusable: true
 
     $disabled:
       color: #aaaaaa44
@@ -123,6 +124,7 @@ Panel
     width: 75
     minimum: 1
     maximum: 999999999
+    focusable: true
 
     $disabled:
       color: #aaaaaa44
@@ -152,6 +154,7 @@ Panel
     buttons: false
     minimum: 1
     maximum: 64000
+    focusable: true
 
   NextButton
     id: nextAmountButton

modules/game_minimap/minimap.lua

@@ -3,6 +3,9 @@ minimapButton = nil
 minimapWindow = nil
 otmm = true
 preloaded = false
+fullmapView = false
+oldZoom = nil
+oldPos = nil
 
 function init()
   minimapButton = modules.client_topmenu.addRightGameToggleButton('minimapButton', tr('Minimap') .. ' (Ctrl+M)', '/images/topbuttons/minimap', toggle)
@@ -19,6 +22,7 @@ function init()
   g_keyboard.bindKeyPress('Alt+Up', function() minimapWidget:move(0,1) end, gameRootPanel)
   g_keyboard.bindKeyPress('Alt+Down', function() minimapWidget:move(0,-1) end, gameRootPanel)
   g_keyboard.bindKeyDown('Ctrl+M', toggle)
+  g_keyboard.bindKeyDown('Ctrl+Shift+M', toggleFullMap)
 
   minimapWindow:setup()
 
@@ -27,6 +31,10 @@ function init()
     onGameEnd = offline,
   })
 
+  connect(LocalPlayer, {
+    onPositionChange = updateCameraPosition
+  })
+
   if g_game.isOnline() then
     online()
   end
@@ -42,12 +50,17 @@ function terminate()
     onGameEnd = offline,
   })
 
+  disconnect(LocalPlayer, {
+    onPositionChange = updateCameraPosition
+  })
+
   local gameRootPanel = modules.game_interface.getRootPanel()
   g_keyboard.unbindKeyPress('Alt+Left', gameRootPanel)
   g_keyboard.unbindKeyPress('Alt+Right', gameRootPanel)
   g_keyboard.unbindKeyPress('Alt+Up', gameRootPanel)
   g_keyboard.unbindKeyPress('Alt+Down', gameRootPanel)
   g_keyboard.unbindKeyDown('Ctrl+M')
+  g_keyboard.unbindKeyDown('Ctrl+Shift+M')
 
   minimapWindow:destroy()
   minimapButton:destroy()
@@ -74,7 +87,7 @@ end
 
 function online()
   loadMap(not preloaded)
-  minimapWidget:followLocalPlayer()
+  updateCameraPosition()
 end
 
 function offline()
@@ -114,6 +127,38 @@ function saveMap()
   minimapWidget:save()
 end
 
-function getMinimap()
-  return minimapWidget
+function updateCameraPosition()
+  local player = g_game.getLocalPlayer()
+  if not player then return end
+  local pos = player:getPosition()
+  if not pos then return end
+  if not minimapWidget:isDragging() then
+    if not fullmapView then
+      minimapWidget:setCameraPosition(player:getPosition())
+    end
+    minimapWidget:setCrossPosition(player:getPosition())
+  end
+end
+
+function toggleFullMap()
+  if not fullmapView then
+    fullmapView = true
+    minimapWindow:hide()
+    minimapWidget:setParent(modules.game_interface.getRootPanel())
+    minimapWidget:fill('parent')
+    minimapWidget:setAlternativeWidgetsVisible(true)
+  else
+    fullmapView = false
+    minimapWidget:setParent(minimapWindow:getChildById('contentsPanel'))
+    minimapWidget:fill('parent')
+    minimapWindow:show()
+    minimapWidget:setAlternativeWidgetsVisible(false)
+  end
+
+  local zoom = oldZoom or 0
+  local pos = oldPos or minimapWidget:getCameraPosition()
+  oldZoom = minimapWidget:getZoom()
+  oldPos = minimapWidget:getCameraPosition()
+  minimapWidget:setZoom(zoom)
+  minimapWidget:setCameraPosition(pos)
 end

modules/game_minimap/minimap.otui

@@ -10,7 +10,7 @@ MiniWindow
     text: ?
     text-align: center
     phantom: false
-    !tooltip: tr('Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks')
+    !tooltip: tr('Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks\nPress Ctrl+Shift+M to view the entire game map')
     anchors.top: minimizeButton.top
     anchors.right: minimizeButton.left
     margin-right: 3

modules/game_npctrade/npctrade.lua

@@ -1,6 +1,7 @@
 BUY = 1
 SELL = 2
 CURRENCY = 'gold'
+CURRENCY_DECIMAL = false
 WEIGHT_UNIT = 'oz'
 LAST_INVENTORY = 10
 
@@ -29,11 +30,12 @@ buyWithBackpack = nil
 ignoreCapacity = nil
 ignoreEquipped = nil
 showAllItems = nil
+sellAllButton = nil
 
-playerFreeCapacity = nil
-playerMoney = nil
+playerFreeCapacity = 0
+playerMoney = 0
 tradeItems = {}
-playerItems = nil
+playerItems = {}
 selectedItem = nil
 
 cancelNextRelease = nil
@@ -60,6 +62,7 @@ function init()
   ignoreCapacity = npcWindow:recursiveGetChildById('ignoreCapacity')
   ignoreEquipped = npcWindow:recursiveGetChildById('ignoreEquipped')
   showAllItems = npcWindow:recursiveGetChildById('showAllItems')
+  sellAllButton = npcWindow:recursiveGetChildById('sellAllButton')
 
   buyTab = npcWindow:getChildById('buyTab')
   sellTab = npcWindow:getChildById('sellTab')
@@ -124,13 +127,17 @@ function onItemBoxChecked(widget)
     selectedItem = item
     refreshItem(item)
     tradeButton:enable()
+
+    if getCurrentTradeType() == SELL then
+      quantityScroll:setValue(quantityScroll:getMaximum())
+    end
   end
 end
 
 function onQuantityValueChange(quantity)
   if selectedItem then
     weightLabel:setText(string.format('%.2f', selectedItem.weight*quantity) .. ' ' .. WEIGHT_UNIT)
-    priceLabel:setText(getItemPrice(selectedItem) .. ' ' .. CURRENCY)
+    priceLabel:setText(formatCurrency(getItemPrice(selectedItem)))
   end
 end
 
@@ -144,6 +151,7 @@ function onTradeTypeChange(radioTabs, selected, deselected)
   ignoreCapacity:setVisible(currentTradeType == BUY)
   ignoreEquipped:setVisible(currentTradeType == SELL)
   showAllItems:setVisible(currentTradeType == SELL)
+  sellAllButton:setVisible(currentTradeType == SELL)
 
   refreshTradeItems()
   refreshPlayerGoods()
@@ -199,8 +207,9 @@ function onShowAllItemsChange()
   refreshPlayerGoods()
 end
 
-function setCurrency(currency)
+function setCurrency(currency, decimal)
   CURRENCY = currency
+  CURRENCY_DECIMAL = decimal
 end
 
 function setShowWeight(state)
@@ -220,7 +229,8 @@ function clearSelectedItem()
   weightLabel:clearText()
   priceLabel:clearText()
   tradeButton:disable()
-  quantityScroll:setMaximum(1)
+  quantityScroll:setMinimum(0)
+  quantityScroll:setMaximum(0)
   if selectedItem then
     radioItems:selectWidget(nil)
     selectedItem = nil
@@ -254,60 +264,45 @@ function getItemPrice(item, single)
 end
 
 function getSellQuantity(item)
-  if not playerItems[item.ptr:getId()] then
-    return 0
-  end
-
+  if not item or not playerItems[item:getId()] then return 0 end
   local removeAmount = 0
   if ignoreEquipped:isChecked() then
     local localPlayer = g_game.getLocalPlayer()
     for i=1,LAST_INVENTORY do
       local inventoryItem = localPlayer:getInventoryItem(i)
-      if inventoryItem and inventoryItem:getId() == item.ptr:getId() then
+      if inventoryItem and inventoryItem:getId() == item:getId() then
         removeAmount = removeAmount + inventoryItem:getCount()
       end
     end
   end
-  return playerItems[item.ptr:getId()] - removeAmount
+  return playerItems[item:getId()] - removeAmount
 end
 
 function canTradeItem(item)
   if getCurrentTradeType() == BUY then
     return (ignoreCapacity:isChecked() or (not ignoreCapacity:isChecked() and playerFreeCapacity >= item.weight)) and playerMoney >= getItemPrice(item, true)
   else
-    return getSellQuantity(item) > 0
+    return getSellQuantity(item.ptr) > 0
   end
 end
 
 function refreshItem(item)
   nameLabel:setText(item.name)
   weightLabel:setText(string.format('%.2f', item.weight) .. ' ' .. WEIGHT_UNIT)
-  priceLabel:setText(getItemPrice(item) .. ' ' .. CURRENCY)
+  priceLabel:setText(formatCurrency(getItemPrice(item)))
 
   if getCurrentTradeType() == BUY then
     local capacityMaxCount = math.floor(playerFreeCapacity / item.weight)
     if ignoreCapacity:isChecked() then
-      capacityMaxCount = 100
+      capacityMaxCount = 65535
     end
     local priceMaxCount = math.floor(playerMoney / getItemPrice(item, true))
-    local finalCount = math.max(0, math.min(100, math.min(priceMaxCount, capacityMaxCount)))
+    local finalCount = math.max(0, math.min(getMaxAmount(), math.min(priceMaxCount, capacityMaxCount)))
+    quantityScroll:setMinimum(1)
     quantityScroll:setMaximum(finalCount)
-
-    if quantityScroll:getValue() > finalCount then
-      quantityScroll:setValue(finalCount)
-    end
   else
-    local removeAmount = 0
-    if ignoreEquipped:isChecked() then
-      local localPlayer = g_game.getLocalPlayer()
-      for i=1,LAST_INVENTORY do
-        local inventoryItem = localPlayer:getInventoryItem(i)
-        if inventoryItem and inventoryItem:getId() == item.ptr:getId() then
-          removeAmount = removeAmount + inventoryItem:getCount()
-        end
-      end
-    end
-    quantityScroll:setMaximum(math.max(0, math.min(100, getSellQuantity(item))))
+    quantityScroll:setMinimum(1)
+    quantityScroll:setMaximum(math.max(0, math.min(getMaxAmount(), getSellQuantity(item.ptr))))
   end
 
   setupPanel:enable()
@@ -340,7 +335,7 @@ function refreshTradeItems()
       local weight = string.format('%.2f', item.weight) .. ' ' .. WEIGHT_UNIT
       text = text .. '\n' .. weight
     end
-    local price = item.price .. ' ' .. CURRENCY
+    local price = formatCurrency(item.price)
     text = text .. '\n' .. price
     itemBox:setText(text)
 
@@ -358,7 +353,9 @@ end
 function refreshPlayerGoods()
   if not initialized then return end
 
-  moneyLabel:setText(playerMoney .. ' ' .. CURRENCY)
+  checkSellAllTooltip()
+
+  moneyLabel:setText(formatCurrency(playerMoney))
   capacityLabel:setText(string.format('%.2f', playerFreeCapacity) .. ' ' .. WEIGHT_UNIT)
 
   local currentTradeType = getCurrentTradeType()
@@ -372,6 +369,7 @@ function refreshPlayerGoods()
 
     local canTrade = canTradeItem(item)
     itemWidget:setOn(canTrade)
+    itemWidget:setEnabled(canTrade)
 
     local searchCondition = (searchFilter == '') or (searchFilter ~= '' and string.find(item.name:lower(), searchFilter) ~= nil)
     local showAllItemsCondition = (currentTradeType == BUY) or (showAllItems:isChecked()) or (currentTradeType == SELL and not showAllItems:isChecked() and canTrade)
@@ -440,7 +438,7 @@ function onPlayerGoods(money, items)
       playerItems[id] = playerItems[id] + item[2]
     end
   end
-
+  
   refreshPlayerGoods()
 end
 
@@ -453,7 +451,86 @@ function onFreeCapacityChange(localPlayer, freeCapacity, oldFreeCapacity)
 end
 
 function onInventoryChange(inventory, item, oldItem)
-  if selectedItem then
-    refreshItem(selectedItem)
+  refreshPlayerGoods()
+end
+
+function getTradeItemData(id, type)
+  if table.empty(tradeItems[type]) then
+    return false
+  end
+
+  if type then
+    for key,item in pairs(tradeItems[type]) do
+      if item.ptr and item.ptr:getId() == id then
+        return item
+      end
+    end
+  else
+    for _,items in pairs(tradeItems) do
+      for key,item in pairs(items) do
+        if item.ptr and item.ptr:getId() == id then
+          return item
+        end
+      end
+    end
+  end
+  return false
+end
+
+function checkSellAllTooltip()
+  sellAllButton:setEnabled(true)
+  sellAllButton:removeTooltip()
+  
+  local total = 0
+  local info = ''
+  local first = true
+
+  for key, amount in pairs(playerItems) do
+    local data = getTradeItemData(key, SELL)
+    if data then
+      amount = getSellQuantity(data.ptr)
+      if amount > 0 then
+        if data and amount > 0 then
+          info = info..(not first and "\n" or "")..
+                 amount.." "..
+                 data.name.." ("..
+                 data.price*amount.." gold)"
+
+          total = total+(data.price*amount)
+          if first then first = false end
+        end
+      end
+    end
+  end
+  if info ~= '' then
+    info = info.."\nTotal: "..total.." gold"
+    sellAllButton:setTooltip(info)
+  else
+    sellAllButton:setEnabled(false)
+  end
+end
+
+function formatCurrency(amount)
+  if CURRENCY_DECIMAL then
+    return string.format("%.02f", amount/100.0) .. ' ' .. CURRENCY
+  else
+    return amount .. ' ' .. CURRENCY
+  end
+end
+
+function getMaxAmount()
+  if getCurrentTradeType() == SELL and g_game.getFeature(GameDoubleShopSellAmount) then
+    return 10000
+  end
+  return 100
+end
+
+function sellAll()
+  for itemid,item in pairs(playerItems) do
+    local item = Item.create(itemid)
+    local amount = getSellQuantity(item)
+    if amount > 0 then
+      g_game.sellItem(item, amount, ignoreEquipped:isChecked())
+    end
   end
 end

modules/game_npctrade/npctrade.otui

@@ -243,6 +243,16 @@ MainWindow
       checked: true
       @onCheckChange: modules.game_npctrade.onShowAllItemsChange()
 
+  Button
+    id: sellAllButton
+    !text: tr('Sell All')
+    width: 64
+    anchors.right: next.left
+    anchors.bottom: parent.bottom
+    margin-right: 10
+    visible: false
+    @onClick: modules.game_npctrade.sellAll()
+
   Button
     id: tradeButton
     !text: tr('Buy')

modules/game_playerdeath/playerdeath.lua

@@ -33,7 +33,10 @@ function displayDeadMessage()
 end
 
 function openWindow()
-  if deathWindow then return end
+  if deathWindow then
+    deathWindow:destroy()
+    return
+  end
   deathWindow = g_ui.createWidget('DeathWindow', rootWidget)
   local okButton = deathWindow:getChildById('buttonOk')
   local cancelButton = deathWindow:getChildById('buttonCancel')
@@ -44,7 +47,7 @@ function openWindow()
     deathWindow = nil
   end
   local cancelFunc = function()
-    modules.game_interface.logout()
+    g_game.safeLogout()
     cancelButton:getParent():destroy()
     deathWindow = nil
   end

modules/game_spelllist/spelllist.lua

@@ -161,6 +161,10 @@ function init()
   
   initialiseSpelllist() 
   resizeWindow()
+
+  if g_game.isOnline() then
+    online()
+  end
 end
 
 function terminate()
@@ -201,7 +205,7 @@ function initialiseSpelllist()
   
     tmpLabel:setHeight(SpelllistSettings[SpelllistProfile].iconSize.height + 4)
     tmpLabel:setTextOffset(topoint((SpelllistSettings[SpelllistProfile].iconSize.width + 10) .. ' ' .. (SpelllistSettings[SpelllistProfile].iconSize.height - 32)/2 + 3))
-    tmpLabel:setImageSource('/images/game/spells/' .. SpelllistSettings[SpelllistProfile].iconFile)
+    tmpLabel:setImageSource(SpelllistSettings[SpelllistProfile].iconFile)
     tmpLabel:setImageClip(Spells.getImageClip(iconId, SpelllistProfile))
     tmpLabel:setImageSize(tosize(SpelllistSettings[SpelllistProfile].iconSize.width .. ' ' .. SpelllistSettings[SpelllistProfile].iconSize.height))
     tmpLabel.onClick = updateSpellInformation

modules/game_textmessage/textmessage.lua

@@ -123,3 +123,7 @@ function clearMessages()
     end
   end
 end
+
+function LocalPlayer:onAutoWalkFail(player)
+  modules.game_textmessage.displayFailureMessage(tr('There is no way.'))
+end

modules/game_things/things.lua

@@ -18,7 +18,7 @@ function isLoaded()
 end
 
 function load()
-  local version = g_game.getProtocolVersion()
+  local version = g_game.getClientVersion()
 
   local datPath, sprPath
   if filename then

modules/game_viplist/viplist.lua

@@ -3,7 +3,8 @@ vipButton = nil
 addVipWindow = nil
 
 function init()
-  connect(g_game, { onGameEnd = clear,
+  connect(g_game, { onGameStart = refresh,
+                    onGameEnd = clear,
                     onAddVip = onAddVip,
                     onVipStateChange = onVipStateChange })
 
@@ -20,7 +21,8 @@ end
 
 function terminate()
   g_keyboard.unbindKeyDown('Ctrl+P')
-  disconnect(g_game, { onGameEnd = clear,
+  disconnect(g_game, { onGameStart = refresh,
+                       onGameEnd = clear,
                        onAddVip = onAddVip,
                        onVipStateChange = onVipStateChange })
 
@@ -86,6 +88,23 @@ function isHiddingOffline()
   return settings['hideOffline']
 end
 
+function getSortedBy()
+  local settings = g_settings.getNode('VipList')
+  if not settings then
+    return 'status'
+  end
+  return settings['sortedBy']
+end
+
+function sortBy(state)
+  settings = {}
+  settings['sortedBy'] = state
+  g_settings.mergeNode('VipList', settings)
+
+  refresh()
+end
+
+
 function onAddVip(id, name, state)
   local vipList = vipWindow:getChildById('contentsPanel')
 
@@ -116,13 +135,13 @@ function onAddVip(id, name, state)
   
   for i=1,childrenCount do
     local child = vipList:getChildByIndex(i)
-    if state == VipState.Online and child.vipState ~= VipState.Online then
+    if state == VipState.Online and child.vipState ~= VipState.Online and getSortedBy() == 'status' then
       vipList:insertChild(i, label)
       return
     end
 
-    if (state ~= VipState.Online and child.vipState ~= VipState.Online)
-      or (state == VipState.Online and child.vipState == VipState.Online) then
+    if ((state ~= VipState.Online and child.vipState ~= VipState.Online)
+      or (state == VipState.Online and child.vipState == VipState.Online)) or getSortedBy() == 'name' then
       
       local childText = child:getText():lower()
       local length = math.min(childText:len(), nameLower:len())
@@ -165,6 +184,14 @@ function onVipListMousePress(widget, mousePos, mouseButton)
   else
     menu:addOption(tr('Show Offline'), function() hideOffline(false) end)
   end
+  
+  if not(getSortedBy() == 'name') then
+    menu:addOption(tr('Sort by name'), function() sortBy('name') end)
+  end
+  
+  if not(getSortedBy() == 'status') then
+    menu:addOption(tr('Sort by status'), function() sortBy('status') end)
+  end
 
   menu:display(mousePos)
 
@@ -181,16 +208,28 @@ function onVipListLabelMousePress(widget, mousePos, mouseButton)
   menu:addOption(tr('Add new VIP'), function() createAddWindow() end)
   menu:addOption(tr('Remove %s', widget:getText()), function() if widget then g_game.removeVip(widget:getId():sub(4)) vipList:removeChild(widget) end end)
   menu:addSeparator()
-  menu:addOption(tr('Copy Name'), function() g_window.setClipboardText(widget:getText()) end)  if modules.game_console.getOwnPrivateTab() then
+  menu:addOption(tr('Copy Name'), function() g_window.setClipboardText(widget:getText()) end) 
+
+  if modules.game_console.getOwnPrivateTab() then
     menu:addSeparator()
-    menu:addOption(tr('Invite to private chat'), function() g_game.inviteToOwnChannel(creatureName) end)
-    menu:addOption(tr('Exclude from private chat'), function() g_game.excludeFromOwnChannel(creatureName) end)
+    menu:addOption(tr('Invite to private chat'), function() g_game.inviteToOwnChannel(widget:getText()) end)
+    menu:addOption(tr('Exclude from private chat'), function() g_game.excludeFromOwnChannel(widget:getText()) end)
   end
+
   if not isHiddingOffline() then
     menu:addOption(tr('Hide Offline'), function() hideOffline(true) end)
   else
     menu:addOption(tr('Show Offline'), function() hideOffline(false) end)
   end
+  
+  if not(getSortedBy() == 'name') then
+    menu:addOption(tr('Sort by name'), function() sortBy('name') end)
+  end
+  
+  if not(getSortedBy() == 'status') then
+    menu:addOption(tr('Sort by status'), function() sortBy('status') end)
+  end 
+  
   menu:display(mousePos)
 
   return true

modules/gamelib/const.lua

@@ -80,6 +80,7 @@ GameLoginPending = 35
 GameNewSpeedLaw = 36
 GameForceFirstAutoWalkStep = 37
 GameMinimapRemove = 38
+GameDoubleShopSellAmount = 39
 
 TextColors = {
   red       = '#f55e5e', --'#c83200'
@@ -91,7 +92,7 @@ TextColors = {
   --blue1     = '#6e50dc',
   --blue2     = '#3264c8',
   --blue3     = '#0096c8',
-  white     = '#ffffff' --'#bebebe'
+  white     = '#ffffff', --'#bebebe'
 }
 
 MessageModes = {
@@ -145,7 +146,7 @@ MessageModes = {
   RVRAnswer               = 47,
   RVRContinue             = 48,
   Last                    = 49,
-  Invalid                 = 255
+  Invalid                 = 255,
 }
 
 OTSERV_RSA  = "1091201329673994292788609605089955415282375029027981291234687579" ..
@@ -169,7 +170,7 @@ OsTypes = {
   Flash = 3,
   OtclientLinux = 10,
   OtclientWindows = 11,
-  OtclientMac = 12
+  OtclientMac = 12,
 }
 
 PathFindResults = {
@@ -177,26 +178,31 @@ PathFindResults = {
   Position = 1,
   Impossible = 2,
   TooFar = 3,
-  NoWay = 4
+  NoWay = 4,
 }
 
 PathFindFlags = {
   AllowNullTiles = 1,
   AllowCreatures = 2,
   AllowNonPathable = 4,
-  AllowNonWalkable = 8
+  AllowNonWalkable = 8,
 }
 
 VipState = {
   Offline = 0,
   Online = 1,
-  Pending = 2
+  Pending = 2,
 }
 
 ExtendedIds = {
   Activate = 0,
   Locale = 1,
-  Ping = 2
+  Ping = 2,
+  Sound = 3,
+  Game = 4,
+  Particles = 5,
+  MapShader = 6,
+  NeedsUpdate = 7
 }
 
 -- @}

modules/gamelib/game.lua

@@ -6,7 +6,7 @@ end
 
 function g_game.chooseRsa(host)
   if currentRsa ~= CIPSOFT_RSA and currentRsa ~= OTSERV_RSA then return end
-  if string.ends(host, '.tibia.com') or string.ends(host, '.cipsoft.com') then
+  if host:ends('.tibia.com') or host:ends('.cipsoft.com') then
     g_game.setRsa(CIPSOFT_RSA)
 
     if g_app.getOs() == 'windows' then
@@ -32,20 +32,29 @@ function g_game.isOfficialTibia()
   return currentRsa == CIPSOFT_RSA
 end
 
-function g_game.getSupportedProtocols()
+function g_game.getSupportedClients()
   return {
-    810, 853, 854, 860, 861, 862, 870,
-    910, 940, 944, 953, 954, 960, 961,
-    963, 970, 971, 973
+    810, 811, 840, 842, 850, 853, 854,
+    860, 861, 862, 870, 910, 940, 944,
+    953, 954, 960, 961, 963, 970, 980,
+    981, 982, 983, 984, 985, 986, 1001,
+    1002, 1010
   }
 end
 
-function g_game.getSupportedClients(protocol)
+function g_game.getProtocolVersionForClient(client)
   clients = {
-    [971] = {980},
-    [973] = {981}
+    [980] = 971,
+    [981] = 973,
+    [982] = 974,
+	  [983] = 975,
+	  [984] = 976,
+	  [985] = 977,
+	  [986] = 978,
+	  [1001] = 979,
+	  [1002] = 980,
   }
-  return clients[protocol] or {protocol}
+  return clients[client] or client
 end
 
 g_game.setRsa(OTSERV_RSA)

modules/gamelib/player.lua

@@ -161,4 +161,4 @@ function Player:hasState(_state, states)
     end
   end
   return false
-end
+end

modules/gamelib/protocollogin.lua

@@ -10,13 +10,13 @@ LoginServerExtendedCharacterList = 101
 
 function ProtocolLogin:login(host, port, accountName, accountPassword)
   if string.len(host) == 0 or port == nil or port == 0 then
-    signalcall(self.onError, self, tr("You must enter a valid server address and port."))
+    signalcall(self.onLoginError, self, tr("You must enter a valid server address and port."))
     return
   end
 
   self.accountName = accountName
   self.accountPassword = accountPassword
-  self.connectCallback = sendLoginPacket
+  self.connectCallback = self.sendLoginPacket
 
   self:connect(host, port)
 end
@@ -25,7 +25,7 @@ function ProtocolLogin:cancelLogin()
   self:disconnect()
 end
 
-function ProtocolLogin:sendLoginPacket(extended)
+function ProtocolLogin:sendLoginPacket()
   local msg = OutputMessage.create()
 
   msg:addU8(ClientOpcodes.ClientEnterAccount)
@@ -85,7 +85,9 @@ function ProtocolLogin:sendLoginPacket(extended)
 end
 
 function ProtocolLogin:onConnect()
-  self:sendLoginPacket()
+  self.gotConnection = true
+  self:connectCallback()
+  self.connectCallback = nil
 end
 
 function ProtocolLogin:onRecv(msg)
@@ -96,7 +98,7 @@ function ProtocolLogin:onRecv(msg)
     elseif opcode == LoginServerMotd then
       self:parseMotd(msg)
     elseif opcode == LoginServerUpdateNeeded then
-      signalcall(self.onError, self, tr("Client needs update."))
+      signalcall(self.onLoginError, self, tr("Client needs update."))
     elseif opcode == LoginServerCharacterList then
       self:parseCharacterList(msg)
     elseif opcode == LoginServerExtendedCharacterList then
@@ -113,7 +115,7 @@ end
 
 function ProtocolLogin:parseError(msg)
   local errorMessage = msg:getString()
-  signalcall(self.onError, self, errorMessage)
+  signalcall(self.onLoginError, self, errorMessage)
 end
 
 function ProtocolLogin:parseMotd(msg)
@@ -130,12 +132,12 @@ function ProtocolLogin:parseCharacterList(msg)
     character.worldName = msg:getString()
     character.worldIp = iptostring(msg:getU32())
     character.worldPort = msg:getU16()
-    characters[i] = character
 
-    -- ??
     if g_game.getProtocolVersion() >= 971 then
-      msg:getU8()
+      character.unknown = msg:getU8()
     end
+
+    characters[i] = character
   end
 
   local account = {}
@@ -153,3 +155,8 @@ end
 function ProtocolLogin:parseOpcode(opcode, msg)
   signalcall(self.onOpcode, self, opcode, msg)
 end
+
+function ProtocolLogin:onError(msg, code)
+  local text = translateNetworkError(code, self:isConnecting(), msg)
+  signalcall(self.onLoginError, self, text)
+end

modules/gamelib/spells.lua

@@ -1,17 +1,17 @@
 SpelllistSettings = {
   ['Default'] = { 
-    iconFile = 'defaultspells',
+    iconFile = '/images/game/spells/defaultspells',
     iconSize = {width = 32, height = 32},
     spellListWidth = 210,
     spellWindowWidth = 550,
     spellOrder = {'Animate Dead', 'Annihilation', 'Avalanche', 'Berserk', 'Blood Rage', 'Brutal Strike', 'Cancel Invisibility', 'Challenge', 'Chameleon', 'Charge', 'Conjure Arrow', 'Conjure Bolt', 'Conjure Explosive Arrow', 'Conjure Piercing Bolt', 'Conjure Poisoned Arrow', 'Conjure Power Bolt', 'Conjure Sniper Arrow', 'Convince Creature', 'Creature Illusion', 'Cure Bleeding', 'Cure Burning', 'Cure Curse', 'Cure Electrification', 'Cure Poison', 'Cure Poison Rune', 'Curse', 'Death Strike', 'Desintegrate', 'Destroy Field', 'Divine Caldera', 'Divine Healing', 'Divine Missile', 'Electrify', 'Enchant Party', 'Enchant Spear', 'Enchant Staff', 'Energy Beam', 'Energy Field', 'Energy Strike', 'Energy Wall', 'Energy Wave', 'Energybomb', 'Envenom', 'Eternal Winter', 'Ethereal Spear', 'Explosion', 'Fierce Berserk', 'Find Person', 'Fire Field', 'Fire Wall', 'Fire Wave', 'Fireball', 'Firebomb', 'Flame Strike', 'Food', 'Front Sweep', 'Great Energy Beam', 'Great Fireball', 'Great Light', 'Groundshaker', 'Haste', 'Heal Friend', 'Heal Party', 'Heavy Magic Missile', 'Hells Core', 'Holy Flash', 'Holy Missile', 'Ice Strike', 'Ice Wave', 'Icicle', 'Ignite', 'Inflict Wound', 'Intense Healing', 'Intense Healing Rune', 'Intense Recovery', 'Intense Wound Cleansing', 'Invisibility', 'Levitate', 'Light', 'Light Healing', 'Light Magic Missile', 'Lightning', 'Magic Rope', 'Magic Shield', 'Magic Wall', 'Mass Healing', 'Paralyze', 'Physical Strike', 'Poison Bomb', 'Poison Field', 'Poison Wall', 'Protect Party', 'Protector', 'Rage of the Skies', 'Recovery', 'Salvation', 'Sharpshooter', 'Soulfire', 'Stalagmite', 'Stone Shower', 'Strong Energy Strike', 'Strong Ethereal Spear', 'Strong Flame Strike', 'Strong Haste', 'Strong Ice Strike', 'Strong Ice Wave', 'Strong Terra Strike', 'Sudden Death', 'Summon Creature', 'Swift Foot', 'Terra Strike', 'Terra Wave', 'Thunderstorm', 'Train Party', 'Ultimate Energy Strike', 'Ultimate Flame Strike', 'Ultimate Healing', 'Ultimate Healing Rune', 'Ultimate Ice Strike', 'Ultimate Light', 'Ultimate Terra Strike', 'Whirlwind Throw', 'Wild Growth', 'Wound Cleansing', 'Wrath of Nature'}
-  },
+  }--[[,
   
   ['Sample'] =  { 
-    iconFile = 'sample', 
+    iconFile = '/images/game/spells/sample', 
     iconSize = {width = 64, height = 64},
     spellOrder = {'Critical Strike', 'Firefly', 'Fire Breath', 'Moonglaives', 'Wind Walk'}
-  }
+  }]]
 }
 
 SpellInfo = {
@@ -361,6 +361,27 @@ function Spells.getSpellByIcon(iconId)
   return nil
 end
 
+function Spells.getSpellIconIds()
+  local ids = {}
+  for profile,data in pairs(SpellInfo) do
+    for k,spell in pairs(data) do
+      table.insert(ids, spell.id)
+    end
+  end
+  return ids
+end
+
+function Spells.getSpellProfileById(id)
+  for profile,data in pairs(SpellInfo) do
+    for k,spell in pairs(data) do
+      if spell.id == id then
+        return profile
+      end
+    end
+  end
+  return nil
+end
+
 function Spells.getSpellProfileByWords(words)
   for profile,data in pairs(SpellInfo) do
     for k,spell in pairs(data) do

modules/gamelib/ui/uiminimap.lua

@@ -1,43 +1,43 @@
 function UIMinimap:onSetup()
   self.flagWindow = nil
-  self.flagsWidget = self:getChildById('flags')
   self.floorUpWidget = self:getChildById('floorUp')
   self.floorDownWidget = self:getChildById('floorDown')
   self.zoomInWidget = self:getChildById('zoomIn')
   self.zoomOutWidget = self:getChildById('zoomOut')
-  self.dx = 0
-  self.dy = 0
+  self.flags = {}
+  self.alternatives = {}
   self.autowalk = true
-  self.allowFollowLocalPlayer = true
-  self.onPositionChange = function() self:followLocalPlayer() end
   self.onAddAutomapFlag = function(pos, icon, description) self:addFlag(pos, icon, description) end
   self.onRemoveAutomapFlag = function(pos, icon, description) self:removeFlag(pos, icon, description) end
   connect(g_game, {
     onAddAutomapFlag = self.onAddAutomapFlag,
     onRemoveAutomapFlag = self.onRemoveAutomapFlag,
   })
-  connect(LocalPlayer, { onPositionChange = self.onPositionChange })
 end
 
 function UIMinimap:onDestroy()
-  disconnect(LocalPlayer, { onPositionChange = self.onPositionChange })
+  for _,widget in pairs(self.alternatives) do
+    widget:destroy()
+  end
+  self.alternatives = {}
   disconnect(g_game, {
     onAddAutomapFlag = self.onAddAutomapFlag,
     onRemoveAutomapFlag = self.onRemoveAutomapFlag,
   })
   self:destroyFlagWindow()
-  self:destroyFullPanel()
+  self.flags = {}
 end
 
 function UIMinimap:onVisibilityChange()
   if not self:isVisible() then
     self:destroyFlagWindow()
-    self:destroyFullPanel()
   end
 end
 
-function UIMinimap:hideFlags()
-  self.flagsWidget:hide()
+function UIMinimap:onCameraPositionChange(cameraPos)
+  if self.cross then
+    self:setCrossPosition(self.cross.pos)
+  end
 end
 
 function UIMinimap:hideFloor()
@@ -54,33 +54,21 @@ function UIMinimap:disableAutoWalk()
   self.autowalk = false
 end
 
-function UIMinimap:disableFollowPlayer()
-  self.allowFollowLocalPlayer = false
-end
-
-function UIMinimap:enableFullPanel(image)
-  self.fullImage = image
-end
-
 function UIMinimap:load()
   local settings = g_settings.getNode('Minimap')
   if settings then
     if settings.flags then
-      for i=1,#settings.flags do
-        local flag = settings.flags[i]
+      for _,flag in pairs(settings.flags) do
         self:addFlag(flag.position, flag.icon, flag.description)
       end
     end
     self:setZoom(settings.zoom)
   end
-  self:updateFlags()
 end
 
 function UIMinimap:save()
   local settings = { flags={} }
-  local children = self.flagsWidget:getChildren()
-  for i=1,#children do
-    local flag = children[i]
+  for _,flag in pairs(self.flags) do
     table.insert(settings.flags, {
       position = flag.pos,
       icon = flag.icon,
@@ -91,134 +79,116 @@ function UIMinimap:save()
   g_settings.setNode('Minimap', settings)
 end
 
-function UIMinimap:addFlag(pos, icon, description)
-  local flag = self:getFlag(pos, icon, description)
-  if flag then
-    return
+local function onFlagMouseRelease(widget, pos, button)
+  if button == MouseRightButton then
+    local menu = g_ui.createWidget('PopupMenu')
+    menu:addOption(tr('Delete mark'), function() widget:destroy() end)
+    menu:display(pos)
+    return true
   end
-  
-  flag = g_ui.createWidget('MinimapFlag', self.flagsWidget)
-  flag.pos = pos
-  flag.icon = icon
-  flag.description = description
-  flag:setIcon('/images/game/minimap/flag' .. icon)
-  flag:setTooltip(description)
-  flag.onMouseRelease = function(widget, pos, button)
-    if button == MouseRightButton then
-      local menu = g_ui.createWidget('PopupMenu')
-      menu:addOption(tr('Delete mark'), function() widget:destroy() end)
-      menu:display(pos)
-      return true
-    end
-    return false
-  end
-
-  self:updateFlag(flag)
+  return false
 end
 
-function UIMinimap:getFlag(pos, icon, description)
-  local children = self.flagsWidget:getChildren()
-  for i=1,#children do
-    local flag = children[i]
+function UIMinimap:setCrossPosition(pos)
+  local cross = self.cross
+  if not self.cross then
+    cross = g_ui.createWidget('MinimapCross', self)
+    cross:setIcon('/images/game/minimap/cross')
+    self.cross = cross
+  end
+
+  pos.z = self:getCameraPosition().z
+  cross.pos = pos
+  if pos then
+    self:centerInPosition(cross, pos)
+  else
+    cross:breakAnchors()
+  end
+end
+
+function UIMinimap:addFlag(pos, icon, description)
+  if not pos or not icon then return end
+  local flag = self:getFlag(pos, icon, description)
+  if flag or not icon then
+    return
+  end
+
+  flag = g_ui.createWidget('MinimapFlag')
+  self:insertChild(1, flag)
+  flag.pos = pos
+  flag.description = description
+  flag.icon = icon
+  flag:setIcon('/images/game/minimap/flag' .. icon)
+  flag:setTooltip(description)
+  flag.onMouseRelease = onFlagMouseRelease
+  flag.onDestroy = function() table.removevalue(self.flags, flag) end
+  table.insert(self.flags, flag)
+  self:centerInPosition(flag, pos)
+end
+
+function UIMinimap:addAlternativeWidget(widget, pos, maxZoom)
+  widget.pos = pos
+  widget.maxZoom = maxZoom or 0
+  widget.minZoom = minZoom
+  table.insert(self.alternatives, widget)
+end
+
+function UIMinimap:setAlternativeWidgetsVisible(show)
+  local layout = self:getLayout()
+  layout:disableUpdates()
+  for _,widget in pairs(self.alternatives) do
+    if show then
+      self:insertChild(1, widget)
+      self:centerInPosition(widget, widget.pos)
+    else
+      self:removeChild(widget)
+    end
+  end
+  layout:enableUpdates()
+  layout:update()
+end
+
+function UIMinimap:onZoomChange(zoom)
+  for _,widget in pairs(self.alternatives) do
+    if (not widget.minZoom or widget.minZoom >= zoom) and widget.maxZoom <= zoom then
+      widget:show()
+    else
+      widget:hide()
+    end
+  end
+end
+
+function UIMinimap:getFlag(pos)
+  for _,flag in pairs(self.flags) do
     if flag.pos.x == pos.x and flag.pos.y == pos.y and flag.pos.z == pos.z then
       return flag
     end
   end
+  return nil
 end
 
 function UIMinimap:removeFlag(pos, icon, description)
-  local flag = self:getFlag(pos, icon, description)
+  local flag = self:getFlag(pos)
   if flag then
     flag:destroy()
   end
 end
 
-function UIMinimap:updateFlag(flag)
-  local point = self:getPoint(flag.pos)
-  if self:containsPoint(point) and self:getZoom() >= 0 and flag.pos.z == self:getCameraPosition().z then
-    flag:setVisible(true)
-    flag:setMarginLeft(point.x - self:getX() - flag:getWidth()/2)
-    flag:setMarginTop(point.y - self:getY() - flag:getHeight()/2)
-  else
-    flag:setVisible(false)   
-  end
-end
-
-function UIMinimap:updateFlags()
-  local children = self.flagsWidget:getChildren()
-  for i=1,#children do
-    self:updateFlag(children[i])
-  end
-end
-
-UIMinimap.realSetCameraPosition = UIMinimap.realSetCameraPosition or UIMinimap.setCameraPosition
-function UIMinimap:setCameraPosition(pos)
-  self:realSetCameraPosition(pos)
-  self:updateFlags()
-end
-
-UIMinimap.realZoomIn = UIMinimap.realZoomIn or UIMinimap.zoomIn
-function UIMinimap:zoomIn()
-  self:realZoomIn()
-  self:updateFlags()
-end
-
-UIMinimap.realZoomOut = UIMinimap.realZoomOut or UIMinimap.zoomOut
-function UIMinimap:zoomOut()
-  self:realZoomOut()
-  self:updateFlags()
-end
-
-UIMinimap.realSetZoom = UIMinimap.realSetZoom or UIMinimap.setZoom
-function UIMinimap:setZoom(zoom)
-  self:realSetZoom(zoom)
-  self:updateFlags()
-end
-
-function UIMinimap:floorUp(floors)
-  local pos = self:getCameraPosition()
-  pos.z = pos.z - floors
-  if pos.z >= FloorHigher then
-    self:setCameraPosition(pos)
-  end
-  self:updateFlags()
-end
-
-function UIMinimap:floorDown(floors)
-  local pos = self:getCameraPosition()
-  pos.z = pos.z + floors
-  if pos.z <= FloorLower then
-    self:setCameraPosition(pos)
-  end
-  self:updateFlags()
-end
-
-function UIMinimap:followLocalPlayer()
-  if not self:isDragging() and self.allowFollowLocalPlayer then
-    local player = g_game.getLocalPlayer()
-    self:followCreature(player)
-    self:updateFlags()
-  end
-end
-
 function UIMinimap:reset()
-  self:followLocalPlayer()
   self:setZoom(0)
+  if self.cross then
+    self:setCameraPosition(self.cross.pos)
+  end
 end
 
 function UIMinimap:move(x, y)
-  local topLeft, bottomRight = self:getArea()
-  self.dx = self.dx + ((bottomRight.x - topLeft.x) / self:getWidth() ) * x
-  self.dy = self.dy + ((bottomRight.y - topLeft.y) / self:getHeight()) * y
-  local dx = math.floor(self.dx)
-  local dy = math.floor(self.dy)
-  self.dx = self.dx - dx
-  self.dy = self.dy - dy
-
   local cameraPos = self:getCameraPosition()
+  local scale = self:getScale()
+  if scale > 1 then scale = 1 end
+  local dx = x/scale
+  local dy = y/scale
   local pos = {x = cameraPos.x - dx, y = cameraPos.y - dy, z = cameraPos.z}
   self:setCameraPosition(pos)
-  self:updateFlags()
 end
 
 function UIMinimap:onMouseWheel(mousePos, direction)
@@ -232,7 +202,6 @@ function UIMinimap:onMouseWheel(mousePos, direction)
   elseif direction == MouseWheelUp and keyboardModifiers == KeyboardCtrlModifier then
     self:floorDown(1)
   end
-  self:updateFlags()
 end
 
 function UIMinimap:onMousePress(pos, button)
@@ -245,20 +214,18 @@ function UIMinimap:onMouseRelease(pos, button)
   if not self.allowNextRelease then return true end
   self.allowNextRelease = false
 
-  local mapPos = self:getPosition(pos)
+  local mapPos = self:getTilePosition(pos)
   if not mapPos then return end
 
   if button == MouseLeftButton then
     local player = g_game.getLocalPlayer()
     if self.autowalk then
-      player.onAutoWalkFail = function() modules.game_textmessage.displayFailureMessage(tr('There is no way.')) end
       player:autoWalk(mapPos)
     end
     return true
   elseif button == MouseRightButton then
     local menu = g_ui.createWidget('PopupMenu')
     menu:addOption(tr('Create mark'), function() self:createFlagWindow(mapPos) end)
-    if self.fullImage then menu:addOption(tr('Full map'), function() self:createFullPanel() end) end
     menu:display(pos)
     return true
   end
@@ -266,11 +233,17 @@ function UIMinimap:onMouseRelease(pos, button)
 end
 
 function UIMinimap:onDragEnter(pos)
+  self.dragReference = pos
+  self.dragCameraReference = self:getCameraPosition()
   return true
 end
 
 function UIMinimap:onDragMove(pos, moved)
-  self:move(moved.x, moved.y)
+  local scale = self:getScale()
+  local dx = (self.dragReference.x - pos.x)/scale
+  local dy = (self.dragReference.y - pos.y)/scale
+  local pos = {x = self.dragCameraReference.x + dx, y = self.dragCameraReference.y + dy, z = self.dragCameraReference.z}
+  self:setCameraPosition(pos)
   return true
 end
 
@@ -278,20 +251,6 @@ function UIMinimap:onDragLeave(widget, pos)
   return true
 end
 
-function UIMinimap:createFullPanel()
-  self.fullPanel = g_ui.createWidget('MinimapFullPanel', rootWidget)
-  self.fullPanel.onDestroy = function() self.fullPanel = nil end
-  local image = self.fullPanel:getChildById('image')
-  image:setImage(self.fullImage)
-end
-
-function UIMinimap:destroyFullPanel()
-  if self.fullPanel then
-    self.fullPanel:destroy()
-    self.fullPanel = nil
-  end
-end
-
 function UIMinimap:createFlagWindow(pos)
   if self.flagWindow then return end
   if not pos then return end
@@ -311,16 +270,14 @@ function UIMinimap:createFlagWindow(pos)
     checkbox.icon = i
     flagRadioGroup:addWidget(checkbox)
   end
-  
+
   flagRadioGroup:selectWidget(flagRadioGroup:getFirstWidget())
-  
+
   okButton.onClick = function() 
-      self:addFlag(pos, flagRadioGroup:getSelectedWidget().icon, description:getText())
-      self:destroyFlagWindow()
-    end
-  cancelButton.onClick = function()
-      self:destroyFlagWindow()
-    end
+    self:addFlag(pos, flagRadioGroup:getSelectedWidget().icon, description:getText())
+    self:destroyFlagWindow()
+  end
+  cancelButton.onClick = function() self:destroyFlagWindow() end
 
   self.flagWindow.onDestroy = function() flagRadioGroup:destroy() end
 end
@@ -331,9 +288,3 @@ function UIMinimap:destroyFlagWindow()
     self.flagWindow = nil
   end
 end
-
-function UIMinimap:getArea()
-  local topLeft = self:getPosition({ x = self:getX() + 1, y = self:getY() + 1 })
-  local bottomRight = self:getPosition({ x = self:getX() + self:getWidth() - 2, y = self:getY() + self:getHeight() - 2 })
-  return topLeft, bottomRight
-end