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
K'van
Tales of MajEyal
Commits
1b5058d0
Commit
1b5058d0
authored
10 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
plop
parent
b7b5d446
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/data/damage_types.lua
+3
-1
3 additions, 1 deletion
game/modules/tome/data/damage_types.lua
with
3 additions
and
1 deletion
game/modules/tome/data/damage_types.lua
+
3
−
1
View file @
1b5058d0
...
@@ -399,6 +399,8 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
...
@@ -399,6 +399,8 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
print
(
"[PROJECTOR] final dam after static checks"
,
dam
)
print
(
"[PROJECTOR] final dam after static checks"
,
dam
)
local
initial_dam
=
dam
local
hd
=
{
"DamageProjector:final"
,
src
=
src
,
x
=
x
,
y
=
y
,
type
=
type
,
dam
=
dam
,
tmp
=
tmp
,
no_martyr
=
no_martyr
}
local
hd
=
{
"DamageProjector:final"
,
src
=
src
,
x
=
x
,
y
=
y
,
type
=
type
,
dam
=
dam
,
tmp
=
tmp
,
no_martyr
=
no_martyr
}
if
src
:
triggerHook
(
hd
)
then
dam
=
hd
.
dam
if
hd
.
stopped
then
return
hd
.
stopped
end
end
if
src
:
triggerHook
(
hd
)
then
dam
=
hd
.
dam
if
hd
.
stopped
then
return
hd
.
stopped
end
end
if
target
.
fireTalentCheck
then
if
target
.
fireTalentCheck
then
...
@@ -414,7 +416,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
...
@@ -414,7 +416,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
local
source_talent
=
src
.
__projecting_for
and
src
.
__projecting_for
.
project_type
and
(
src
.
__projecting_for
.
project_type
.
talent_id
or
src
.
__projecting_for
.
project_type
.
talent
)
and
src
.
getTalentFromId
and
src
:
getTalentFromId
(
src
.
__projecting_for
.
project_type
.
talent
or
src
.
__projecting_for
.
project_type
.
talent_id
)
local
source_talent
=
src
.
__projecting_for
and
src
.
__projecting_for
.
project_type
and
(
src
.
__projecting_for
.
project_type
.
talent_id
or
src
.
__projecting_for
.
project_type
.
talent
)
and
src
.
getTalentFromId
and
src
:
getTalentFromId
(
src
.
__projecting_for
.
project_type
.
talent
or
src
.
__projecting_for
.
project_type
.
talent_id
)
local
dead
local
dead
dead
,
dam
=
target
:
takeHit
(
dam
,
src
,
{
damtype
=
type
,
source_talent
=
source_talent
,
initial_dam
=
dam
})
dead
,
dam
=
target
:
takeHit
(
dam
,
src
,
{
damtype
=
type
,
source_talent
=
source_talent
,
initial_dam
=
initial_
dam
})
-- Log damage for later
-- Log damage for later
if
not
DamageType
:
get
(
type
).
hideMessage
then
if
not
DamageType
:
get
(
type
).
hideMessage
then
...
...
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