Commit 95f894a52d9aca1fe82641adfcf9b01975e31c4b

Authored by DarkGod
1 parent d09d9482

Fixed Turtle Grand Arrival with Through the Crowd

... ... @@ -71,6 +71,10 @@ function _M:get(id)
71 71 return _M.dam_def[id]
72 72 end
73 73
  74 +function _M:exists(id)
  75 + return _M.dam_def[id]
  76 +end
  77 +
74 78 function _M:projectingFor(src, v)
75 79 src.__projecting_for = v
76 80 end
... ...
... ... @@ -4992,9 +4992,12 @@ end
4992 4992
4993 4993 --- Called when we are initiating a projection
4994 4994 function _M:on_project_init(t, x, y, damtype, dam, particles)
4995   - if self:attr("nullify_all_friendlyfire") then
4996   - t.friendlyfire = false
4997   - t.selffire = false
  4995 + if self:attr("nullify_all_friendlyfire") and not t.ignore_nullify_all_friendlyfire then
  4996 + local dt = DamageType:exists(damtype)
  4997 + if not dt or not dt.ignore_nullify_all_friendlyfire then
  4998 + t.friendlyfire = false
  4999 + t.selffire = false
  5000 + end
4998 5001 end
4999 5002 end
5000 5003
... ...
... ... @@ -121,7 +121,7 @@ newTalent{
121 121 }
122 122 end,
123 123 on_arrival = function(self, t, m)
124   - local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y}
  124 + local tg = {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), talent=t, x=m.x, y=m.y, ignore_nullify_all_friendlyfire=true}
125 125 self:project(tg, m.x, m.y, function(px, py)
126 126 local target = game.level.map(px, py, Map.ACTOR)
127 127 if not target or self:reactionToward(target) < 0 then return end
... ...