Skip to content
Snippets Groups Projects
Commit e6ca86f8 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'steady-shoot-fix' into 'master'

Allows Steady Shot triggered via Shoot to apply Marked

Allows Steady Shot triggered via Shoot to apply Marked even if Master Marksman is not known, just as using the talent manually would.

See merge request !738
parents 56533513 70cfddad
No related branches found
No related tags found
1 merge request!738Allows Steady Shot triggered via Shoot to apply Marked
Pipeline #
......@@ -61,8 +61,8 @@ newTalent{
if self.mark_steady then self.mark_steady = nil end
end,
archery_onhit = function(self, t, target, x, y)
if self:knowTalent(self.T_MASTER_MARKSMAN) then
local chance = 15 + (self.mark_steady or 0)
if self:knowTalent(self.T_MASTER_MARKSMAN) or self.mark_steady then
local chance = (self:knowTalent(self.T_MASTER_MARKSMAN) and 15 or 0) + (self.mark_steady or 0)
if self:hasEffect(self.EFF_TRUESHOT) then chance = chance + (chance * self:callTalent(self.T_TRUESHOT, "getMarkChance")/100) end
if self:isTalentActive(self.T_AIM) then
chance = chance + self:callTalent(self.T_AIM, "getMarkChance")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment