Minor SDL improvements

This reverts commit 71b5c5f2e4.

.gitignore

@@ -37,3 +37,5 @@ otclient.layout
 LOCALTODO
 tags
 Thumbs.db
+.directory
+src/framework/graphics/dx/

CMakeLists.txt

@@ -1,17 +1,21 @@
 cmake_minimum_required(VERSION 2.6)
 project(otclient)
 
-set(VERSION "0.6.0")
+set(VERSION "0.6.2")
+
+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)
 
 # functions map for reading backtraces
-set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map")
+if(NOT APPLE)
+    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map")
+endif()
 
 option(USE_PCH "Use precompiled header (speed up compile)" OFF)
 

data/cursors/cursors.otml

@@ -0,0 +1,13 @@
+Cursors
+  target:
+    image: targetcursor
+    hot-spot: 9 9
+  horizontal:
+    image: horizontalcursor
+    hot-spot: 9 4
+  vertical:
+    image: verticalcursor
+    hot-spot: 4 9
+  text:
+    image: textcursor
+    hot-spot: 4 9

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/de.lua

@@ -344,7 +344,7 @@ locale = {
     ["You are dazzled"] = "Du bist geblendet",
     ["You are dead."] = "Du bist tot.",
     ["You are dead"] = "Du bist tot",
-    ["You are drowing"] = "Du ertrinkst",
+    ["You are drowning"] = "Du ertrinkst",
     ["You are drunk"] = "Du bist betrunken",
     ["You are electrified"] = "Du bist elektrifiziert",
     ["You are freezing"] = "Du bist am Erfrieren",

data/locales/es.lua

@@ -6,368 +6,370 @@ locale = {
   languageName = "Espa<EFBFBD>ol",
  
   translation = {
-    ["1a) Offensive Name"] = false,
-    ["1b) Invalid Name Format"] = false,
-    ["1c) Unsuitable Name"] = false,
-    ["1d) Name Inciting Rule Violation"] = false,
-    ["2a) Offensive Statement"] = false,
-    ["2b) Spamming"] = false,
-    ["2c) Illegal Advertising"] = false,
-    ["2d) Off-Topic Public Statement"] = false,
-    ["2e) Non-English Public Statement"] = false,
-    ["2f) Inciting Rule Violation"] = false,
-    ["3a) Bug Abuse"] = false,
-    ["3b) Game Weakness Abuse"] = false,
-    ["3c) Using Unofficial Software to Play"] = false,
-    ["3d) Hacking"] = false,
-    ["3e) Multi-Clienting"] = false,
-    ["3f) Account Trading or Sharing"] = false,
-    ["4a) Threatening Gamemaster"] = false,
-    ["4b) Pretending to Have Influence on Rule Enforcement"] = false,
-    ["4c) False Report to Gamemaster"] = false,
-    ["Accept"] = false,
-    ["Account name"] = "Nombre de la cuenta",
-    ["Account Status:"] = false,
-    ["Action:"] = false,
+    ["1a) Offensive Name"] = "1a) Nombre ofensivo",
+    ["1b) Invalid Name Format"] = "1b) Formato invalido para nombre",
+    ["1c) Unsuitable Name"] = "1c) Nombre no adecuado",
+    ["1d) Name Inciting Rule Violation"] = "1d) Nombre que incita una violacion al reglamento",
+    ["2a) Offensive Statement"] = "2a) Comentario ofensivo",
+    ["2b) Spamming"] = "2b) Spamming",
+    ["2c) Illegal Advertising"] = "2c) Publicidad ilicita",
+    ["2d) Off-Topic Public Statement"] = "2d) Publicacion fuera de lugar",
+    ["2e) Non-English Public Statement"] = "2e) Publicacion fuera del ingles",
+    ["2f) Inciting Rule Violation"] = "2f) Incitar a una violacion al reglamento",
+    ["3a) Bug Abuse"] = "3a) Abuso de error",
+    ["3b) Game Weakness Abuse"] = "3b) Abuso de debilidad del juego",
+    ["3c) Using Unofficial Software to Play"] = "3c) Usando software ilegal para jugar",
+    ["3d) Hacking"] = "3d) Hackeo",
+    ["3e) Multi-Clienting"] = "3e) Multiple Cliente",
+    ["3f) Account Trading or Sharing"] = "3f) Intercambio de cuenta",
+    ["4a) Threatening Gamemaster"] = "4a) Amenzar a un Gamemaster",
+    ["4b) Pretending to Have Influence on Rule Enforcement"] = "4b) Pretender tener influencia en una parte del reglamento",
+    ["4c) False Report to Gamemaster"] = "4c) Reporte falso a un Gamemaster",
+    ["Accept"] = "Aceptar",
+    ["Account name"] = "Nombre de cuenta",
+    ["Account Status:"] = "Estado de cuenta:",
+    ["Action:"] = "Accion:",
     ["Add"] = "A<EFBFBD>adir",
     ["Add new VIP"] = "A<EFBFBD>adir nuevo VIP",
     ["Addon 1"] = "Addon 1",
-    ["Addon 2"] = "Addon 2",
-    ["Addon 3"] = "Addon 3",
+    ["Addon 2"] = "Addon 1",
+    ["Addon 3"] = "Addon 1",
     ["Add to VIP list"] = "A<EFBFBD>adir a lista VIP",
-    ["Adjust volume"] = "Ajustar vol<EFBFBD>men",
-    ["Alas! Brave adventurer, you have met a sad fate.\nBut do not despair, for the gods will bring you back\ninto this world in exchange for a small sacrifice\n\nSimply click on Ok to resume your journeys!"] = false,
-    ["All"] = false,
-    ["All modules and scripts were reloaded."] = "Todos los m<>dulos y scripts han sido reiniciados",
-    ["Allow auto chase override"] = false,
-    ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = false,
-    ["Ambient light: %s%%"] = false,
+    ["Adjust volume"] = "Ajustar volumen",
+    ["Alas! Brave adventurer, you have met a sad fate.\nBut do not despair, for the gods will bring you back\ninto this world in exchange for a small sacrifice\n\nSimply click on Ok to resume your journeys!"] = "<EFBFBD>Ay! Aventurero valiente, que ha conocido a un triste destino. \nPero no se desespere, porque los dioses le llevar<61> de vuelta \na este mundo a cambio de un peque<75>o sacrificio \n\nSimply haga clic en Aceptar para continuar con sus viajes!",
+    ["All"] = "Todo",
+    ["All modules and scripts were reloaded."] = "Todos los m<>dulos y scripts se vuelven a cargar.",
+    ["Allow auto chase override"] = "Permitur auto persecuci<63>n override",
+    ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = "Conocido por la comunidad de tibia como dash.\nRecomenada para players de alto nivel.",
+    ["Ambient light: %s%%"] = "Ambiente de luz: %s%%",
     ["Amount:"] = "Cantidad:",
-    ["Amount"] = false,
-    ["Anonymous"] = false,
-    ["Are you sure you want to logout?"] = false,
+    ["Amount"] = "Cantidad",
+    ["Anonymous"] = "An<EFBFBD>nimo",
+    ["Are you sure you want to logout?"] = "<EFBFBD>Estas seguro de que quieres salir?",
     ["Attack"] = "Atacar",
     ["Author"] = "Autor",
-    ["Autoload"] = "Cargar autom<6F>ticamente",
-    ["Autoload priority"] = "Prioridad de carga",
-    ["Auto login"] = "Entrar autom<6F>ticamente",
-    ["Auto login selected character on next charlist load"] = "Entrar autom<6F>ticamente con un personage cuando se vuelva a abrir la lista de personajes",
-    ["Axe Fighting"] = "Combate con Hacha",
-    ["Balance:"] = false,
-    ["Banishment"] = false,
-    ["Banishment + Final Warning"] = false,
+    ["Autoload"] = "Auto carga",
+    ["Autoload priority"] = "Auto carga prioritaria",
+    ["Auto login"] = "Auto iniciar",
+    ["Auto login selected character on next charlist load"] = "Auto cargar car<61>cter seleccionado en la carga charlist siguiente",
+    ["Axe Fighting"] = "Combate con acha",
+    ["Balance:"] = "Saldo:",
+    ["Banishment"] = "Banishment",
+    ["Banishment + Final Warning"] = "Banishment + Final Warning",
     ["Battle"] = "Batalla",
-    ["Browse"] = false,
-    ["Bug report sent."] = false,
-    ["Button Assign"] = "Seleccionar Bot<6F>n",
-    ["Buy"] = "Comprar",
-    ["Buy Now"] = false,
-    ["Buy Offers"] = false,
-    ["Buy with backpack"] = "Comprar con mochila",
+    ["Browse"] = "Navegar",
+    ["Bug report sent."] = "Reporte de error enviado.",
+    ["Button Assign"] = "Boton asignado",
+    ["Buy"] = "Compra",
+    ["Buy Now"] = "Compra ahora",
+    ["Buy Offers"] = "Comprar oferta",
+    ["Buy with backpack"] = "Comprar con backpack",
     ["Cancel"] = "Cancelar",
-    ["Cannot login while already in game."] = false,
-    ["Cap"] = false,
+    ["Cannot login while already in game."] = "No se puede iniciar sesi<73>n, mientras que estes en el juego.",
+    ["Cap"] = "Cap",
     ["Capacity"] = "Capacidad",
-    ["Center"] = false,
+    ["Center"] = "Centrar",
     ["Channels"] = "Canales",
-    ["Character List"] = "Lista de personajes",
-    ["Classic control"] = "Control cl<EFBFBD>sico",
-    ["Clear current message window"] = false,
-    ["Clear Messages"] = false,
+    ["Character List"] = "Lista de car<EFBFBD>cter",
+    ["Classic control"] = "Control Clasico",
+    ["Clear current message window"] = "Limpiar mensaje actual en ventana",
+    ["Clear Messages"] = "Limpiar mensaje",
     ["Clear object"] = "Limpiar objeto",
-    ["Client needs update."] = false,
+    ["Client needs update."] = "El cliente necesita actualizacion.",
     ["Close"] = "Cerrar",
     ["Close this channel"] = "Cerrar este canal",
-    ["Club Fighting"] = "Combate con Maza",
+    ["Club Fighting"] = "Combate con mazo",
     ["Combat Controls"] = "Controles de combate",
-    ["Comment:"] = false,
-    ["Connecting to game server..."] = "Conectando al servidor de juego...",
-    ["Connecting to login server..."] = "Conectando al servidor de autentificaci<63>n...",
-    ["Console"] = false,
-    ["Cooldowns"] = false,
-    ["Copy message"] = false,
-    ["Copy name"] = false,
-    ["Copy Name"] = "Copiar Nombre",
-    ["Create Map Mark"] = false,
-    ["Create mark"] = false,
-    ["Create New Offer"] = false,
-    ["Create Offer"] = false,
-    ["Current hotkeys:"] = "Atajos actuales",
-    ["Current hotkey to add: %s"] = "Atajo actual para a<>adir: %s",
-    ["Current Offers"] = false,
-    ["Default"] = "Principal",
-    ["Delete mark"] = false,
-    ["Description:"] = false,
+    ["Comment:"] = "Comentario:",
+    ["Connecting to game server..."] = "Conectando a servidor game...",
+    ["Connecting to login server..."] = "Conectando a servidor login...",
+    ["Console"] = "Consola",
+    ["Cooldowns"] = "Descansos",
+    ["Copy message"] = "Copiar mensaje",
+    ["Copy name"] = "Copiar nombre",
+    ["Copy Name"] = "Copiar nombre",
+    ["Create Map Mark"] = "Crear marca en mapa",
+    ["Create mark"] = "Crear marca",
+    ["Create New Offer"] = "Crear nueva oferta",
+    ["Create Offer"] = "Crear oferta",
+    ["Current hotkeys:"] = "Actuales hotkeys:",
+    ["Current hotkey to add: %s"] = "Actuales hotkeys a agregar: %s",
+    ["Current Offers"] = "Oferta actual",
+    ["Default"] = "Predeterminado",
+    ["Delete mark"] = "Borrar Marca",
+    ["Description:"] = "Descripci<EFBFBD>n:",
     ["Description"] = "Descripci<EFBFBD>n",
-    ["Destructive Behaviour"] = false,
+    ["Destructive Behaviour"] = "Comportamiento agresivo",
     ["Detail"] = "Detalle",
-    ["Details"] = false,
+    ["Details"] = "Detalles",
     ["Disable Shared Experience"] = "Desactivar experiencia compartida",
-    ["Dismount"] = false,
-    ["Display connection speed to the server (milliseconds)"] = false,
-    ["Distance Fighting"] = "Combate a Distancia",
-    ["Don't stretch/shrink Game Window"] = false,
-    ["Edit hotkey text:"] = "Editar texto del atajo",
-    ["Edit List"] = false,
-    ["Edit Text"] = "Editar Texto",
-    ["Enable music"] = false,
-    ["Enable Shared Experience"] = "Activar experiencia compartida",
-    ["Enable smart walking"] = false,
-    ["Enable vertical synchronization"] = "Activar sincronizaci<63>n vertical",
-    ["Enable walk booster"] = false,
+    ["Dismount"] = "Desmontar",
+    ["Display connection speed to the server (milliseconds)"] = "Mostrar velocidad de conexion en el servidor (millisegundos)",
+    ["Distance Fighting"] = "Combate a distancia",
+    ["Don\'t stretch/shrink Game Window"] = "No estirar ni reducir el tama<6D>o de ventana",
+    ["Edit hotkey text:"] = "Editar texto de hotkey:",
+    ["Edit List"] = "Editar lista",
+    ["Edit Text"] = "Editar texto",
+    ["Enable music"] = "Habilitar musica",
+    ["Enable Shared Experience"] = "Habilitar experiencia compartida",
+    ["Enable smart walking"] = "Habilitar caminado inteligente",
+    ["Enable vertical synchronization"] = "Habilitar sincronizaci<63>n vertical",
+    ["Enable walk booster"] = "Habilitar caminado turbo",
     ["Enter Game"] = "Entrar al juego",
-    ["Enter one name per line."] = false,
-    ["Enter with your account again to update your client."] = false,
+    ["Enter one name per line."] = "Introducir un nombre por linea.",
+    ["Enter with your account again to update your client."] = "",
     ["Error"] = "Error",
     ["Error"] = "Error",
-    ["Excessive Unjustified Player Killing"] = false,
-    ["Exclude from private chat"] = "Excluir del canal privado",
-    ["Exit"] = false,
+    ["Excessive Unjustified Player Killing"] = "Asesinato excesivo injustivicado de players",
+    ["Exclude from private chat"] = "Ejecutar desde un canal privado",
+    ["Exit"] = "Salir",
     ["Experience"] = "Experiencia",
-    ["Filter list to match your level"] = false,
-    ["Filter list to match your vocation"] = false,
-    ["Find:"] = false,
+    ["Filter list to match your level"] = "Lista de filtros que coincida con el nivel",
+    ["Filter list to match your vocation"] = "Lista de filtros que coincida con el vocaci<63>n",
+    ["Find:"] = "Encontrar:",
     ["Fishing"] = "Pesca",
-    ["Fist Fighting"] = "Combate con Pu<EFBFBD>os",
+    ["Fist Fighting"] = "Combate con pu<EFBFBD>os",
     ["Follow"] = "Seguir",
-    ["Force Exit"] = false,
-    ["For Your Information"] = false,
-    ["Free Account"] = false,
-    ["Fullscreen"] = "Pantalla Completa",
-    ["Game"] = false,
-    ["Game framerate limit: %s"] = false,
+    ["Force Exit"] = "Forzar salida",
+    ["For Your Information"] = "Para tu informaci<63>n",
+    ["Free Account"] = "Account gratis",
+    ["Fullscreen"] = "Pantalla completa",
+    ["Game"] = "Juego",
+    ["Game framerate limit: %s"] = "Imagenes por segundo en juego: %s",
     ["Graphics"] = "Gr<EFBFBD>ficos",
-    ["Graphics card driver not detected"] = false,
-    ["Graphics Engine:"] = false,
+    ["Graphics card driver not detected"] = "Controlador de tarjeta gr<67>fica de video no detectado",
+    ["Graphics Engine:"] = "Motor Grafico:",
     ["Head"] = "Cabeza",
-    ["Healing"] = false,
-    ["Health Info"] = false,
-    ["Health Information"] = false,
-    ["Hide monsters"] = "Esconder monstruos",
-    ["Hide non-skull players"] = "Esconder jugadores sin calavera",
-    ["Hide Npcs"] = "Esconder NPCs",
-    ["Hide Offline"] = false,
-    ["Hide party members"] = "Esconder miembros del grupo",
-    ["Hide players"] = "Esconder jugadores",
-    ["Hide spells for higher exp. levels"] = false,
-    ["Hide spells for other vocations"] = false,
-    ["Hit Points"] = "Puntos de Vida",
-    ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = false,
-    ["Hotkeys"] = "Atajos",
-    ["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."] = false,
-    ["Ignore"] = false,
-    ["Ignore capacity"] = "Ignorar capacidad",
-    ["Ignored players:"] = false,
-    ["Ignore equipped"] = "Ignorar equipado",
-    ["Ignore List"] = false,
-    ["Ignore players"] = false,
-    ["Ignore Private Messages"] = false,
-    ["Ignore Yelling"] = false,
-    ["Interface framerate limit: %s"] = false,
+    ["Healing"] = "Curacion",
+    ["Health Info"] = "HP Info",
+    ["Health Information"] = "HP Informaci<63>n",
+    ["Hide monsters"] = "Ocultar monsters",
+    ["Hide non-skull players"] = "Ocultar no-skull players",
+    ["Hide Npcs"] = "Ocultar NPCs",
+    ["Hide Offline"] = "Ocultar fuera de linea",
+    ["Hide party members"] = "Ocultar miembros de party",
+    ["Hide players"] = "Ocultar players",
+    ["Hide spells for higher exp. levels"] = "Ocultar spells para niveles mas altos que tu experiencia.",
+    ["Hide spells for other vocations"] = "Ocultar spells que sean para otra vocaci<63>n",
+    ["Hit Points"] = "Puntos de vida",
+    ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = "Mantenga pulsado el bot<6F>n derecho del rat<61>n para navegar\nScroll bot<6F>n central del rat<61>n para ampliar\nbot<EFBFBD>n derecho del mouse para crear marcas del mapa",
+    ["Hotkeys"] = "Hotkeys",
+    ["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."] = "Si se cierra el programa, tu personaje puede permanecer en el juego.\nHaga clic en 'Salir' para asegurarse de que personaje deja el juego correctamente.\nClick en 'Salir' si desea salir del programa sin tener que salir de tu personaje.",
+    ["Ignore"] = "Ignorar",
+    ["Ignore capacity"] = "Ignorar Capacidad",
+    ["Ignored players:"] = "Players ignorados:",
+    ["Ignore equipped"] = "Ignorar lo equipodo",
+    ["Ignore List"] = "Ignorar lista",
+    ["Ignore players"] = "Ignorar players",
+    ["Ignore Private Messages"] = "Ignorar mensajes privados",
+    ["Ignore Yelling"] = "Ignorar gritos",
+    ["Interface framerate limit: %s"] = "Interface de imagenes por segundo: %s",
     ["Inventory"] = "Inventario",
-    ["Invite to Party"] = "Invitar al grupo",
-    ["Invite to private chat"] = "Invitar al canal privado",
-    ["IP Address Banishment"] = false,
-    ["Item Offers"] = false,
-    ["It is empty."] = false,
-    ["Join %s's Party"] = false,
-    ["Leave Party"] = "Salir del grupo",
+    ["Invite to Party"] = "Ivitar a party",
+    ["Invite to private chat"] = "Invitar a canal privado",
+    ["IP Address Banishment"] = "Banishment - Direccion IP",
+    ["Item Offers"] = "Ofertas de objetos",
+    ["It is empty."] = "Est<EFBFBD> vasio.",
+    ["Join %s\'s Party"] = "Unir %s\'s party",
+    ["Leave Party"] = "Dejar party",
     ["Level"] = "Nivel",
-    ["Lifetime Premium Account"] = false,
-    ["Limits FPS to 60"] = "Limita los FPS a 60",
-    ["List of items that you're able to buy"] = "Lista de objetos que usted puede comprar",
-    ["List of items that you're able to sell"] = "Lista de objetos que usted puede vender",
+    ["Lifetime Premium Account"] = "Tiempo de Premium Account",
+    ["Limits FPS to 60"] = "Limites FPS a 60",
+    ["List of items that you're able to buy"] = "Lista de objetos que puedes de comprar",
+    ["List of items that you're able to sell"] = "Lista de objetos que puedes de vender",
     ["Load"] = "Cargar",
-    ["Logging out..."] = false,
-    ["Login"] = "Entrar",
-    ["Login Error"] = "Error de Autentificaci<EFBFBD>n",
-    ["Login Error"] = "Error de Autentificaci<EFBFBD>n",
-    ["Logout"] = false,
-    ["Look"] = "Ver",
-    ["Magic Level"] = "Nivel M<EFBFBD>gico",
-    ["Make sure that your client uses\nthe correct game protocol version"] = "Compruebe que tu cliente use\nuse el mismo protocolo que el servidor de juego",
+    ["Logging out..."] = "Cerrando sesion...",
+    ["Login"] = "Ingresar",
+    ["Login Error"] = "Error de ingreso",
+    ["Login Error"] = "Error de ingreso",
+    ["Logout"] = "Salir",
+    ["Look"] = "Mirar",
+    ["Magic Level"] = "Nivel m<EFBFBD>gico",
+    ["Make sure that your client uses\nthe correct game protocol version"] = "Aseg<EFBFBD>rese de que el cliente utiliza\nes el correcto de versi<73>n del protocolo",
     ["Mana"] = "Mana",
-    ["Manage hotkeys:"] = "Configurar atajos:",
-    ["Market"] = false,
-    ["Market Offers"] = false,
-    ["Message of the day"] = "Mensaje del d<EFBFBD>a",
-    ["Message to "] = false,
-    ["Message to %s"] = "Mandar mensaje a %s",
+    ["Manage hotkeys:"] = "Administrador de hotkeys:",
+    ["Market"] = "Mercado",
+    ["Market Offers"] = "Ofertas en mercado",
+    ["Message of the day"] = "Mensaje del dia",
+    ["Message to "] = "Mensaje a",
+    ["Message to %s"] = "Mensaje a %s",
     ["Minimap"] = "Minimapa",
-    ["Module Manager"] = "Administrador de M<EFBFBD>dulos",
-    ["Module name"] = "Nombre del m<EFBFBD>dulo",
-    ["Mount"] = false,
-    ["Move Stackable Item"] = "Mover objeto contable",
+    ["Module Manager"] = "Administrador de modulos",
+    ["Module name"] = "Nombre de modulo",
+    ["Mount"] = "Montura",
+    ["Move Stackable Item"] = "Mover objeto apilable",
     ["Move up"] = "Mover arriba",
-    ["My Offers"] = false,
+    ["My Offers"] = "Mis ofertas",
     ["Name:"] = "Nombre:",
-    ["Name Report"] = false,
-    ["Name Report + Banishment"] = false,
-    ["Name Report + Banishment + Final Warning"] = false,
-    ["No"] = false,
-    ["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."] = false,
-    ["No Mount"] = false,
-    ["No Outfit"] = false,
-    ["No statement has been selected."] = false,
-    ["Notation"] = false,
-    ["NPC Trade"] = "Comercia con NPC",
-    ["Offer History"] = false,
-    ["Offers"] = false,
-    ["Offer Type:"] = false,
-    ["Offline Training"] = false,
-    ["Ok"] = "Ok",
-    ["on %s.\n"] = false,
-    ["Open"] = "Abrir",
-    ["Open a private message channel:"] = "Abrir un canal privado:",
-    ["Open charlist automatically when starting client"] = false,
-    ["Open in new window"] = "Abrir en una nueva ventana",
-    ["Open new channel"] = "Abrir novo canal",
+    ["Name Report"] = "Name Report",
+    ["Name Report + Banishment"] = "Name Report + Banishment",
+    ["Name Report + Banishment + Final Warning"] = "Name Report + Banishment + Final Warning",
+    ["No"] = "No",
+    ["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."] = "No graphics card detected, everything will be drawn using the CPU,\npor lo tanto el rendimiento va a ser muy malo.\nPor favor, actualice su controlador de gr<67>ficos para tener un mejor rendimiento.",
+    ["No item selected."] = "No hay elemento seleccionado.",
+    ["No Mount"] = "No montura",
+    ["No Outfit"] = "No outfit",
+    ["No statement has been selected."] = "No hay comentario seleccionado.",
+    ["Notation"] = "Notation",
+    ["NPC Trade"] = "Intercambio con NPC",
+    ["Offer History"] = "Historial de oferta",
+    ["Offers"] = "Ofertas",
+    ["Offer Type:"] = "Tipo de oferta:",
+    ["Offline Training"] = "Entrenamiento offLine",
+    ["Ok"] = "OK",
+    ["on %s.\n"] = "en %s.\n",
+    ["Open"] = "Abierto",
+    ["Open a private message channel:"] = "Abrir mensaje en canal privado:",
+    ["Open charlist automatically when starting client"] = "Abrir lista de players automaticamente al iniciar el cliente",
+    ["Open in new window"] = "Abrir en nueva ventana",
+    ["Open new channel"] = "Abrir nuevo canal",
     ["Options"] = "Opciones",
-    ["Overview"] = false,
-    ["Pass Leadership to %s"] = "Pasar el liderazgo a %s",
+    ["Overview"] = "Descripcion",
+    ["Pass Leadership to %s"] = "Pasar liderazgo a %s",
     ["Password"] = "Contrase<EFBFBD>a",
-    ["Piece Price:"] = false,
-    ["Please enter a character name:"] = "Por favor, introduce el nombre de un personaje:",
-    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, presione la tecla que desee para\na<EFBFBD>adir a tu administrador de atajos",
-    ["Please Select"] = false,
-    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = false,
-    ["Please wait"] = "Por favor, espere",
+    ["Piece Price:"] = "Precio por pieza:",
+    ["Please enter a character name:"] = "Por favor ingresar nombre del player:",
+    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, presiona la tecla que desees para que sea registrada en\nel administrador de hotkeys",
+    ["Please Select"] = "Por favor selecciona",
+    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor usa estos dialogos solo para reportar errores.\n<EFBFBD>No reportar violaciones al reglamento aqu<71>!",
+    ["Please wait"] = "Por favor espera",
     ["Port"] = "Puerto",
-    ["Position:"] = false,
-    ["Position: %i %i %i"] = false,
-    ["Premium Account (%s) days left"] = false,
-    ["Price:"] = "Precio",
+    ["Position:"] = "Posici<EFBFBD>n:",
+    ["Position: %i %i %i"] = "Posici<EFBFBD>n: %i %i %i",
+    ["Premium Account (%s) days left"] = "Premium Accoun restan dias (%s)",
+    ["Price:"] = "Precio:",
     ["Primary"] = "Primario",
-    ["Protocol"] = false,
-    ["Quest Log"] = false,
-    ["Randomize"] = false,
-    ["Randomize characters outfit"] = false,
-    ["Reason:"] = false,
-    ["Refresh"] = "Actualizar",
-    ["Refresh Offers"] = false,
-    ["Regeneration Time"] = false,
-    ["Reject"] = false,
-    ["Reload All"] = "Recargar Todos",
-    ["Remember account and password when starts client"] = false,
+    ["Protocol"] = "Protocolo",
+    ["Quest Log"] = "Quest Log",
+    ["Randomize"] = "Combinar",
+    ["Randomize characters outfit"] = "Combinar oufit del jugador",
+    ["Reason:"] = "Reason:",
+    ["Refresh"] = "Refrescar",
+    ["Refresh Offers"] = "Refrescar ofertas",
+    ["Regeneration Time"] = "Tiempo de regeneraci<63>n",
+    ["Reject"] = "Rechazar",
+    ["Reload All"] = "Cargar todo de nuevo",
+    ["Remember account and password when starts client"] = "Recordar cuenta y contrase<73>a al iniciar el cliente",
     ["Remember password"] = "Recordar contrase<73>a",
-    ["Remove"] = "Quitar",
-    ["Remove %s"] = "Quitar %s",
-    ["Report Bug"] = false,
-    ["Reserved for more functionality later."] = false,
-    ["Reset Market"] = false,
-    ["Revoke %s's Invitation"] = false,
-    ["Rotate"] = "Girar",
-    ["Rule Violation"] = false,
-    ["Save"] = false,
-    ["Save Messages"] = false,
+    ["Remove"] = "Remover",
+    ["Remove %s"] = "Remover %s",
+    ["Report Bug"] = "Reportar error",
+    ["Reserved for more functionality later."] = "eservado para una funcion futura.",
+    ["Reset Market"] = "Reiniciar mercado",
+    ["Revoke %s\'s Invitation"] = "Anular %s\'s invitaci<63>n",
+    ["Rotate"] = "Rotar",
+    ["Rule Violation"] = "Violacion de regla",
+    ["Save"] = "Salvar",
+    ["Save Messages"] = "Salvar mensaje",
     ["Search:"] = "Buscar:",
-    ["Search all items"] = false,
+    ["Search all items"] = "Buscar todos los objetos",
     ["Secondary"] = "Secundario",
     ["Select object"] = "Seleccionar objeto",
-    ["Select Outfit"] = "Selecionar Traje",
-    ["Select your language"] = false,
+    ["Select Outfit"] = "Seleccionar outfit",
+    ["Select your language"] = "Selectionar tu lenguaje",
     ["Sell"] = "Vender",
-    ["Sell Now"] = false,
-    ["Sell Offers"] = false,
-    ["Send"] = false,
-    ["Send automatically"] = "Enviar autom<EFBFBD>ticamente",
-    ["Send Message"] = false,
-    ["Server"] = "Servidor",
-    ["Server Log"] = "Registro del servidor",
-    ["Set Outfit"] = "Escoger Traje",
-    ["Shielding"] = "Defensa",
+    ["Sell Now"] = "Vender ya",
+    ["Sell Offers"] = "Ofertas de venta",
+    ["Send"] = "Enviar",
+    ["Send automatically"] = "Enviar automaticamente",
+    ["Send Message"] = "Enviar mensaje",
+    ["Server"] = "Server",
+    ["Server Log"] = "Server Log",
+    ["Set Outfit"] = "Fijar outfit",
+    ["Shielding"] = "Escudo",
     ["Show all items"] = "Mostrar todos los objetos",
-    ["Show connection ping"] = false,
-    ["Show Depot Only"] = false,
-    ["Show event messages in console"] = "Mostrar los mensajes de eventos en la consola",
-    ["Show frame rate"] = "Mostrar FPS",
-    ["Show info messages in console"] = "Mostrar los mensajes informativos en la consola",
-    ["Show left panel"] = false,
-    ["Show levels in console"] = "Mostrar los niveles en la consola",
-    ["Show Offline"] = false,
-    ["Show private messages in console"] = "Mostrar los mensajes privados en la consola",
-    ["Show private messages on screen"] = false,
-    ["Show Server Messages"] = false,
-    ["Show status messages in console"] = "Mostrar los mensajes de estado en la consola",
-    ["Show Text"] = false,
-    ["Show timestamps in console"] = "Mostrar la hora en la consola",
-    ["Show your depot items only"] = false,
+    ["Show connection ping"] = "Mostrar ping de conexi<78>n",
+    ["Show Depot Only"] = "Mostrar solo el Depot",
+    ["Show event messages in console"] = "Mostrar mensajes de evento en consola",
+    ["Show frame rate"] = "Mostrar velocidad por cuadro",
+    ["Show info messages in console"] = "Mostrar mensajes de informaci<EFBFBD>n en consola",
+    ["Show left panel"] = "Mostrar panel izquierdo",
+    ["Show levels in console"] = "Mostrar niveles en consola",
+    ["Show Offline"] = "Mostrar offLine",
+    ["Show private messages in console"] = "Mostrar mensajes privados en consola",
+    ["Show private messages on screen"] = "Mostrar mensajes privados en pantalla",
+    ["Show Server Messages"] = "Mostrar mensajes del servidor",
+    ["Show status messages in console"] = "Mostrar mensajes de estado en consola",
+    ["Show Text"] = "Mostrar texto",
+    ["Show timestamps in console"] = "Mostrar marcas de tiempo en consola",
+    ["Show your depot items only"] = "Mostrar solo tus objetos en depot",
     ["Skills"] = "Habilidades",
-    ["Soul"] = false,
-    ["Soul Points"] = "Puntos del Alma",
-    ["Special"] = false,
-    ["Speed"] = false,
-    ["Spell Cooldowns"] = false,
-    ["Spell List"] = false,
-    ["Stamina"] = "Vigor",
-    ["Statement:"] = false,
-    ["Statement Report"] = false,
-    ["Statistics"] = false,
-    ["Stop Attack"] = "Detener el Ataque",
-    ["Stop Follow"] = "Detener el Seguimiento",
-    ["Support"] = false,
+    ["Soul"] = "Soul",
+    ["Soul Points"] = "Puntos de Soul",
+    ["Special"] = "Especial",
+    ["Speed"] = "Velocidad",
+    ["Spell Cooldowns"] = "Spells Cooldowns",
+    ["Spell List"] = "Lista de spells",
+    ["Stamina"] = "Stamina",
+    ["Statement:"] = "Comentario:",
+    ["Statement Report"] = "Statement Report",
+    ["Statistics"] = "Estadisticas",
+    ["Stop Attack"] = "Detener ataque",
+    ["Stop Follow"] = "Detener persecucion",
+    ["Support"] = "Soporte",
     ["%s: (use object)"] = "%s: (usar objeto)",
-    ["%s: (use object on target)"] = "%s: (usar objeto en objetivo)",
-    ["%s: (use object on yourself)"] = "%s: (usar objeto en ti mismo)",
-    ["%s: (use object with crosshair)"] = "%s: (usar objeto con mirilla)",
-    ["Sword Fighting"] = "Combate con Espada",
+    ["%s: (use object on target)"] = "%s: (usar objeto en un objetivo)",
+    ["%s: (use object on yourself)"] = "%s: (usar objeto en mi mismo)",
+    ["%s: (use object with crosshair)"] = "%s: (usar objeto en aire)",
+    ["Sword Fighting"] = "Combate de espada",
     ["Terminal"] = "Terminal",
-    ["There is no way."] = "No hay ruta.",
-    ["Title"] = false,
-    ["Total Price:"] = false,
-    ["Trade"] = "Comercial",
-    ["Trade with ..."] = "Comercial con ...",
-    ["Trying to reconnect in %s seconds."] = false,
-    ["Unable to load dat file, please place a valid dat in '%s'"] = false,
-    ["Unable to load spr file, please place a valid spr in '%s'"] = false,
-    ["Unable to logout."] = "No es posible salir.",
-    ["Unignore"] = false,
-    ["Unload"] = "Descarga",
-    ["Update needed"] = false,
-    ["Use"] = "Usar",
-    ["Use on target"] = "Usar en objetivo",
-    ["Use on yourself"] = "Usar en ti mismo",
+    ["There is no way."] = "No hay ninguna manera.",
+    ["Title"] = "T<EFBFBD>tulo",
+    ["Total Price:"] = "Total total:",
+    ["Trade"] = "Intercambio",
+    ["Trade with ..."] = "Intercambiar con ...",
+    ["Trying to reconnect in %s seconds."] = "",
+    ["Unable to load dat file, please place a valid dat in '%s'"] = "No se puede cargar el archivo dat, por favor coloque un dat v<>lido en '%s'",
+    ["Unable to load spr file, please place a valid spr in '%s'"] = "No se puede cargar el archivo spr, por favor coloque un spr v<>lido en '%s'",
+    ["Unable to logout."] = "No se puede cerrar sesi<73>n-",
+    ["Unignore"] = "Desactivar ignorado",
+    ["Unload"] = "No cargado",
+    ["Update needed"] = "Es necesario actualizar",
+    ["Use"] = "Uso",
+    ["Use on target"] = "Usar en un objetivo",
+    ["Use on yourself"] = "Usar en mi mismo",
     ["Use with ..."] = "Usar en ...",
-    ["Version"] = "Versi<EFBFBD>n",
-    ["VIP List"] = "Lista VIP",
-    ["Voc."] = false,
-    ["Vocation"] = false,
-    ["Waiting List"] = false,
-    ["Website"] = "Sitio Web",
-    ["Weight:"] = "Peso",
-    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = false,
-    ["With crosshair"] = "Con mirilla",
-    ["Yes"] = false,
-    ["You are bleeding"] = false,
-    ["You are burning"] = "Est<EFBFBD>s quemando",
-    ["You are cursed"] = "Est<EFBFBD>s maldito",
-    ["You are dazzled"] = "Est<EFBFBD>s deslumbrado",
-    ["You are dead."] = "Has muerto.",
-    ["You are dead"] = false,
-    ["You are drowing"] = "Te est<EFBFBD>s ahogando",
-    ["You are drunk"] = false,
-    ["You are electrified"] = "Est<EFBFBD>s electrocutado",
-    ["You are freezing"] = "Est<EFBFBD>s congelado",
-    ["You are hasted"] = "Vas con prisa",
-    ["You are hungry"] = false,
-    ["You are paralysed"] = "Est<EFBFBD>s paralizado",
-    ["You are poisoned"] = "Est<EFBFBD>s envenenado",
-    ["You are protected by a magic shield"] = "Est<EFBFBD>s protegido por un escudo m<EFBFBD>gico",
-    ["You are strengthened"] = "Est<EFBFBD>s reforzado",
-    ["You are within a protection zone"] = "Est<EFBFBD>s en una zona de protecci<63>n",
-    ["You can enter new text."] = false,
-    ["You have %s percent"] = "Tienes %s por ciento",
-    ["You have %s percent to go"] = "Te falta %s por ciento para avanzar",
-    ["You may not logout during a fight"] = "No puedes salir mientras est<73>s en un combate",
+    ["Version"] = "Version",
+    ["VIP List"] = "Lista Vip",
+    ["Voc."] = "Voc.",
+    ["Vocation"] = "Vocaci<EFBFBD>n",
+    ["Waiting List"] = "Lista de espera",
+    ["Website"] = "Sitio WEB",
+    ["Weight:"] = "Peso:",
+    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectar cuando se camina en diagonal usando las flechas",
+    ["With crosshair"] = "Con punto de mira",
+    ["Yes"] = "Si",
+    ["You are bleeding"] = "Tu estas sangrado",
+    ["You are burning"] = "Tu estas quemado",
+    ["You are cursed"] = "Tu estas maldecido",
+    ["You are dazzled"] = "Tu estas deslumbrado",
+    ["You are dead."] = "Tu estas muerto.",
+    ["You are dead"] = "Tu estas muerto",
+    ["You are drowning"] = "Tu estas ahotado",
+    ["You are drunk"] = "Tu estas borracho",
+    ["You are electrified"] = "Tu estas electrificado",
+    ["You are freezing"] = "Tu estas congelado",
+    ["You are hasted"] = "Tu estas rapido",
+    ["You are hungry"] = "Tu estas hambriento",
+    ["You are paralysed"] = "Tu estas paralizado",
+    ["You are poisoned"] = "Tu estas envenedado",
+    ["You are protected by a magic shield"] = "Tu estas protegido por un campo magico",
+    ["You are strengthened"] = "Tu estas reforzado",
+    ["You are within a protection zone"] = "Tu estas dentro de una zona segura",
+    ["You can enter new text."] = "Tu puedes introducir un texto nuevo.",
+    ["You have %s percent"] = "Tu tienes %s porciento",
+    ["You have %s percent to go"] = "Tu tienes %s porciento para ir",
+    ["You may not logout during a fight"] = "No puedes salir durante una pelea",
     ["You may not logout or enter a protection zone"] = "No puedes salir o entrar en una zona de protecci<63>n",
-    ["You must enter a comment."] = false,
-    ["You must enter a valid server address and port."] = false,
-    ["You must select a character to login!"] = "Debes seleccionar un personaje para entrar!",
-    ["Your Capacity:"] = false,
-    ["You read the following, written by \n%s\n"] = false,
-    ["You read the following, written on \n%s.\n"] = false,
-    ["Your Money:"] = false,
+    ["You must enter a comment."] = "Debes introducir un comentario.",
+    ["You must enter a valid server address and port."] = "Debes introducir una direcci<63>n v<>lida de servidor y el puerto.",
+    ["You must select a character to login!"] = "<EFBFBD>Debes seleccionar un personaje para ingresar!",
+    ["Your Capacity:"] = "Tu capacidad:",
+    ["You read the following, written by \n%s\n"] = "Uno lee lo siguiente, escrito por \n%s\n",
+    ["You read the following, written on \n%s.\n"] = "Uno lee lo siguiente, escrito en \n%s\n",
+    ["Your Money:"] = "Tu dinero:",
+    ["Change language"] = "Cambiar idioma",
+    ["Don't stretch or shrink Game Window"] = "No estirar o encoger Ventana de Juego"
   }
 }
  

data/locales/pl.lua

@@ -347,7 +347,7 @@ locale = {
     ["You are dazzled"] = "Jestes oslepiony",
     ["You are dead."] = "Zginales marnie.",
     ["You are dead"] = false,
-    ["You are drowing"] = "Topisz sie",
+    ["You are drowning"] = "Topisz sie",
     ["You are drunk"] = false,
     ["You are electrified"] = "Jestes porazony pradem",
     ["You are freezing"] = "Marzniesz",

data/locales/pt.lua

@@ -5,6 +5,12 @@ 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)",
+    ["%s: (use object with crosshair)"] = "%s: (usar objeto com mira)",
+    ["%s: (use object)"] = "%s: (usar objeto)",
     ["1a) Offensive Name"] = "1a) Nome ofensivo",
     ["1b) Invalid Name Format"] = "1b) Nome com formato inv<6E>lido",
     ["1c) Unsuitable Name"] = "1c) Nome n<>o adequado",
@@ -26,48 +32,51 @@ locale = {
     ["4c) False Report to Gamemaster"] = "4c) Relat<61>rio falso para Gamemaster",
     ["Accept"] = "Aceitar",
     ["Account name"] = "Nome da conta",
-    ["Account Status:"] = false,
-    ["Action:"] = "A<EFBFBD><EFBFBD>o:",
-    ["Add"] = "Adicionar",
+    ["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",
     ["Addon 1"] = "Addon 1",
     ["Addon 2"] = "Addon 2",
     ["Addon 3"] = "Addon 3",
-    ["Add to VIP list"] = "Adicionar a lista VIP",
     ["Adjust volume"] = "Ajustar volume",
     ["Alas! Brave adventurer, you have met a sad fate.\nBut do not despair, for the gods will bring you back\ninto this world in exchange for a small sacrifice\n\nSimply click on Ok to resume your journeys!"] = false,
-    ["All"] = "Todos",
     ["All modules and scripts were reloaded."] = "Todos m<>dulos e scripts foram recarregados.",
+    ["All"] = "Todos",
     ["Allow auto chase override"] = "Permitir sobrescrever o modo de persegui<75><69>o",
     ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = "Tamb<EFBFBD>m conhecido como dash na comunidade tibiana, recomendado\npara jogar com personagem que possuam velocidade alta",
     ["Ambient light: %s%%"] = "Luz ambiente: %s%%",
-    ["Amount:"] = "Quantidade:",
     ["Amount"] = "Quantidade",
     ["Anonymous"] = "An<EFBFBD>nimo",
+    ["Any"] = "Qualquer",
     ["Are you sure you want to logout?"] = "Voc<EFBFBD> tem certeza que quer sair?",
     ["Attack"] = "Atacar",
+    ["Audio"] = "<EFBFBD>udio",
     ["Author"] = "Autor",
-    ["Autoload"] = "Carregar automaticamente",
-    ["Autoload priority"] = "Prioridade de carregamento",
-    ["Auto login"] = "Entrar automaticamente",
     ["Auto login selected character on next charlist load"] = "Entrar automaticamente com o personagem quando reabrir a lista de personagens",
+    ["Auto login"] = "Entrar automaticamente",
+    ["Autoload priority"] = "Prioridade de carregamento",
+    ["Autoload"] = "Carregar automaticamente",
     ["Axe Fighting"] = "Combate com Machado",
-    ["Balance:"] = "Saldo:",
-    ["Banishment"] = "Banimento",
+    ["Balance"] = "Saldo",
     ["Banishment + Final Warning"] = "Banimento + Aviso final",
+    ["Banishment"] = "Banimento",
     ["Battle"] = "Batalha",
     ["Browse"] = "Navegar",
     ["Bug report sent."] = "Reporte de bug enviado.",
     ["Button Assign"] = "Selecionar bot<6F>o",
-    ["Buy"] = "Comprar",
     ["Buy Now"] = "Comparar agora",
     ["Buy Offers"] = "Ofertas de compra",
     ["Buy with backpack"] = "Comprar com mochila",
+    ["Buy"] = "Comprar",
     ["Cancel"] = "Cancelar",
     ["Cannot login while already in game."] = "N<EFBFBD>o <20> possivel logar enquanto j<> estiver jogando.",
     ["Cap"] = "Cap",
     ["Capacity"] = "Capacidade",
     ["Center"] = "Centro",
+    ["Change language"] = "Trocar l<>ngua",
     ["Channels"] = "Canais",
     ["Character List"] = "Lista de personagens",
     ["Classic control"] = "Controle cl<63>ssico",
@@ -75,15 +84,17 @@ locale = {
     ["Clear Messages"] = "Limpar mensagens",
     ["Clear object"] = "Limpar objeto",
     ["Client needs update."] = "O client do jogo precisa ser atualizado",
-    ["Close"] = "Fechar",
     ["Close this channel"] = "Fechar esse canal",
+    ["Close"] = "Fechar",
     ["Club Fighting"] = "Combate com Porrete",
     ["Combat Controls"] = "Controles de combate",
-    ["Comment:"] = "Coment<EFBFBD>rio:",
+    ["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",
-    ["Cooldowns"] = false,
+    ["Cooldown"] = "Cooldown",
+    ["Cooldowns"] = "Cooldowns",
     ["Copy message"] = "Copiar mensagem",
     ["Copy name"] = "Copiar nome",
     ["Copy Name"] = "Copiar Nome",
@@ -91,25 +102,34 @@ locale = {
     ["Create mark"] = "Criar marca",
     ["Create New Offer"] = "Criar nova oferta",
     ["Create Offer"] = "Criar oferta",
-    ["Current hotkeys:"] = "Atalhos atuais",
     ["Current hotkey to add: %s"] = "Atalho atual para adicionar: %s",
+    ["Current hotkeys:"] = "Atalhos atuais",
     ["Current Offers"] = "Ofertas atuais",
     ["Default"] = "Padr<EFBFBD>o",
     ["Delete mark"] = "Deletar marca",
-    ["Description:"] = "Descri<EFBFBD><EFBFBD>o",
     ["Description"] = "Descri<EFBFBD><EFBFBD>o",
+    ["Description:"] = "Descri<EFBFBD><EFBFBD>o",
     ["Destructive Behaviour"] = "Comportamento destrutivo",
     ["Detail"] = "Detalhe",
     ["Details"] = "Detalhes",
     ["Disable Shared Experience"] = "Desativar experi<72>ncia compartilhada",
     ["Dismount"] = "Desmontar",
     ["Display connection speed to the server (milliseconds)"] = "Exibir a velocidade de conex<65>o com o servidor (milisegundos)",
+    ["Display creature health bars"] = "Exibir barras de vida das criaturas",
+    ["Display creature names"] = "Exibir nomes das criaturas",
+    ["Display text messages"] = "Exibir mensagens de texto",
     ["Distance Fighting"] = "Combate a Dist<73>ncia",
-    ["Don't stretch/shrink Game Window"] = "N<EFBFBD>o esticar a janela do game",
+    ["Don't stretch or shrink Game Window"] = "N<EFBFBD>o esticar ou contrair a janela do game",
+    ["Druid"] = "Druid",
     ["Edit hotkey text:"] = "Editar texto do atalho",
     ["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",
+    ["Enable shader effects"] = "Ativar efeitos shader",
     ["Enable Shared Experience"] = "Ativar experi<72>ncia compartilhada",
     ["Enable smart walking"] = "Ativar andar inteligente",
     ["Enable vertical synchronization"] = "Ativar sincroniza<7A><61>o vertical",
@@ -118,162 +138,174 @@ locale = {
     ["Enter one name per line."] = "Entre somente um nome por linha.",
     ["Enter with your account again to update your client."] = "Entre com sua conta denovo para atualizar o client.",
     ["Error"] = "Erro",
-    ["Error"] = "Erro",
     ["Excessive Unjustified Player Killing"] = "Assassinato em excesso, sem justificativa, de jogadores",
     ["Exclude from private chat"] = "Excluir do canal privado",
     ["Exit"] = "Sair",
     ["Experience"] = "Experi<EFBFBD>ncia",
     ["Filter list to match your level"] = "Filtrar a lista para o seu level",
     ["Filter list to match your vocation"] = "Filtrar a lista para a sua voca<63><61>o",
-    ["Find:"] = "Procurar",
+    ["Find"] = "Procurar",
     ["Fishing"] = "Pesca",
     ["Fist Fighting"] = "Porrada",
     ["Follow"] = "Seguir",
-    ["Force Exit"] = "For<EFBFBD>ar Saida",
     ["For Your Information"] = "Para sua informa<6D><61>o",
-    ["Free Account"] = false,
+    ["Force Exit"] = "For<EFBFBD>ar Saida",
+    ["Formula"] = "F<EFBFBD>rmula",
+    ["Free Account"] = "Conta Gr<47>tis",
     ["Fullscreen"] = "Tela cheia",
-    ["Game"] = "Jogo",
     ["Game framerate limit: %s"] = "Limite da taxa de quadros do jogo: %s",
-    ["Graphics"] = "Gr<EFBFBD>ficos",
-    ["Graphics card driver not detected"] = false,
+    ["Game"] = "Jogo",
+    ["Graphics card driver not detected"] = "Driver da placa de v<>deo n<>o detectado",
     ["Graphics Engine:"] = "Motor Gr<47>fico:",
+    ["Graphics"] = "Gr<EFBFBD>ficos",
+    ["Group"] = "Grupo",
     ["Head"] = "Cabe<EFBFBD>a",
-    ["Healing"] = false,
+    ["Healing"] = "Curando",
     ["Health Info"] = "Barra de Vida",
     ["Health Information"] = "Informa<EFBFBD><EFBFBD>o de vida",
     ["Hide monsters"] = "Esconder montros",
     ["Hide non-skull players"] = "Esconder jogadores sem caveira",
     ["Hide Npcs"] = "Esconder NPCs",
-    ["Hide Offline"] = false,
+    ["Hide Offline"] = "Esconder Offline",
     ["Hide party members"] = "Esconder membros do grupo",
     ["Hide players"] = "Esconder jogadores",
-    ["Hide spells for higher exp. levels"] = false,
-    ["Hide spells for other vocations"] = false,
+    ["Hide spells for higher exp. levels"] = "Esconder feiti<74>os de n<>vel maior",
+    ["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"] = false,
+    ["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"] = false,
     ["Ignore capacity"] = "Ignorar capacidade",
-    ["Ignored players:"] = false,
     ["Ignore equipped"] = "Ignorar equipado",
-    ["Ignore List"] = false,
-    ["Ignore players"] = false,
-    ["Ignore Private Messages"] = false,
-    ["Ignore Yelling"] = false,
+    ["Ignore List"] = "Lista de Ignorados",
+    ["Ignore players"] = "Jogadores ignorados",
+    ["Ignore Private Messages"] = "Ignorar mensagens privadas",
+    ["Ignore Yelling"] = "Ignorar gritos",
+    ["Ignore"] = "Ignorar",
+    ["Ignored players:"] = "Joadores ignorados:",
     ["Interface framerate limit: %s"] = "Limite da taxa de quadros da interface: %s",
     ["Inventory"] = "Invent<EFBFBD>rio",
     ["Invite to Party"] = "Convidar para o grupo",
     ["Invite to private chat"] = "Convidar para o canal privado",
     ["IP Address Banishment"] = "Banimento de endere<72>o IP",
+    ["It is empty."] = "Est<EFBFBD> vazio.",
     ["Item Offers"] = "Ofertas de items",
-    ["It is empty."] = false,
     ["Join %s's Party"] = "Entrar na party do %s",
+    ["Knight"] = "Knight",
     ["Leave Party"] = "Sair do grupo",
     ["Level"] = "N<EFBFBD>vel",
-    ["Lifetime Premium Account"] = false,
+    ["Lifetime Premium Account"] = "Conta Premium para a vida toda.",
     ["Limits FPS to 60"] = "Limita o FPS para 60",
     ["List of items that you're able to buy"] = "Lista de itens que voc<6F> pode comprar",
     ["List of items that you're able to sell"] = "Lista de itens que voc<6F> pode vender",
     ["Load"] = "Carregar",
     ["Logging out..."] = "Saindo...",
+    ["Login Error"] = "Erro de Autentica<63><61>o",
     ["Login"] = "Entrar",
-    ["Login Error"] = "Erro de Autentica<63><61>o",
-    ["Login Error"] = "Erro de Autentica<63><61>o",
     ["Logout"] = "Sair",
     ["Look"] = "Olhar",
     ["Magic Level"] = "N<EFBFBD>vel M<>gico",
     ["Make sure that your client uses\nthe correct game protocol version"] = "Tenha certeza que o seu cliente use\no mesmo protocolo do servidor do jogo",
     ["Mana"] = "Mana",
     ["Manage hotkeys:"] = "Configurar atalhos:",
-    ["Market"] = "Mercado",
     ["Market Offers"] = "Ofertas do mercado",
+    ["Market"] = "Mercado",
     ["Message of the day"] = "Mensagem do dia",
     ["Message to "] = "Mensagem para ",
     ["Message to %s"] = "Mandar mensagem para %s",
     ["Minimap"] = "Minimapa",
     ["Module Manager"] = "Gerenciador de M<>dulos",
     ["Module name"] = "Nome do m<>dulo",
-    ["Mount"] = false,
+    ["Mount"] = "Montar",
     ["Move Stackable Item"] = "Mover item cont<6E>vel",
     ["Move up"] = "Mover para cima",
+    ["Music volume: %d"] = "Volume da m<>sica: %d",
     ["My Offers"] = "Minhas ofertas",
-    ["Name:"] = "Nome:",
-    ["Name Report"] = "Reportar Nome",
-    ["Name Report + Banishment"] = "Reportar Nome + Banimento",
     ["Name Report + Banishment + Final Warning"] = "Reportar Nome + Banimento + Aviso Final",
-    ["No"] = "N<EFBFBD>o",
+    ["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",
     ["No Outfit"] = "Sem roupa",
     ["No statement has been selected."] = "Nenhuma afirma<6D><61>o foi selecionada.",
+    ["No"] = "N<EFBFBD>o",
     ["Notation"] = "Nota<EFBFBD><EFBFBD>o",
     ["NPC Trade"] = "Troca com NPC",
     ["Offer History"] = "Hist<EFBFBD>rico de ofertas",
+    ["Offer Type"] = "Tipo de oferta",
     ["Offers"] = "Ofertas",
-    ["Offer Type:"] = "Tipo de oferta:",
     ["Offline Training"] = "Treino Offline",
     ["Ok"] = "Ok",
     ["on %s.\n"] = "em %s.\n",
-    ["Open"] = "Abrir",
     ["Open a private message channel:"] = "Abrir um canal privado:",
-    ["Open charlist automatically when starting client"] = false,
+    ["Open charlist automatically when starting client"] = "Abrir lista de personagens ao iniciar o cliente",
     ["Open in new window"] = "Abrir em nova janela",
     ["Open new channel"] = "Abrir novo canal",
+    ["Open"] = "Abrir",
     ["Options"] = "Op<EFBFBD><EFBFBD>es",
     ["Overview"] = "Vis<EFBFBD>o geral",
+    ["Paladin"] = "Paladin",
     ["Pass Leadership to %s"] = "Passar lideran<61>a para %s",
     ["Password"] = "Senha",
-    ["Piece Price:"] = "Pre<EFBFBD>o por pe<70>a:",
+    ["Piece Price"] = "Pre<EFBFBD>o por pe<70>a",
     ["Please enter a character name:"] = "Por favor, entre com o nome do personagem:",
-    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, pressione a tecla que voc<6F> deseja\nadicionar no gerenciador de atalhos",
     ["Please Select"] = "Por favor, selecione algo",
     ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor, use este campo apenas para reportar defeitos. N<>o reporte viola<6C><61>o de regras aqui!",
     ["Please wait"] = "Por favor, espere",
+    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, pressione a tecla que voc<6F> deseja\nadicionar no gerenciador de atalhos",
     ["Port"] = "Porta",
-    ["Position:"] = false,
-    ["Position: %i %i %i"] = false,
-    ["Premium Account (%s) days left"] = false,
-    ["Price:"] = "Pre<EFBFBD>o",
+    ["Position"] = "Posi<EFBFBD><EFBFBD>o",
+    ["Position: %i %i %i"] = "Posi<EFBFBD><EFBFBD>o: %i %i %i",
+    ["Premium Account (%s) days left"] = "Conta Premium (%s) dias faltando",
+    ["Premium"] = "Premium",
+    ["Price"] = "Pre<EFBFBD>o",
     ["Primary"] = "Prim<EFBFBD>rio",
     ["Protocol"] = "Protocolo",
     ["Quest Log"] = "Registro de Quest",
-    ["Randomize"] = "Embaralhar",
     ["Randomize characters outfit"] = "Gerar roupa aleat<61>ria",
-    ["Reason:"] = "Motivo:",
-    ["Refresh"] = "Atualizar",
+    ["Randomize"] = "Embaralhar",
+    ["Reason"] = "Motivo",
     ["Refresh Offers"] = "Atualizar Ofertas",
+    ["Refresh"] = "Atualizar",
     ["Regeneration Time"] = "Tempo de Regenera<72><61>o",
     ["Reject"] = "Rejeitar",
     ["Reload All"] = "Recarregar Todos",
-    ["Remember account and password when starts client"] = false,
+    ["Remember account and password when starts client"] = "Lembrar conta e senha quando iniciar o cliente",
     ["Remember password"] = "Lembrar senha",
-    ["Remove"] = "Remover",
     ["Remove %s"] = "Remover %s",
+    ["Remove"] = "Remover",
     ["Report Bug"] = "Reportar defeito",
     ["Reserved for more functionality later."] = "Reservado para futura maior funcionalidade.",
+    ["Reset All"] = "Resetar Todos",
     ["Reset Market"] = "Resetar Mercado",
     ["Revoke %s's Invitation"] = "N<EFBFBD>o aceitar o convite do %s",
     ["Rotate"] = "Girar",
     ["Rule Violation"] = "Viola<EFBFBD><EFBFBD>o de regra",
-    ["Save"] = false,
-    ["Save Messages"] = false,
-    ["Search:"] = "Procurar:",
+    ["Save Messages"] = "Salvar Mensagens",
+    ["Save"] = "Salvar",
     ["Search all items"] = "Procurar todos os items",
+    ["Search"] = "Procurar",
     ["Secondary"] = "Secund<EFBFBD>rio",
     ["Select object"] = "Selecionar objeto",
     ["Select Outfit"] = "Selecionar Roupa",
-    ["Select your language"] = false,
-    ["Sell"] = "Vender",
+    ["Select your language"] = "Selecione sua l<>ngua",
+    ["Select"] = "Selecionar",
+    ["Sell All"] = "Vender Todos",
     ["Sell Now"] = "Vender agora",
     ["Sell Offers"] = "Ofertas de venda",
-    ["Send"] = "Enviar",
+    ["Sell"] = "Vender",
     ["Send automatically"] = "Enviar automaticamente",
-    ["Send Message"] = false,
-    ["Server"] = "Servidor",
+    ["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",
     ["Shielding"] = "Defesa",
     ["Show all items"] = "Exibir todos os itens",
@@ -284,57 +316,57 @@ locale = {
     ["Show info messages in console"] = "Exibir mensagens informativas no console",
     ["Show left panel"] = "Mostrar barra lateral esquerda",
     ["Show levels in console"] = "Exibir n<>veis no console",
-    ["Show Offline"] = false,
+    ["Show Offline"] = "Mostrar Offline",
     ["Show private messages in console"] = "Exibir mensagens privadas no console",
     ["Show private messages on screen"] = "Exibir mensagens na tela",
-    ["Show Server Messages"] = false,
+    ["Show Server Messages"] = "Mostrar Mensagens do Servidor",
     ["Show status messages in console"] = "Exibir mensagens de estado no console",
     ["Show Text"] = "Mostrar texto",
     ["Show timestamps in console"] = "Exibir o hor<6F>rio no console",
     ["Show your depot items only"] = "Mostrar os itens somentedo dep<65>sito",
     ["Skills"] = "Habilidades",
-    ["Soul"] = "Alma",
+    ["Sorcerer"] = "Sorcerer",
     ["Soul Points"] = "Pontos de Alma",
-    ["Special"] = false,
+    ["Soul"] = "Alma",
+    ["Special"] = "Especial",
     ["Speed"] = "Velocidade",
-    ["Spell Cooldowns"] = false,
-    ["Spell List"] = false,
+    ["Spell Cooldowns"] = "",
+    ["Spell List"] = "Lista de Feiti<74>os",
     ["Stamina"] = "Vigor",
-    ["Statement:"] = "Afirma<EFBFBD><EFBFBD>o:",
     ["Statement Report"] = "Afirmar Relato",
+    ["Statement"] = "Afirma<EFBFBD><EFBFBD>o",
     ["Statistics"] = "Estat<EFBFBD>sticas",
     ["Stop Attack"] = "Parar de Atacar",
     ["Stop Follow"] = "Parar de Seguir",
-    ["Support"] = false,
-    ["%s: (use object)"] = "%s: (usar objeto)",
-    ["%s: (use object on target)"] = "%s: (usar objeto no alvo)",
-    ["%s: (use object on yourself)"] = "%s: (usar objeto em si)",
-    ["%s: (use object with crosshair)"] = "%s: (usar objeto com mira)",
+    ["Support"] = "Suporte",
     ["Sword Fighting"] = "Combate com Espada",
     ["Terminal"] = "Terminal",
     ["There is no way."] = "N<EFBFBD>o h<> rota",
-    ["Title"] = false,
-    ["Total Price:"] = "Pre<EFBFBD>o total:",
-    ["Trade"] = "Trocar",
+    ["Title"] = "T<EFBFBD>tulo",
+    ["Total Price"] = "Pre<EFBFBD>o total",
     ["Trade with ..."] = "Trocar com ...",
+    ["Trade"] = "Trocar",
     ["Trying to reconnect in %s seconds."] = "Tentando reconectar em %s segundos.",
-    ["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",
+    ["Type"] = "Tipo",
+    ["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"] = false,
+    ["Unignore"] = "Designorar",
     ["Unload"] = "Descarregar",
-    ["Update needed"] = false,
-    ["Use"] = "Usar",
+    ["Update needed"] = "Atualiza<EFBFBD><EFBFBD>o necess<73>ria",
     ["Use on target"] = "Usar no alvo",
     ["Use on yourself"] = "Usar em si",
     ["Use with ..."] = "Usar com ...",
+    ["Use"] = "Usar",
     ["Version"] = "Vers<EFBFBD>o",
     ["VIP List"] = "Lista VIP",
     ["Voc."] = "Voc.",
-    ["Vocation"] = false,
+    ["Vocation"] = "Voca<EFBFBD><EFBFBD>o",
     ["Waiting List"] = "Lista de espera",
     ["Website"] = "Website",
-    ["Weight:"] = "Peso",
+    ["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",
@@ -342,9 +374,9 @@ locale = {
     ["You are burning"] = "Voc<EFBFBD> est<73> queimando",
     ["You are cursed"] = "Voc<EFBFBD> est<73> amaldi<64>oado",
     ["You are dazzled"] = "Voc<EFBFBD> est<73> deslumbrado",
-    ["You are dead."] = "Voc<EFBFBD> est<73> morto.",
     ["You are dead"] = "Voc<EFBFBD> est<73> morto",
-    ["You are drowing"] = "Voc<EFBFBD> est<73> se afogando",
+    ["You are dead."] = "Voc<EFBFBD> est<73> morto.",
+    ["You are drowning"] = "Voc<EFBFBD> est<73> se afogando",
     ["You are drunk"] = "Voc<EFBFBD> est<73> b<>bado",
     ["You are electrified"] = "Voc<EFBFBD> est<73> eletrificado",
     ["You are freezing"] = "Voc<EFBFBD> est<73> congelando",
@@ -356,17 +388,21 @@ locale = {
     ["You are strengthened"] = "Voc<EFBFBD> est<73> refor<6F>ado",
     ["You are within a protection zone"] = "Voc<EFBFBD> est<73> dentro de uma zona de prote<74><65>o",
     ["You can enter new text."] = "Voc<EFBFBD> pode entrar com um novo texto.",
-    ["You have %s percent"] = "Voc<EFBFBD> tem %s porcento",
+    ["You have %d%% to advance to level %d."] = "Voc<EFBFBD> tem %d%% para avan<61>ar para o n<>vel %d.",
     ["You have %s percent to go"] = "Voc<EFBFBD> tem %s porcento para avan<61>ar",
+    ["You have %s percent"] = "Voc<EFBFBD> tem %s porcento",
     ["You may not logout during a fight"] = "Voc<EFBFBD> n<>o pode sair durante um combate",
     ["You may not logout or enter a protection zone"] = "Voc<EFBFBD> n<>o pode sair ou entrar em uma zona de prote<74><65>o",
     ["You must enter a comment."] = "Voc<EFBFBD> precisa entrar com um coment<6E>rio",
     ["You must enter a valid server address and port."] = "Voc<EFBFBD> precisa colocar um endere<72>o e uma porta do servidor v<>lidos.",
     ["You must select a character to login!"] = "Voc<EFBFBD> deve selecionar um personagem para entrar!",
-    ["Your Capacity:"] = "Sua capacidade:",
     ["You read the following, written by \n%s\n"] = "Voc<EFBFBD> l<> o seguinte, escrito por \n%s\n",
-    ["You read the following, written on \n%s.\n"] = false,
-    ["Your Money:"] = "Seu dinheiro:",
+    ["You read the following, written on \n%s.\n"] = "Voc<EFBFBD> l<> o seguinte, escrito em \n%s.\n",
+    ["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/locales/sv.lua

@@ -345,7 +345,7 @@ locale = {
     ["You are dazzled"] = "Du <20>r chockad",
     ["You are dead."] = "Du <20>r d<>d.",
     ["You are dead"] = "Du <20>r d<>d",
-    ["You are drowing"] = "Du drunknar",
+    ["You are drowning"] = "Du drunknar",
     ["You are drunk"] = "Du <20>r full.",
     ["You are electrified"] = "Du <20>r elektrifierad",
     ["You are freezing"] = "Du Fryser",

data/particles/particles.otps

@@ -1,35 +1,36 @@
 Particle
-  name: default_particle
+  name: groupcooldown_particle
 
-  duration: 10
+  duration: 0.4
   min-position-radius: 0
-  max-position-radius: 256
+  max-position-radius: 32
   min-position-angle: 0
   max-position-angle: 360
   velocity: 10
   min-velocity-angle: 0
   max-velocity-angle: 360
-  colors: #ffffff00 #ffffffff #00000000
+  colors: #ffffff00 #ffffffff #fff13000
   colors-stops: 0 0.1 1
-  size: 24 24
-  texture: /data/particles/particle
+  size: 1 1
+  texture: /particles/particle
   composition-mode: normal
 
 Effect
-  name: background-effect
-  description: Effect for the game background
+  name: groupcooldown-effect
+  description: Effect for group cooldowns in the cooldown module
 
   System
     position: 0 0
 
     Emitter
       position: 0 0
-      delay: 0
-      duration: 0
-      burst-rate: 50
-      burst-count: 1
-      particle-type: default_particle
+      delay: 0.06
+      duration: 0.2
+      burst-rate: 350
+      burst-count: 50
+      particle-type: groupcooldown_particle
 
     AttractionAffector
       position: 0 0
       acceleration: 1000
+

data/styles/10-buttons.otui

@@ -67,3 +67,17 @@ PreviousButton < UIButton
 
   $disabled:
     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

@@ -4,6 +4,7 @@ TextList < UIScrollArea
   border-color: #1d222b
   background-color: #222833
   padding: 1
+  auto-focus: none
 
 HorizontalList < UIScrollArea
   layout: horizontalBox

data/styles/10-panels.otui

@@ -1,8 +1,10 @@
 Panel < UIWidget
   phantom: true
+  auto-focus: first
 
 ScrollablePanel < UIScrollArea
   phantom: true
+  auto-focus: first
 
 FlatPanel < Panel
   image-source: /images/ui/panel_flat

data/styles/10-progressbars.otui

@@ -1,9 +1,24 @@
 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:
+    visible: false
+    margin-top: 0
+    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

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-imageview.otui

@@ -0,0 +1,6 @@
+ImageView < UIImageView
+  image-smooth: false
+  image-fixed-ratio: true
+  draggable: true
+  border-width: 2
+  border-color: #000000

data/styles/20-popupmenus.otui

@@ -1,18 +1,10 @@
 PopupMenuButton < UIButton
   height: 18
-  margin-left: 5
-  margin-right: 5
-  margin-top: 1
-  margin-bottom: 1
   size: 0 21
-  text-offset: 0 0
+  text-offset: 4 0
+  text-align: left
   font: verdana-11px-antialised
 
-  image-source: /images/ui/button_popupmenu
-  image-color: white
-  image-clip: 0 0 20 20
-  image-border: 2
-
   color: #aaaaaa
   background-color: alpha
 
@@ -24,6 +16,13 @@ PopupMenuButton < UIButton
   $disabled:
     color: #555555
 
+PopupMenuShortcutLabel < Label
+  font: verdana-11px-antialised
+  text-align: right
+  anchors.fill: parent
+  margin-right: 2
+  margin-left: 5
+
 PopupMenuSeparator < UIWidget
   margin-left: 2
   margin-right: 2
@@ -39,5 +38,4 @@ PopupMenu < UIPopupMenu
   width: 50
   image-source: /images/ui/menubox
   image-border: 3
-  padding-top: 3
-  padding-bottom: 3
+  padding: 3

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-tabbars.otui

@@ -104,7 +104,7 @@ TabBarVerticalButton < UIButton
     anchors.top: parent.top
   $!first:
     anchors.top: prev.bottom
-    margin-top: 5
+    margin-top: 10
   $hover !checked:
     color: white
     icon-color: #cccccc

data/styles/20-topmenu.otui

@@ -6,6 +6,9 @@ TopButton < UIButton
   image-color: #ffffffff
   icon-color: #ffffffff
 
+  $on:
+    image-source: /images/ui/button_top_blink
+
   $hover !disabled:
     image-color: #ffffff99
     image-clip: 26 0 26 26
@@ -43,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

@@ -0,0 +1,244 @@
+MinimapFlag < UIWidget
+  size: 11 11
+  focusable: false
+
+MinimapCross < UIWidget
+  focusable: false
+  phantom: true
+  image: /images/game/minimap/cross
+  size: 16 16
+
+MinimapFloorUpButton < Button
+  size: 20 20
+  margin-right: 28
+  margin-bottom: 28
+  anchors.right: parent.right
+  anchors.bottom: parent.bottom
+  icon-source: /images/game/minimap/floor_up
+  icon-clip: 0 32 16 16
+  $pressed:
+    icon-clip: 0 0 16 16
+  $hover !pressed:
+    icon-clip: 0 16 16 16
+
+MinimapFloorDownButton < Button
+  size: 20 20
+  margin-right: 28
+  margin-bottom: 4
+  anchors.right: parent.right
+  anchors.bottom: parent.bottom
+  icon-source: /images/game/minimap/floor_down
+  icon-clip: 0 32 16 16
+  $pressed:
+    icon-clip: 0 0 16 16
+  $hover !pressed:
+    icon-clip: 0 16 16 16
+
+MinimapZoomInButton < Button
+  text: +
+  size: 20 20
+  margin-right: 4
+  margin-bottom: 28
+  anchors.right: parent.right
+  anchors.bottom: parent.bottom
+  //icon-source: /images/game/minimap/zoom_in
+
+MinimapZoomOutButton < Button
+  text: -
+  size: 20 20
+  margin-right: 4
+  margin-bottom: 4
+  anchors.right: parent.right
+  anchors.bottom: parent.bottom
+  //icon-source: /images/game/minimap/zoom_out
+
+MinimapResetButton < Button
+  !text: tr('Center')
+  size: 44 20
+  anchors.left: parent.left
+  anchors.top: parent.top
+  margin: 4
+
+Minimap < UIMinimap
+  draggable: true
+  focusable: false
+  cross: true
+  color: black
+
+  MinimapFloorUpButton
+    id: floorUp
+    @onClick: self:getParent():floorUp(1)
+
+  MinimapFloorDownButton
+    id: floorDown
+    @onClick: self:getParent():floorDown(1)
+
+  MinimapZoomInButton
+    id: zoomIn
+    @onClick: self:getParent():zoomIn()
+
+  MinimapZoomOutButton
+    id: zoomOut
+    @onClick: self:getParent():zoomOut()
+
+  MinimapResetButton
+    id: reset
+    @onClick: self:getParent():reset()
+
+
+// Minimap Flag Create Window
+
+
+MinimapFlagCheckBox < CheckBox
+  size: 15 15
+  margin-left: 2
+  image-source: /images/game/minimap/flagcheckbox
+  image-size: 15 15
+  image-border: 3
+  icon-source: /images/game/minimap/mapflags
+  icon-size: 11 11
+  icon-offset: 2 4
+  anchors.left: prev.right
+  anchors.top: prev.top
+  $!checked:
+    image-clip: 26 0 26 26
+  $hover !checked:
+    image-clip: 78 0 26 26
+  $checked:
+    image-clip: 0 0 26 26
+  $hover checked:
+    image-clip: 52 0 26 26
+
+MinimapFlagWindow < MainWindow
+  !text: tr('Create Map Mark')
+  size: 196 185
+
+  Label
+    !text: tr('Position') .. ':'
+    text-auto-resize: true
+    anchors.top: parent.top
+    anchors.left: parent.left
+    margin-top: 2
+
+  Label
+    id: position
+    text-auto-resize: true
+    anchors.top: parent.top
+    anchors.right: parent.right
+    margin-top: 2
+
+  Label
+    !text: tr('Description') .. ':'
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    margin-top: 7
+
+  TextEdit
+    id: description
+    margin-top: 3
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    anchors.right: parent.right
+
+  MinimapFlagCheckBox
+    id: flag0
+    icon-source: /images/game/minimap/flag0
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    margin-top: 6
+    margin-left: 0  
+
+  MinimapFlagCheckBox
+    id: flag1
+    icon-source: /images/game/minimap/flag1
+
+  MinimapFlagCheckBox
+    id: flag2
+    icon-source: /images/game/minimap/flag2
+
+  MinimapFlagCheckBox
+    id: flag3
+    icon-source: /images/game/minimap/flag3
+
+  MinimapFlagCheckBox
+    id: flag4
+    icon-source: /images/game/minimap/flag4
+
+  MinimapFlagCheckBox
+    id: flag5
+    icon-source: /images/game/minimap/flag5
+
+  MinimapFlagCheckBox
+    id: flag6
+    icon-source: /images/game/minimap/flag6
+
+  MinimapFlagCheckBox
+    id: flag7
+    icon-source: /images/game/minimap/flag7
+
+  MinimapFlagCheckBox
+    id: flag8
+    icon-source: /images/game/minimap/flag8
+
+  MinimapFlagCheckBox
+    id: flag9
+    icon-source: /images/game/minimap/flag9
+
+  MinimapFlagCheckBox
+    id: flag10
+    icon-source: /images/game/minimap/flag10
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    margin-top: 6
+    margin-left: 0  
+
+  MinimapFlagCheckBox
+    id: flag11
+    icon-source: /images/game/minimap/flag11
+
+  MinimapFlagCheckBox
+    id: flag12
+    icon-source: /images/game/minimap/flag12
+
+  MinimapFlagCheckBox
+    id: flag13
+    icon-source: /images/game/minimap/flag13
+
+  MinimapFlagCheckBox
+    id: flag14
+    icon-source: /images/game/minimap/flag14
+
+  MinimapFlagCheckBox
+    id: flag15
+    icon-source: /images/game/minimap/flag15
+
+  MinimapFlagCheckBox
+    id: flag16
+    icon-source: /images/game/minimap/flag16
+
+  MinimapFlagCheckBox
+    id: flag17
+    icon-source: /images/game/minimap/flag17
+
+  MinimapFlagCheckBox
+    id: flag18
+    icon-source: /images/game/minimap/flag18
+
+  MinimapFlagCheckBox
+    id: flag19
+    icon-source: /images/game/minimap/flag19
+
+  Button
+    id: okButton
+    !text: tr('Ok')
+    width: 64
+    anchors.right: next.left
+    anchors.bottom: parent.bottom
+    margin-right: 10
+
+  Button
+    id: cancelButton
+    !text: tr('Cancel')
+    width: 64
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom

init.lua

@@ -3,6 +3,7 @@
 
 -- setup logger
 g_logger.setLogFile(g_resources.getWorkDir() .. g_app.getCompactName() .. ".log")
+g_logger.info(os.date("== application started at %b %d %Y %X"))
 
 -- print first terminal message
 g_logger.info(g_app.getName() .. ' ' .. g_app.getVersion() .. ' rev ' .. g_app.getBuildRevision() .. ' (' .. g_app.getBuildCommit() .. ') built on ' .. g_app.getBuildDate() .. ' for arch ' .. g_app.getBuildArch())
@@ -47,7 +48,8 @@ g_modules.ensureModuleLoaded("game_interface")
 -- mods 1000-9999
 g_modules.autoLoadModules(9999)
 
-if g_resources.fileExists("/otclientrc") then
-  dofile("/otclientrc")
-end
+local script = '/' .. g_app.getCompactName() .. 'rc.lua'
 
+if g_resources.fileExists(script) then
+  dofile(script)
+end

modules/client/client.lua

@@ -1,5 +1,5 @@
 local musicFilename = "/sounds/startup"
-local musicChannel = g_sounds.getChannel(1)
+local musicChannel = nil
 
 function setMusic(filename)
   musicFilename = filename
@@ -11,9 +11,14 @@ function setMusic(filename)
 end
 
 function reloadScripts()
-  g_textures.clearTexturesCache()
+  g_textures.clearCache()
   g_modules.reloadModules()
-  dofile('/' .. g_app.getCompactName() .. 'rc')
+
+  local script = '/' .. g_app.getCompactName() .. 'rc'
+  if g_resources.fileExists(script) then
+    dofile(script)
+  end
+
   local message = tr('All modules and scripts were reloaded.')
 
   modules.game_textmessage.displayGameMessage(message)
@@ -48,12 +53,18 @@ function startup()
 end
 
 function init()
+  connect(g_app, { onRun = startup, 
+                   onExit = exit })
+
   g_window.setMinimumSize({ width = 600, height = 480 })
+
+  musicChannel = g_sounds.getChannel(1)
   g_sounds.preload(musicFilename)
 
   -- initialize in fullscreen mode on mobile devices
-  if g_window.getPlatformType() == "X11-EGL" then
-    g_window.setFullscreen(true)
+  if g_app.getOs() == "android" then
+    g_window.maximize()
+    --g_window.setFullscreen(true)
   else
     -- window size
     local size = { width = 800, height = 600 }
@@ -82,10 +93,16 @@ function init()
 
   g_keyboard.bindKeyDown('Ctrl+Shift+R', reloadScripts)
 
-  connect(g_app, { onRun = startup })
+  -- generate machine uuid, this is a security measure for storing passwords
+  if not g_crypt.setMachineUUID(g_configs.get('uuid')) then
+    g_configs.set('uuid', g_crypt.getMachineUUID())
+    g_configs.save()
+  end                   
 end
 
 function terminate()
+  disconnect(g_app, { onRun = startup, 
+                      onExit = exit })
   -- save window configs
   g_settings.set('window-size', g_window.getUnmaximizedSize())
   g_settings.set('window-pos', g_window.getUnmaximizedPos())
@@ -96,3 +113,7 @@ function terminate()
     g_settings.set('protocol-version', protocolVersion)
   end
 end
+
+function exit()
+  g_logger.info("Exiting application..")
+end

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_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 })
@@ -25,7 +26,6 @@ function terminate()
 
   g_effects.cancelFade(background:getChildById('clientVersionLabel'))
   background:destroy()
-  background = nil
 
   Background = nil
 end
@@ -41,3 +41,7 @@ end
 function hideVersionLabel()
   background:getChildById('clientVersionLabel'):hide()
 end
+
+function setVersionText(text)
+  clientVersionLabel:setText(text)
+end

modules/client_entergame/characterlist.lua

@@ -13,25 +13,21 @@ local resendWaitEvent
 local function tryLogin(charInfo, tries)
   tries = tries or 1
 
-  if tries > 4 then
-    CharacterList.destroyLoadBox()
-    displayErrorBox(tr('Error'), tr('Unable to logout.'))
+  if tries > 50 then
     return
   end
 
   if g_game.isOnline() then
     if tries == 1 then
       g_game.safeLogout()
-      loadBox = displayCancelBox(tr('Please wait'), tr('Logging out...'))
     end
-    scheduleEvent(function() tryLogin(charInfo, tries+1) end, 250)
+    scheduleEvent(function() tryLogin(charInfo, tries+1) end, 100)
     return
   end
 
-  CharacterList.destroyLoadBox()
+  CharacterList.hide()
 
-  local locale = modules.client_locales.getCurrentLocale().name
-  g_game.loginWorld(G.account, G.password, charInfo.worldName, charInfo.worldHost, charInfo.worldPort, charInfo.characterName, locale)
+  g_game.loginWorld(G.account, G.password, charInfo.worldName, charInfo.worldHost, charInfo.worldPort, charInfo.characterName)
 
   loadBox = displayCancelBox(tr('Please wait'), tr('Connecting to game server...'))
   connect(loadBox, { onCancel = function()
@@ -41,7 +37,8 @@ local function tryLogin(charInfo, tries)
                                 end })
 
   -- save last used character
-  g_settings.set('lastUsedCharacter', charInfo.characterName)
+  g_settings.set('last-used-character', charInfo.characterName)
+  g_settings.set('last-used-world', charInfo.worldName)
 end
 
 local function updateWait(timeStart, timeEnd)
@@ -114,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()
@@ -227,12 +225,15 @@ function CharacterList.create(characters, account, otui)
 
     connect(widget, { onDoubleClick = function () CharacterList.doLogin() return true end } )
 
-    if i == 1 or g_settings.get('lastUsedCharacter') == widget.characterName then
+    if i == 1 or (g_settings.get('last-used-character') == widget.characterName and g_settings.get('last-used-world') == widget.worldName) then
       focusLabel = widget
     end
   end
 
-  characterList:focusChild(focusLabel, ActiveFocusReason)
+  if focusLabel then
+    characterList:focusChild(focusLabel, KeyboardFocusReason)
+    addEvent(function() characterList:ensureChildVisible(focusLabel) end)
+  end
 
   -- account
   if account.premDays > 0 and account.premDays < 65535 then

modules/client_entergame/characterlist.otui

@@ -1,33 +1,36 @@
 CharacterWidget < UIWidget
   height: 14
-  focusable: true
   background-color: alpha
-  @onFocusChange: |
+  &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: name
-    color: #ffffff
+    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: true
 
-    $!on:
-      color: #aaaaaa
+    $on:
+      color: #ffffff
 
   Label
     id: worldName
     color: #ffffff
+    color: #aaaaaa
     anchors.top: parent.top
     anchors.right: parent.right
     margin-right: 5
@@ -35,10 +38,9 @@ CharacterWidget < UIWidget
     text-auto-resize: true
     background-color: alpha
     &baseText: '(%s)'
-    on: true
 
-    $!on:
-      color: #aaaaaa
+    $on:
+      color: #ffffff
 
 MainWindow
   id: charactersWindow
@@ -61,6 +63,7 @@ MainWindow
     padding: 1
     focusable: false
     vertical-scrollbar: characterListScrollBar
+    auto-focus: first
 
   VerticalScrollBar
     id: characterListScrollBar
@@ -73,7 +76,7 @@ MainWindow
 
   Label
     id: accountStatusCaption
-    !text: tr('Account Status:')
+    !text: tr('Account Status') .. ':'
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.bottom: next.top

modules/client_entergame/entergame.lua

@@ -7,6 +7,8 @@ local motdWindow
 local motdButton
 local enterGameButton
 local protocolBox
+local protocolLogin
+local motdEnabled = true
 
 -- private functions
 local function onError(protocol, message, errorCode)
@@ -26,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)
+  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
 
@@ -44,28 +62,33 @@ local function onCharacterList(protocol, characters, account, otui)
   CharacterList.create(characters, account, otui)
   CharacterList.show()
 
+  if motdEnabled then
     local lastMotdNumber = g_settings.getNumber("motd")
     if G.motdNumber and G.motdNumber ~= lastMotdNumber then
       g_settings.set("motd", motdNumber)
-    local motdBox = displayInfoBox(tr('Message of the day'), G.motdMessage)
-    connect(motdBox, { onOk = CharacterList.show })
+      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))
+  protocolBox:setTooltip("Supports Client" .. (#clients > 1 and "s" or "") .. ": " .. table.tostring(clients))
 end
 
 local function onUpdateNeeded(protocol, signature)
   loadBox:destroy()
   loadBox = nil
 
-  if updateFunc then
+  if EnterGame.updateFunc then
     local continueFunc = EnterGame.show
     local cancelFunc = EnterGame.show
-    updateFunc(signature, continueFunc, cancelFunc)
+    EnterGame.updateFunc(signature, continueFunc, cancelFunc)
+  else
+    local errorBox = displayErrorBox(tr('Update needed'), tr('Your client needs update, try redownloading it.'))
+    connect(errorBox, { onOk = EnterGame.show })
   end
 end
 
@@ -77,12 +100,12 @@ 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')
@@ -90,20 +113,15 @@ function EnterGame.init()
 
   if port == nil or port == 0 then port = 7171 end
 
-  enterGame:getChildById('accountNameTextEdit'):setText(account)
-  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)
-  enterGame:getChildById('accountNameTextEdit'):focus()
 
   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)
   end
@@ -123,17 +141,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
   if motdWindow then
     motdWindow:destroy()
     motdWindow = nil
@@ -142,7 +163,14 @@ function EnterGame.terminate()
     motdButton:destroy()
     motdButton = nil
   end
-  protocolBox = nil
+  if loadBox then
+    loadBox:destroy()
+    loadBox = nil
+  end
+  if protocolLogin then
+    protocolLogin:cancelLogin()
+    protocolLogin = nil
+  end
   EnterGame = nil
 end
 
@@ -165,6 +193,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()
@@ -174,7 +214,6 @@ 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()
@@ -192,8 +231,8 @@ function EnterGame.doLogin()
   g_settings.set('host', G.host)
   g_settings.set('port', G.port)
 
-  local protocolLogin = ProtocolLogin.create()
-  protocolLogin.onError = onError
+  protocolLogin = ProtocolLogin.create()
+  protocolLogin.onLoginError = onError
   protocolLogin.onMotd = onMotd
   protocolLogin.onCharacterList = onCharacterList
   protocolLogin.onUpdateNeeded = onUpdateNeeded
@@ -212,8 +251,7 @@ function EnterGame.doLogin()
   end
 
   if modules.game_things.isLoaded() then
-    local locale = modules.client_locales.getCurrentLocale().name
-    protocolLogin:login(G.host, G.port, G.account, G.password, locale)
+    protocolLogin:login(G.host, G.port, G.account, G.password)
   else
     loadBox:destroy()
     loadBox = nil
@@ -222,7 +260,7 @@ function EnterGame.doLogin()
 end
 
 function EnterGame.displayMotd()
-  if not motdWindow or not motdWindow:isVisible() then
+  if not motdWindow then
     motdWindow = displayInfoBox(tr('Message of the day'), G.motdMessage)
     motdWindow.onOk = function() motdWindow = nil end
   end
@@ -241,10 +279,6 @@ function EnterGame.setDefaultServer(host, port, protocol)
     protocolBox:setCurrentOption(protocol)
     accountTextEdit:setText('')
     passwordTextEdit:setText('')
-
-    if autoLoginEvent then
-      autoLoginEvent:cancel()
-    end
   end
 end
 
@@ -272,6 +306,11 @@ function EnterGame.setUniqueServer(host, port, protocol, windowWidth, windowHeig
   protocolLabel:setVisible(false)
   protocolLabel:setHeight(0)
 
+  local serverListButton = enterGame:getChildById('serverListButton')
+  serverListButton:setVisible(false)
+  serverListButton:setHeight(0)
+  serverListButton:setWidth(0)
+
   local rememberPasswordBox = enterGame:getChildById('rememberPasswordBox')
   rememberPasswordBox:setMarginTop(-5)
 
@@ -286,3 +325,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,13 +58,22 @@ EnterGameWindow
     margin-top: 8
     text-auto-resize: true
 
+  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 protocol version')
     anchors.left: parent.left
-    anchors.right: parent.right
+    anchors.right: serverListButton.left
     anchors.top: serverLabel.bottom
     margin-top: 2
+    margin-right: 4
 
   MenuLabel
     id: protocolLabel
@@ -66,6 +92,10 @@ EnterGameWindow
     margin-top: 2
     margin-right: 3
     width: 90
+    @onSetup: |
+      for _, proto in pairs(g_game.getSupportedProtocols()) do
+        self:addOption(proto)
+      end
 
   MenuLabel
     id: portLabel
@@ -103,9 +133,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()
@@ -116,3 +145,4 @@ EnterGameWindow
     anchors.bottom: parent.bottom
     anchors.left: parent.left
     color: green
+    text-auto-resize: true

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

@@ -17,14 +17,22 @@ end
 function createWindow()
   localesWindow = g_ui.displayUI('locales')
   local localesPanel = localesWindow:getChildById('localesPanel')
+  local layout = localesPanel:getLayout()
+  local spacing = layout:getCellSpacing()
+  local size = layout:getCellSize()
 
+  local count = 0
   for name,locale in pairs(installedLocales) do
     local widget = g_ui.createWidget('LocalesButton', localesPanel)
     widget:setImageSource('/images/flags/' .. name .. '')
     widget:setText(locale.languageName)
     widget.onClick = function() selectFirstLocale(name) end
+    count = count + 1
   end
 
+  count = math.max(1, math.min(count, 3))
+  localesPanel:setWidth(size.width*count + spacing*(count-1))
+
   addEvent(function() addEvent(function() localesWindow:raise() localesWindow:focus() end) end)
 end
 
@@ -61,7 +69,7 @@ function init()
     pdebug('Using configured locale: ' .. userLocaleName)
   else
     setLocale(defaultLocaleName)
-    connect(g_app, {onRun = createWindow})
+    connect(g_app, { onRun = createWindow })
   end
 
   ProtocolGame.registerExtendedOpcode(ExtendedIds.Locale, onExtendedLocales)
@@ -73,6 +81,7 @@ function terminate()
   currentLocale = nil
 
   ProtocolGame.unregisterExtendedOpcode(ExtendedIds.Locale)
+  disconnect(g_app, { onRun = createWindow })
   disconnect(g_game, { onGameStart = onGameStart })
 end
 
@@ -101,6 +110,8 @@ function installLocale(locale)
     error('Unable to install locale.')
   end
 
+  if _G.allowedLocales and not _G.allowedLocales[locale.name] then return end
+
   if locale.name ~= defaultLocaleName then
     local updatesNeeded = 0
     for _i,k in pairs(neededTranslations) do
@@ -110,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
 
@@ -130,10 +141,14 @@ end
 
 function setLocale(name)
   local locale = installedLocales[name]
+  if locale == currentLocale then return end
   if not locale then
     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
@@ -167,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_locales/locales.otui

@@ -24,8 +24,6 @@ UIWindow
 
   Panel
     id: localesPanel
-    !width: 96*3 + 32*3
-    margin-left: 16
     margin-top: 50
     anchors.horizontalCenter: parent.horizontalCenter
     anchors.top: prev.bottom

modules/client_locales/neededtranslations.lua

@@ -339,7 +339,7 @@ neededTranslations = {
   "You are dazzled",
   "You are dead.",
   "You are dead",
-  "You are drowing",
+  "You are drowning",
   "You are drunk",
   "You are electrified",
   "You are freezing",

modules/client_modulemanager/modulemanager.lua

@@ -20,18 +20,16 @@ function init()
   addEvent(listModules)
 end
 
-function hideButton()
-  moduleManagerButton:hide()
-end
-
 function terminate()
   moduleManagerWindow:destroy()
-  moduleManagerWindow = nil
   moduleManagerButton:destroy()
-  moduleManagerButton = nil
   moduleList = nil
 end
 
+function disable()
+  moduleManagerButton:hide()
+end
+
 function hide()
   moduleManagerWindow:hide()
 end

modules/client_options/audio.otui

@@ -0,0 +1,28 @@
+Panel
+  OptionCheckBox
+    id: enableAudio
+    !text: tr('Enable audio')
+
+  OptionCheckBox
+    id: enableMusicSound
+    !text: tr('Enable music sound')
+
+  Label
+    id: musicSoundVolumeLabel
+    !text: tr('Music volume: %d', 100)
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 6
+    @onSetup: |
+      local value = modules.client_options.getOption('musicSoundVolume')
+      self:setText(tr('Music volume: %d', value))
+
+  OptionScrollbar
+    id: musicSoundVolume
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 3
+    minimum: 0
+    maximum: 100

modules/client_options/game.otui

@@ -13,13 +13,9 @@ Panel
     !tooltip: tr('Will detect when to use diagonal step based on the\nkeys you are pressing')
 
   OptionCheckBox
-    id: walkBooster
-    !text: tr('Enable walk booster')
-    !tooltip: tr('Also known as dash in tibia community, recommended\nfor playing characters with high speed')
-
-  OptionCheckBox
-    id: enableMusic
-    !text: tr('Enable music')
+    id: dashWalk
+    !text: tr('Enable dash walking')
+    !tooltip: tr('Will boost your walk on high speed characters')
 
   OptionCheckBox
     id: showPing
@@ -30,6 +26,18 @@ Panel
     id: showLeftPanel
     !text: tr('Show left panel')
 
+  OptionCheckBox
+    id: displayNames
+    !text: tr('Display creature names')
+
+  OptionCheckBox
+    id: displayHealth
+    !text: tr('Display creature health bars')
+
+  OptionCheckBox
+    id: displayText
+    !text: tr('Display text messages')
+
   Button
     id: changeLocale
     !text: tr('Change language')
@@ -37,3 +45,4 @@ Panel
     anchors.top: prev.bottom
     anchors.left: prev.left
     margin-top: 5
+    width: 120

modules/client_options/graphics.otui

@@ -1,25 +1,10 @@
-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
-  Label
-    !text: tr('Graphics Engine:')
-    anchors.left: parent.left
-    anchors.top: parent.top
-
   ButtonBox
     id: opengl1
-    anchors.left: prev.right
-    anchors.verticalCenter: prev.verticalCenter
+    anchors.left: parent.left
+    anchors.top: parent.top
     text: OpenGL 1
     size: 80 20
-    margin-left: 6
 
   ButtonBox
     id: opengl2
@@ -29,6 +14,14 @@ Panel
     size: 80 20
     margin-left: 4
 
+  ButtonBox
+    id: directx9
+    anchors.left: prev.right
+    anchors.verticalCenter: prev.verticalCenter
+    text: DirectX 9
+    size: 80 20
+    margin-left: 4
+
   OptionCheckBox
     id: vsync
     !text: tr('Enable vertical synchronization')
@@ -39,12 +32,13 @@ Panel
     !text: tr('Show frame rate')
 
   OptionCheckBox
-    id: fullscreen
-    !text: tr('Fullscreen')
+    id: enableLights
+    !text: tr('Enable lights')
 
   OptionCheckBox
-    id: dontStretchShrink
-    !text: tr("Don't stretch or shrink Game Window")
+    id: fullscreen
+    !text: tr('Fullscreen')
+    tooltip: Ctrl+Shift+F
 
   Label
     id: backgroundFrameRateLabel
@@ -52,7 +46,7 @@ Panel
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: prev.bottom
-    margin-top: 16
+    margin-top: 6
     @onSetup: |
       local value = modules.client_options.getOption('backgroundFrameRate')
       local text = value
@@ -62,7 +56,7 @@ Panel
 
       self:setText(tr('Game framerate limit: %s', text))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: backgroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
@@ -86,7 +80,7 @@ Panel
 
       self:setText(tr('Interface framerate limit: %s', text))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: foregroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
@@ -105,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

@@ -1,52 +1,71 @@
 local defaultOptions = {
   vsync = false,
-  showFps = true,
-  showPing = true,
+  showFps = false,
+  showPing = false,
   fullscreen = false,
-  dontStretchShrink = false,
   classicControl = false,
-  walkBooster = false,
   smartWalk = false,
+  dashWalk = false,
   autoChaseOverride = true,
   showStatusMessagesInConsole = true,
   showEventMessagesInConsole = true,
   showInfoMessagesInConsole = true,
   showTimestampsInConsole = true,
   showLevelsInConsole = true,
-  showPrivateMessagesInConsole = false,
+  showPrivateMessagesInConsole = true,
   showPrivateMessagesOnScreen = true,
-  enableMusic = true,
   showLeftPanel = false,
   foregroundFrameRate = 61,
   backgroundFrameRate = 201,
-  ambientLight = 15,
-  painterEngine = 0
+  painterEngine = 0,
+  enableAudio = true,
+  enableMusicSound = true,
+  musicSoundVolume = 100,
+  enableLights = true,
+  ambientLight = 25,
+  displayNames = true,
+  displayHealth = true,
+  displayText = true
 }
 
-local warningWindow
 local optionsWindow
 local optionsButton
 local optionsTabBar
 local options = {}
-local gamePanel
+local generalPanel
 local consolePanel
 local graphicsPanel
+local soundPanel
+local audioButton
 
 local function setupGraphicsEngines()
   local enginesRadioGroup = UIRadioGroup.create()
   local ogl1 = graphicsPanel:getChildById('opengl1')
   local ogl2 = graphicsPanel:getChildById('opengl2')
+  local dx9 = graphicsPanel:getChildById('directx9')
   enginesRadioGroup:addWidget(ogl1)
   enginesRadioGroup:addWidget(ogl2)
+  enginesRadioGroup:addWidget(dx9)
 
+  if g_window.getPlatformType() == 'WIN32-EGL' then
+    enginesRadioGroup:selectWidget(dx9)
+    ogl1:setEnabled(false)
+    ogl2:setEnabled(false)
+    dx9:setEnabled(true)
+  else
+    ogl1:setEnabled(g_graphics.isPainterEngineAvailable(1))
+    ogl2:setEnabled(g_graphics.isPainterEngineAvailable(2))
+    dx9:setEnabled(false)
     if g_graphics.getPainterEngine() == 2 then
       enginesRadioGroup:selectWidget(ogl2)
     else
       enginesRadioGroup:selectWidget(ogl1)
     end
 
-  ogl1:setEnabled(g_graphics.isPainterEngineAvailable(1))
-  ogl2:setEnabled(g_graphics.isPainterEngineAvailable(2))
+    if g_app.getOs() ~= 'windows' then
+      dx9:hide()
+    end
+  end
 
   enginesRadioGroup.onSelectionChange = function(self, selected)
     if selected == ogl1 then
@@ -62,75 +81,58 @@ local function setupGraphicsEngines()
   end
 end
 
-function displayWarning(widget, warning)
-  if warningWindow and warningWindow:isVisible() then
-    return
-  end
-  if widget:isChecked() then
-    local yesCallback = function() warningWindow:destroy() warningWindow=nil end
-    local noCallback = function() widget:setChecked(false) warningWindow:destroy() warningWindow=nil end
-
-    warningWindow = displayGeneralBox('Warning', tr(warning), {
-      { text='Yes', callback=yesCallback },
-      { text='No', callback=noCallback },
-      anchor=AnchorHorizontalCenter}, yesCallback, noCallback)
-  end
-end
-
 function init()
-  -- 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))
+    options[k] = v
   end
-  end
-
-  g_keyboard.bindKeyDown('Ctrl+D', function() toggle() end)
-  g_keyboard.bindKeyDown('Ctrl+F', function() toggleOption('fullscreen') end)
-  g_keyboard.bindKeyDown('Ctrl+Shift+D', function() toggleOption('walkBooster') end)
 
   optionsWindow = g_ui.displayUI('options')
   optionsWindow:hide()
-  optionsButton = modules.client_topmenu.addLeftButton('optionsButton', tr('Options') .. ' (Ctrl+D)', '/images/topbuttons/options', toggle)
 
   optionsTabBar = optionsWindow:getChildById('optionsTabBar')
   optionsTabBar:setContentWidget(optionsWindow:getChildById('optionsTabContent'))
 
-  gamePanel = g_ui.loadUI('game')
-  optionsTabBar:addTab(tr('Game'), gamePanel)
+  g_keyboard.bindKeyDown('Ctrl+Shift+F', function() toggleOption('fullscreen') end)
+  g_keyboard.bindKeyDown('Ctrl+N', toggleDisplays)
+
+  generalPanel = g_ui.loadUI('game')
+  optionsTabBar:addTab(tr('Game'), generalPanel, '/images/optionstab/game')
 
   consolePanel = g_ui.loadUI('console')
-  optionsTabBar:addTab(tr('Console'), consolePanel)
+  optionsTabBar:addTab(tr('Console'), consolePanel, '/images/optionstab/console')
 
   graphicsPanel = g_ui.loadUI('graphics')
-  optionsTabBar:addTab(tr('Graphics'), graphicsPanel)
+  optionsTabBar:addTab(tr('Graphics'), graphicsPanel, '/images/optionstab/graphics')
 
-  if g_game.isOfficialTibia() then
-    local optionWalkBooster = gamePanel:getChildById('walkBooster')
-    optionWalkBooster.onCheckChange = function(widget)
-      displayWarning(widget, "This feature could be detectable by official Tibia servers. Would like to continue?")
-      setOption(widget:getId(), widget:isChecked())
-    end
-  end
+  audioPanel = g_ui.loadUI('audio')
+  optionsTabBar:addTab(tr('Audio'), audioPanel, '/images/optionstab/audio')
 
-  setupGraphicsEngines()
+  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+D')
-  g_keyboard.unbindKeyDown('Ctrl+F')
-  g_keyboard.unbindKeyDown('Ctrl+Shift+D')
+  g_keyboard.unbindKeyDown('Ctrl+Shift+F')
+  g_keyboard.unbindKeyDown('Ctrl+N')
   optionsWindow:destroy()
-  optionsWindow = nil
   optionsButton:destroy()
-  optionsButton = nil
-  optionsTabBar = nil
-  gamePanel = nil
-  consolePanel = nil
-  graphicsPanel = nil
+  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()
@@ -151,77 +153,91 @@ function hide()
   optionsWindow:hide()
 end
 
-function toggleOption(key)
-  local optionWidget = optionsWindow:recursiveGetChildById(key)
-  if optionWidget then
-    optionWidget:setChecked(not getOption(key))
+function toggleDisplays()
+  if options['displayNames'] and options['displayHealth'] then
+    setOption('displayNames', false)
+  elseif options['displayHealth'] then
+    setOption('displayHealth', false)
   else
-    setOption(key, not getOption(key))
+    if not options['displayNames'] and not options['displayHealth'] then
+      setOption('displayNames', true)
+    else
+      setOption('displayHealth', true)
+    end
   end
 end
 
-function setOption(key, value)
-  if options[key] == value then return end
+function toggleOption(key)
+  setOption(key, not getOption(key))
+end
+
+function setOption(key, value, force)
+  if not force and options[key] == value then return end
+  local gameMapPanel = modules.game_interface.getMapPanel()
+
   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)
-  elseif key == 'dontStretchShrink' then
-    addEvent(function()
-      modules.game_interface.updateStretchShrink()
-    end)
-  elseif key == 'enableMusic' then
+  elseif key == 'enableAudio' then
     g_sounds.setAudioEnabled(value)
+    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)
+    audioPanel:getChildById('musicSoundVolumeLabel'):setText(tr('Music volume: %d', value))
   elseif key == 'showLeftPanel' then
-    addEvent(function()
     modules.game_interface.getLeftPanel():setOn(value)
-    end)
   elseif key == 'backgroundFrameRate' then
-    local text = value
-    if value <= 0 or value >= 201 then
-      text = 'max'
-      value = 0
-    end
-
-    if graphicsPanel then
+    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))
-    end
-    g_app.setBackgroundPaneMaxFps(value)
+    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
+    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))
-    end
-    g_app.setForegroundPaneMaxFps(value)
+    g_app.setForegroundPaneMaxFps(v)
+  elseif key == 'enableLights' then
+    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 = rootWidget:recursiveGetChildById('gameMapPanel')
-      if graphicsPanel then
     graphicsPanel:getChildById('ambientLightLabel'):setText(tr('Ambient light: %s%%', value))
-      end
-      if map then
-        map:setMinimumAmbientLight(value/100)
-        map:setDrawLights(value < 100)
-      end
-    end)
+    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)
+  elseif key == 'displayHealth' then
+    gameMapPanel:setDrawHealthBars(value)
+  elseif key == 'displayText' then
+    gameMapPanel:setDrawTexts(value)
   end
+
+  -- change value for keybind updates
+  for _,panel in pairs(optionsTabBar:getTabsPanel()) do
+    local widget = panel:recursiveGetChildById(key)
+    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
+
   g_settings.set(key, value)
   options[key] = value
 end
@@ -230,4 +246,10 @@ function getOption(key)
   return options[key]
 end
 
+function addTab(name, panel, icon)
+  optionsTabBar:addTab(name, panel, icon)
+end
 
+function addButton(name, func, icon)
+  optionsTabBar:addButton(name, func, icon)
+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,27 +13,31 @@ 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')
-  size: 350 310
+  size: 480 340
 
   @onEnter: modules.client_options.hide()
   @onEscape: modules.client_options.hide()
 
-  TabBarRounded
+  TabBarVertical
     id: optionsTabBar
     anchors.top: parent.top
     anchors.left: parent.left
-    anchors.right: parent.right
+    anchors.bottom: parent.bottom
 
   Panel
     id: optionsTabContent
-    anchors.top: optionsTabBar.bottom
-    anchors.left: parent.left
+    anchors.top: optionsTabBar.top
+    anchors.left: optionsTabBar.right
     anchors.right: parent.right
-    anchors.bottom: parent.bottom
-    margin-top: 10
+    anchors.bottom: optionsTabBar.bottom
+    margin-left: 10
 
   Button
     !text: tr('Ok')

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.getSupportedProtocols()) 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!')
@@ -106,5 +115,5 @@ function onRecv(protocol, message)
 end
 
 function onError(protocol, message, code)
-  perror('Could not send statistics: ' .. message)
+  pdebug('Could not send statistics: ' .. message)
 end

modules/client_styles/styles.lua

@@ -1,24 +1,27 @@
 function init()
-  local styles = g_resources.listDirectoryFiles('/styles')
-  for _i,style in pairs(styles) do
-    if string.ends(style, '.otui') then
-        g_ui.importStyle('/styles/' .. style)
+  local files
+  files = g_resources.listDirectoryFiles('/styles')
+  for _,file in pairs(files) do
+    if g_resources.isFileType(file, 'otui') then
+      g_ui.importStyle('/styles/' .. file)
     end
   end
 
-  local fonts = g_resources.listDirectoryFiles('/fonts')
-  for _i,font in pairs(fonts) do
-    if string.ends(font, '.otfont') then
-      g_fonts.importFont('/fonts/' .. font)
+  files = g_resources.listDirectoryFiles('/fonts')
+  for _,file in pairs(files) do
+    if g_resources.isFileType(file, 'otfont') then
+      g_fonts.importFont('/fonts/' .. file)
     end
   end
 
-  local particles = g_resources.listDirectoryFiles('/particles')
-  for _i,particle in pairs(particles) do
-    if string.ends(particle, '.otps') then
-      g_particles.importParticle('/particles/' .. particle)
+  files = g_resources.listDirectoryFiles('/particles')
+  for _,file in pairs(files) do
+    if g_resources.isFileType(file, 'otps')then
+      g_particles.importParticle('/particles/' .. file)
     end
   end
+
+  g_mouse.loadCursors('/cursors/cursors')
 end
 
 function terminate()

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
-    end
-  end
+local function pcolored(text, color)
+  color = color or 'white'
+  modules.client_terminal.addLine(tostring(text), color)
 end
 
-function drawDebugBoxes(enable)
-  if enable == nil then enable = true end
-  g_ui.setDebugBoxesDrawing(enable)
+function draw_debug_boxes()
+  g_ui.setDebugBoxesDrawing(not g_ui.isDrawingDebugBoxes())
 end
 
-function hideMap()
-  local map = rootWidget:recursiveGetChildById('gameMapPanel')
-  if map then map:hide() end
+function hide_map()
+  modules.game_interface.getMapPanel():hide()
 end
 
-function showMap()
-  local map = rootWidget:recursiveGetChildById('gameMapPanel')
-  if map then map:show() end
+function show_map()
+  modules.game_interface.getMapPanel():show()
 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)
+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
+
+  if not hasFile then
+    pcolored('ERROR: unable to find any 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 ' .. name, 'green')
+        modules.client_terminal.flushLines()
+        module:reload()
+        files[filepath] = newtime
+
+        if name == 'client_terminal' then
+          modules.client_terminal.show()
+        end
+        break
+      end
+    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
+
+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
-      g_tooltip.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 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)
+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
-        label:hide()
+      pcolored(path .. v)
     end
-    end, 100)
+  end
+end
+
+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 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
-    removeEvent(label.event)
-    label.event = nil
-    label:hide()
+      pcolored(m:getName() .. ' => not loaded', 'red')
+    end
   end
 end
