Commit 7b84ef748716b12359aea31cd12905b9f2b1e242

Authored by Otowa Kotori
2 parents cfe60569 daccc078

Merge remote-tracking branch 'upstream/master' into i18n

... ... @@ -4320,6 +4320,7 @@ function _M:updateModdableTile()
4320 4320 table.insert(self.shimmer_particles_active, p)
4321 4321 end
4322 4322 end
  4323 + if not self.moddable_tile then return end
4323 4324
4324 4325 local base = "player/"..self.moddable_tile:gsub("#sex#", self.female and "female" or "male").."/"
4325 4326
... ...
... ... @@ -100,7 +100,7 @@ newTalent {
100 100 end
101 101 pen_off(self, t, target, x, y)
102 102 end,
103   - archery_target_parameters = {one_shot = true},
  103 + archery_target_parameters = {limit_shots = 1, multishots = 1}, -- {one_shot = true},
104 104 damage_multiplier = function(self, t)
105 105 return self:combatTalentWeaponDamage(t, 1.5, 1.9)
106 106 end,
... ... @@ -149,7 +149,7 @@ newTalent {
149 149 archery_onhit = function(self, t, target, x, y)
150 150 pen_off(self, t, target, x, y)
151 151 end,
152   - archery_target_parameters = {one_shot = true},
  152 + archery_target_parameters = {limit_shots = 1, multishots = 1}, --{one_shot = true},
153 153 speed = "archery",
154 154 action = function(self, t)
155 155 local tg = {type = "hit"}
... ...
... ... @@ -668,7 +668,7 @@ newTalent{
668 668 return true
669 669 end,
670 670 info = function(self, t)
671   - return ([[Open a hole in space, summoning an animated blade for 10 turns.]]):tformat()
  671 + return ([[Open a hole in space, summoning an animated blade for 15 turns.]]):tformat()
672 672 end,
673 673 }
674 674
... ...
... ... @@ -163,7 +163,7 @@ newTalent{
163 163 local _ _, x, y = self:canProject(tg, x, y)
164 164
165 165 local proj = throw(self, tg.range, 1, x, y, nil, nil, nil)
166   - proj.name = _t"Throwing Knife"
  166 + if proj then proj.name = _t"Throwing Knife" end
167 167
168 168 return true
169 169 end,
... ... @@ -255,7 +255,7 @@ newTalent{
255 255 local tgt, id = rng.table(tgts)
256 256 if tgt then
257 257 local proj = throw(self, self:getTalentRadius(t), t.getDamage(self,t), tgt.act.x, tgt.act.y, nil, nil, 1)
258   - proj.name = _t"Fan of Knives"
  258 + if proj then proj.name = _t"Fan of Knives" end
259 259 tgt.cnt = tgt.cnt + 1
260 260 print(("Fan of Knives #%d: target:%s (%s, %s) = %d"):format(count, tgt.act.name, tgt.act.x, tgt.act.y, tgt.cnt))
261 261 count = count - 1
... ... @@ -334,7 +334,7 @@ newTalent{
334 334 if #tgts <= 0 then return nil end
335 335 local a, id = rng.table(tgts)
336 336 local proj = throw(self, self:getTalentRange(t), 1, a.x, a.y, nil, nil, nil)
337   - proj.name = _t"Quickdraw Knife"
  337 + if proj then proj.name = _t"Quickdraw Knife" end
338 338 self.turn_procs.quickdraw = true
339 339 end,
340 340 info = function(self, t)
... ... @@ -379,7 +379,7 @@ newTalent{
379 379 local dam = t2.getDamage(self,t2)
380 380
381 381 local proj = throw(self, self:getTalentRange(t), dam, x, y, DamageType.NATURE, 1, nil)
382   - proj.name = _t"Venomous Throw"
  382 + if proj then proj.name = _t"Venomous Throw" end
383 383 self.talents_cd[self.T_VENOMOUS_STRIKE] = 8
384 384
385 385 return true
... ...
... ... @@ -3882,6 +3882,7 @@ newEffect{
3882 3882 eff.target:removeEffect(eff.target.EFF_FED_UPON, false, true)
3883 3883 end,
3884 3884 updateFeed = function(self, eff)
  3885 + if not eff then return end
3885 3886 local source = eff.src
3886 3887 local target = eff.target
3887 3888
... ...