Skip to content
Snippets Groups Projects
Commit b47dd000 authored by DarkGod's avatar DarkGod
Browse files

fix

parent a6d277ae
No related branches found
No related tags found
No related merge requests found
......@@ -100,9 +100,12 @@ function _M:start()
self:tryAuth()
self:waitFirstAuth()
elseif core.steam and self.generic.onlinesteam and self.generic.onlinesteam.autolog then
self.steam_token = core.steam.sessionTicket():toHex()
self:tryAuth()
self:waitFirstAuth()
local ticket = core.steam.sessionTicket()
if ticket then
self.steam_token = ticket:toHex()
self:tryAuth()
self:waitFirstAuth()
end
end
end
......
......@@ -138,8 +138,13 @@ function _M:login()
end
function _M:loginSteam()
local ticket = core.steam.sessionTicket()
if not ticket then
Dialog:simplePopup("Steam", "Steam client not found.")
return
end
local d = self:simpleWaiter("Login...", "Login in your account, please wait...") core.display.forceRedraw()
profile:performloginSteam((core.steam.sessionTicket():toHex()))
profile:performloginSteam((ticket:toHex()))
profile:waitFirstAuth()
d:done()
if not profile.auth and profile.auth_last_error then
......
......@@ -70,8 +70,14 @@ function _M:okclick()
return
end
local ticket = core.steam.sessionTicket()
if not ticket then
Dialog:simplePopup("Steam", "Steam client not found.")
return
end
local d = self:simpleWaiter("Registering...", "Registering on http://te4.org/, please wait...") core.display.forceRedraw()
profile:performloginSteam(core.steam.sessionTicket():toHex(), self.c_login.text, self.c_email.text ~= "" and self.c_email.text)
profile:performloginSteam(ticket:toHex(), self.c_login.text, self.c_email.text ~= "" and self.c_email.text)
profile:waitFirstAuth()
d:done()
if not profile.auth and profile.auth_last_error then
......
game/modules/tome/data/gfx/ui/targetshader.png

27.6 KiB | W: | H:

game/modules/tome/data/gfx/ui/targetshader.png

26.9 KiB | W: | H:

game/modules/tome/data/gfx/ui/targetshader.png
game/modules/tome/data/gfx/ui/targetshader.png
game/modules/tome/data/gfx/ui/targetshader.png
game/modules/tome/data/gfx/ui/targetshader.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -108,13 +108,13 @@ newTalent{
stamina = 50,
cooldown = 50,
tactical = { BUFF = 1 },
getTalentCount = function(self, t) return math.floor(self:combatTalentScale(t, 2, 10.1, "log", 0, 2)) end,
getTalentCount = function(self, t) return math.floor(self:combatTalentScale(t, 2, 7, "log")) end,
getMaxLevel = function(self, t) return self:getTalentLevel(t) end,
action = function(self, t)
local tids = {}
for tid, _ in pairs(self.talents_cd) do
local tt = self:getTalentFromId(tid)
if self:getTalentLevel(tt) <= t.getMaxLevel(self, t) and (tt.type[1]:find("^cunning/") or tt.type[1]:find("^technique/")) then
if tt.type[2] <= t.getMaxLevel(self, t) and (tt.type[1]:find("^cunning/") or tt.type[1]:find("^technique/")) then
tids[#tids+1] = tid
end
end
......@@ -129,7 +129,7 @@ newTalent{
info = function(self, t)
local talentcount = t.getTalentCount(self, t)
local maxlevel = t.getMaxLevel(self, t)
return ([[Your quick wits allow you to reset the cooldown of up to %d of your combat talents (cunning or technique) of talent level %0.1f or less.]]):
return ([[Your quick wits allow you to reset the cooldown of up to %d of your combat talents (cunning or technique) of tier %d or less.]]):
format(talentcount, maxlevel)
end,
}
......
......@@ -142,7 +142,7 @@ newTalent{
cooldown = 50,
range = 10,
tactical = { BUFF = 2 },
nbTalents = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7, "log")) end,
getTalentCount = function(self, t) return math.floor(self:combatTalentScale(t, 2, 7, "log")) end,
getMaxLevel = function(self, t) return self:getTalentLevel(t) end,
action = function(self, t)
local nb = t.nbTalents(self, t)
......@@ -150,7 +150,7 @@ newTalent{
local tids = {}
for tid, _ in pairs(self.talents_cd) do
local tt = self:getTalentFromId(tid)
if self:getTalentLevel(tt) <= maxlev and tt.type[1]:find("^wild%-gift/") then
if tt.type[2] <= maxlev and tt.type[1]:find("^wild%-gift/") then
tids[#tids+1] = tid
end
end
......@@ -164,7 +164,7 @@ newTalent{
return true
end,
info = function(self, t)
return ([[Your deep link with Nature allows you to reset the cooldown of %d of your wild gifts of talent level %d or less.]]):
return ([[Your deep link with Nature allows you to reset the cooldown of %d of your wild gifts of tier %d or less.]]):
format(t.nbTalents(self, t), t.getMaxLevel(self, t))
end,
}
......
......@@ -155,17 +155,17 @@ newTalent{
name = "Metaflow",
type = {"spell/meta",4},
require = spells_req4,
points = 5,
points = 50,
mana = 70,
cooldown = 50,
tactical = { BUFF = 2 },
getTalentCount = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
getTalentCount = function(self, t) return math.floor(self:combatTalentScale(t, 2, 7, "log")) end,
getMaxLevel = function(self, t) return self:getTalentLevel(t) end,
action = function(self, t)
local tids = {}
for tid, _ in pairs(self.talents_cd) do
local tt = self:getTalentFromId(tid)
if self:getTalentLevel(tt) <= t.getMaxLevel(self, t) and tt.is_spell then
if tt.type[2] <= t.getMaxLevel(self, t) and tt.is_spell then
tids[#tids+1] = tid
end
end
......@@ -181,7 +181,7 @@ newTalent{
info = function(self, t)
local talentcount = t.getTalentCount(self, t)
local maxlevel = t.getMaxLevel(self, t)
return ([[Your mastery of the arcane flows allow you to reset the cooldown of %d of your spells of talent level %0.1f or less.]]):
return ([[Your mastery of the arcane flows allow you to reset the cooldown of %d of your spells of tier %d or less.]]):
format(talentcount, maxlevel)
end,
}
......@@ -23,7 +23,7 @@ local UserChat = require "profile-thread.UserChat"
module(..., package.seeall, class.make)
local debug = true
local debug = false
local mport = debug and 2259 or 2257
local pport = debug and 2260 or 2258
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment