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
35467f62
Commit
35467f62
authored
10 years ago
by
Alex Ksandra
Browse files
Options
Downloads
Patches
Plain Diff
Moved finishers (Unfortunate End and Crushing Blow) after resists.
parent
33a2d95c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!57
Damage handlers reorder
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
game/modules/tome/data/damage_types.lua
+12
-13
12 additions, 13 deletions
game/modules/tome/data/damage_types.lua
with
12 additions
and
13 deletions
game/modules/tome/data/damage_types.lua
+
12
−
13
View file @
35467f62
...
...
@@ -349,24 +349,11 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
dam
=
dam
*
target
:
callTalent
(
target
.
T_ROLL_WITH_IT
,
"getMult"
)
print
(
"[PROJECTOR] after Roll With It dam"
,
dam
)
end
-- Curse of Misfortune: Unfortunate End (chance to increase damage enough to kill)
if
src
and
src
.
hasEffect
and
src
:
hasEffect
(
src
.
EFF_CURSE_OF_MISFORTUNE
)
then
local
eff
=
src
:
hasEffect
(
src
.
EFF_CURSE_OF_MISFORTUNE
)
local
def
=
src
.
tempeffect_def
[
src
.
EFF_CURSE_OF_MISFORTUNE
]
dam
=
def
.
doUnfortunateEnd
(
src
,
eff
,
target
,
dam
)
end
if
src
and
src
.
hasEffect
and
src
:
hasEffect
(
src
.
EFF_SEAL_FATE
)
then
src
:
callEffect
(
src
.
EFF_SEAL_FATE
,
"doDamage"
,
target
)
end
if
src
:
attr
(
"crushing_blow"
)
and
(
dam
*
(
1
.
25
+
(
src
.
combat_critical_power
or
0
)
/
200
))
>
target
.
life
then
dam
=
dam
*
(
1
.
25
+
(
src
.
combat_critical_power
or
0
)
/
200
)
game
.
logPlayer
(
src
,
"You end your target with a crushing blow!"
)
end
if
target
:
attr
(
"resist_unseen"
)
and
not
target
:
canSee
(
src
)
then
dam
=
dam
*
(
1
-
math.min
(
target
.
resist_unseen
,
100
)
/
100
)
end
...
...
@@ -414,6 +401,18 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
dam
=
dam
*
(
1
-
src
.
necrotic_minion_be_nice
)
end
-- Curse of Misfortune: Unfortunate End (chance to increase damage enough to kill)
if
src
and
src
.
hasEffect
and
src
:
hasEffect
(
src
.
EFF_CURSE_OF_MISFORTUNE
)
then
local
eff
=
src
:
hasEffect
(
src
.
EFF_CURSE_OF_MISFORTUNE
)
local
def
=
src
.
tempeffect_def
[
src
.
EFF_CURSE_OF_MISFORTUNE
]
dam
=
def
.
doUnfortunateEnd
(
src
,
eff
,
target
,
dam
)
end
if
src
:
attr
(
"crushing_blow"
)
and
(
dam
*
(
1
.
25
+
(
src
.
combat_critical_power
or
0
)
/
200
))
>
target
.
life
then
dam
=
dam
*
(
1
.
25
+
(
src
.
combat_critical_power
or
0
)
/
200
)
game
.
logPlayer
(
src
,
"You end your target with a crushing blow!"
)
end
print
(
"[PROJECTOR] final dam after static checks"
,
dam
)
local
hd
=
{
"DamageProjector:final"
,
src
=
src
,
x
=
x
,
y
=
y
,
type
=
type
,
dam
=
dam
,
tmp
=
tmp
,
no_martyr
=
no_martyr
}
...
...
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