This commit is contained in:
OTCv8
2020-07-16 16:59:46 +02:00
parent 760162d581
commit a65844f182
12 changed files with 543 additions and 355 deletions

View File

@@ -303,9 +303,9 @@ function CharacterList.create(characters, account, otui)
status = tr(' (Suspended)')
end
if account.subStatus == SubscriptionStatus.Free then
if account.subStatus == SubscriptionStatus.Free and account.premDays < 1 then
accountStatusLabel:setText(('%s%s'):format(tr('Free Account'), status))
elseif account.subStatus == SubscriptionStatus.Premium then
else
if account.premDays == 0 or account.premDays == 65535 then
accountStatusLabel:setText(('%s%s'):format(tr('Gratis Premium Account'), status))
else

View File

@@ -166,6 +166,16 @@ local function onTibia12HTTPResult(session, playdata)
end
end
-- proxies
if g_proxy then
g_proxy.clear()
if playdata["proxies"] then
for i, proxy in ipairs(playdata["proxies"]) do
g_proxy.addProxy(proxy["host"], tonumber(proxy["port"]), tonumber(proxy["priority"]))
end
end
end
g_game.setCustomProtocolVersion(0)
g_game.chooseRsa(G.host)
g_game.setClientVersion(G.clientVersion)
@@ -414,7 +424,7 @@ function EnterGame.doLogin()
G.host = server_params[1] .. ":" .. server_params[2] .. ":" .. server_params[3]
G.clientVersion = tonumber(server_params[4])
elseif #server_params >= 3 then
if tonumber(server_params[3]) == server_params[3] then
if tostring(tonumber(server_params[3])) == server_params[3] then
G.host = server_params[1] .. ":" .. server_params[2]
G.clientVersion = tonumber(server_params[3])
end