-
-function autoReloadModule(name)
-  local function reloadEvent()
-    reloadModule(name)
-    scheduleEvent(reloadEvent, 1000)
-  end
-  reloadEvent()
-end
-
-function createDebugUIItem(id)
-  local uiitem = g_ui.createWidget('Item', rootWidget)
-  uiitem:setPosition({x= 200, y = 200 })
-  uiitem:setItemId(id)
-  uiitem:show()
-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)
@@ -25,6 +36,7 @@ local function navigateCommand(step)
     if currentHistoryIndex > 0 then
       local command = commandHistory[numCommands - currentHistoryIndex + 1]
       commandTextEdit:setText(command)
+      commandTextEdit:setCursorPos(-1)
     else
       commandTextEdit:clearText()
     end
@@ -52,6 +64,7 @@ local function completeCommand()
   -- complete command with one match
   if #possibleCommands == 1 then
     commandTextEdit:setText(possibleCommands[1])
+    commandTextEdit:setCursorPos(-1)
   -- show command matches
   elseif #possibleCommands > 0 then
     print('>> ' .. commandBegin)
@@ -75,6 +88,7 @@ local function completeCommand()
       end
     end
     commandTextEdit:setText(commandBegin)
+      commandTextEdit:setCursorPos(-1)
 
     for i,v in ipairs(possibleCommands) do
       print(v)
