Update v0.6.5 download link in README

This flag is ALWAYS set, cause it's always 0 i put there by mistake.
It causes an issue by simplying drawing everything dark, cause of
the opacity...

.gitignore

@@ -1,4 +1,3 @@
-/modules/.project
 build*
 CMakeCache.txt
 CMakeFiles
@@ -37,3 +36,75 @@ otclient.layout
 LOCALTODO
 tags
 Thumbs.db
+.directory
+src/framework/graphics/dx/
+modules/.project/modules.sublime-workspace
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper

CMakeLists.txt

@@ -1,17 +1,21 @@
 cmake_minimum_required(VERSION 2.6)
 project(otclient)
 
-set(VERSION "0.6.0")
+set(VERSION "0.6.5")
+
+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)
 

README.md

@@ -8,6 +8,18 @@ that each functionality is a separated module, giving the possibility to users m
 anything easily. Users can also create new mods and extend game interface for their own purposes.
 Otclient is written in C++2011, the upcoming C++ standard and heavily scripted in lua.
 
+### Where do I download?
+
+Here is the latest v0.6.5 release compiled for both i686(32 bit) and x86_64(64 bit) machines, with OpenGL renderer.
+This release is compatible with protocols ranges from 7.60 up to 10.31.
+
+* [For Windows](https://www.dropbox.com/sh/se1okacemoqzjve/XFqFoSKLCg/otclient-win-0.6.5.zip)
+* [For Linux](https://www.dropbox.com/sh/se1okacemoqzjve/xKJL7j6vEo/otclient-linux-0.6.5.tar.gz)
+
+**NOTE:** You will need to download spr/dat files on your own and place them in `data/things/VER/` (i.e: `data/things/1031/Tibia.spr`)
+
+Older releases can be downloaded from [here](https://www.dropbox.com/sh/se1okacemoqzjve/-oWK4YFm03)
+
 ### Features
 
 Beyond of it's flexibility with scripts, otclient comes with tons of other features that make possible
@@ -18,17 +30,18 @@ to port to mobile platforms. Otclient is also flexible enough to
 create tibia tools like map editors just using scripts, because it wasn't designed to be just a
 client, instead otclient was designed to be a combination of a framework and tibia APIs.
 
-### Download
-
-Stable versions of otclient master branch compiled for Windows and Linux is available
-in the [downloads section](https://github.com/edubart/otclient/downloads) of the project's github page.
-
 ### Compiling
 
+A package with all required libraries for compiling OTClient on Windows can be found here:
+* [For MSVC 2013](https://www.dropbox.com/sh/se1okacemoqzjve/dI4ODbq7OT/otclient-msvc13-libs.zip)
+* [For MingW32](https://www.dropbox.com/sh/se1okacemoqzjve/UAkRCiGXXR/otclient-libs_mingw32-dwarf2.zip)
+
 In short, if you need to compile OTClient, follow these tutorials:
 * [Compiling on Windows](https://github.com/edubart/otclient/wiki/Compiling-on-Windows)
 * [Compiling on Linux](https://github.com/edubart/otclient/wiki/Compiling-on-Linux)
 
+
+
 ### Need help?
 
 Try to ask questions in [otland](http://otland.net/f494/), now we have a board for the project there,
@@ -50,4 +63,3 @@ Talk directly with us at #otclient irc.freenode.net or send an email directly to
 
 Otclient is made available under the MIT License, thus this means that you are free
 to do whatever you want, commercial, non-commercial, closed or open.
-

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

@@ -1,374 +1,378 @@
 -- special thanks for Shaday, who made these translations
+--Dominique120 edits: I made some statements to sound more formal and appropriate as well as correcting a few words that were not translated. I also added a few notes for future translators to keep in mind.
+
 
 locale = {
   name = "es",
   charset = "cp1252",
   languageName = "Espa<EFBFBD>ol",
-
+ 
   translation = {
-    ["1a) Offensive Name"] = false,
+    ["1a) Offensive Name"] = "1a) Nombre ofensivo",
-    ["1b) Invalid Name Format"] = false,
+    ["1b) Invalid Name Format"] = "1b) Formato invalido para nombre",
-    ["1c) Unsuitable Name"] = false,
+    ["1c) Unsuitable Name"] = "1c) Nombre no adecuado",
-    ["1d) Name Inciting Rule Violation"] = false,
+    ["1d) Name Inciting Rule Violation"] = "1d) Nombre que incita una violaci<63>n al reglamento",
-    ["2a) Offensive Statement"] = false,
+    ["2a) Offensive Statement"] = "2a) Comentario ofensivo",
-    ["2b) Spamming"] = false,
+    ["2b) Spamming"] = "2b) Spamming",
-    ["2c) Illegal Advertising"] = false,
+    ["2c) Illegal Advertising"] = "2c) Publicidad il<69>cita",
-    ["2d) Off-Topic Public Statement"] = false,
+    ["2d) Off-Topic Public Statement"] = "2d) Publicaci<63>n fuera de lugar",
-    ["2e) Non-English Public Statement"] = false,
+    ["2e) Non-English Public Statement"] = "2e) Publicaci<63>n fuera del ingles",
-    ["2f) Inciting Rule Violation"] = false,
+    ["2f) Inciting Rule Violation"] = "2f) Incitar a una violaci<63>n al reglamento",
-    ["3a) Bug Abuse"] = false,
+    ["3a) Bug Abuse"] = "3a) Abuso de error",
-    ["3b) Game Weakness Abuse"] = false,
+    ["3b) Game Weakness Abuse"] = "3b) Abuso de debilidad del juego",
-    ["3c) Using Unofficial Software to Play"] = false,
+    ["3c) Using Unofficial Software to Play"] = "3c) Usando software ilegal para jugar",
-    ["3d) Hacking"] = false,
+    ["3d) Hacking"] = "3d) Hackeo",
-    ["3e) Multi-Clienting"] = false,
+    ["3e) Multi-Clienting"] = "3e) Uso de m<>ltiples clientes",
-    ["3f) Account Trading or Sharing"] = false,
+    ["3f) Account Trading or Sharing"] = "3f) Intercambio de cuenta",
-    ["4a) Threatening Gamemaster"] = false,
+    ["4a) Threatening Gamemaster"] = "4a) Amenzar a un Gamemaster",
-    ["4b) Pretending to Have Influence on Rule Enforcement"] = false,
+    ["4b) Pretending to Have Influence on Rule Enforcement"] = "4b) Pretender tener influencia en una parte del reglamento",
-    ["4c) False Report to Gamemaster"] = false,
+    ["4c) False Report to Gamemaster"] = "4c) Reporte falso a un Gamemaster",
-    ["Accept"] = false,
+    ["Accept"] = "Aceptar",
-    ["Account name"] = "Nombre de la cuenta",
+    ["Account name"] = "Nombre de cuenta",
-    ["Account Status:"] = false,
+    ["Account Status:"] = "Estado de cuenta:",
-    ["Action:"] = false,
+    ["Action:"] = "Acci<EFBFBD>n:",
     ["Add"] = "A<EFBFBD>adir",
     ["Add new VIP"] = "A<EFBFBD>adir nuevo VIP",
     ["Addon 1"] = "Addon 1",
-    ["Addon 2"] = "Addon 2",
+    ["Addon 2"] = "Addon 1",
-    ["Addon 3"] = "Addon 3",
+    ["Addon 3"] = "Addon 1",
     ["Add to VIP list"] = "A<EFBFBD>adir a lista VIP",
-    ["Adjust volume"] = "Ajustar vol<EFBFBD>men",
+    ["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!"] = false,
+    ["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, has conocido un triste destino. \nPero no se desespere, porque los dioses te llevar<61>n de vuelta \na este mundo a cambio de un peque<75>o sacrificio \n\nSimplemente haga clic en Aceptar para continuar con sus viajes!",
-    ["All"] = false,
+    ["All"] = "Todo",
-    ["All modules and scripts were reloaded."] = "Todos los m<>dulos y scripts han sido reiniciados",
+    ["All modules and scripts were reloaded."] = "Todos los m<>dulos y scripts se vuelven a cargar.",
-    ["Allow auto chase override"] = false,
+    ["Allow auto chase override"] = "Permitur auto persecuci<63>n override",
-    ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = false,
+    ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = "Conocido por la comunidad de tibia como dash.\nRecomenada para jugadores de alto nivel.",
-    ["Ambient light: %s%%"] = false,
+    ["Ambient light: %s%%"] = "Ambiente de luz: %s%%",
     ["Amount:"] = "Cantidad:",
-    ["Amount"] = false,
+    ["Amount"] = "Cantidad",
-    ["Anonymous"] = false,
+    ["Anonymous"] = "An<EFBFBD>nimo",
-    ["Are you sure you want to logout?"] = false,
+    ["Are you sure you want to logout?"] = "<EFBFBD>Estas seguro de que deseas salir?",
     ["Attack"] = "Atacar",
     ["Author"] = "Autor",
-    ["Autoload"] = "Cargar autom<6F>ticamente",
+    ["Autoload"] = "Auto carga",
-    ["Autoload priority"] = "Prioridad de carga",
+    ["Autoload priority"] = "Auto carga prioritaria",
-    ["Auto login"] = "Entrar autom<6F>ticamente",
+    ["Auto login"] = "Auto ingresar",
-    ["Auto login selected character on next charlist load"] = "Entrar autom<6F>ticamente con un personage cuando se vuelva a abrir la lista de personajes",
+    ["Auto login selected character on next charlist load"] = "Ingresar la siguiente vez que aparece el charlist con el personaje seleccionado",
-    ["Axe Fighting"] = "Combate con Hacha",
+    ["Axe Fighting"] = "Combate con hacha",
-    ["Balance:"] = false,
+    ["Balance:"] = "Saldo:",
-    ["Banishment"] = false,
+    ["Banishment"] = "Banishment",
-    ["Banishment + Final Warning"] = false,
+    ["Banishment + Final Warning"] = "Banishment + Final Warning",
     ["Battle"] = "Batalla",
-    ["Browse"] = false,
+    ["Browse"] = "Navegar",
-    ["Bug report sent."] = false,
+    ["Bug report sent."] = "Reporte de error enviado.",
-    ["Button Assign"] = "Seleccionar Bot<EFBFBD>n",
+    ["Button Assign"] = "Bot<EFBFBD>n asignado",
-    ["Buy"] = "Comprar",
+    ["Buy"] = "Compra",
-    ["Buy Now"] = false,
+    ["Buy Now"] = "Compra ahora",
-    ["Buy Offers"] = false,
+    ["Buy Offers"] = "Comprar oferta",
     ["Buy with backpack"] = "Comprar con mochila",
     ["Cancel"] = "Cancelar",
-    ["Cannot login while already in game."] = false,
+    ["Cannot login while already in game."] = "No se puede iniciar sesi<73>n, mientras que est<73>s en el juego.",
-    ["Cap"] = false,
+    ["Cap"] = "Cap",
     ["Capacity"] = "Capacidad",
-    ["Center"] = false,
+    ["Center"] = "Centrar",
     ["Channels"] = "Canales",
-    ["Character List"] = "Lista de personajes",
+    ["Character List"] = "Lista de car<EFBFBD>cter",
-    ["Classic control"] = "Control cl<EFBFBD>sico",
+    ["Classic control"] = "Controles Cl<EFBFBD>sicos",
-    ["Clear current message window"] = false,
+    ["Clear current message window"] = "Limpiar mensaje actual en ventana",
-    ["Clear Messages"] = false,
+    ["Clear Messages"] = "Limpiar mensaje",
     ["Clear object"] = "Limpiar objeto",
-    ["Client needs update."] = false,
+    ["Client needs update."] = "El cliente necesita una actualizaci<63>n.",
     ["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,
+    ["Comment:"] = "Comentario:",
-    ["Connecting to game server..."] = "Conectando al servidor de juego...",
+    ["Connecting to game server..."] = "Conectando a servidor game...",
-    ["Connecting to login server..."] = "Conectando al servidor de autentificaci<63>n...",
+    ["Connecting to login server..."] = "Conectando a servidor login...",
-    ["Console"] = false,
+    ["Console"] = "Consola",
-    ["Cooldowns"] = false,
+    ["Cooldowns"] = "Descansos",
-    ["Copy message"] = false,
+    ["Copy message"] = "Copiar mensaje",
-    ["Copy name"] = false,
+    ["Copy name"] = "Copiar nombre",
-    ["Copy Name"] = "Copiar Nombre",
+    ["Copy Name"] = "Copiar nombre",
-    ["Create Map Mark"] = false,
+    ["Create Map Mark"] = "Crear marca en mapa",
-    ["Create mark"] = false,
+    ["Create mark"] = "Crear marca",
-    ["Create New Offer"] = false,
+    ["Create New Offer"] = "Crear nueva oferta",
-    ["Create Offer"] = false,
+    ["Create Offer"] = "Crear oferta",
-    ["Current hotkeys:"] = "Atajos actuales",
+    ["Current hotkeys:"] = "Actuales hotkeys:",
-    ["Current hotkey to add: %s"] = "Atajo actual para a<>adir: %s",
+    ["Current hotkey to add: %s"] = "Actuales hotkeys a agregar: %s",
-    ["Current Offers"] = false,
+    ["Current Offers"] = "Oferta actual",
-    ["Default"] = "Principal",
+    ["Default"] = "Predeterminado",
-    ["Delete mark"] = false,
+    ["Delete mark"] = "Borrar Marca",
-    ["Description:"] = false,
+    ["Description:"] = "Descripci<EFBFBD>n:",
     ["Description"] = "Descripci<EFBFBD>n",
-    ["Destructive Behaviour"] = false,
+    ["Destructive Behaviour"] = "Comportamiento destructivo",
     ["Detail"] = "Detalle",
-    ["Details"] = false,
+    ["Details"] = "Detalles",
     ["Disable Shared Experience"] = "Desactivar experiencia compartida",
-    ["Dismount"] = false,
+    ["Dismount"] = "Desmontar",
-    ["Display connection speed to the server (milliseconds)"] = false,
+    ["Display connection speed to the server (milliseconds)"] = "Mostrar velocidad de conexi<78>n en el servidor (millisegundos)",
-    ["Distance Fighting"] = "Combate a Distancia",
+    ["Distance Fighting"] = "Combate a distancia",
-    ["Don't stretch/shrink Game Window"] = false,
+    ["Don\'t stretch/shrink Game Window"] = "No estirar ni reducir el tama<6D>o de ventana",
-    ["Edit hotkey text:"] = "Editar texto del atajo",
+    ["Edit hotkey text:"] = "Editar texto de hotkey:",
-    ["Edit List"] = false,
+    ["Edit List"] = "Editar lista",
-    ["Edit Text"] = "Editar Texto",
+    ["Edit Text"] = "Editar texto",
-    ["Enable music"] = false,
+    ["Enable music"] = "Habilitar m<>sica",
-    ["Enable Shared Experience"] = "Activar experiencia compartida",
+    ["Enable Shared Experience"] = "Habilitar experiencia compartida",
-    ["Enable smart walking"] = false,
+    ["Enable smart walking"] = "Habilitar caminado inteligente",
-    ["Enable vertical synchronization"] = "Activar sincronizaci<63>n vertical",
+    ["Enable vertical synchronization"] = "Habilitar sincronizaci<63>n vertical",
-    ["Enable walk booster"] = false,
+    ["Enable walk booster"] = "Habilitar caminado turbo",
     ["Enter Game"] = "Entrar al juego",
-    ["Enter one name per line."] = false,
+    ["Enter one name per line."] = "Introducir un nombre por linea.",
-    ["Enter with your account again to update your client."] = false,
+    ["Enter with your account again to update your client."] = "Ingrese con su cuenta nuevamente para actualizar el cliente.",
     ["Error"] = "Error",
     ["Error"] = "Error",
-    ["Excessive Unjustified Player Killing"] = false,
+    ["Excessive Unjustified Player Killing"] = "Asesinato excesivo injustificado de jugadores",
-    ["Exclude from private chat"] = "Excluir del canal privado",
+    ["Exclude from private chat"] = "Ejecutar desde un canal privado",
-    ["Exit"] = false,
+    ["Exit"] = "Salir",
     ["Experience"] = "Experiencia",
-    ["Filter list to match your level"] = false,
+    ["Filter list to match your level"] = "Lista de filtros que coincida con el nivel",
-    ["Filter list to match your vocation"] = false,
+    ["Filter list to match your vocation"] = "Lista de filtros que coincida con el vocaci<63>n",
-    ["Find:"] = false,
+    ["Find:"] = "Encontrar:",
     ["Fishing"] = "Pesca",
-    ["Fist Fighting"] = "Combate con Pu<EFBFBD>os",
+    ["Fist Fighting"] = "Combate con pu<EFBFBD>os",
     ["Follow"] = "Seguir",
-    ["Force Exit"] = false,
+    ["Force Exit"] = "Forzar salida",
-    ["For Your Information"] = false,
+    ["For Your Information"] = "Para tu informaci<63>n",
-    ["Free Account"] = false,
+    ["Free Account"] = "Cuenta gratis",
-    ["Fullscreen"] = "Pantalla Completa",
+    ["Fullscreen"] = "Pantalla completa",
-    ["Game"] = false,
+    ["Game"] = "Juego",
-    ["Game framerate limit: %s"] = false,
+    ["Game framerate limit: %s"] = "Limite de cuadros por segundo en el juego: %s",
     ["Graphics"] = "Gr<EFBFBD>ficos",
-    ["Graphics card driver not detected"] = false,
+    ["Graphics card driver not detected"] = "Controlador de tarjeta gr<67>fica de video no detectado",
-    ["Graphics Engine:"] = false,
+    ["Graphics Engine:"] = "Motor Gr<47>fico:",
     ["Head"] = "Cabeza",
-    ["Healing"] = false,
+    ["Healing"] = "Curaci<EFBFBD>n",
-    ["Health Info"] = false,
+    ["Health Info"] = "HP Info",--This can be better
-    ["Health Information"] = false,
+    ["Health Information"] = "HP Informaci<63>n",--This can be better
-    ["Hide monsters"] = "Esconder monstruos",
+    ["Hide monsters"] = "Ocultar monstruos",
-    ["Hide non-skull players"] = "Esconder jugadores sin calavera",
+    ["Hide non-skull players"] = "Ocultar jugadores sin skull",
-    ["Hide Npcs"] = "Esconder NPCs",
+    ["Hide Npcs"] = "Ocultar NPCs",
-    ["Hide Offline"] = false,
+    ["Hide Offline"] = "Ocultar fuera de linea",
-    ["Hide party members"] = "Esconder miembros del grupo",
+    ["Hide party members"] = "Ocultar miembros del party",
-    ["Hide players"] = "Esconder jugadores",
+    ["Hide players"] = "Ocultar players",
-    ["Hide spells for higher exp. levels"] = false,
+    ["Hide spells for higher exp. levels"] = "Ocultar hechizos para niveles mas altos que tu experiencia.",
-    ["Hide spells for other vocations"] = false,
+    ["Hide spells for other vocations"] = "Ocultar hechizos que sean para otra vocaci<63>n",
-    ["Hit Points"] = "Puntos de Vida",
+    ["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,
+    ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = "Mantenga presionado el bot<6F>n derecho del rat<61>n para navegar\nDezplaze la rueda central del rat<61>n para ampliar\nbot<EFBFBD>n derecho del mouse para crear marcas del mapa", 
-    ["Hotkeys"] = "Atajos",
+    ["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."] = false,
+    ["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.\nHaga click en 'Salir' si desea salir del programa sin tener que salir de tu personaje.",
-    ["Ignore"] = false,
+    ["Ignore"] = "Ignorar",
-    ["Ignore capacity"] = "Ignorar capacidad",
+    ["Ignore capacity"] = "Ignorar Capacidad",
-    ["Ignored players:"] = false,
+    ["Ignored players:"] = "Jugadores ignorados:",
-    ["Ignore equipped"] = "Ignorar equipado",
+    ["Ignore equipped"] = "Ignorar lo equipado",
-    ["Ignore List"] = false,
+    ["Ignore List"] = "Ignorar lista",
-    ["Ignore players"] = false,
+    ["Ignore players"] = "Ignorar jugadores",
-    ["Ignore Private Messages"] = false,
+    ["Ignore Private Messages"] = "Ignorar mensajes privados",
-    ["Ignore Yelling"] = false,
+    ["Ignore Yelling"] = "Ignorar gritos",
-    ["Interface framerate limit: %s"] = false,
+    ["Interface framerate limit: %s"] = "Interface de cuadros por segundo: %s",
     ["Inventory"] = "Inventario",
-    ["Invite to Party"] = "Invitar al grupo",
+    ["Invite to Party"] = "Ivitar al party",
-    ["Invite to private chat"] = "Invitar al canal privado",
+    ["Invite to private chat"] = "Invitar a canal privado",
-    ["IP Address Banishment"] = false,
+    ["IP Address Banishment"] = "Banishment - Direcci<63>n IP",
-    ["Item Offers"] = false,
+    ["Item Offers"] = "Ofertas de objetos",
-    ["It is empty."] = false,
+    ["It is empty."] = "Est<EFBFBD> vaci<63>.",
-    ["Join %s's Party"] = false,
+    ["Join %s\'s Party"] = "Unirse al party de %s ",
-    ["Leave Party"] = "Salir del grupo",
+    ["Leave Party"] = "Dejar el party",
     ["Level"] = "Nivel",
-    ["Lifetime Premium Account"] = false,
+    ["Lifetime Premium Account"] = "Tiempo de Premium Account infinito",
-    ["Limits FPS to 60"] = "Limita los FPS a 60",
+    ["Limits FPS to 60"] = "Limites 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 buy"] = "Lista de objetos que puedes de comprar",
-    ["List of items that you're able to sell"] = "Lista de objetos que usted puede vender",
+    ["List of items that you're able to sell"] = "Lista de objetos que puedes de vender",
     ["Load"] = "Cargar",
-    ["Logging out..."] = false,
+    ["Logging out..."] = "Cerrando sesi<73>n...",
-    ["Login"] = "Entrar",
+    ["Login"] = "Ingresar",
-    ["Login Error"] = "Error de Autentificaci<EFBFBD>n",
+    ["Login Error"] = "Error de ingreso",
-    ["Login Error"] = "Error de Autentificaci<EFBFBD>n",
+    ["Login Error"] = "Error de ingreso",
-    ["Logout"] = false,
+    ["Logout"] = "Salir",
-    ["Look"] = "Ver",
+    ["Look"] = "Mirar",
-    ["Magic Level"] = "Nivel M<EFBFBD>gico",
+    ["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",
+    ["Make sure that your client uses\nthe correct game protocol version"] = "Aseg<EFBFBD>rese de que el cliente este utilizando\nes el versi<EFBFBD>n del protocolo adecuado",
     ["Mana"] = "Mana",
-    ["Manage hotkeys:"] = "Configurar atajos:",
+    ["Manage hotkeys:"] = "Administrador de hotkeys:",
-    ["Market"] = false,
+    ["Market"] = "Mercado",
-    ["Market Offers"] = false,
+    ["Market Offers"] = "Ofertas en mercado",
     ["Message of the day"] = "Mensaje del d<>a",
-    ["Message to "] = false,
+    ["Message to "] = "Mensaje a",
-    ["Message to %s"] = "Mandar mensaje a %s",
+    ["Message to %s"] = "Mensaje a %s",
     ["Minimap"] = "Minimapa",
-    ["Module Manager"] = "Administrador de M<EFBFBD>dulos",
+    ["Module Manager"] = "Administrador de m<EFBFBD>dulos",
-    ["Module name"] = "Nombre del m<EFBFBD>dulo",
+    ["Module name"] = "Nombre del modulo",
-    ["Mount"] = false,
+    ["Mount"] = "Montar", --Unique name?
-    ["Move Stackable Item"] = "Mover objeto contable",
+    ["Move Stackable Item"] = "Mover objeto apilable",
     ["Move up"] = "Mover arriba",
-    ["My Offers"] = false,
+    ["My Offers"] = "Mis ofertas",
     ["Name:"] = "Nombre:",
-    ["Name Report"] = false,
+    ["Name Report"] = "Name Report",
-    ["Name Report + Banishment"] = false,
+    ["Name Report + Banishment"] = "Name Report + Banishment",
-    ["Name Report + Banishment + Final Warning"] = false,
+    ["Name Report + Banishment + Final Warning"] = "Name Report + Banishment + Final Warning",
-    ["No"] = false,
+    ["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."] = 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."] = "No se ha detectado una tarjeta gr<67>fica y todo sera procesado por tu procesador,\npor lo tanto el rendimiento va a ser muy malo.\nPor favor, actualice su controlador de gr<67>ficos para tener un rendimiento optimo.",
-    ["No item selected."] = false,
+    ["No item selected."] = "No hay elemento seleccionado.",
-    ["No Mount"] = false,
+    ["No Mount"] = "No montura",
-    ["No Outfit"] = false,
+    ["No Outfit"] = "No outfit",
-    ["No statement has been selected."] = false,
+    ["No statement has been selected."] = "No hay comentario seleccionado.",
-    ["Notation"] = false,
+    ["Notation"] = "Notation",
-    ["NPC Trade"] = "Comercia con NPC",
+    ["NPC Trade"] = "Intercambio con NPC",
-    ["Offer History"] = false,
+    ["Offer History"] = "Historial de oferta",
-    ["Offers"] = false,
+    ["Offers"] = "Ofertas",
-    ["Offer Type:"] = false,
+    ["Offer Type:"] = "Tipo de oferta:",
-    ["Offline Training"] = false,
+    ["Offline Training"] = "Entrenamiento offLine",
-    ["Ok"] = "Ok",
+    ["Ok"] = "OK",
-    ["on %s.\n"] = false,
+    ["on %s.\n"] = "en %s.\n",
-    ["Open"] = "Abrir",
+    ["Open"] = "Abierto",
-    ["Open a private message channel:"] = "Abrir un canal privado:",
+    ["Open a private message channel:"] = "Abrir mensaje en canal privado:",
-    ["Open charlist automatically when starting client"] = false,
+    ["Open charlist automatically when starting client"] = "Abrir lista de jugadores autom<6F>ticamente al iniciar el cliente",
-    ["Open in new window"] = "Abrir en una nueva ventana",
+    ["Open in new window"] = "Abrir en nueva ventana",
-    ["Open new channel"] = "Abrir novo canal",
+    ["Open new channel"] = "Abrir nuevo canal",
     ["Options"] = "Opciones",
-    ["Overview"] = false,
+    ["Overview"] = "Descripci<EFBFBD>n",
-    ["Pass Leadership to %s"] = "Pasar el liderazgo a %s",
+    ["Pass Leadership to %s"] = "Pasar liderazgo a %s",
     ["Password"] = "Contrase<EFBFBD>a",
-    ["Piece Price:"] = false,
+    ["Piece Price:"] = "Precio por pieza:",
-    ["Please enter a character name:"] = "Por favor, introduce el nombre de un personaje:",
+    ["Please enter a character name:"] = "Por favor ingresar nombre del jugador:",
-    ["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, 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"] = false,
+    ["Please Select"] = "Por favor seleccione",
-    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = false,
+    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor usa este di<64>logo solo para reportar errores.\n<EFBFBD>No reportar violaciones del reglamento aqu<71>!",
-    ["Please wait"] = "Por favor, espere",
+    ["Please wait"] = "Por favor espere",
     ["Port"] = "Puerto",
-    ["Position:"] = false,
+    ["Position:"] = "Posici<EFBFBD>n:",
-    ["Position: %i %i %i"] = false,
+    ["Position: %i %i %i"] = "Posici<EFBFBD>n: %i %i %i",
-    ["Premium Account (%s) days left"] = false,
+    ["Premium Account (%s) days left"] = "Tienes (%s) d<>as de Premium Account restantes",
-    ["Price:"] = "Precio",
+    ["Price:"] = "Precio:",
     ["Primary"] = "Primario",
-    ["Protocol"] = false,
+    ["Protocol"] = "Protocolo",
-    ["Quest Log"] = false,
+    ["Quest Log"] = "Quest Log", --Unique name
-    ["Randomize"] = false,
+    ["Randomize"] = "Combinar",
-    ["Randomize characters outfit"] = false,
+    ["Randomize characters outfit"] = "Combinar vestimenta del jugador",
-    ["Reason:"] = false,
+    ["Reason:"] = "Raz<EFBFBD>n:",
-    ["Refresh"] = "Actualizar",
+    ["Refresh"] = "Refrescar",
-    ["Refresh Offers"] = false,
+    ["Refresh Offers"] = "Refrescar ofertas",
-    ["Regeneration Time"] = false,
+    ["Regeneration Time"] = "Tiempo de regeneraci<63>n",
-    ["Reject"] = false,
+    ["Reject"] = "Rechazar",
-    ["Reload All"] = "Recargar Todos",
+    ["Reload All"] = "Cargar todo de nuevo",
-    ["Remember account and password when starts client"] = false,
+    ["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"] = "Remover",
-    ["Remove %s"] = "Quitar %s",
+    ["Remove %s"] = "Remover %s",
-    ["Report Bug"] = false,
+    ["Report Bug"] = "Reportar error",
-    ["Reserved for more functionality later."] = false,
+    ["Reserved for more functionality later."] = "Reservado para una funci<63>n futura.",
-    ["Reset Market"] = false,
+    ["Reset Market"] = "Reiniciar mercado",
-    ["Revoke %s's Invitation"] = false,
+    ["Revoke %s\'s Invitation"] = "Anular %s\'s invitaci<63>n",
-    ["Rotate"] = "Girar",
+    ["Rotate"] = "Rotar",
-    ["Rule Violation"] = false,
+    ["Rule Violation"] = "Violaci<EFBFBD>n del reglamento",
-    ["Save"] = false,
+    ["Save"] = "Guardar",
-    ["Save Messages"] = false,
+    ["Save Messages"] = "Guardar 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 Outfit"] = "Seleccionar outfit",
-    ["Select your language"] = false,
+    ["Select your language"] = "Selectionar tu lenguaje",
     ["Sell"] = "Vender",
-    ["Sell Now"] = false,
+    ["Sell Now"] = "Vender ahora",
-    ["Sell Offers"] = false,
+    ["Sell Offers"] = "Ofertas de venta",
-    ["Send"] = false,
+    ["Send"] = "Enviar",
     ["Send automatically"] = "Enviar autom<6F>ticamente",
-    ["Send Message"] = false,
+    ["Send Message"] = "Enviar mensaje",
-    ["Server"] = "Servidor",
+    ["Server"] = "Server", --Unique name
-    ["Server Log"] = "Registro del servidor",
+    ["Server Log"] = "Server Log", --Unique name
-    ["Set Outfit"] = "Escoger Traje",
+    ["Set Outfit"] = "Escoger vestimenta",
-    ["Shielding"] = "Defensa",
+    ["Shielding"] = "Escudo",
     ["Show all items"] = "Mostrar todos los objetos",
-    ["Show connection ping"] = false,
+    ["Show connection ping"] = "Mostrar ping de conexi<78>n",
-    ["Show Depot Only"] = false,
+    ["Show Depot Only"] = "Mostrar solo el Depot",
-    ["Show event messages in console"] = "Mostrar los mensajes de eventos en la consola",
+    ["Show event messages in console"] = "Mostrar mensajes de evento en consola",
-    ["Show frame rate"] = "Mostrar FPS",
+    ["Show frame rate"] = "Mostrar informaci<EFBFBD>n de cuadros por secundo",
-    ["Show info messages in console"] = "Mostrar los mensajes informativos en la consola",
+    ["Show info messages in console"] = "Mostrar mensajes de informaci<EFBFBD>n en consola",
-    ["Show left panel"] = false,
+    ["Show left panel"] = "Mostrar panel izquierdo",
-    ["Show levels in console"] = "Mostrar los niveles en la consola",
+    ["Show levels in console"] = "Mostrar niveles en consola",
-    ["Show Offline"] = false,
+    ["Show Offline"] = "Mostrar Desconectados",
-    ["Show private messages in console"] = "Mostrar los mensajes privados en la consola",
+    ["Show private messages in console"] = "Mostrar mensajes privados en consola",
-    ["Show private messages on screen"] = false,
+    ["Show private messages on screen"] = "Mostrar mensajes privados en pantalla",
-    ["Show Server Messages"] = false,
+    ["Show Server Messages"] = "Mostrar mensajes del servidor",
-    ["Show status messages in console"] = "Mostrar los mensajes de estado en la consola",
+    ["Show status messages in console"] = "Mostrar mensajes de estado en consola",
-    ["Show Text"] = false,
+    ["Show Text"] = "Mostrar texto",
-    ["Show timestamps in console"] = "Mostrar la hora en la consola",
+    ["Show timestamps in console"] = "Mostrar marcas de tiempo en consola",
-    ["Show your depot items only"] = false,
+    ["Show your depot items only"] = "Mostrar solo tus objetos en depot",
     ["Skills"] = "Habilidades",
-    ["Soul"] = false,
+    ["Soul"] = "Soul",
-    ["Soul Points"] = "Puntos del Alma",
+    ["Soul Points"] = "Puntos de Soul", --I'm leaving these as is because its a unique name, if you want to change it it can be "Alma" or "Esp<73>ritu"
-    ["Special"] = false,
+    ["Special"] = "Especial",
-    ["Speed"] = false,
+    ["Speed"] = "Velocidad",
-    ["Spell Cooldowns"] = false,
+    ["Spell Cooldowns"] = "Spells Cooldowns", --Could be "Tiempo de recarga para los hechizos".
-    ["Spell List"] = false,
+    ["Spell List"] = "Lista de hechizos",
-    ["Stamina"] = "Vigor",
+    ["Stamina"] = "Resistencia",
-    ["Statement:"] = false,
+    ["Statement:"] = "Comentario:",
-    ["Statement Report"] = false,
+    ["Statement Report"] = "Statement Report", --Could be "reporte del comentario"
-    ["Statistics"] = false,
+    ["Statistics"] = "Estad<EFBFBD>sticas",
-    ["Stop Attack"] = "Detener el Ataque",
+    ["Stop Attack"] = "Detener ataque",
-    ["Stop Follow"] = "Detener el Seguimiento",
+    ["Stop Follow"] = "Detener persecuci<EFBFBD>n",
-    ["Support"] = false,
+    ["Support"] = "Soporte",
     ["%s: (use object)"] = "%s: (usar objeto)",
-    ["%s: (use object on target)"] = "%s: (usar objeto en objetivo)",
+    ["%s: (use object on target)"] = "%s: (usar objeto en un objetivo)",
-    ["%s: (use object on yourself)"] = "%s: (usar objeto en ti mismo)",
+    ["%s: (use object on yourself)"] = "%s: (usar objeto en mi mismo)",
-    ["%s: (use object with crosshair)"] = "%s: (usar objeto con mirilla)",
+    ["%s: (use object with crosshair)"] = "%s: (usar objeto con punto de mira)",
-    ["Sword Fighting"] = "Combate con Espada",
+    ["Sword Fighting"] = "Combate de espada",
     ["Terminal"] = "Terminal",
-    ["There is no way."] = "No hay ruta.",
+    ["There is no way."] = "No hay ninguna manera.",
-    ["Title"] = false,
+    ["Title"] = "Titulo",
-    ["Total Price:"] = false,
+    ["Total Price:"] = "Total total:",
-    ["Trade"] = "Comercial",
+    ["Trade"] = "Intercambio",
-    ["Trade with ..."] = "Comercial con ...",
+    ["Trade with ..."] = "Intercambiar con ...",
-    ["Trying to reconnect in %s seconds."] = false,
+    ["Trying to reconnect in %s seconds."] = "",
-    ["Unable to load dat file, please place a valid dat in '%s'"] = false,
+    ["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'"] = false,
+    ["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 es posible salir.",
+    ["Unable to logout."] = "No se puede cerrar sesi<73>n-",
-    ["Unignore"] = false,
+    ["Unignore"] = "Dejar de ignorar",
-    ["Unload"] = "Descarga",
+    ["Unload"] = "No cargado",
-    ["Update needed"] = false,
+    ["Update needed"] = "Es necesario actualizar",
-    ["Use"] = "Usar",
+    ["Use"] = "Uso",
-    ["Use on target"] = "Usar en objetivo",
+    ["Use on target"] = "Usar en un objetivo",
-    ["Use on yourself"] = "Usar en ti mismo",
+    ["Use on yourself"] = "Usar en mi mismo",
     ["Use with ..."] = "Usar en ...",
     ["Version"] = "Versi<EFBFBD>n",
-    ["VIP List"] = "Lista VIP",
+    ["VIP List"] = "Lista Vip",
-    ["Voc."] = false,
+    ["Voc."] = "Voc.",
-    ["Vocation"] = false,
+    ["Vocation"] = "Vocaci<EFBFBD>n",
-    ["Waiting List"] = false,
+    ["Waiting List"] = "Lista de espera",
     ["Website"] = "Sitio Web",
-    ["Weight:"] = "Peso",
+    ["Weight:"] = "Peso:",
-    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = false,
+    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectara cuando se camina en diagonal usando las flechas",
-    ["With crosshair"] = "Con mirilla",
+    ["With crosshair"] = "Con punto de mira",
-    ["Yes"] = false,
+    ["Yes"] = "Si",
-    ["You are bleeding"] = false,
+    ["You are bleeding"] = "Te estas desangrando",
-    ["You are burning"] = "Est<EFBFBD>s quemando",
+    ["You are burning"] = "Te estas quemando",
-    ["You are cursed"] = "Est<EFBFBD>s maldito",
+    ["You are cursed"] = "Tu estas maldecido",
-    ["You are dazzled"] = "Est<EFBFBD>s deslumbrado",
+    ["You are dazzled"] = "Tu estas deslumbrado",
-    ["You are dead."] = "Has muerto.",
+    ["You are dead."] = "Tu estas muerto.",
-    ["You are dead"] = false,
+    ["You are dead"] = "Tu estas muerto",
-    ["You are drowing"] = "Te est<EFBFBD>s ahogando",
+    ["You are drowning"] = "Te estas ahogando",
-    ["You are drunk"] = false,
+    ["You are drunk"] = "Tu estas ebrio",
-    ["You are electrified"] = "Est<EFBFBD>s electrocutado",
+    ["You are electrified"] = "Tu estas electrocutado",
-    ["You are freezing"] = "Est<EFBFBD>s congelado",
+    ["You are freezing"] = "Te estas congelando",
-    ["You are hasted"] = "Vas con prisa",
+    ["You are hasted"] = "Tu estas r<>pido", --I dont know what is the best way to translate this so I'm leaving it as I found it.
-    ["You are hungry"] = false,
+    ["You are hungry"] = "Tu estas hambriento",
-    ["You are paralysed"] = "Est<EFBFBD>s paralizado",
+    ["You are paralysed"] = "Tu estas paralizado",
-    ["You are poisoned"] = "Est<EFBFBD>s envenenado",
+    ["You are poisoned"] = "Tu estas envenedado",
-    ["You are protected by a magic shield"] = "Est<EFBFBD>s protegido por un escudo m<>gico",
+    ["You are protected by a magic shield"] = "Tu estas protegido por un escudo m<>gico",
-    ["You are strengthened"] = "Est<EFBFBD>s reforzado",
+    ["You are strengthened"] = "Tu estas reforzado",
-    ["You are within a protection zone"] = "Est<EFBFBD>s en una zona de protecci<63>n",
+    ["You are within a protection zone"] = "Tu estas dentro de una zona de protecci<63>n",
-    ["You can enter new text."] = false,
+    ["You can enter new text."] = "Tu puedes ingresar un texto nuevo.",
-    ["You have %s percent"] = "Tienes %s por ciento",
+    ["You have %s percent"] = "Tu tienes %s por ciento",
-    ["You have %s percent to go"] = "Te falta %s por ciento para avanzar",
+    ["You have %s percent to go"] = "Tu tienes %s por ciento para ir",
-    ["You may not logout during a fight"] = "No puedes salir mientras est<73>s en un combate",
+    ["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 comment."] = "Debes ingresar un comentario.",
-    ["You must enter a valid server address and port."] = false,
+    ["You must enter a valid server address and port."] = "Debes ingresar una direcci<63>n v<>lida de servidor y el puerto.",
-    ["You must select a character to login!"] = "Debes seleccionar un personaje para entrar!",
+    ["You must select a character to login!"] = "<EFBFBD>Debes seleccionar un personaje para ingresar!",
-    ["Your Capacity:"] = false,
+    ["Your Capacity:"] = "Tu capacidad:",
-    ["You read the following, written by \n%s\n"] = false,
+    ["You read the following, written by \n%s\n"] = "Lees lo siguiente, escrito por \n%s\n",
-    ["You read the following, written on \n%s.\n"] = false,
+    ["You read the following, written on \n%s.\n"] = "Lees lo siguiente, escrito en \n%s\n",
-    ["Your Money:"] = false,
+    ["Your Money:"] = "Tu dinero:",
+    ["Change language"] = "Cambiar idioma",
+    ["Don't stretch or shrink Game Window"] = "No estirar o encoger Ventana de Juego"
   }
 }
-
+ 
-modules.client_locales.installLocale(locale)
+modules.client_locales.installLocale(locale)

data/locales/pl.lua

@@ -1,36 +1,31 @@
--- by Don Daniello
--- 09 June 2012
--- http://DonDaniello.com
--- http://otland.net/members/Don+Daniello
-
 locale = {
   name = "pl",
   languageName = "Polski",
 
   translation = {
-    ["1a) Offensive Name"] = false,
+    ["1a) Offensive Name"] = "1a) Obrazliwe Imie",
-    ["1b) Invalid Name Format"] = false,
+    ["1b) Invalid Name Format"] = "1b) Niepoprawny Format Imienia",
-    ["1c) Unsuitable Name"] = false,
+    ["1c) Unsuitable Name"] = "1c) Nieodpowiednie Imie",
-    ["1d) Name Inciting Rule Violation"] = false,
+    ["1d) Name Inciting Rule Violation"] = "1d) Imie Nawolujace Do Lamania Regulaminu",
-    ["2a) Offensive Statement"] = false,
+    ["2a) Offensive Statement"] = "2a) Obrazliwa wypowiedz",
-    ["2b) Spamming"] = false,
+    ["2b) Spamming"] = "2b) Spamowanie",
-    ["2c) Illegal Advertising"] = false,
+    ["2c) Illegal Advertising"] = "2c) Nielegalne Reklamy",
-    ["2d) Off-Topic Public Statement"] = false,
+    ["2d) Off-Topic Public Statement"] = "2d) Publiczne Wypowiadanie Sie Nie Na Temat",
-    ["2e) Non-English Public Statement"] = false,
+    ["2e) Non-English Public Statement"] = "2e) Publiczne wypowiadanie Sie W Jezyku Innym Niz Angielski",
-    ["2f) Inciting Rule Violation"] = false,
+    ["2f) Inciting Rule Violation"] = "2f) Nawolywanie Do Lamania Regulaminu ",
-    ["3a) Bug Abuse"] = false,
+    ["3a) Bug Abuse"] = "3a) Wykorzystywanie Bledow",
-    ["3b) Game Weakness Abuse"] = false,
+    ["3b) Game Weakness Abuse"] = "3b) Wykorzystanie Slabosci Gry",
-    ["3c) Using Unofficial Software to Play"] = false,
+    ["3c) Using Unofficial Software to Play"] = "3c) Gra Przy Uzyciu Nieoficjalnego Oprogramowania",
-    ["3d) Hacking"] = false,
+    ["3d) Hacking"] = "3d) Wlamywanie Sie",
-    ["3e) Multi-Clienting"] = false,
+    ["3e) Multi-Clienting"] = "3e) Uzycie Multi-Klienta",
-    ["3f) Account Trading or Sharing"] = false,
+    ["3f) Account Trading or Sharing"] = "3f) Handel Lub Udostepnianie Kont",
-    ["4a) Threatening Gamemaster"] = false,
+    ["4a) Threatening Gamemaster"] = "4a) Grozby Pod Adresem Mistrza Gry",
-    ["4b) Pretending to Have Influence on Rule Enforcement"] = false,
+    ["4b) Pretending to Have Influence on Rule Enforcement"] = "4b) Udawanie Wplywu na Ustanawianie Regul Gry",
-    ["4c) False Report to Gamemaster"] = false,
+    ["4c) False Report to Gamemaster"] = "4c) Wyslanie Falszywego Raportu Mistrzowi Gry",
-    ["Accept"] = false,
+    ["Accept"] = "Akceptuj",
     ["Account name"] = "Numer konta",
-    ["Account Status:"] = false,
+    ["Account Status:"] = "Status Konta:",
-    ["Action:"] = false,
+    ["Action:"] = "Akcja:",
     ["Add"] = "Dodaj",
     ["Add new VIP"] = "Nowy VIP",
     ["Addon 1"] = "Addon 1",
@@ -39,15 +34,15 @@ locale = {
     ["Add to VIP list"] = "Dodaj do VIPow",
     ["Adjust volume"] = "Zmien glosnosc",
     ["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"] = "Wszystkie",
     ["All modules and scripts were reloaded."] = "Wszystkie moduly ",
     ["Allow auto chase override"] = false,
     ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = false,
-    ["Ambient light: %s%%"] = false,
+    ["Ambient light: %s%%"] = "Swiatlo tla: %s%%",
     ["Amount:"] = "Ilosc:",
-    ["Amount"] = false,
+    ["Amount"] = "Ilosc",
-    ["Anonymous"] = false,
+    ["Anonymous"] = "Anonimowy",
-    ["Are you sure you want to logout?"] = false,
+    ["Are you sure you want to logout?"] = "Czy jestes pewien, ze sie chcesz wylogowac?",
     ["Attack"] = "Atak",
     ["Author"] = "Autor",
     ["Autoload"] = "Autoladowanie",
@@ -59,17 +54,17 @@ locale = {
     ["Banishment"] = false,
     ["Banishment + Final Warning"] = false,
     ["Battle"] = "Bitwa",
-    ["Browse"] = false,
+    ["Browse"] = "Przegladaj",
-    ["Bug report sent."] = false,
+    ["Bug report sent."] = "Raport o bledzie zostal wyslany.",
     ["Button Assign"] = "Przypisanie Klawisza",
     ["Buy"] = "Kup",
-    ["Buy Now"] = false,
+    ["Buy Now"] = "Kup Teraz",
-    ["Buy Offers"] = false,
+    ["Buy Offers"] = "Oferty Kupna",
     ["Buy with backpack"] = "Kupuj z plecakami",
     ["Cancel"] = "Anuluj",
-    ["Cannot login while already in game."] = false,
+    ["Cannot login while already in game."] = "Nie mozna zalogowac gdy juz w grze",
     ["Cap"] = false,
-    ["Capacity"] = "Capacidad",
+    ["Capacity"] = "Ladownosc",
     ["Center"] = false,
     ["Channels"] = "Kanaly",
     ["Character List"] = "Lista postaci",
@@ -82,65 +77,64 @@ locale = {
     ["Close this channel"] = "Zamknij kanal",
     ["Club Fighting"] = "Walka obuchem",
     ["Combat Controls"] = "Kontrola walki",
-    ["Comment:"] = false,
+    ["Comment:"] = "Komentarz:",
     ["Connecting to game server..."] = "Laczenie z serwerem gry...",
     ["Connecting to login server..."] = "Laczenie z serwerem logowania...",
-    ["Console"] = false,
+    ["Console"] = "Konsola",
     ["Cooldowns"] = false,
-    ["Copy message"] = false,
+    ["Copy message"] = "Kopiuj wiadomosc",
-    ["Copy name"] = false,
+    ["Copy name"] = "Kopiuj imie",
-    ["Copy Name"] = "Kopiuj Nick",
+    ["Copy Name"] = "Kopiuj Imie",
-    ["Create Map Mark"] = false,
+    ["Create Map Mark"] = "Utworz Znacznik na Mapie",
-    ["Create mark"] = false,
+    ["Create mark"] = "Utworz znacznik",
-    ["Create New Offer"] = false,
+    ["Create New Offer"] = "Utworz Nowa Oferte",
-    ["Create Offer"] = false,
+    ["Create Offer"] = "Utworz Oferte",
     ["Current hotkeys:"] = "Aktualny hotkey:",
     ["Current hotkey to add: %s"] = "Aktualny hotkey do dodania: %s",
-    ["Current Offers"] = false,
+    ["Current Offers"] = "Obecne Oferty",
     ["Default"] = "Domyslny",
-    ["Delete mark"] = false,
+    ["Delete mark"] = "Usun znacznik",
-    ["Description:"] = false,
+    ["Description:"] = "Opis:",
     ["Description"] = "Opis",
-    ["Destructive Behaviour"] = false,
+    ["Destructive Behaviour"] = "Destrukcyjne Zachowanie",
     ["Detail"] = "Szczegoly",
-    ["Details"] = false,
+    ["Details"] = "Szczegoly",
     ["Disable Shared Experience"] = "Wylacz Dzielenie Doswiadczenia",
     ["Dismount"] = false,
-    ["Display connection speed to the server (milliseconds)"] = false,
+    ["Display connection speed to the server (milliseconds)"] = "Wyswietl ping do serwera (ms)",
     ["Distance Fighting"] = "Walka na odleglosc",
-    ["Don't stretch/shrink Game Window"] = false,
+    ["Don't stretch/shrink Game Window"] = "Nie rozszerzaj/zwezaj Okna Gry",
     ["Edit hotkey text:"] = "Edytuj tresc hotkeya:",
-    ["Edit List"] = false,
+    ["Edit List"] = "Lista Edycji",
     ["Edit Text"] = "Edytuj tekst",
-    ["Enable music"] = false,
+    ["Enable music"] = "Odtwarzaj muzyke",
     ["Enable Shared Experience"] = "Wlacz dzielenie doswiadczenia",
     ["Enable smart walking"] = false,
     ["Enable vertical synchronization"] = "Wlacz synchronizacje pionowa",
     ["Enable walk booster"] = false,
     ["Enter Game"] = "Wejdz do gry",
-    ["Enter one name per line."] = false,
+    ["Enter one name per line."] = "Wprowadz jedno imie na linie",
-    ["Enter with your account again to update your client."] = false,
+    ["Enter with your account again to update your client."] = "Zaloguj sie ponownie by zaktualizowac klienta",
     ["Error"] = "Blad",
-    ["Error"] = "Blad",
+    ["Excessive Unjustified Player Killing"] = "Nadmierne Nieusprawiedliwione Zabijanie Graczy",
-    ["Excessive Unjustified Player Killing"] = false,
     ["Exclude from private chat"] = "Wyrzuc w prywatnej konwersacji",
     ["Exit"] = false,
     ["Experience"] = "Doswiadczenie",
-    ["Filter list to match your level"] = false,
+    ["Filter list to match your level"] = "Wyswietl tylko odpowiednie dla mojego poziomu",
-    ["Filter list to match your vocation"] = false,
+    ["Filter list to match your vocation"] = "Wyswietl tylko odpowiednie dla mojej klasy",
-    ["Find:"] = false,
+    ["Find:"] = "Szukaj:",
     ["Fishing"] = "Wedkarstwo",
     ["Fist Fighting"] = "Walka wrecz",
     ["Follow"] = "Podazaj",
-    ["Force Exit"] = false,
+    ["Force Exit"] = "Wymus Zamkniecie",
     ["For Your Information"] = false,
-    ["Free Account"] = false,
+    ["Free Account"] = "Darmowe Konto",
     ["Fullscreen"] = "Pelen ekran",
-    ["Game"] = false,
+    ["Game"] = "Gra",
-    ["Game framerate limit: %s"] = false,
+    ["Game framerate limit: %s"] = "Limit FPS: %s",
     ["Graphics"] = "Grafika",
-    ["Graphics card driver not detected"] = false,
+    ["Graphics card driver not detected"] = "Nie wykryto karty graficznej",
-    ["Graphics Engine:"] = false,
+    ["Graphics Engine:"] = "Silnik graficzny:",
     ["Head"] = "Glowa",
     ["Healing"] = false,
     ["Health Info"] = false,
@@ -148,43 +142,43 @@ locale = {
     ["Hide monsters"] = "Ukryj potwory",
     ["Hide non-skull players"] = "Ukryj graczy bez skulla",
     ["Hide Npcs"] = "Ukryj NPCe",
-    ["Hide Offline"] = false,
+    ["Hide Offline"] = "Ukryj Niedostepnych",
-    ["Hide party members"] = "Ukryj czlonkow zabawy",
+    ["Hide party members"] = "Ukryj czlonkow druzyny",
     ["Hide players"] = "Ukryj graczy",
-    ["Hide spells for higher exp. levels"] = false,
+    ["Hide spells for higher exp. levels"] = "Ukryj zaklecia wyzszych poziomow postaci",
-    ["Hide spells for other vocations"] = false,
+    ["Hide spells for other vocations"] = "Ukryj zaklecia innych klas",
     ["Hit Points"] = "Punkty uderzen",
     ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = false,
     ["Hotkeys"] = "Hotkeye",
     ["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"] = "Ignoruj",
     ["Ignore capacity"] = "Ignoruj pojemnosc",
-    ["Ignored players:"] = false,
+    ["Ignored players:"] = "Ignorowani gracze:",
     ["Ignore equipped"] = "Ignoruj ekwipunek",
-    ["Ignore List"] = false,
+    ["Ignore List"] = "Lista Ignorowanych",
-    ["Ignore players"] = false,
+    ["Ignore players"] = "Ignoruj graczy",
-    ["Ignore Private Messages"] = false,
+    ["Ignore Private Messages"] = "Ignoruj Prywatne Wiadomosci",
-    ["Ignore Yelling"] = false,
+    ["Ignore Yelling"] = "Ignoruj Krzyki",
-    ["Interface framerate limit: %s"] = false,
+    ["Interface framerate limit: %s"] = "Limit FPS interfejsu: %s",
-    ["Inventory"] = "Inwentarz",
+    ["Inventory"] = "Ekwipunek",
-    ["Invite to Party"] = "Zapros do zabawy",
+    ["Invite to Party"] = "Zapros do druzyny",
     ["Invite to private chat"] = "Zapros do prywatnej konwersacji",
-    ["IP Address Banishment"] = false,
+    ["IP Address Banishment"] = "Blokada adresu IP",
-    ["Item Offers"] = false,
+    ["Item Offers"] = "Oferty Przedmiotow",
-    ["It is empty."] = false,
+    ["It is empty."] = "To jest puste.",
-    ["Join %s's Party"] = false,
+    ["Join %s's Party"] = "Dolacz do druzyny gracza %s",
-    ["Leave Party"] = "Opusc zabawe",
+    ["Leave Party"] = "Opusc druzyne",
     ["Level"] = "Poziom",
-    ["Lifetime Premium Account"] = false,
+    ["Lifetime Premium Account"] = "Konto Premium na Stale",
     ["Limits FPS to 60"] = "Ogranicz FPS do 60",
     ["List of items that you're able to buy"] = "Lista przedmiotow, ktore mozesz kupic",
     ["List of items that you're able to sell"] = "Lista przedmiotow, ktore mozesz sprzedac",
     ["Load"] = "Wczytaj",
-    ["Logging out..."] = false,
+    ["Logging out..."] = "Wylogowuje...",
     ["Login"] = "Zaloguj",
     ["Login Error"] = "Blad Logowania",
     ["Login Error"] = "Blad Logowania",
-    ["Logout"] = false,
+    ["Logout"] = "Wyloguj",
     ["Look"] = "Spojrz",
     ["Magic Level"] = "Poziom Magiczny",
     ["Make sure that your client uses\nthe correct game protocol version"] = "Upewnij sie, ze twoj klient\nuzywa wlasciwego protokolu gry.",
@@ -193,7 +187,7 @@ locale = {
     ["Market"] = false,
     ["Market Offers"] = false,
     ["Message of the day"] = "Wiadomosc dnia",
-    ["Message to "] = false,
+    ["Message to "] = "Wiadomosc do ",
     ["Message to %s"] = "Wiadomosc do %s",
     ["Minimap"] = "Minimapa",
     ["Module Manager"] = "Menedzer modulow",
@@ -201,32 +195,32 @@ locale = {
     ["Mount"] = false,
     ["Move Stackable Item"] = "Przenies przedmiot",
     ["Move up"] = "Przenies wyzej",
-    ["My Offers"] = false,
+    ["My Offers"] = "Moje Oferty",
     ["Name:"] = "Nazwa:",
     ["Name Report"] = false,
     ["Name Report + Banishment"] = false,
     ["Name Report + Banishment + Final Warning"] = false,
-    ["No"] = false,
+    ["No"] = "Nie",
     ["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 item selected."] = "Nie wybrano przedmiotu.",
-    ["No Mount"] = false,
+    ["No Mount"] = "Brak wierzchowca",
-    ["No Outfit"] = false,
+    ["No Outfit"] = "Brak stroju",
     ["No statement has been selected."] = false,
     ["Notation"] = false,
     ["NPC Trade"] = "Handel NPC",
-    ["Offer History"] = false,
+    ["Offer History"] = "Historia Ofert",
-    ["Offers"] = false,
+    ["Offers"] = "Oferty",
-    ["Offer Type:"] = false,
+    ["Offer Type:"] = "Typ Oferty:",
-    ["Offline Training"] = false,
+    ["Offline Training"] = "Trening Offline",
     ["Ok"] = "Ok",
     ["on %s.\n"] = false,
     ["Open"] = "Otworz",
     ["Open a private message channel:"] = "Otworz prywatny kanal:",
-    ["Open charlist automatically when starting client"] = false,
+    ["Open charlist automatically when starting client"] = "Automatycznie otworz liste postaci przy starcie gry",
     ["Open in new window"] = "Otworz w nowym oknie",
     ["Open new channel"] = "Otworz nowy kanal",
     ["Options"] = "Opcje",
-    ["Overview"] = false,
+    ["Overview"] = "Podsumowanie",
     ["Pass Leadership to %s"] = "Przekaz przywodztwo %s",
     ["Password"] = "Haslo",
     ["Piece Price:"] = false,
@@ -236,79 +230,79 @@ locale = {
     ["Please use this dialog to only report bugs. Do not report rule violations here!"] = false,
     ["Please wait"] = "Prosze czekac",
     ["Port"] = "Port",
-    ["Position:"] = false,
+    ["Position:"] = "Pozycja:",
-    ["Position: %i %i %i"] = false,
+    ["Position: %i %i %i"] = "Pozycja: %i %i %i",
-    ["Premium Account (%s) days left"] = false,
+    ["Premium Account (%s) days left"] = "Konto Premium (%s) dni",
     ["Price:"] = "Cena:",
     ["Primary"] = "Podstawowy",
-    ["Protocol"] = false,
+    ["Protocol"] = "Protokol",
-    ["Quest Log"] = false,
+    ["Quest Log"] = "Dziennik Misji",
     ["Randomize"] = false,
     ["Randomize characters outfit"] = false,
-    ["Reason:"] = false,
+    ["Reason:"] = "Powod:",
     ["Refresh"] = "Odswiez",
-    ["Refresh Offers"] = false,
+    ["Refresh Offers"] = "Odswiez Oferty",
-    ["Regeneration Time"] = false,
+    ["Regeneration Time"] = "Czas Regeneracji",
-    ["Reject"] = false,
+    ["Reject"] = "Odrzuc",
     ["Reload All"] = "Przeladuj Wszystko",
-    ["Remember account and password when starts client"] = false,
+    ["Remember account and password when starts client"] = "Zapamietaj identyfikator konta oraz haslo",
     ["Remember password"] = "Zapamietaj haslo",
     ["Remove"] = "Usun",
     ["Remove %s"] = "Usun %s",
-    ["Report Bug"] = false,
+    ["Report Bug"] = "Zglos Blad",
-    ["Reserved for more functionality later."] = false,
+    ["Reserved for more functionality later."] = "Zarezerowane dla przyszlych funkcjonalnosci.",
     ["Reset Market"] = false,
-    ["Revoke %s's Invitation"] = false,
+    ["Revoke %s's Invitation"] = "Odmow na zaproszenie gracza %s",
     ["Rotate"] = "Obroc",
-    ["Rule Violation"] = false,
+    ["Rule Violation"] = "Zlamanie Regul",
-    ["Save"] = false,
+    ["Save"] = "Zapisz",
-    ["Save Messages"] = false,
+    ["Save Messages"] = "Zapisz Wiadomosci",
     ["Search:"] = "Szukaj:",
-    ["Search all items"] = false,
+    ["Search all items"] = "Znajdz wszystkie przedmioty",
     ["Secondary"] = "Drugorzedny",
     ["Select object"] = "Wybierz obiekt",
     ["Select Outfit"] = "Wybierz outfit",
-    ["Select your language"] = false,
+    ["Select your language"] = "Wybierz jezyk",
     ["Sell"] = "Sprzedaj",
-    ["Sell Now"] = false,
+    ["Sell Now"] = "Sprzedaj Teraz",
-    ["Sell Offers"] = false,
+    ["Sell Offers"] = "Oferty Sprzedazy",
-    ["Send"] = false,
+    ["Send"] = "Wyslij",
     ["Send automatically"] = "Wyslij automatycznie",
-    ["Send Message"] = false,
+    ["Send Message"] = "Wyslij Wiadomosc",
     ["Server"] = "Serwer",
     ["Server Log"] = "Log Serwera",
     ["Set Outfit"] = "Ustaw outfit",
     ["Shielding"] = "Obrona tarcza",
     ["Show all items"] = "Pokaz wszystkie przedmioty",
-    ["Show connection ping"] = false,
+    ["Show connection ping"] = "Wyswietl ping",
     ["Show Depot Only"] = false,
     ["Show event messages in console"] = "Pokaz wydarzenia w konsoli",
-    ["Show frame rate"] = "Pokaz ilosc FPS",
+    ["Show frame rate"] = "Pokaz FPS",
     ["Show info messages in console"] = "Pokaz informacje w konsoli",
-    ["Show left panel"] = false,
+    ["Show left panel"] = "Pokaz lewy panel",
     ["Show levels in console"] = "Pokaz poziomy w konsoli",
-    ["Show Offline"] = false,
+    ["Show Offline"] = "Pokaz Niedostepnych",
     ["Show private messages in console"] = "Pokaz prywatne wiadomosci w konsoli",
-    ["Show private messages on screen"] = false,
+    ["Show private messages on screen"] = "Pokaz prywatne wiadomosci na ekranie",
-    ["Show Server Messages"] = false,
+    ["Show Server Messages"] = "Pokaz Wiadomosci Serwera",
     ["Show status messages in console"] = "Pokaz status w konsoli",
-    ["Show Text"] = false,
+    ["Show Text"] = "Pokaz Tekst",
     ["Show timestamps in console"] = "Pokaz znaczniki czasu w konsoli",
     ["Show your depot items only"] = false,
     ["Skills"] = "Umiejetnosci",
-    ["Soul"] = false,
+    ["Soul"] = "Dusze",
     ["Soul Points"] = "Punkty Duszy",
     ["Special"] = false,
-    ["Speed"] = false,
+    ["Speed"] = "Predkosc",
     ["Spell Cooldowns"] = false,
-    ["Spell List"] = false,
+    ["Spell List"] = "Lista Zaklec",
     ["Stamina"] = "Wytrzymalosc",
     ["Statement:"] = false,
     ["Statement Report"] = false,
-    ["Statistics"] = false,
+    ["Statistics"] = "Statystki",
-    ["Stop Attack"] = "Zatrzymaj atak",
+    ["Stop Attack"] = "Anuluj atak",
-    ["Stop Follow"] = "Zatrzymaj podazanie",
+    ["Stop Follow"] = "Przestan podazac",
-    ["Support"] = false,
+    ["Support"] = "Wsparcie",
     ["%s: (use object)"] = "%s: (uzyj obiekt)",
     ["%s: (use object on target)"] = "%s: (uzyj obiektu na celu)",
     ["%s: (use object on yourself)"] = "%s: (uzyj obiektu na sobie)",
@@ -316,15 +310,15 @@ locale = {
     ["Sword Fighting"] = "Atak mieczem",
     ["Terminal"] = "Terminal",
     ["There is no way."] = "Nie ma drogi.",
-    ["Title"] = false,
+    ["Title"] = "Tytul",
-    ["Total Price:"] = false,
+    ["Total Price"] = "Cena sumaryczna",
     ["Trade"] = "Handel",
     ["Trade with ..."] = "Handluj z ...",
-    ["Trying to reconnect in %s seconds."] = false,
+    ["Trying to reconnect in %s seconds."] = "Ponowna proba laczenia za %s sekund.",
-    ["Unable to load dat file, please place a valid dat in '%s'"] = false,
+    ["Unable to load dat file, please place a valid dat in '%s'"] = "Nie mozna zaladowac pliku .dat z '%s'",
-    ["Unable to load spr file, please place a valid spr in '%s'"] = false,
+    ["Unable to load spr file, please place a valid spr in '%s'"] = "Nie mozna zaladowac pliku .spr z '%s'",
     ["Unable to logout."] = "Nie mozna sie wylogowac.",
-    ["Unignore"] = false,
+    ["Unignore"] = "Anuluj Ignorowanie",
     ["Unload"] = "Wylacz",
     ["Update needed"] = false,
     ["Use"] = "Uzyj",
@@ -334,42 +328,87 @@ locale = {
     ["Version"] = "Wersja",
     ["VIP List"] = "Lista VIP",
     ["Voc."] = false,
-    ["Vocation"] = false,
+    ["Vocation"] = "Klasa",
-    ["Waiting List"] = false,
+    ["Waiting List"] = "Lista Oczekujacych",
     ["Website"] = "Strona:",
     ["Weight:"] = "Waga:",
     ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = false,
     ["With crosshair"] = "Z celownikiem",
-    ["Yes"] = false,
+    ["Yes"] = "Tak",
-    ["You are bleeding"] = false,
+    ["You are bleeding"] = "Krwawisz",
     ["You are burning"] = "Palisz sie",
     ["You are cursed"] = "Jestes przeklety",
     ["You are dazzled"] = "Jestes oslepiony",
     ["You are dead."] = "Zginales marnie.",
-    ["You are dead"] = false,
+    ["You are dead"] = "Jestes martwy",
-    ["You are drowing"] = "Topisz sie",
+    ["You are drowning"] = "Topisz sie",
-    ["You are drunk"] = false,
+    ["You are drunk"] = "Caly swiat wiruje",
     ["You are electrified"] = "Jestes porazony pradem",
     ["You are freezing"] = "Marzniesz",
     ["You are hasted"] = "Zapieprzasz",
-    ["You are hungry"] = false,
+    ["You are hungry"] = "Burczy ci w brzuchu",
     ["You are paralysed"] = "Jestes sparalizowany",
     ["You are poisoned"] = "Jestes zatruty",
     ["You are protected by a magic shield"] = "Jestes chroniony magiczna tarcza",
     ["You are strengthened"] = "Jestes wzmocniony",
     ["You are within a protection zone"] = "Jestes w strefie ochronnej",
-    ["You can enter new text."] = false,
+    ["You can enter new text."] = "Mozesz wprowadzic nowy tekst.",
     ["You have %s percent"] = "Masz %s procent",
     ["You have %s percent to go"] = "Brakuje Ci %s procent",
     ["You may not logout during a fight"] = "Nie mozesz sie wylogowac w trakcie walki",
     ["You may not logout or enter a protection zone"] = "Nie mozesz sie wylogowac ani wejsc do strefy ochronnej",
-    ["You must enter a comment."] = false,
+    ["You must enter a comment."] = "Prosze wprowadzic komentarz",
-    ["You must enter a valid server address and port."] = false,
+    ["You must enter a valid server address and port."] = "Prosze wprowadzic poprawny adres i port.",
     ["You must select a character to login!"] = "Musisz wybrac postac aby sie zalogowac!",
-    ["Your Capacity:"] = false,
+    ["Your Capacity:"] = "Twoja Ladownosc:",
     ["You read the following, written by \n%s\n"] = false,
     ["You read the following, written on \n%s.\n"] = false,
     ["Your Money:"] = false,
+    ["Enable dash walking"] = false,
+    ["Will boost your walk on high speed characters"] = "Przyspieszy poruszanie sie postaci o wysokiej predkosci",
+    ["Display creature names"] = "Wyswietlaj nazwy potworow",
+    ["Display creature health bars"] = "Wyswietlaj paski zycia potworow",
+    ["Display text messages"] = "Wyswietlaj wiadomosci tekstowe",
+    ["Change language"] = "Zmien jezyk",
+    ["Enable lights"] = "Odblokuj oswietlenie",
+    ["Enable audio"] = "Odblokuj dzwiek",
+    ["Enable music sound"] = "Odblokuj muzyke",
+    ["Music volume: %d"] = "Glosnosc muzyki: %d",
+		["Audio"] = "Dzwiek",
+		["Server List"] = "Lista serwerow",
+		["Server list"] = "Lista serwerow",
+		["Client Version"] = "Wersja klienta",
+		["Add new server"] = "Dodaj nowy serwer",
+		["Select"] = "Wybierz",
+		["New Server"] = "Nowy serwer",
+		["Host"] = false,
+		["Reset All"] = "Ustaw domyslne",
+		["Disable chat mode, allow to walk using ASDW"] = "Zablokuj tryb rozmow, zezwol na poruszanie sie za pomoca klawiszy ADSW",
+		["Name"] = "Imie",
+		["Price"] = "Cena",
+		["Your Money"] = "Twoje fundusze",
+		["Weight"] = "Waga",
+		["Your Capacity"] = "Twoj udzwig",
+		["Search"] = "Szukaj",
+		["Sell All"] = "Sprzedaj wszystko",
+		["Statement"] = false,
+		["Reason"] = "Powod",
+		["Action"] = "Akcja",
+		["Comment"] = "Komentarz",
+		["Balance"] = false,
+		["Offer Type"] = "Typ oferty",
+		["Piece Price"] = false,
+		["Find"] = "Szukaj",
+		["Formula"] = "Formula",
+		["Group"] = "Groupa",
+		["Type"] = "Typ",
+		["Cooldown"] = false,
+		["Premium"] = false,
+		["Any"] = "Dowolny",
+		["Sorcerer"] = "Czarodziej",
+		["Druid"] = false,
+		["Paladin"] = "Paladyn",
+		["Knight"] = "Rycerz"
   }
 }
 

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,
+    ["Account Status"] = "Estado da Conta",
-    ["Action:"] = "A<EFBFBD><EFBFBD>o:",
+    ["Action"] = "A<EFBFBD><EFBFBD>o",
-    ["Add"] = "Adicionar",
+    ["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:",
+    ["Balance"] = "Saldo",
-    ["Banishment"] = "Banimento",
     ["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",
+    ["Game"] = "Jogo",
-    ["Graphics card driver not detected"] = false,
+    ["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 higher exp. levels"] = "Esconder feiti<74>os de n<>vel maior",
-    ["Hide spells for other vocations"] = false,
+    ["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 List"] = "Lista de Ignorados",
-    ["Ignore players"] = false,
+    ["Ignore players"] = "Jogadores ignorados",
-    ["Ignore Private Messages"] = false,
+    ["Ignore Private Messages"] = "Ignorar mensagens privadas",
-    ["Ignore Yelling"] = false,
+    ["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"] = "Posi<EFBFBD><EFBFBD>o",
-    ["Position: %i %i %i"] = false,
+    ["Position: %i %i %i"] = "Posi<EFBFBD><EFBFBD>o: %i %i %i",
-    ["Premium Account (%s) days left"] = false,
+    ["Premium Account (%s) days left"] = "Conta Premium (%s) dias faltando",
-    ["Price:"] = "Pre<EFBFBD>o",
+    ["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:",
+    ["Randomize"] = "Embaralhar",
-    ["Refresh"] = "Atualizar",
+    ["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"] = "Salvar Mensagens",
-    ["Save Messages"] = false,
+    ["Save"] = "Salvar",
-    ["Search:"] = "Procurar:",
     ["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,
+    ["Select your language"] = "Selecione sua l<>ngua",
-    ["Sell"] = "Vender",
+    ["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,
+    ["Send Message"] = "Enviar Mensagem",
-    ["Server"] = "Servidor",
+    ["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 Cooldowns"] = "",
-    ["Spell List"] = false,
+    ["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,
+    ["Support"] = "Suporte",
-    ["%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)",
     ["Sword Fighting"] = "Combate com Espada",
     ["Terminal"] = "Terminal",
     ["There is no way."] = "N<EFBFBD>o h<> rota",
-    ["Title"] = false,
+    ["Title"] = "T<EFBFBD>tulo",
-    ["Total Price:"] = "Pre<EFBFBD>o total:",
+    ["Total Price"] = "Pre<EFBFBD>o total",
-    ["Trade"] = "Trocar",
     ["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",
+    ["Type"] = "Tipo",
-    ["Unable to load spr file, please place a valid spr in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo spr, por favor coloque um arquivo v<>lido em %s",
+    ["Unable to establish a connection. (err: %d)"] = "N<EFBFBD>o foi poss<73>vel estabilizar a conex<65>. (err: %d)",
+    ["Unable to load dat file, please place a valid dat in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo DAT, por favor coloque um arquivo v<>lido em %s",
+    ["Unable to load spr file, please place a valid spr in '%s'"] = "N<EFBFBD>o foi poss<73>vel carregar o arquivo SPR, por favor coloque um arquivo v<>lido em %s",
     ["Unable to logout."] = "N<EFBFBD>o <20> possivel sair",
-    ["Unignore"] = false,
+    ["Unignore"] = "Designorar",
     ["Unload"] = "Descarregar",
-    ["Update needed"] = false,
+    ["Update needed"] = "Atualiza<EFBFBD><EFBFBD>o necess<73>ria",
-    ["Use"] = "Usar",
     ["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,
+    ["You read the following, written on \n%s.\n"] = "Voc<EFBFBD> l<> o seguinte, escrito em \n%s.\n",
-    ["Your Money:"] = "Seu dinheiro:",
+    ["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
+  size: 1 1
-  texture: /data/particles/particle
+  texture: /particles/particle
   composition-mode: normal
 
 Effect
-  name: background-effect
+  name: groupcooldown-effect
-  description: Effect for the game background
+  description: Effect for group cooldowns in the cooldown module
 
   System
     position: 0 0
 
     Emitter
       position: 0 0
-      delay: 0
+      delay: 0.06
-      duration: 0
+      duration: 0.2
-      burst-rate: 50
+      burst-rate: 350
-      burst-count: 1
+      burst-count: 50
-      particle-type: default_particle
+      particle-type: groupcooldown_particle
 
     AttractionAffector
       position: 0 0
       acceleration: 1000
+

data/styles/10-buttons.otui

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

data/styles/10-checkboxes.otui

@@ -1,7 +1,6 @@
 CheckBox < UICheckBox
   size: 16 16
   text-align: left
-  text: aa
   text-offset: 16 0
   color: #aaaaaa
   image-color: #ffffffff

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,9 +4,16 @@ TextList < UIScrollArea
   border-color: #1d222b
   background-color: #222833
   padding: 1
+  auto-focus: none
 
 HorizontalList < UIScrollArea
   layout: horizontalBox
   border-width: 1
   border-color: #1d222b
   background-color: #222833
+
+VerticalList < UIScrollArea
+  layout: verticalBox
+  border-width: 1
+  border-color: #1d222b
+  background-color: #222833

data/styles/10-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,17 +1,9 @@
 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: 3
-  padding-bottom: 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
+  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
+local script = '/' .. g_app.getCompactName() .. 'rc.lua'
-  dofile("/otclientrc")
-end
 
+if g_resources.fileExists(script) then
+  dofile(script)
+end

modules/.project/modules.sublime-project

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

modules/client/client.lua

@@ -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.lua'
+  if g_resources.fileExists(script) then
+    dofile(script)
+  end
+
   local message = tr('All modules and scripts were reloaded.')
 
   modules.game_textmessage.displayGameMessage(message)
@@ -48,6 +53,9 @@ function startup()
 end
 
 function init()
+  connect(g_app, { onRun = startup, 
+                   onExit = exit })
+
   g_window.setMinimumSize({ width = 600, height = 480 })
   g_sounds.preload(musicFilename)
 
@@ -82,17 +90,22 @@ 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())
   g_settings.set('window-maximized', g_window.isMaximized())
-
+end
-  local protocolVersion = g_game.getProtocolVersion()
+
-  if protocolVersion ~= 0 then
+function exit()
-    g_settings.set('protocol-version', protocolVersion)
+  g_logger.info("Exiting application..")
-  end
 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_stats
+    - client_serverlist
+    - client_stats

modules/client_background/background.lua

@@ -1,18 +1,19 @@
 -- private variables
 local background
+local clientVersionLabel
 
 -- public functions
 function init()
   background = g_ui.displayUI('background')
   background:lower()
 
-  local clientVersionLabel = background:getChildById('clientVersionLabel')
+  clientVersionLabel = background:getChildById('clientVersionLabel')
   clientVersionLabel:setText(g_app.getName() .. ' ' .. g_app.getVersion() .. '\n' ..
                              'Rev  ' .. g_app.getBuildRevision() .. ' ('.. g_app.getBuildCommit() .. ')\n' ..
                              'Built on ' .. g_app.getBuildDate())
 
   if not g_game.isOnline() then
-    g_effects.fadeIn(clientVersionLabel, 1500)
+    addEvent(function() g_effects.fadeIn(clientVersionLabel, 1500) end)
   end
 
   connect(g_game, { onGameStart = hide })
@@ -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
+  if tries > 50 then
-    CharacterList.destroyLoadBox()
-    displayErrorBox(tr('Error'), tr('Unable to logout.'))
     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)
-  g_game.loginWorld(G.account, G.password, charInfo.worldName, charInfo.worldHost, charInfo.worldPort, charInfo.characterName, locale)
 
   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: |
-    local children = self:getChildren()
+    function(self)
-    for i=1,#children do
+      local children = self:getChildren()
-      children[i]:setOn(self:isFocused())
+      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:
+    $on:
-      color: #aaaaaa
+      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:
+    $on:
-      color: #aaaaaa
+      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

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

modules/client_entergame/entergame.otui

@@ -1,9 +1,26 @@
 EnterGameWindow < MainWindow
+  !text: tr('Enter Game')
+  size: 236 274
+
+EnterGameButton < Button
+  width: 64
+
+ServerListButton < UIButton
+  size: 17 17
+  image-source: /images/topbuttons/minimap
+  image-color: #ffffffff
+
+  $hover !disabled:
+    image-color: #ffffff99
+
+  $pressed:
+    image-color: #ffffff44
+
+  $disabled:
+    image-color: #ffffff55
 
 EnterGameWindow
   id: enterGame
-  !text: tr('Enter Game')
-  size: 236 274
   @onEnter: EnterGame.doLogin()
 
   MenuLabel
@@ -41,17 +58,26 @@ EnterGameWindow
     margin-top: 8
     text-auto-resize: true
 
-  TextEdit
+  ServerListButton
-    id: serverHostTextEdit
+    id: serverListButton
-    !tooltip: tr('Make sure that your client uses\nthe correct game protocol version')
+    !tooltip: tr('Server list')
-    anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: serverLabel.bottom
+    margin-top: 3
+    @onClick: ServerList.show()
+
+  TextEdit
+    id: serverHostTextEdit
+    !tooltip: tr('Make sure that your client uses\nthe correct game client version')
+    anchors.left: parent.left
+    anchors.right: serverListButton.left
+    anchors.top: serverLabel.bottom
     margin-top: 2
+    margin-right: 4
 
   MenuLabel
-    id: protocolLabel
+    id: clientLabel
-    !text: tr('Protocol')
+    !text: tr('Client Version')
     anchors.left: parent.left
     anchors.top: serverHostTextEdit.bottom
     text-auto-resize: true
@@ -59,10 +85,10 @@ EnterGameWindow
     margin-top: 8
 
   ComboBox
-    id: protocolComboBox
+    id: clientComboBox
     anchors.left: parent.left
     anchors.right: parent.horizontalCenter
-    anchors.top: protocolLabel.bottom
+    anchors.top: clientLabel.bottom
     margin-top: 2
     margin-right: 3
     width: 90
@@ -80,7 +106,7 @@ EnterGameWindow
     text: 7171
     anchors.right: parent.right
     anchors.left: parent.horizontalCenter
-    anchors.top: protocolComboBox.top
+    anchors.top: clientComboBox.top
     margin-left: 3
 
   CheckBox
@@ -103,9 +129,8 @@ EnterGameWindow
     anchors.top: prev.bottom
     margin-top: 2
 
-  Button
+  EnterGameButton
     !text: tr('Ok')
-    width: 64
     anchors.right: parent.right
     anchors.bottom: parent.bottom
     @onClick: EnterGame.doLogin()
@@ -116,3 +141,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
@@ -139,7 +137,7 @@ function unloadCurrentModule()
     local module = g_modules.getModule(focusedChild:getText())
     if module then
       module:unload()
-      if ModuleManager == nil then return end
+      if modules.client_modulemanager == nil then return end
       updateModuleInfo(module:getName())
       refreshLoadedModules()
     end

modules/client_options/audio.otui

@@ -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
+    id: dashWalk
-    !text: tr('Enable walk booster')
+    !text: tr('Enable dash walking')
-    !tooltip: tr('Also known as dash in tibia community, recommended\nfor playing characters with high speed')
+    !tooltip: tr('Will boost your walk on high speed characters')
-
-  OptionCheckBox
-    id: enableMusic
-    !text: tr('Enable music')
 
   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.left: parent.left
-    anchors.verticalCenter: prev.verticalCenter
+    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,17 @@ Panel
     !text: tr('Show frame rate')
 
   OptionCheckBox
-    id: fullscreen
+    id: enableLights
-    !text: tr('Fullscreen')
+    !text: tr('Enable lights')
 
+  OptionCheckBox
+    id: fullscreen
+    !text: tr('Fullscreen')
+    tooltip: Ctrl+Shift+F
+    
   OptionCheckBox
     id: dontStretchShrink
-    !text: tr("Don't stretch or shrink Game Window")
+    !text: tr('Don\'t stretch/shrink Game Window')  
 
   Label
     id: backgroundFrameRateLabel
@@ -52,7 +50,7 @@ Panel
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.top: prev.bottom
-    margin-top: 16
+    margin-top: 12
     @onSetup: |
       local value = modules.client_options.getOption('backgroundFrameRate')
       local text = value
@@ -62,7 +60,7 @@ Panel
 
       self:setText(tr('Game framerate limit: %s', text))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: backgroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
@@ -86,7 +84,7 @@ Panel
 
       self:setText(tr('Interface framerate limit: %s', text))
 
-  FrameRateScrollbar
+  OptionScrollbar
     id: foregroundFrameRate
     anchors.left: parent.left
     anchors.right: parent.right
@@ -105,7 +103,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,72 @@
 local defaultOptions = {
   vsync = false,
-  showFps = true,
+  showFps = false,
-  showPing = true,
+  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,
+  dontStretchShrink = false
 }
 
-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_graphics.getPainterEngine() == 2 then
+  if g_window.getPlatformType() == 'WIN32-EGL' then
-    enginesRadioGroup:selectWidget(ogl2)
+    enginesRadioGroup:selectWidget(dx9)
+    ogl1:setEnabled(false)
+    ogl2:setEnabled(false)
+    dx9:setEnabled(true)
   else
-    enginesRadioGroup:selectWidget(ogl1)
+    ogl1:setEnabled(g_graphics.isPainterEngineAvailable(1))
-  end
+    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))
+    if g_app.getOs() ~= 'windows' then
-  ogl2:setEnabled(g_graphics.isPainterEngineAvailable(2))
+      dx9:hide()
+    end
+  end
 
   enginesRadioGroup.onSelectionChange = function(self, selected)
     if selected == ogl1 then
@@ -62,75 +82,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
+    options[k] = v
-      setOption(k, g_settings.getBoolean(k))
-    elseif type(v) == 'number' then
-      setOption(k, g_settings.getNumber(k))
-    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')
+  g_keyboard.bindKeyDown('Ctrl+Shift+F', function() toggleOption('fullscreen') end)
-  optionsTabBar:addTab(tr('Game'), gamePanel)
+  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
+  audioPanel = g_ui.loadUI('audio')
-    local optionWalkBooster = gamePanel:getChildById('walkBooster')
+  optionsTabBar:addTab(tr('Audio'), audioPanel, '/images/optionstab/audio')
-    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
 
-  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+Shift+F')
-  g_keyboard.unbindKeyDown('Ctrl+F')
+  g_keyboard.unbindKeyDown('Ctrl+N')
-  g_keyboard.unbindKeyDown('Ctrl+Shift+D')
   optionsWindow:destroy()
-  optionsWindow = nil
   optionsButton:destroy()
-  optionsButton = nil
+  audioButton:destroy()
-  optionsTabBar = nil
+end
-  gamePanel = nil
+
-  consolePanel = nil
+function setup()
-  graphicsPanel = nil
+  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 +154,95 @@ function hide()
   optionsWindow:hide()
 end
 
-function toggleOption(key)
+function toggleDisplays()
-  local optionWidget = optionsWindow:recursiveGetChildById(key)
+  if options['displayNames'] and options['displayHealth'] then
-  if optionWidget then
+    setOption('displayNames', false)
-    optionWidget:setChecked(not getOption(key))
+  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)
+function toggleOption(key)
-  if options[key] == value then return end
+  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()
+    modules.client_topmenu.setFpsVisible(value)
-      local frameCounter = rootWidget:recursiveGetChildById('frameCounter')
-      if frameCounter then frameCounter:setVisible(value) end
-    end)
   elseif key == 'showPing' then
-    addEvent(function()
+    modules.client_topmenu.setPingVisible(value)
-      local ping = rootWidget:recursiveGetChildById('pingLabel')
-      if ping then ping:setVisible(value) end
-    end)
   elseif key == 'fullscreen' then
     g_window.setFullscreen(value)
+  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
+    modules.game_interface.getLeftPanel():setOn(value)
+  elseif key == 'backgroundFrameRate' 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))
+    g_app.setBackgroundPaneMaxFps(v)
+  elseif key == 'foregroundFrameRate' 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))
+    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
+    graphicsPanel:getChildById('ambientLightLabel'):setText(tr('Ambient light: %s%%', value))
+    gameMapPanel:setMinimumAmbientLight(value/100)
+    gameMapPanel:setDrawLights(options['enableLights'] and value < 100)
+  elseif key == 'painterEngine' then
+    g_graphics.selectPainterEngine(value)
+  elseif key == 'displayNames' then
+    gameMapPanel:setDrawNames(value)
+  elseif key == 'displayHealth' then
+    gameMapPanel:setDrawHealthBars(value)
+  elseif key == 'displayText' then
+    gameMapPanel:setDrawTexts(value)
   elseif key == 'dontStretchShrink' then
     addEvent(function()
       modules.game_interface.updateStretchShrink()
     end)
-  elseif key == 'enableMusic' then
-    g_sounds.setAudioEnabled(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
-      graphicsPanel:getChildById('backgroundFrameRateLabel'):setText(tr('Game framerate limit: %s', text))
-    end
-    g_app.setBackgroundPaneMaxFps(value)
-  elseif key == 'foregroundFrameRate' then
-    local text = value
-    if value <= 0 or value >= 61 then
-      text = 'max'
-      value = 0
-    end
-
-    if graphicsPanel then
-      graphicsPanel:getChildById('foregroundFrameRateLabel'):setText(tr('Interface framerate limit: %s', text))
-    end
-    g_app.setForegroundPaneMaxFps(value)
-  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)
-  elseif key == 'painterEngine' then
-    g_graphics.selectPainterEngine(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 +251,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.top: optionsTabBar.top
-    anchors.left: parent.left
+    anchors.left: optionsTabBar.right
     anchors.right: parent.right
-    anchors.bottom: parent.bottom
+    anchors.bottom: optionsTabBar.bottom
-    margin-top: 10
+    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.getSupportedClients()) do
+        self:addOption(proto)
+      end
+
+  Button
+    id: buttonAdd
+    !text: tr('Add')
+    width: 64
+    anchors.right: parent.horizontalCenter
+    anchors.bottom: parent.bottom
+    margin-right: 2
+    @onClick: AddServer.add()
+
+  Button
+    id: buttonCancel
+    !text: tr('Cancel')
+    width: 64
+    anchors.left: parent.horizontalCenter
+    anchors.bottom: parent.bottom
+    margin-left: 2
+    @onClick: AddServer.hide()

modules/client_serverlist/serverlist.lua

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

modules/client_serverlist/serverlist.otmod

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

modules/client_serverlist/serverlist.otui

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

modules/client_stats/stats.lua

@@ -25,6 +25,8 @@ end
 function terminate()
   disconnect(g_game, { onGameStart = onGameStart,
                        onGameEnd = onGameEnd })
+  removeEvent(firstReportEvent)
+  removeEvent(sendReportEvent)
 end
 
 function configure(host, port, delay)
@@ -45,13 +47,15 @@ end
 
 function onGameStart()
   if not HOST then return end
+  removeEvent(firstReportEvent)
+  removeEvent(sendReportEvent)
   firstReportEvent = addEvent(sendReport, FIRST_REPORT_DELAY*1000)
   sendReportEvent = cycleEvent(sendReport, REPORT_DELAY*1000)
 end
 
 function onGameEnd()
-  removeEvent(sendReportEvent)
   removeEvent(firstReportEvent)
+  removeEvent(sendReportEvent)
 end
 
 function onConnect(protocol)
@@ -75,6 +79,10 @@ function onConnect(protocol)
   post = post .. '&window_height='     .. g_window.getHeight()
   post = post .. '&player_name='       .. g_game.getCharacterName()
   post = post .. '&world_name='        .. g_game.getWorldName()
+  post = post .. '&otserv_host='       .. G.host
+  post = post .. '&otserv_port='       .. G.port
+  post = post .. '&otserv_protocol='   .. g_game.getProtocolVersion()
+  post = post .. '&otserv_client='     .. g_game.getClientVersion()
   post = post .. '&build_version='     .. g_app.getVersion()
   post = post .. '&build_revision='    .. g_app.getBuildRevision()
   post = post .. '&build_commit='      .. g_app.getBuildCommit()
@@ -84,6 +92,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 +107,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 +119,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')
+  local files
-  for _i,style in pairs(styles) do
+  files = g_resources.listDirectoryFiles('/styles')
-    if string.ends(style, '.otui') then
+  for _,file in pairs(files) do
-        g_ui.importStyle('/styles/' .. style)
+    if g_resources.isFileType(file, 'otui') then
+      g_ui.importStyle('/styles/' .. file)
     end
   end
 
-  local fonts = g_resources.listDirectoryFiles('/fonts')
+  files = g_resources.listDirectoryFiles('/fonts')
-  for _i,font in pairs(fonts) do
+  for _,file in pairs(files) do
-    if string.ends(font, '.otfont') then
+    if g_resources.isFileType(file, 'otfont') then
-      g_fonts.importFont('/fonts/' .. font)
+      g_fonts.importFont('/fonts/' .. file)
     end
   end
 
-  local particles = g_resources.listDirectoryFiles('/particles')
+  files = g_resources.listDirectoryFiles('/particles')
-  for _i,particle in pairs(particles) do
+  for _,file in pairs(files) do
-    if string.ends(particle, '.otps') then
+    if g_resources.isFileType(file, 'otps')then
-      g_particles.importParticle('/particles/' .. particle)
+      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)
+local function pcolored(text, color)
-  widget = widget or rootWidget
+  color = color or 'white'
-  level = level or 0
+  modules.client_terminal.addLine(tostring(text), color)
-  for i=1,widget:getChildCount() do
+end
-    local child = widget:getChildByIndex(i)
+
-    if child:isVisible() then
+function draw_debug_boxes()
-      local name = child:getId()
+  g_ui.setDebugBoxesDrawing(not g_ui.isDrawingDebugBoxes())
-      if name:match('widget%d+') == nil then
+end
-        print(string.rep(' ', level) .. name)
+
-      end
+function hide_map()
-      if child:getId() ~= 'terminalBuffer' then
+  modules.game_interface.getMapPanel():hide()
-        dumpWidgets(child, level+1)
+end
-      end
+
+function show_map()
+  modules.game_interface.getMapPanel():show()
+end
+
+function live_textures_reload()
+  g_textures.liveReload()
+end
+
+function live_module_reload(name)
+  if not name then
+    pcolored('ERROR: missing module name', 'red')
+    return
+  end
+
+  local module = g_modules.getModule(name)
+  if not module then
+    pcolored('ERROR: unable to find module ' .. name, 'red')
+    return
+  end
+
+  if not module:isReloadble() then
+    pcolored('ERROR: that module is not reloadable', 'red')
+    return
+  end
+
+  if not module:canReload() then
+    pcolored('ERROR: some other modules requires this module, cannot reload now', 'red')
+    return
+  end
+
+  local files = {}
+  local hasFile = false
+  for _,file in pairs(g_resources.listDirectoryFiles('/' .. name)) do
+    local filepath = '/' .. name .. '/' .. file
+    local time = g_resources.getFileTime(filepath)
+    if time > 0 then
+      files[filepath] = time
+      hasFile = true
     end
   end
-end
 
-function drawDebugBoxes(enable)
+  if not hasFile then
-  if enable == nil then enable = true end
+    pcolored('ERROR: unable to find any file for module', 'red')
-  g_ui.setDebugBoxesDrawing(enable)
+    return
-end
+  end
 
-function hideMap()
+  cycleEvent(function()
-  local map = rootWidget:recursiveGetChildById('gameMapPanel')
+    for filepath,time in pairs(files) do
-  if map then map:hide() end
+      local newtime = g_resources.getFileTime(filepath)
-end
+      if newtime > time then
+        pcolored('Reloading ' .. name, 'green')
+        modules.client_terminal.flushLines()
+        module:reload()
+        files[filepath] = newtime
 
-function showMap()
+        if name == 'client_terminal' then
-  local map = rootWidget:recursiveGetChildById('gameMapPanel')
+          modules.client_terminal.show()
-  if map then map:show() end
+        end
-end
+        break
-
-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)
       end
-    else
+    end
-      g_tooltip.hide()
+  end, 1000)
+end
+
+function live_sprites_reload()
+  local files = {}
+  for _,file in pairs(g_resources.listDirectoryFiles('/things')) do
+    local filepath = '/things/' .. file
+    local time = g_resources.getFileTime(filepath)
+    if time > 0 then
+      files[filepath] = time
+      hasFile = true
     end
   end
+
+  if not hasFile then
+    pcolored('ERROR: unable to find things file for module', 'red')
+    return
+  end
+
+  cycleEvent(function()
+    for filepath,time in pairs(files) do
+      local newtime = g_resources.getFileTime(filepath)
+      if newtime > time then
+        pcolored('Reloading sprites...', 'green')
+        modules.client_terminal.flushLines()
+        modules.game_things.load()
+        files[filepath] = newtime
+
+        if name == 'client_terminal' then
+          modules.client_terminal.show()
+        end
+        break
+      end
+    end
+  end, 1000)
 end
 
-function debugPosition(enable)
+local pinging = false
-  if enable == nil then enable = true end
+local function pingBack(ping)
-  local label = rootWidget:getChildById('debugPositionLabel')
+  if ping < 300 then color = 'green'
-  if not label then
+  elseif ping < 600 then color = 'yellow'
-    label = g_ui.createWidget('GameLabel', rootWidget)
+  else color = 'red' end
-    label:setColor('pink')
+  pcolored(g_game.getWorldName() .. ' => ' .. ping .. ' ms', color)
-    label:setFont('terminus-14px-bold')
+end
-    label:setId('debugPositionLabel')
+function ping()
-    label:setPosition({x= 10, y = 40 })
+  if pinging then
-    label:setPhantom(true)
+    pcolored('Ping stopped.')
-    label:setTextAutoResize(true)
+    g_game.setPingDelay(1000)
-  end
+    disconnect(g_game, 'onPingBack', pingBack)
-  if enable then
-    label.event = cycleEvent(function()
-      local player = g_game.getLocalPlayer()
-      if player then
-        local pos = g_game.getLocalPlayer():getPosition()
-        label:show()
-        label:setText('x: ' .. pos.x .. '\ny: ' .. pos.y .. '\nz: ' .. pos.z)
-      else
-        label:hide()
-      end
-    end, 100)
   else
-    removeEvent(label.event)
+    if not (g_game.getFeature(GameClientPing) or g_game.getFeature(GameExtendedClientPing)) then
-    label.event = nil
+      pcolored('this server does not support ping', 'red')
-    label:hide()
+      return
+    elseif not g_game.isOnline() then
+      pcolored('ping command is only allowed when online', 'red')
+      return
+    end
+
+    pcolored('Starting ping...')
+    g_game.setPingDelay(0)
+    connect(g_game, 'onPingBack', pingBack)
+  end
+  pinging = not pinging
+end
+
+function clear()
+  modules.client_terminal.clear()
+end
+
+function ls(path)
+  path = path or '/'
+  local files = g_resources.listDirectoryFiles(path)
+  for k,v in pairs(files) do
+    if g_resources.directoryExists(path .. v) then
+      pcolored(path .. v, 'blue')
+    else
+      pcolored(path .. v)
+    end
   end
 end
 
-function autoReloadModule(name)
+function about_version()
-  local function reloadEvent()
+  pcolored(g_app.getName() .. ' ' .. g_app.getVersion() .. '\n' ..
-    reloadModule(name)
+        'Rev  ' .. g_app.getBuildRevision() .. ' ('.. g_app.getBuildCommit() .. ')\n' ..
-    scheduleEvent(reloadEvent, 1000)
+        'Built on ' .. g_app.getBuildDate())
-  end
-  reloadEvent()
 end
 
-function createDebugUIItem(id)
+function about_graphics()
-  local uiitem = g_ui.createWidget('Item', rootWidget)
+  pcolored('Vendor ' .. g_graphics.getVendor() )
-  uiitem:setPosition({x= 200, y = 200 })
+  pcolored('Renderer' .. g_graphics.getRenderer())
-  uiitem:setItemId(id)
+  pcolored('Version' .. g_graphics.getVersion())
-  uiitem:show()
+end
+
+function about_modules()
+  for k,m in pairs(g_modules.getModules()) do
+    local loadedtext
+    if m:isLoaded() then
+      pcolored(m:getName() .. ' => loaded', 'green')
+    else
+      pcolored(m:getName() .. ' => not loaded', 'red')
+    end
+  end
 end

modules/client_terminal/terminal.lua

@@ -1,21 +1,32 @@
 -- configs
-local LogColors = { [LogInfo] = 'white',
+local LogColors = { [LogDebug] = 'pink',
+                    [LogInfo] = 'white',
                     [LogWarning] = 'yellow',
                     [LogError] = 'red' }
-local MaxLogLines = 80
+local MaxLogLines = 128
-local LabelHeight = 16
 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 disabled then return end
-  if level == LogDebug 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 = popWindow
-  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
 
   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)
-  g_logger.fireOldMessages()
+
+  if not g_app.isRunning() then
+    g_logger.fireOldMessages()
+  elseif _G.terminalLines then
+    for _,line in pairs(_G.terminalLines) do
+      addLine(line.text, line.color)
+    end
+  end
 end
 
 function terminate()
   g_settings.setList('terminal-history', commandHistory)
+
+  removeEvent(flushEvent)
+
+  if poped then
+    oldPos = terminalWindow:getPosition()
+    oldSize = terminalWindow:getSize()
+  end
+  local settings = {
+    size = oldSize,
+    pos = oldPos,
+    poped = poped
+  }
+  g_settings.setNode('terminal-window', settings)
+
   g_keyboard.unbindKeyDown('Ctrl+T')
   g_logger.setOnLog(nil)
-  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 firstShown 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,59 @@ function hide()
   terminalWindow:hide()
 end
 
-function addLine(text, color)
+function disable()
-  -- delete old lines if needed
+  terminalButton:hide()
-  local numLines = terminalBuffer:getChildCount() + 1
+  g_keyboard.unbindKeyDown('Ctrl+T')
-  if numLines > MaxLogLines then
+  disabled = true
-    terminalBuffer:getChildByIndex(1):destroy()
+end
+
+function flushLines()
+  local numLines = terminalBuffer:getChildCount() + #cachedLines
+  local fulltext = terminalSelectText:getText()
+
+  for _,line in pairs(cachedLines) do
+    -- delete old lines if needed
+    if numLines > MaxLogLines then
+      local firstChild = terminalBuffer:getChildByIndex(1)
+      if firstChild then
+        local len = #firstChild:getText()
+        firstChild:destroy()
+        table.remove(allLines, 1)
+        fulltext = string.sub(fulltext, len)
+      end
+    end
+
+    local label = g_ui.createWidget('TerminalLabel', terminalBuffer)
+    label:setId('terminalLabel' .. numLines)
+    label:setText(line.text)
+    label:setColor(line.color)
+
+    table.insert(allLines, {text=line.text,color=line.color})
+
+    fulltext = fulltext .. '\n' .. line.text
   end
 
-  -- create new line label
+  terminalSelectText:setText(fulltext)
-  local label = g_ui.createWidget('TerminalLabel', terminalBuffer)
+
-  label:setId('terminalLabel' .. numLines)
+  cachedLines = {}
-  label:setText(text)
+  removeEvent(flushEvent)
-  label:setColor(color)
+  flushEvent = nil
+end
+
+function addLine(text, color)
+  if not flushEvent then
+    flushEvent = scheduleEvent(flushLines, 10)
+  end
+
+  text = string.gsub(text, '\t', '    ')
+  table.insert(cachedLines, {text=text, color=color})
 end
 
 function executeCommand(command)
   if command == nil or #command == 0 then return end
 
-  logLocked = true
+  -- add command line
-  g_logger.log(LogInfo, '> ' .. command)
+  addLine("> " .. command, "#ffffff")
-  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
 
   -- reset current history index
   currentHistoryIndex = 0
@@ -218,15 +309,33 @@ function executeCommand(command)
     end
   end
 
-  -- add command line
+  -- detect and convert commands with simple syntax
-  --addLine(">> " .. command, "#ffffff")
+  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 +346,15 @@ function executeCommand(command)
   local ok, ret = pcall(func)
   if ok then
     -- if the command returned a value, print it
-    if ret then print(ret) end
+    if ret then addLine(ret, 'white') end
   else
-    g_logger.log(LogError, 'command failed: ' .. ret)
+    addLine('ERROR: command failed: ' .. ret, 'red')
   end
 end
+
+function clear()
+  terminalBuffer:destroyChildren()
+  terminalSelectText:setText('')
+  cachedLines = {}
+  allLines = {}
+end