Commit fe06dfbcb24aa0e310bf1347265d559a7192fc2f

Authored by DarkGod
2 parents 01ce59f6 e31542da

Merge branch 'yutio888/t-engine4-174-miscs'

... ... @@ -309,7 +309,7 @@ newTalent{
309 309 if self:getNegative() < drain then return end
310 310
311 311 local tgts = {}
312   - local grids = core.fov.circle_grids(self.x, self.y, 5, true)
  312 + local grids = core.fov.circle_grids(self.x, self.y, self:getTalentRange(t), true)
313 313 for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
314 314 local a = game.level.map(x, y, Map.ACTOR)
315 315 if a and self:reactionToward(a) < 0 then
... ... @@ -349,11 +349,11 @@ newTalent{
349 349 local damage = t.getDamage(self, t)
350 350 local drain = t.getNegativeDrain(self, t)
351 351 return ([[Chant the glory of the Moons, conjuring a shroud of dancing shadows that follows you as long as this spell is active.
352   - Each turn, a shadowy beam will hit up to %d of your foes within radius 5 for 1 to %0.2f damage.
  352 + Each turn, a shadowy beam will hit up to %d of your foes within radius %d for 1 to %0.2f damage.
353 353 This powerful spell will drain %0.1f negative energy for each beam; no beam will fire if your negative energy is too low.
354 354 You may only have one Hymn active at once.
355 355 The damage will increase with your Spellpower.]]):
356   - tformat(targetcount, damDesc(self, DamageType.DARKNESS, damage), drain)
  356 + tformat(targetcount, self:getTalentRange(t), damDesc(self, DamageType.DARKNESS, damage), drain)
357 357 end,
358 358 }
359 359
... ... @@ -470,7 +470,7 @@ newTalent{
470 470 if self:getNegative() < t.getNegativeDrain(self, t) then return end
471 471
472 472 local tgts = {}
473   - local grids = core.fov.circle_grids(self.x, self.y, 5, true)
  473 + local grids = core.fov.circle_grids(self.x, self.y, self:getTalentRange(t), true)
474 474 for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
475 475 local a = game.level.map(x, y, Map.ACTOR)
476 476 if a and self:reactionToward(a) < 0 then
... ... @@ -522,8 +522,8 @@ newTalent{
522 522 end,
523 523 info = function(self, t)
524 524 return ([[Your passion for singing the praises of the Moons reaches its zenith.
525   - Your Hymns now fire shadowy beams that will hit up to %d of your foes within radius 5 for %0.2f damage, with a 25%% chance of blinding %s.
  525 + Your Hymns now fire shadowy beams that will hit up to %d of your foes within radius %d for %0.2f damage, with a 25%% chance of blinding %s.
526 526 This powerful effect will drain %0.1f negative energy each time it fires at at least 1 target; no beam will fire if your negative energy is too low.
527   - These values scale with your Spellpower.]]):tformat(t.getTargetCount(self, t), damDesc(self, DamageType.DARKNESS, t.getDamage(self, t)), Desc.vs"sp", t.getNegativeDrain(self, t))
  527 + These values scale with your Spellpower.]]):tformat(t.getTargetCount(self, t), self:getTalentRange(t), damDesc(self, DamageType.DARKNESS, t.getDamage(self, t)), Desc.vs"sp", t.getNegativeDrain(self, t))
528 528 end,
529 529 }
... ...
... ... @@ -215,7 +215,7 @@ newTalent{
215 215 getTargetCount = function(self, t) return math.floor(self:getTalentLevel(t)) end,
216 216 callbackOnActBase = function(self, t)
217 217 local tgts = {}
218   - local grids = core.fov.circle_grids(self.x, self.y, 6, true)
  218 + local grids = core.fov.circle_grids(self.x, self.y, self:getTalentRange(t), true)
219 219 for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
220 220 local a = game.level.map(x, y, Map.ACTOR)
221 221 if a and self:reactionToward(a) < 0 then
... ... @@ -250,9 +250,9 @@ newTalent{
250 250 info = function(self, t)
251 251 local targetcount = t.getTargetCount(self, t)
252 252 local damage = t.getDamage(self, t)
253   - return ([[Conjures a furious, raging lightning storm with a radius of 6 that follows you as long as this spell is active.
  253 + return ([[Conjures a furious, raging lightning storm with a radius of %d that follows you as long as this spell is active.
254 254 Each turn, a random lightning bolt will hit up to %d of your foes for 1.00 to %0.2f damage (%0.2f average) in a radius of 1.
255 255 The damage will increase with your Spellpower.]]):
256   - tformat(targetcount, damDesc(self, DamageType.LIGHTNING, damage), damDesc(self, DamageType.LIGHTNING, damage / 2))
  256 + tformat(self:getTalentRange(t), targetcount, damDesc(self, DamageType.LIGHTNING, damage), damDesc(self, DamageType.LIGHTNING, damage / 2))
257 257 end,
258 258 }
... ...