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
Merge requests
!356
RogueReworkFixes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
RogueReworkFixes
razakai/t-engine4:RogueFixes
into
master
Overview
0
Commits
1
Pipelines
0
Changes
11
Merged
razakai
requested to merge
razakai/t-engine4:RogueFixes
into
master
8 years ago
Overview
0
Commits
1
Pipelines
0
Changes
11
Expand
Reworked Parry
Marauder now gets Dual Weapons category rather than Duelist
Fixed a few bugs in new talents
Added Grappling Hook tool to Artifice
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
035383b5
1 commit,
8 years ago
11 files
+
270
−
57
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
11
Search (e.g. *.vue) (Ctrl+P)
game/modules/tome/class/interface/Archery.lua
+
12
−
0
Options
@@ -316,6 +316,18 @@ local function archery_projectile(tx, ty, tg, self, tmp)
print
(
"[ATTACK ARCHERY] raw dam"
,
dam
,
"versus"
,
armor
,
"with APR"
,
apr
)
local
pres
=
util
.
bound
(
target
:
combatArmorHardiness
()
/
100
,
0
,
1
)
if
target
.
knowTalent
and
target
:
hasEffect
(
target
.
EFF_PARRY
)
then
local
deflect
=
math.min
(
dam
,
target
:
callTalent
(
target
.
T_PARRY
,
"doDeflect"
))
if
deflect
>
0
then
game
:
delayedLogDamage
(
self
,
target
,
0
,
(
"%s(%d parried#LAST#)"
):
format
(
DamageType
:
get
(
damtype
).
text_color
or
"#aaaaaa#"
,
deflect
),
false
)
dam
=
math.max
(
dam
-
deflect
,
0
)
print
(
"[ATTACK] after PARRY"
,
dam
)
if
target
:
knowTalent
(
target
.
T_TEMPO
)
then
local
t
=
target
:
getTalentFromId
(
target
.
T_TEMPO
)
t
.
do_tempo
(
target
,
t
)
end
end
end
armor
=
math.max
(
0
,
armor
-
apr
)
dam
=
math.max
(
dam
*
pres
-
armor
,
0
)
+
(
dam
*
(
1
-
pres
))
print
(
"[ATTACK ARCHERY] after armor"
,
dam
)
Loading