Commit 90b4d0997b5fcb9b45557c2f568555551021c199
Merge branch 'master' of git.net-core.org:tome/t-engine4
Showing
4 changed files
with
10 additions
and
7 deletions
... | ... | @@ -102,7 +102,7 @@ newTalent{ |
102 | 102 | m:takeHit(split, src) |
103 | 103 | m:setTarget(src or nil) |
104 | 104 | game:delayedLogMessage(self, nil, "guardian_damage", "#STEEL_BLUE##Source# shares damage with %s guardian!", string.his_her(self)) |
105 | - game:delayedLogDamage(src or self, self, 0, ("#STEEL_BLUE#(%d shared)#LAST#"):tformat(split), nil) | |
105 | + game:delayedLogDamage(src or self, self, 0, ("#STEEL_BLUE#(%d shared)#LAST#"):tformat(split*2), nil) | |
106 | 106 | |
107 | 107 | else |
108 | 108 | game.logPlayer(self, "Not enough space to summon warden!") | ... | ... |
... | ... | @@ -61,8 +61,8 @@ newTalent{ |
61 | 61 | if self.mark_steady then self.mark_steady = nil end |
62 | 62 | end, |
63 | 63 | archery_onhit = function(self, t, target, x, y) |
64 | - if self:knowTalent(self.T_MASTER_MARKSMAN) then | |
65 | - local chance = 15 + (self.mark_steady or 0) | |
64 | + if self:knowTalent(self.T_MASTER_MARKSMAN) or self.mark_steady then | |
65 | + local chance = (self:knowTalent(self.T_MASTER_MARKSMAN) and 15 or 0) + (self.mark_steady or 0) | |
66 | 66 | if self:hasEffect(self.EFF_TRUESHOT) then chance = chance + (chance * self:callTalent(self.T_TRUESHOT, "getMarkChance")/100) end |
67 | 67 | if self:isTalentActive(self.T_AIM) then |
68 | 68 | chance = chance + self:callTalent(self.T_AIM, "getMarkChance") | ... | ... |
... | ... | @@ -167,7 +167,6 @@ newTalent{ |
167 | 167 | getDamage = function(self, t) |
168 | 168 | return self:combatTalentWeaponDamage(t, .1, 1) |
169 | 169 | end, |
170 | - range = 1, | |
171 | 170 | target = function(self, t) |
172 | 171 | if self:hasEffect(self.EFF_GRAPPLING) then return {type="ball", range=1, radius=5, selffire=false} end |
173 | 172 | return {type="hit", range=self:getTalentRange(t)} |
... | ... | @@ -190,7 +189,11 @@ newTalent{ |
190 | 189 | local tg = self:getTalentTarget(t) |
191 | 190 | local x, y, target = self:getTarget(tg) |
192 | 191 | if not target or not self:canProject(tg, x, y) then return nil end |
193 | - | |
192 | + | |
193 | + if core.fov.distance(self.x, self.y, x, y) > 1 and self:attr("never_move") then | |
194 | + game.logPlayer(self, "You cannot move!") | |
195 | + return nil | |
196 | + end | |
194 | 197 | local grappled = false |
195 | 198 | |
196 | 199 | -- do the rush | ... | ... |
... | ... | @@ -3847,7 +3847,7 @@ newEffect{ |
3847 | 3847 | if eff.resistGain and eff.resistGain > 0 then |
3848 | 3848 | local gainList = {} |
3849 | 3849 | for id, resist in pairs(eff.target.resists) do |
3850 | - if resist > 0 and id ~= "all" then | |
3850 | + if resist > 0 and id ~= "all" and id ~= "absolute" then | |
3851 | 3851 | gainList[id] = eff.resistGain * 0.01 * resist |
3852 | 3852 | end |
3853 | 3853 | end |
... | ... | @@ -3940,7 +3940,7 @@ newEffect{ |
3940 | 3940 | if eff.resistLoss and eff.resistLoss < 0 then |
3941 | 3941 | local lossList = {} |
3942 | 3942 | for id, resist in pairs(self.resists) do |
3943 | - if resist > 0 and id ~= "all" then | |
3943 | + if resist > 0 and id ~= "all" and id ~= "absolute" then | |
3944 | 3944 | lossList[id] = eff.resistLoss * 0.01 * resist |
3945 | 3945 | end |
3946 | 3946 | end | ... | ... |
-
Please register or login to post a comment