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
Otowa Kotori
Tales of MajEyal
Commits
02f56539
Commit
02f56539
authored
6 years ago
by
Chris Davidson
Browse files
Options
Downloads
Patches
Plain Diff
Fix merge mistakes
Not quite sure whats going on but this should fix it.
parent
bf88a2c0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
game/modules/tome/class/interface/Combat.lua
+7
-2
7 additions, 2 deletions
game/modules/tome/class/interface/Combat.lua
with
7 additions
and
2 deletions
game/modules/tome/class/interface/Combat.lua
+
7
−
2
View file @
02f56539
...
...
@@ -2239,10 +2239,10 @@ end
--- Returns the resistance penetration
function
_M
:
combatGetResistPen
(
type
,
straight
)
local
add
=
0
if
not
self
.
resists_pen
then
return
0
end
local
pen
=
(
self
.
resists_pen
.
all
or
0
)
+
(
self
.
resists_pen
[
type
]
or
0
)
if
straight
then
return
pen
end
local
add
=
0
if
self
.
auto_highest_resists_pen
and
self
.
auto_highest_resists_pen
[
type
]
then
local
highest
=
self
.
resists_pen
.
all
or
0
...
...
@@ -2255,7 +2255,12 @@ function _M:combatGetResistPen(type, straight)
return
highest
+
self
.
auto_highest_resists_pen
[
type
]
end
return
pen
if
self
:
knowTalent
(
self
.
T_UMBRAL_AGILITY
)
and
type
==
"DARKNESS"
then
local
t
=
self
:
getTalentFromId
(
self
.
T_UMBRAL_AGILITY
)
add
=
add
+
t
.
getPenetration
(
self
,
t
)
end
return
pen
+
add
end
--- Returns the damage affinity
...
...
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