Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
yutio888
Tales of MajEyal
Commits
aed1b29d
Commit
aed1b29d
authored
12 years ago
by
dg
Browse files
Options
Downloads
Patches
Plain Diff
fix
git-svn-id:
http://svn.net-core.org/repos/t-engine4@5111
51575b47-30f0-44d4-a5cc-537603b46e54
parent
6234c534
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/class/Actor.lua
+2
-0
2 additions, 0 deletions
game/modules/tome/class/Actor.lua
game/modules/tome/class/Player.lua
+1
-1
1 addition, 1 deletion
game/modules/tome/class/Player.lua
with
3 additions
and
1 deletion
game/modules/tome/class/Actor.lua
+
2
−
0
View file @
aed1b29d
...
...
@@ -2480,6 +2480,8 @@ function _M:onTakeoff(o, bypass_set)
end
function _M:checkMindstar(o)
if not o.psiblade_tile or not o.combat then return end
local new
local old
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/class/Player.lua
+
1
−
1
View file @
aed1b29d
...
...
@@ -1074,7 +1074,7 @@ function _M:onWear(o, bypass_set)
if
not
self
.
no_power_reset_on_wear
then
o
:
forAllStack
(
function
(
so
)
if
so
.
power
and
so
:
attr
(
"power_regen"
)
then
so
.
power
=
0
end
if
so
.
talent_cooldown
then
self
.
talents_cd
[
so
.
talent_cooldown
]
=
math.max
(
self
.
talents_cd
[
so
.
talent_cooldown
]
or
0
,
math.min
(
4
,
math.floor
((
so
.
use_power
or
so
.
use_talent
).
power
/
5
)))
end
if
so
.
talent_cooldown
then
self
.
talents_cd
[
so
.
talent_cooldown
]
=
math.max
(
self
.
talents_cd
[
so
.
talent_cooldown
]
or
0
,
math.min
(
4
,
math.floor
((
so
.
use_power
or
so
.
use_talent
or
{
power
=
10
}
).
power
/
5
)))
end
end
)
end
end
...
...
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