Skip to content
Snippets Groups Projects
Commit 588a8412 authored by Eric Wykoff's avatar Eric Wykoff
Browse files

moar better

(that's everything I could find with grep aside from a chronomancy talent I'm going to replace anyway)
parent 76db2248
No related branches found
No related tags found
1 merge request!7Nerf timeless
......@@ -108,14 +108,17 @@ newTalent{
stamina = 50,
cooldown = 50,
tactical = { BUFF = 1 },
fixed_cooldown = true,
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 tt.type[2] <= t.getMaxLevel(self, t) and (tt.type[1]:find("^cunning/") or tt.type[1]:find("^technique/")) then
tids[#tids+1] = tid
if not tt.fixed_cooldown 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
end
for i = 1, t.getTalentCount(self, t) do
......
......@@ -146,6 +146,7 @@ newTalent{
cooldown = 50,
range = 10,
tactical = { BUFF = 2 },
fixed_cooldown = true,
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)
......@@ -154,8 +155,10 @@ newTalent{
local tids = {}
for tid, _ in pairs(self.talents_cd) do
local tt = self:getTalentFromId(tid)
if tt.type[2] <= maxlev and tt.type[1]:find("^wild%-gift/") then
tids[#tids+1] = tid
if not tt.fixed_cooldown then
if tt.type[2] <= maxlev and tt.type[1]:find("^wild%-gift/") then
tids[#tids+1] = tid
end
end
end
for i = 1, nb do
......
......@@ -510,14 +510,17 @@ newTalent{
equilibrium = 20,
cooldown = 50,
range = 10,
fixed_cooldown = true,
tactical = { BUFF = 2 },
action = function(self, t)
local nb = 3
local tids = {}
for tid, _ in pairs(self.talents_cd) do
local tt = self:getTalentFromId(tid)
if tt.type[1]:find("^wild%-gift/") or tt.type[1]:find("psionic/") or tt.type[1]:find("cursed/") then
tids[#tids+1] = tid
if not tt.fixed_cooldown then
if tt.type[1]:find("^wild%-gift/") or tt.type[1]:find("psionic/") or tt.type[1]:find("cursed/") then
tids[#tids+1] = tid
end
end
end
for i = 1, nb do
......
......@@ -222,30 +222,32 @@ uberTalent{
for tid, _ in pairs(self.talents_cd) do
local t = self:getTalentFromId(tid)
if
(kind == "physical" and
(
t.type[1]:find("^technique/") or
t.type[1]:find("^cunning/")
if not t.fixed_cooldown then
if
(kind == "physical" and
(
t.type[1]:find("^technique/") or
t.type[1]:find("^cunning/")
)
) or
(kind == "spell" and
(
t.type[1]:find("^spell/") or
t.type[1]:find("^corruption/") or
t.type[1]:find("^celestial/") or
t.type[1]:find("^chronomancy/")
)
) or
(kind == "mind" and
(
t.type[1]:find("^wild%-gift/") or
t.type[1]:find("^cursed/") or
t.type[1]:find("^psionic/")
)
)
) or
(kind == "spell" and
(
t.type[1]:find("^spell/") or
t.type[1]:find("^corruption/") or
t.type[1]:find("^celestial/") or
t.type[1]:find("^chronomancy/")
)
) or
(kind == "mind" and
(
t.type[1]:find("^wild%-gift/") or
t.type[1]:find("^cursed/") or
t.type[1]:find("^psionic/")
)
)
then
tids[#tids+1] = tid
then
tids[#tids+1] = tid
end
end
end
if #tids == 0 then return end
......
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