Commit 3fc3ec47d98f83862a3dfec582929a54a3af1a9c

Authored by Mcintyre Watts
1 parent c6272a53

Melee-summons auto-cast and no warning works for hovering player.

... ... @@ -308,6 +308,7 @@ function _M:targetGetForPlayer(typ)
308 308 msg = typ.msg
309 309 end
310 310 self:targetMode("exclusive", msg, coroutine.running(), typ)
  311 + if typ.nowarning then self.target_warning = false end
311 312 if self.target.target.x and config.settings.auto_accept_target and not typ.immediate_keys and not typ.nolock and not typ.no_restrict then
312 313 self.target_co = nil
313 314 self:targetMode(false, false) self.tooltip_x, self.tooltip_y = nil, nil
... ... @@ -315,7 +316,6 @@ function _M:targetGetForPlayer(typ)
315 316 end
316 317 if typ.immediate_keys then self.target_style = "immediate" end
317 318 if typ.nolock then self.target_style = "free" end
318   - if typ.nowarning then self.target_warning = false end
319 319 return coroutine.yield()
320 320 end
321 321 return self.target.target.x, self.target.target.y, self.target.target.entity
... ...
... ... @@ -60,7 +60,7 @@ newTalent{
60 60 }
61 61 end,
62 62 action = function(self, t)
63   - local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
  63 + local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), talent=t}
64 64 --print("war hound targeting:") table.print(tg) -- debugging
65 65 local tx, ty, target = self:getTarget(tg)
66 66 if not tx or not ty then return nil end
... ... @@ -157,7 +157,7 @@ newTalent{
157 157 }
158 158 end,
159 159 action = function(self, t)
160   - local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
  160 + local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), talent=t}
161 161 local tx, ty, target = self:getTarget(tg)
162 162 if not tx or not ty then return nil end
163 163 local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
... ... @@ -268,7 +268,7 @@ newTalent{
268 268 }
269 269 end,
270 270 action = function(self, t)
271   - local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
  271 + local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), talent=t}
272 272 local tx, ty, target = self:getTarget(tg)
273 273 if not tx or not ty then return nil end
274 274 local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
... ... @@ -373,7 +373,7 @@ newTalent{
373 373 }
374 374 end,
375 375 action = function(self, t)
376   - local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
  376 + local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), talent=t}
377 377 local tx, ty, target = self:getTarget(tg)
378 378 if not tx or not ty then return nil end
379 379 local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
... ...
... ... @@ -140,7 +140,7 @@ newTalent{
140 140 end)
141 141 end,
142 142 action = function(self, t)
143   - local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
  143 + local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), talent=t}
144 144 local tx, ty, target = self:getTarget(tg)
145 145 if not tx or not ty then return nil end
146 146 local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
... ...