Commit cd40b3fd0d5746828064ca4e5536d1fac154ac12

Authored by DarkGod
2 parents 517a8dcb 6fe7cf25

Merge branch 'otowakotori/t-engine4-tether-fix'

@@ -302,7 +302,11 @@ newTalent{ @@ -302,7 +302,11 @@ newTalent{
302 local trigger = rng.percent(self.chance * core.fov.distance(self.x, self.y, target.x, target.y)) 302 local trigger = rng.percent(self.chance * core.fov.distance(self.x, self.y, target.x, target.y))
303 303
304 if game.level and game.level:hasEntity(target) and tether and not target.dead then 304 if game.level and game.level:hasEntity(target) and tether and not target.dead then
305 - self.temporary = tether.dur 305 + if self.x == tether.x and self.y == tether.y then
  306 + self.temporary = tether.dur
  307 + else
  308 + self.temporary = math.min(self.temporary or 0, tether.dur)
  309 + end
306 end 310 end
307 311
308 if game.level and game.level:hasEntity(target) and tether and trigger and not target.dead then 312 if game.level and game.level:hasEntity(target) and tether and trigger and not target.dead then
@@ -388,6 +392,7 @@ newTalent{ @@ -388,6 +392,7 @@ newTalent{
388 local radius = self:getTalentRadius(t) 392 local radius = self:getTalentRadius(t)
389 return ([[Tether the target to the location for %d turns. 393 return ([[Tether the target to the location for %d turns.
390 Each turn the target has a %d%% chance per tile it's travelled away from the tether to be teleported back, inflicting %0.2f physical and %0.2f temporal (warp) damage to all enemies in a radius of %d at both the entrance and exit locations. 394 Each turn the target has a %d%% chance per tile it's travelled away from the tether to be teleported back, inflicting %0.2f physical and %0.2f temporal (warp) damage to all enemies in a radius of %d at both the entrance and exit locations.
  395 + If the target has already been tethered, it will also be tethered to the new location. The old tether still exists and can function normally, but cannot be extended by any means.
391 The damage will scale with your Spellpower.]]) 396 The damage will scale with your Spellpower.]])
392 :tformat(duration, chance, damDesc(self, DamageType.PHYSICAL, damage), damDesc(self, DamageType.TEMPORAL, damage), radius) 397 :tformat(duration, chance, damDesc(self, DamageType.PHYSICAL, damage), damDesc(self, DamageType.TEMPORAL, damage), radius)
393 end, 398 end,