Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tome
Tales of MajEyal
Commits
f05ea060
Commit
f05ea060
authored
9 years ago
by
Samuel Wegner
Browse files
Options
Downloads
Patches
Plain Diff
Make Contingency and Matrix respect fixed cooldowns
parent
6a6df0df
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!302
Fixed cooldown fix
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/dialogs/talents/ChronomancyContingency.lua
+1
-1
1 addition, 1 deletion
game/modules/tome/dialogs/talents/ChronomancyContingency.lua
game/modules/tome/dialogs/talents/ChronomancyMatrix.lua
+1
-1
1 addition, 1 deletion
game/modules/tome/dialogs/talents/ChronomancyMatrix.lua
with
2 additions
and
2 deletions
game/modules/tome/dialogs/talents/ChronomancyContingency.lua
+
1
−
1
View file @
f05ea060
...
...
@@ -116,7 +116,7 @@ function _M:generateList()
-- Generate lists of all talents by category
for
j
,
t
in
pairs
(
self
.
actor
.
talents_def
)
do
if
self
.
actor
:
knowTalent
(
t
.
id
)
and
t
.
mode
==
"activated"
and
t
.
is_spell
and
not
t
.
requires_target
and
not
t
.
hide
then
if
self
.
actor
:
knowTalent
(
t
.
id
)
and
t
.
mode
==
"activated"
and
t
.
is_spell
and
not
t
.
requires_target
and
not
t
.
hide
and
not
t
.
fixed_cooldown
then
local
nodes
=
talents
local
status
=
tstring
{{
"color"
,
"LIGHT_GREEN"
},
"Talents"
}
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/dialogs/talents/ChronomancyMatrix.lua
+
1
−
1
View file @
f05ea060
...
...
@@ -130,7 +130,7 @@ function _M:generateList()
-- Generate lists of all talents by category
for
j
,
t
in
pairs
(
self
.
actor
.
talents_def
)
do
if
self
.
actor
:
knowTalent
(
t
.
id
)
and
t
.
type
[
1
]:
find
(
"^chronomancy/"
)
and
not
t
.
type
[
1
]:
find
(
"^chronomancy/spellbinding"
)
and
not
t
.
hide
and
t
.
cooldown
and
t
.
mode
~=
"passive"
and
not
t
.
fixed_cooldownand
and
not
spellbound
(
self
.
actor
,
t
.
id
)
then
if
self
.
actor
:
knowTalent
(
t
.
id
)
and
t
.
type
[
1
]:
find
(
"^chronomancy/"
)
and
not
t
.
type
[
1
]:
find
(
"^chronomancy/spellbinding"
)
and
not
t
.
hide
and
t
.
cooldown
and
not
t
.
fixed_cooldown
and
t
.
mode
~=
"passive"
and
not
spellbound
(
self
.
actor
,
t
.
id
)
then
local
nodes
=
talents
local
status
=
tstring
{{
"color"
,
"LIGHT_GREEN"
},
"Talents"
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment