diff --git a/data/images/ui/continue_with_logpass.png b/data/images/ui/continue_with_logpass.png new file mode 100644 index 0000000..7c611bb Binary files /dev/null and b/data/images/ui/continue_with_logpass.png differ diff --git a/modules/client_entergame/entergame.lua b/modules/client_entergame/entergame.lua index b2b71b1..afe76f7 100644 --- a/modules/client_entergame/entergame.lua +++ b/modules/client_entergame/entergame.lua @@ -4,6 +4,7 @@ EnterGame = { } local loadBox local enterGame local enterGameButton +local logpass local clientBox local protocolLogin local server = nil @@ -106,9 +107,8 @@ local function validateThings(things) g_settings.setNode("things", {}) end if missingFiles then - incorrectThings = incorrectThings .. "\nYou should open data/things and create directory " .. versionForMissingFiles .. - ".\nIn this directory (data/things/" .. versionForMissingFiles .. ") you should put missing\nfiles (Tibia.dat and Tibia.spr) " .. + ".\nIn this directory (data/things/" .. versionForMissingFiles .. ") you should put missing\nfiles (Tibia.dat and Tibia.spr/Tibia.cwm) " .. "from correct Tibia version." end return incorrectThings @@ -134,10 +134,18 @@ local function onTibia12HTTPResult(session, playdata) local things = { data = {G.clientVersion .. "/Tibia.dat", ""}, - sprites = {G.clientVersion .. "/Tibia.spr", ""}, + sprites = {G.clientVersion .. "/Tibia.cwm", ""}, } - + local incorrectThings = validateThings(things) + if #incorrectThings > 0 then + things = { + data = {G.clientVersion .. "/Tibia.dat", ""}, + sprites = {G.clientVersion .. "/Tibia.spr", ""}, + } + incorrectThings = validateThings(things) + end + if #incorrectThings > 0 then g_logger.error(incorrectThings) if Updater and not checkedByUpdater[G.clientVersion] then @@ -290,6 +298,9 @@ end function EnterGame.init() if USE_NEW_ENERGAME then return end enterGame = g_ui.displayUI('entergame') + if LOGPASS ~= nil then + logpass = g_ui.loadUI('logpass', enterGame:getParent()) + end serverSelectorPanel = enterGame:getChildById('serverSelectorPanel') customServerSelectorPanel = enterGame:getChildById('customServerSelectorPanel') @@ -351,6 +362,11 @@ end function EnterGame.terminate() if not enterGame then return end g_keyboard.unbindKeyDown('Ctrl+G') + + if logpass then + logpass:destroy() + logpass = nil + end enterGame:destroy() if loadBox then @@ -370,11 +386,22 @@ function EnterGame.show() enterGame:raise() enterGame:focus() enterGame:getChildById('accountNameTextEdit'):focus() + if logpass then + logpass:show() + logpass:raise() + logpass:focus() + end end function EnterGame.hide() if not enterGame then return end enterGame:hide() + if logpass then + logpass:hide() + if modules.logpass then + modules.logpass:hide() + end + end end function EnterGame.openWindow() @@ -415,19 +442,19 @@ function EnterGame.onServerChange() end end -function EnterGame.doLogin() +function EnterGame.doLogin(account, password, token, host) if g_game.isOnline() then local errorBox = displayErrorBox(tr('Login Error'), tr('Cannot login while already in game.')) connect(errorBox, { onOk = EnterGame.show }) return end - G.account = enterGame:getChildById('accountNameTextEdit'):getText() - G.password = enterGame:getChildById('accountPasswordTextEdit'):getText() - G.authenticatorToken = enterGame:getChildById('accountTokenTextEdit'):getText() + G.account = account or enterGame:getChildById('accountNameTextEdit'):getText() + G.password = password or enterGame:getChildById('accountPasswordTextEdit'):getText() + G.authenticatorToken = token or enterGame:getChildById('accountTokenTextEdit'):getText() G.stayLogged = true G.server = serverSelector:getText():trim() - G.host = serverHostTextEdit:getText() + G.host = host or serverHostTextEdit:getText() G.clientVersion = tonumber(clientVersionSelector:getText()) if not rememberPasswordBox:isChecked() then @@ -467,10 +494,17 @@ function EnterGame.doLogin() local things = { data = {G.clientVersion .. "/Tibia.dat", ""}, - sprites = {G.clientVersion .. "/Tibia.spr", ""}, + sprites = {G.clientVersion .. "/Tibia.cwm", ""}, } local incorrectThings = validateThings(things) + if #incorrectThings > 0 then + things = { + data = {G.clientVersion .. "/Tibia.dat", ""}, + sprites = {G.clientVersion .. "/Tibia.spr", ""}, + } + incorrectThings = validateThings(things) + end if #incorrectThings > 0 then g_logger.error(incorrectThings) if Updater and not checkedByUpdater[G.clientVersion] then diff --git a/modules/client_entergame/logpass.otui b/modules/client_entergame/logpass.otui new file mode 100644 index 0000000..91fe96a --- /dev/null +++ b/modules/client_entergame/logpass.otui @@ -0,0 +1,9 @@ +UIWidget + id: logpass + size: 248 41 + anchors.top: enterGame.bottom + anchors.horizontalCenter: enterGame.horizontalCenter + margin-top: 25 + image-size: 248 41 + image-source: /images/ui/continue_with_logpass.png + @onClick: modules.logpass.show() \ No newline at end of file diff --git a/modules/corelib/http.lua b/modules/corelib/http.lua index abc3398..1ff47b0 100644 --- a/modules/corelib/http.lua +++ b/modules/corelib/http.lua @@ -44,7 +44,7 @@ function HTTP.postJSON(url, data, callback) if type(data) == "table" then data = json.encode(data) end - local operation = g_http.post(url, data, HTTP.timeout) + local operation = g_http.post(url, data, HTTP.timeout, true) HTTP.operations[operation] = {type="post", json=true, url=url, callback=callback} return operation end @@ -122,6 +122,9 @@ function HTTP.onGet(operationId, url, err, data) err = nil end if not err and operation.json then + if data:len() == 0 then + data = "null" + end local status, result = pcall(function() return json.decode(data) end) if not status then err = "JSON ERROR: " .. result @@ -153,6 +156,9 @@ function HTTP.onPost(operationId, url, err, data) err = nil end if not err and operation.json then + if data:len() == 0 then + data = "null" + end local status, result = pcall(function() return json.decode(data) end) if not status then err = "JSON ERROR: " .. result @@ -221,6 +227,9 @@ function HTTP.onWsMessage(operationId, message) end if operation.callbacks.onMessage then if operation.json then + if message:len() == 0 then + message = "null" + end local status, result = pcall(function() return json.decode(message) end) local err = nil if not status then diff --git a/modules/game_bot/default_configs/vBot_3.4/_Loader.lua b/modules/game_bot/default_configs/vBot_3.45/_Loader.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/_Loader.lua rename to modules/game_bot/default_configs/vBot_3.45/_Loader.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/actions.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/actions.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/actions.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/actions.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/bank.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/bank.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/bank.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/bank.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/buy_supplies.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/buy_supplies.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/buy_supplies.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/buy_supplies.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/cavebot.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/cavebot.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/cavebot.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/cavebot.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/cavebot.otui b/modules/game_bot/default_configs/vBot_3.45/cavebot/cavebot.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/cavebot.otui rename to modules/game_bot/default_configs/vBot_3.45/cavebot/cavebot.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/clear_tile.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/clear_tile.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/clear_tile.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/clear_tile.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/config.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/config.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/config.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/config.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/config.otui b/modules/game_bot/default_configs/vBot_3.45/cavebot/config.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/config.otui rename to modules/game_bot/default_configs/vBot_3.45/cavebot/config.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/d_withdraw.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/d_withdraw.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/d_withdraw.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/d_withdraw.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/depositor.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/depositor.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/depositor.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/depositor.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/doors.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/doors.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/doors.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/doors.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/editor.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/editor.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/editor.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/editor.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/editor.otui b/modules/game_bot/default_configs/vBot_3.45/cavebot/editor.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/editor.otui rename to modules/game_bot/default_configs/vBot_3.45/cavebot/editor.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/example_functions.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/example_functions.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/example_functions.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/example_functions.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/extension_template.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/extension_template.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/extension_template.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/extension_template.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/inbox_withdraw.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/inbox_withdraw.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/inbox_withdraw.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/inbox_withdraw.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/lure.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/lure.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/lure.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/lure.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/minimap.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/minimap.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/minimap.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/minimap.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/pos_check.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/pos_check.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/pos_check.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/pos_check.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/recorder.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/recorder.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/recorder.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/recorder.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/sell_all.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/sell_all.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/sell_all.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/sell_all.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/supply_check.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/supply_check.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/supply_check.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/supply_check.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/tasker.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/tasker.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/tasker.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/tasker.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/travel.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/travel.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/travel.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/travel.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/walking.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/walking.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/walking.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/walking.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/cavebot/withdraw.lua b/modules/game_bot/default_configs/vBot_3.45/cavebot/withdraw.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/cavebot/withdraw.lua rename to modules/game_bot/default_configs/vBot_3.45/cavebot/withdraw.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/creature.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/creature.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/creature.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/creature.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/creature_attack.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/creature_attack.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/creature_attack.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/creature_attack.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/creature_editor.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/creature_editor.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/creature_editor.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/creature_editor.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/creature_editor.otui b/modules/game_bot/default_configs/vBot_3.45/targetbot/creature_editor.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/creature_editor.otui rename to modules/game_bot/default_configs/vBot_3.45/targetbot/creature_editor.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/creature_priority.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/creature_priority.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/creature_priority.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/creature_priority.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/looting.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/looting.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/looting.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/looting.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/looting.otui b/modules/game_bot/default_configs/vBot_3.45/targetbot/looting.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/looting.otui rename to modules/game_bot/default_configs/vBot_3.45/targetbot/looting.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/target.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/target.lua similarity index 86% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/target.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/target.lua index 3eb1214..0e62612 100644 --- a/modules/game_bot/default_configs/vBot_3.4/targetbot/target.lua +++ b/modules/game_bot/default_configs/vBot_3.45/targetbot/target.lua @@ -38,27 +38,38 @@ local oldTibia = g_game.getClientVersion() < 960 -- main loop, controlled by config targetbotMacro = macro(100, function() local pos = player:getPosition() - local creatures = g_map.getSpectatorsInRange(pos, false, 6, 6) -- 12x12 area - if #creatures > 10 then -- if there are too many monsters around, limit area + local specs = g_map.getSpectatorsInRange(pos, false, 6, 6) -- 12x12 area + local creatures = 0 + for i, spec in ipairs(specs) do + if spec:isMonster() then + creatures = creatures + 1 + end + end + if creatures > 10 then -- if there are too many monsters around, limit area creatures = g_map.getSpectatorsInRange(pos, false, 3, 3) -- 6x6 area + else + creatures = specs end local highestPriority = 0 local dangerLevel = 0 local targets = 0 local highestPriorityParams = nil for i, creature in ipairs(creatures) do - local path = findPath(player:getPosition(), creature:getPosition(), 7, {ignoreLastCreature=true, ignoreNonPathable=true, ignoreCost=true, ignoreCreatures=true}) - if creature:isMonster() and (oldTibia or creature:getType() < 3) and path then - local params = TargetBot.Creature.calculateParams(creature, path) -- return {craeture, config, danger, priority} - dangerLevel = dangerLevel + params.danger - if params.priority > 0 then - targets = targets + 1 - if params.priority > highestPriority then - highestPriority = params.priority - highestPriorityParams = params - end - if ui.editor.debug:isOn() then - creature:setText(params.config.name .. "\n" .. params.priority) + local hppc = creature:getHealthPercent() + if hppc and hppc > 0 then + local path = findPath(player:getPosition(), creature:getPosition(), 7, {ignoreLastCreature=true, ignoreNonPathable=true, ignoreCost=true, ignoreCreatures=true}) + if creature:isMonster() and (oldTibia or creature:getType() < 3) and path then + local params = TargetBot.Creature.calculateParams(creature, path) -- return {craeture, config, danger, priority} + dangerLevel = dangerLevel + params.danger + if params.priority > 0 then + targets = targets + 1 + if params.priority > highestPriority then + highestPriority = params.priority + highestPriorityParams = params + end + if ui.editor.debug:isOn() then + creature:setText(params.config.name .. "\n" .. params.priority) + end end end end diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/target.otui b/modules/game_bot/default_configs/vBot_3.45/targetbot/target.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/target.otui rename to modules/game_bot/default_configs/vBot_3.45/targetbot/target.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/targetbot/walking.lua b/modules/game_bot/default_configs/vBot_3.45/targetbot/walking.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/targetbot/walking.lua rename to modules/game_bot/default_configs/vBot_3.45/targetbot/walking.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/AttackBot.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/AttackBot.lua similarity index 99% rename from modules/game_bot/default_configs/vBot_3.4/vBot/AttackBot.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/AttackBot.lua index 3dc8611..2499055 100644 --- a/modules/game_bot/default_configs/vBot_3.4/vBot/AttackBot.lua +++ b/modules/game_bot/default_configs/vBot_3.45/vBot/AttackBot.lua @@ -1036,6 +1036,14 @@ function getMonstersInArea(category, posOrCreature, pattern, minHp, maxHp, safeP t = monsterNamesTable end + if safePattern then + for i, spec in pairs(getSpectators(posOrCreature, safePattern)) do + if spec ~= player and spec:isPlayer() then + return 0 + end + end + end + if category == 1 or category == 3 or category == 4 then for i, spec in pairs(getSpectators()) do local specHp = spec:getHealthPercent() @@ -1046,14 +1054,6 @@ function getMonstersInArea(category, posOrCreature, pattern, minHp, maxHp, safeP return monsters end - if safePattern then - for i, spec in pairs(getSpectators(posOrCreature, safePattern)) do - if spec ~= player and spec:isPlayer() then - return 0 - end - end - end - for i, spec in pairs(getSpectators(posOrCreature, pattern)) do if spec ~= player then local specHp = spec:getHealthPercent() @@ -1075,7 +1075,7 @@ function getBestTileByPattern(pattern, minHp, maxHp, safePattern, monsterNamesTa for i, tile in pairs(tiles) do local tPos = tile:getPosition() local distance = distanceFromPlayer(tPos) - if tile:canShoot() and tile:isWalkable() then + if tile:canShoot() and tile:isWalkable() and (not safePattern or distance < 4) then local amount = getMonstersInArea(2, tPos, pattern, minHp, maxHp, safePattern, monsterNamesTable) if amount > targetTile.amount then targetTile = {amount=amount,pos=tPos} @@ -1184,15 +1184,15 @@ macro(100, function() local pCat = entry.patternCategory local pattern = entry.pattern local anchorParam = (pattern == 2 or pattern == 6 or pattern == 7 or pattern > 9) and player or pos() - local safe = currentSettings.pvpSafe and spellPatterns[pCat][entry.pattern][2] or false + local safe = currentSettings.PvpSafe and spellPatterns[pCat][entry.pattern][2] or false local monsterAmount = pCat ~= 8 and getMonstersInArea(entry.category, anchorParam, spellPatterns[pCat][entry.pattern][1], entry.minHp, entry.maxHp, safe, entry.monsters) if (pattern ~= 8 and (entry.orMore and monsterAmount >= entry.count or not entry.orMore and monsterAmount == entry.count)) or pattern == 8 and bestSide >= entry.count then return executeAttackBotAction(entry.category, attackData, entry.cooldown) end elseif entry.category == 2 then local pCat = entry.patternCategory - local safe = currentSettings.pvpSafe and spellPatterns[pCat][entry.pattern][2] or false - local data = getBestTileByPattern(spellPatterns[pCat][entry.pattern][1], entry.minHp, entry.maxHp, spellPatterns[pCat][entry.pattern][2], entry.monsters) + local safe = currentSettings.PvpSafe and spellPatterns[pCat][entry.pattern][2] or false + local data = getBestTileByPattern(spellPatterns[pCat][entry.pattern][1], entry.minHp, entry.maxHp, safe, entry.monsters) local monsterAmount local pos if data then diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/AttackBot.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/AttackBot.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/AttackBot.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/AttackBot.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/BotServer.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/BotServer.lua similarity index 99% rename from modules/game_bot/default_configs/vBot_3.4/vBot/BotServer.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/BotServer.lua index 10843ea..59edc3e 100644 --- a/modules/game_bot/default_configs/vBot_3.4/vBot/BotServer.lua +++ b/modules/game_bot/default_configs/vBot_3.45/vBot/BotServer.lua @@ -161,7 +161,7 @@ end) -- mana local lastMana = 0 -macro(100, function() +macro(500, function() if config.manaInfo then if manapercent() ~= lastMana then lastMana = manapercent() diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/BotServer.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/BotServer.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/BotServer.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/BotServer.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/Conditions.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/Conditions.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/Conditions.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/Conditions.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/Conditions.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/Conditions.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/Conditions.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/Conditions.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/Containers.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/Containers.lua similarity index 97% rename from modules/game_bot/default_configs/vBot_3.4/vBot/Containers.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/Containers.lua index cfa8ec3..1f5eb34 100644 --- a/modules/game_bot/default_configs/vBot_3.4/vBot/Containers.lua +++ b/modules/game_bot/default_configs/vBot_3.45/vBot/Containers.lua @@ -505,14 +505,17 @@ macro(100, function() if config.forceOpen then local container = getContainerByItem(dId) if not container then - if getBack() and getBack():getId() == dId then - g_game.open(getBack()) - else - local cItem = findItem(dId) - if cItem then - return g_game.open(cItem) + local t = {getBack(), getAmmo(), getFinger(), getNeck(), getLeft(), getRight()} + for i=1,#t do + local slot = t[i] + if slot and slot:getId() == dId then + return g_game.open(slot) end end + local cItem = findItem(dId) + if cItem then + return g_game.open(cItem) + end end end end diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/Dropper.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/Dropper.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/Dropper.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/Dropper.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/HealBot.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/HealBot.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/HealBot.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/HealBot.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/HealBot.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/HealBot.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/HealBot.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/HealBot.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/Sio.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/Sio.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/Sio.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/Sio.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/alarms.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/alarms.lua similarity index 93% rename from modules/game_bot/default_configs/vBot_3.4/vBot/alarms.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/alarms.lua index ad1654d..44679ad 100644 --- a/modules/game_bot/default_configs/vBot_3.4/vBot/alarms.lua +++ b/modules/game_bot/default_configs/vBot_3.45/vBot/alarms.lua @@ -109,9 +109,11 @@ if rootWidget then widget:setOn(config.privateMessage) end + local pName = player:getName() onTextMessage(function(mode, text) if config.enabled and config.playerAttack and mode == 16 and string.match(text, "hitpoints due to an attack") and not string.match(text, "hitpoints due to an attack by a ") then playSound("/sounds/Player_Attack.ogg") + g_window.setTitle(pName .. " - Player Detected!") end end) @@ -126,7 +128,7 @@ if rootWidget then if math.max(math.abs(posx()-specPos.x), math.abs(posy()-specPos.y)) <= 8 then playSound("/sounds/Player_Detected.ogg") delay(1500) - g_window.setTitle(name() .. " - Player Detected!") + g_window.setTitle(pName .. " - Player Detected!") if config.playerDetectedLogout then modules.game_interface.tryLogout(false) end @@ -143,7 +145,7 @@ if rootWidget then if math.max(math.abs(posx()-specPos.x), math.abs(posy()-specPos.y)) <= 8 then playSound("/sounds/Creature_Detected.ogg") delay(1500) - g_window.setTitle(name() .. " - Creature Detected! ") + g_window.setTitle(pName .. " - Creature Detected! ") return end end @@ -153,7 +155,7 @@ if rootWidget then if config.healthBelow then if hppercent() <= config.healthValue then playSound("/sounds/Low_Health.ogg") - g_window.setTitle(name() .. " - Low Health!") + g_window.setTitle(pName .. " - Low Health!") delay(1500) return end @@ -162,7 +164,7 @@ if rootWidget then if config.manaBelow then if manapercent() <= config.manaValue then playSound("/sounds/Low_Mana.ogg") - g_window.setTitle(name() .. " - Low Mana!") + g_window.setTitle(pName .. " - Low Mana!") delay(1500) return end @@ -172,7 +174,7 @@ if rootWidget then onTalk(function(name, level, mode, text, channelId, pos) if mode == 4 and config.enabled and config.privateMessage then playSound("/sounds/Private_Message.ogg") - g_window.setTitle(name() .. " - Private Message") + g_window.setTitle(pName .. " - Private Message") return end end) diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/alarms.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/alarms.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/alarms.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/alarms.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/analyzer.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/analyzer.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/analyzer.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/analyzer.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/analyzer.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/analyzer.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/analyzer.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/analyzer.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/antiRs.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/antiRs.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/antiRs.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/antiRs.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/cast_food.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/cast_food.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/cast_food.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/cast_food.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/cavebot.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/cavebot.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/cavebot.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/cavebot.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/combo.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/combo.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/combo.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/combo.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/combo.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/combo.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/combo.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/combo.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/configs.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/configs.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/configs.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/configs.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/depositer_config.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/depositer_config.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/depositer_config.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/depositer_config.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/depositer_config.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/depositer_config.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/depositer_config.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/depositer_config.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/depot_withdraw.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/depot_withdraw.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/depot_withdraw.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/depot_withdraw.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/eat_food.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/eat_food.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/eat_food.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/eat_food.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/equip.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/equip.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/equip.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/equip.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/exeta.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/exeta.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/exeta.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/exeta.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/extras.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/extras.lua similarity index 99% rename from modules/game_bot/default_configs/vBot_3.4/vBot/extras.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/extras.lua index 13ba446..4fced37 100644 --- a/modules/game_bot/default_configs/vBot_3.4/vBot/extras.lua +++ b/modules/game_bot/default_configs/vBot_3.45/vBot/extras.lua @@ -113,7 +113,7 @@ if true then vocText = "- ED" end - macro(2000, function() + macro(5000, function() if settings.title then if hppercent() > 0 then g_window.setTitle("Tibia - " .. name() .. " - " .. lvl() .. "lvl " .. vocText) diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/extras.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/extras.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/extras.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/extras.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/info.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/info.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/info.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/info.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/ingame_editor.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/ingame_editor.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/ingame_editor.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/ingame_editor.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/items.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/items.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/items.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/items.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/items_management.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/items_management.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/items_management.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/items_management.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/jewellery_equipper.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/jewellery_equipper.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/jewellery_equipper.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/jewellery_equipper.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/main.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/main.lua similarity index 65% rename from modules/game_bot/default_configs/vBot_3.4/vBot/main.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/main.lua index 1b7fe9d..53f1cca 100644 --- a/modules/game_bot/default_configs/vBot_3.4/vBot/main.lua +++ b/modules/game_bot/default_configs/vBot_3.45/vBot/main.lua @@ -1,3 +1,3 @@ -UI.Label("vBot v3.4 \n Vithrax#5814") +UI.Label("vBot v3.45 \n Vithrax#5814") UI.Button("Official OTCv8 Discord!", function() g_platform.openUrl("https://discord.gg/yhqBE4A") end) UI.Separator() \ No newline at end of file diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/new_cavebot_lib.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/new_cavebot_lib.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/new_cavebot_lib.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/new_cavebot_lib.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/npc_talk.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/npc_talk.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/npc_talk.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/npc_talk.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/player_list.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/player_list.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/player_list.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/player_list.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/playerlist.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/playerlist.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/playerlist.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/playerlist.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/pushmax.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/pushmax.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/pushmax.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/pushmax.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/pushmax.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/pushmax.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/pushmax.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/pushmax.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/quiver_manager.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/quiver_manager.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/quiver_manager.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/quiver_manager.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/siolist.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/siolist.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/siolist.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/siolist.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/spy_level.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/spy_level.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/spy_level.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/spy_level.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/supplies.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/supplies.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/supplies.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/supplies.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/supplies.otui b/modules/game_bot/default_configs/vBot_3.45/vBot/supplies.otui similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/supplies.otui rename to modules/game_bot/default_configs/vBot_3.45/vBot/supplies.otui diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/tools.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/tools.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/tools.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/tools.lua diff --git a/modules/game_bot/default_configs/vBot_3.4/vBot/vlib.lua b/modules/game_bot/default_configs/vBot_3.45/vBot/vlib.lua similarity index 100% rename from modules/game_bot/default_configs/vBot_3.4/vBot/vlib.lua rename to modules/game_bot/default_configs/vBot_3.45/vBot/vlib.lua diff --git a/modules/game_things/things.lua b/modules/game_things/things.lua index 648bc10..cfe5f88 100644 --- a/modules/game_things/things.lua +++ b/modules/game_things/things.lua @@ -15,9 +15,9 @@ function load() local datPath, sprPath if things and things["data"] ~= nil and things["sprites"] ~= nil then - datPath = '/things/' .. things["data"] - sprPath = '/things/' .. things["sprites"] - else + datPath = resolvepath('/things/' .. things["data"]) + sprPath = resolvepath('/things/' .. things["sprites"]) + else if filename then datPath = resolvepath('/things/' .. filename) sprPath = resolvepath('/things/' .. filename) @@ -38,7 +38,7 @@ function load() errorMessage = errorMessage .. tr("Unable to load dat file, please place a valid dat in '%s'", datPath) .. '\n' end end - if not g_sprites.loadSpr(sprPath, false) then + if not g_sprites.loadSpr(sprPath) then errorMessage = errorMessage .. tr("Unable to load spr file, please place a valid spr in '%s'", sprPath) end diff --git a/modules/gamelib/const.lua b/modules/gamelib/const.lua index 199b77d..f299a80 100644 --- a/modules/gamelib/const.lua +++ b/modules/gamelib/const.lua @@ -208,6 +208,7 @@ GameBigAurasCenter = 119 -- Automatic negative offset for aura bigger than 32x32 GameNewUpdateWalk = 120 -- Walk update rate dependant on FPS GameNewCreatureStacking = 121 -- Ignore MAX_THINGS limit while adding to tile GameCreaturesMana = 122 -- get mana from server for creatures other than Player +GameQuickLootFlags = 123 -- enables quick loot feature for all protocols LastGameFeature = 130 diff --git a/otclient_dx.exe b/otclient_dx.exe index 534daf9..47e6f89 100644 Binary files a/otclient_dx.exe and b/otclient_dx.exe differ diff --git a/otclient_gl.exe b/otclient_gl.exe index b7b874d..1d55aff 100644 Binary files a/otclient_gl.exe and b/otclient_gl.exe differ diff --git a/otclient_linux b/otclient_linux index 7047eb8..dc9fb23 100644 Binary files a/otclient_linux and b/otclient_linux differ diff --git a/otclient_mac b/otclient_mac index b9a5823..7150259 100644 Binary files a/otclient_mac and b/otclient_mac differ diff --git a/otclientv8.apk b/otclientv8.apk index b898e2c..263f3ad 100644 Binary files a/otclientv8.apk and b/otclientv8.apk differ