more particles

git-svn-id: http://svn.net-core.org/repos/t-engine4@702 51575b47-30f0-44d4-a5cc-537603b46e54

game/engine/Map.lua

@@ -716,18 +716,8 @@ end
 function _M:processEffects()
 	local todel = {}
 	for i, e in ipairs(self.effects) do
-		local grids
-
-		-- Handle balls
-		if e.dir == 5 then
-			grids = core.fov.circle_grids(e.x, e.y, e.radius, true)
-		-- Handle beams
-		else
-			grids = core.fov.beam_grids(e.x, e.y, e.radius, e.dir, e.angle, true)
-		end
-
 		-- Now display each grids
-		for lx, ys in pairs(grids) do
+		for lx, ys in pairs(e.grids) do
 			for ly, _ in pairs(ys) do
 				if e.friendlyfire or not (lx == e.src.x and ly == e.src.y) then
 					DamageType:get(e.damtype).projector(e.src, lx, ly, e.damtype, e.dam)
@@ -739,7 +729,19 @@ function _M:processEffects()
 		if e.duration <= 0 then
 			table.insert(todel, i)
 		elseif e.update_fct then
-			e:update_fct()
+			if e:update_fct() then
+				if e.dir == 5 then e.grids = core.fov.circle_grids(e.x, e.y, e.radius, true)
+				else e.grids = core.fov.beam_grids(e.x, e.y, e.radius, e.dir, e.angle, true) end
+				if e.particles then
+					for j, ps in ipairs(e.particles) do self:removeParticleEmitter(ps) end
+					e.particles = {}
+					for lx, ys in pairs(grids) do
+						for ly, _ in pairs(ys) do
+							e.particles[#e.particles+1] = self:particleEmitter(lx, ly, 1, overlay.type, overlay.args)
+						end
+					end
+				end
+			end
 		end
 	end
 

game/modules/tome/data/gfx/particles/vapour.lua

@@ -27,7 +27,7 @@ return { generator = function()
 	return {
 		trail = 1,
 		life = 10,
-		size = 1, sizev = 0.4, sizea = 0,
+		size = 1, sizev = 0.5, sizea = 0,
 
 		x = r * math.cos(a), xv = -0.1, xa = 0,
 		y = r * math.sin(a), yv = -0.1, ya = 0,

game/modules/tome/data/talents/gifts/fire-drake.lua

@@ -88,7 +88,7 @@ newTalent{
 			DamageType.FIRE, dam,
 			radius,
 			5, nil,
-			engine.Entity.new{alpha=100, display='', color_br=180, color_bg=30, color_bb=60},
+			{type="inferno"},
 			nil, true
 		)
 		game:playSoundNear(self, "talents/devouringflame")

game/modules/tome/data/talents/spells/water.lua

@@ -140,6 +140,7 @@ newTalent{
 			function(e)
 				e.x = e.src.x
 				e.y = e.src.y
+				return true
 			end,
 			false
 		)