@@ -93,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
 
@@ -109,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)
@@ -134,36 +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)
+
+  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)
-  terminalButton:destroy()
-  terminalButton = nil
-  commandTextEdit = nil
-  terminalBuffer = nil
   terminalWindow:destroy()
-  terminalWindow = nil
+  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
@@ -178,34 +244,55 @@ function hide()
   terminalWindow:hide()
 end
 
-function addLine(text, color)
+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
-  local numLines = terminalBuffer:getChildCount() + 1
     if numLines > MaxLogLines then
+      local len = #terminalBuffer:getChildByIndex(1):getText()
       terminalBuffer:getChildByIndex(1):destroy()
+      table.remove(allLines, 1)
+      fulltext = string.sub(fulltext, len)
     end
 
-  -- create new line label
     local label = g_ui.createWidget('TerminalLabel', terminalBuffer)
     label:setId('terminalLabel' .. numLines)
-  label:setText(text)
-  label:setColor(color)
+    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)
+  if not flushEvent then
+    flushEvent = scheduleEvent(flushLines, 10)
+  end
+
+  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
@@ -218,15 +305,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
 
@@ -237,8 +342,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,71 @@ 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
 
   ResizeBorder
     id: bottomResizeBorder

modules/client_topmenu/topmenu.lua

@@ -14,12 +14,15 @@ local function addButton(id, description, icon, callback, panel, toggle, front)
     class = 'TopButton'
   end
 
-  local button = g_ui.createWidget(class)
+  local button = panel:getChildById(id)
+  if not button then
+    button = g_ui.createWidget(class)
     if front then
       panel:insertChild(1, button)
     else
       panel:addChild(button)
     end
+  end
   button:setId(id)
   button:setTooltip(description)
   button:setIcon(resolvepath(icon, 3))
@@ -34,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')
 
@@ -43,24 +48,71 @@ 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 })
-
-  leftButtonsPanel = nil
-  rightButtonsPanel = nil
-  leftGameButtonsPanel = nil
-  rightGameButtonsPanel = nil
+  disconnect(g_game, { onGameStart = online,
+                       onGameEnd = offline,
+                       onPingBack = updatePing })
+  disconnect(g_app, { onFps = updateFps })
 
   topMenu:destroy()
-  topMenu = nil
+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)
@@ -95,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

@@ -19,6 +19,10 @@ KeyboardFocusReason = 1
 ActiveFocusReason = 2
 OtherFocusReason = 3
 
+AutoFocusNone = 0
+AutoFocusFirst = 1
+AutoFocusLast = 2
+
 KeyboardNoModifier = 0
 KeyboardCtrlModifier = 1
 KeyboardAltModifier = 2
@@ -296,7 +300,7 @@ KeyCodeDescs = {
   [KeyNumpad6] = 'Numpad6',
   [KeyNumpad7] = 'Numpad7',
   [KeyNumpad8] = 'Numpad8',
-  [KeyNumpad9] = 'Numpad9'
+  [KeyNumpad9] = 'Numpad9',
 }
 
 NetworkMessageTypes = {
@@ -307,5 +311,11 @@ NetworkMessageTypes = {
   U64 = 5,
   NumberString = 6,
   String = 7,
-  Table = 8
+  Table = 8,
+}
+
+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/globals.lua

@@ -25,8 +25,8 @@ function addEvent(callback, front)
   return event
 end
 
-function cycleEvent(callback, front)
-  local event = g_dispatcher.cycleEvent(callback, front)
+function cycleEvent(callback, interval)
+  local event = g_dispatcher.cycleEvent(callback, interval)
   -- must hold a reference to the callback, otherwise it would be collected
   event._callback = callback
   return event

modules/corelib/inputmessage.lua

@@ -35,9 +35,17 @@ end
 
 function InputMessage:getColor()
   local color = {}
-  color.r = msg:getU8()
-  color.g = msg:getU8()
-  color.b = msg:getU8()
-  color.a = msg:getU8()
+  color.r = self:getU8()
+  color.g = self:getU8()
+  color.b = self:getU8()
+  color.a = self:getU8()
   return color
 end
+
+function InputMessage:getPosition()
+  local position = {}
+  position.x = self:getU16()
+  position.y = self:getU16()
+  position.z = self:getU8()
+  return position
+end

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,53 +64,43 @@ 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 keyComboDesc = determineKeyComboDesc(keyCode, keyboardModifiers)
-  local callback = widget.boundKeyDownCombos[keyComboDesc]
-  if callback then
-    callback()
-    return true
-  end
-  return false
+  local callback = widget.boundAloneKeyDownCombos[determineKeyComboDesc(keyCode, KeyboardNoModifier)]
+  signalcall(callback, widget, keyCode)
+  callback = widget.boundKeyDownCombos[determineKeyComboDesc(keyCode, keyboardModifiers)]
+  return signalcall(callback, widget, keyCode)
 end
 
 local function onWidgetKeyUp(widget, keyCode, keyboardModifiers)
   if keyCode == KeyUnknown then return false end
-  local keyComboDesc = determineKeyComboDesc(keyCode, keyboardModifiers)
-  local callback = widget.boundKeyUpCombos[keyComboDesc]
-  if callback then
-    callback()
-    return true
-  end
-  return false
+  local callback = widget.boundAloneKeyUpCombos[determineKeyComboDesc(keyCode, KeyboardNoModifier)]
+  signalcall(callback, widget, keyCode)
+  callback = widget.boundKeyUpCombos[determineKeyComboDesc(keyCode, keyboardModifiers)]
+  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()
-    return true
-  end
-  return false
+  local callback = widget.boundKeyPressCombos[determineKeyComboDesc(keyCode, keyboardModifiers)]
+  return signalcall(callback, widget, keyCode, autoRepeatTicks)
 end
 
 local function connectKeyDownEvent(widget)
   if widget.boundKeyDownCombos then return end
   connect(widget, { onKeyDown = onWidgetKeyDown })
   widget.boundKeyDownCombos = {}
+  widget.boundAloneKeyDownCombos = {}
 end
 
 local function connectKeyUpEvent(widget)
   if widget.boundKeyUpCombos then return end
   connect(widget, { onKeyUp = onWidgetKeyUp })
   widget.boundKeyUpCombos = {}
+  widget.boundAloneKeyUpCombos = {}
 end
 
 local function connectKeyPressEvent(widget)
@@ -121,63 +110,65 @@ local function connectKeyPressEvent(widget)
 end
 
 -- public functions
-function g_keyboard.bindKeyDown(keyComboDesc, callback, widget)
+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())
+  if alone then
+    connect(widget.boundAloneKeyDownCombos, keyComboDesc, callback)
+  else
+    connect(widget.boundKeyDownCombos, keyComboDesc, callback)
   end
-  widget.boundKeyDownCombos[keyComboDesc] = callback
 end
 
-function g_keyboard.bindKeyUp(keyComboDesc, callback, widget)
+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())
+  if alone then
+    connect(widget.boundAloneKeyUpCombos, keyComboDesc, callback)
+  else
+    connect(widget.boundKeyUpCombos, keyComboDesc, callback)
   end
-  widget.boundKeyUpCombos[keyComboDesc] = callback
 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/mouse.lua

@@ -20,14 +20,17 @@ function g_mouse.bindPressMove(widget, callback)
   connect(widget, { onMouseMove = function(widget, mousePos, mouseMoved)
     if widget:isPressed() then
       callback(mousePos, mouseMoved)
-    end
       return true
+    end
   end })
 end
 
-function g_mouse.bindPress(widget, callback)
+function g_mouse.bindPress(widget, callback, button)
   connect(widget, { onMousePress = function(widget, mousePos, mouseButton)
+    if not button or button == mouseButton then
       callback(mousePos, mouseButton)
       return true
+    end
+    return false
   end })
 end

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/outputmessage.lua

@@ -61,3 +61,9 @@ function OutputMessage:addColor(color)
   self:addU8(color.b)
   self:addU8(color.a)
 end
+
+function OutputMessage:addPosition(position)
+  self:addU16(position.x)
+  self:addU16(position.y)
+  self:addU8(position.z)
+end

modules/corelib/settings.lua

@@ -8,6 +8,7 @@ g_settings.getNode = g_configs.getNode
 g_settings.remove = g_configs.remove
 g_settings.setList = g_configs.setList
 g_settings.getList = g_configs.getList
+g_settings.save = g_configs.save
 
 local function convertSettingValue(value)
   if type(value) == 'table' then

modules/corelib/string.lua

@@ -49,4 +49,3 @@ function string:explode(sep, limit)
   table.insert(t, tmp)
   return t
 end
-