Skip to content
Snippets Groups Projects
Commit 4f15c939 authored by dg's avatar dg
Browse files

Fix Flare

git-svn-id: http://svn.net-core.org/repos/t-engine4@2930 51575b47-30f0-44d4-a5cc-537603b46e54
parent 500213b6
No related branches found
No related tags found
No related merge requests found
......@@ -87,9 +87,10 @@ end
function _M:move(x, y, force)
local moved = false
local ox, oy = self.x, self.y
if force or self:enoughEnergy() then
moved = engine.Actor.move(self, x, y, force)
if not force and moved and not self.did_energy then self:useEnergy() end
if not force and moved and (self.x ~= ox or self.y ~= oy) and not self.did_energy then self:useEnergy() end
end
self.did_energy = nil
return moved
......
......@@ -87,9 +87,10 @@ end
function _M:move(x, y, force)
local moved = false
local ox, oy = self.x, self.y
if force or self:enoughEnergy() then
moved = engine.Actor.move(self, x, y, force)
if not force and moved and not self.did_energy then self:useEnergy() end
if not force and moved and (self.x ~= ox or self.y ~= oy) and not self.did_energy then self:useEnergy() end
end
self.did_energy = nil
return moved
......
......@@ -198,8 +198,8 @@ newTalent{
local tg = self:getTalentTarget(t)
self:project(tg, x, y, DamageType.LITE, 1)
if self:getTalentLevel(t) >= 3 then
tg.selffire= false
self:project(tg, self.x, self.y, DamageType.BLINDPHYSICAL, 3)
tg.selffire = false
self:project(tg, x, y, DamageType.BLINDPHYSICAL, 3)
end
game.level.map:particleEmitter(x, y, tg.radius, "ball_light", {radius=tg.radius})
end,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment