fireflash effect

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

game/engine/interface/ActorProject.lua

@@ -126,6 +126,7 @@ function _M:project(t, x, y, damtype, dam, particles)
 			end
 		end
 	end
+	return grids
 end
 
 --- Can we project to this grid ?

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

+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+-- Make up the grids list
+local gs = {}
+
+-- Compute the clipping circle
+local sradius = (radius + 0.5) * (engine.Map.tile_w + engine.Map.tile_h) / 2
+for i = -radius, radius do for j = -radius, radius  do
+	local lastx, lasty = 0, 0
+	local l = line.new(0, 0, i, j)
+	local lx, ly = l()
+	while lx do
+		if grids[lx+tx] and grids[lx+tx][ly+ty] then
+			lastx, lasty = lx, ly
+		else
+			gs[lx] = gs[lx] or {}
+			gs[lx][ly] = {x=lastx, y=lasty, radius=math.sqrt(lastx^2 + lasty^2)}
+			print("block", lx, ly, "=>", math.sqrt(lastx^2 + lasty^2))
+		end
+		lx, ly = l()
+	end
+end end
+
+local nb = 0
+return { generator = function()
+	local radius = radius
+	local sradius = (radius + 0.5) * (engine.Map.tile_w + engine.Map.tile_h) / 2
+	local ad = rng.float(0, 360)
+	local a = math.rad(ad)
+	local r = rng.float(sradius - 5, sradius)
+	local x = r * math.cos(a)
+	local y = r * math.sin(a)
+	local bx = math.floor(x / engine.Map.tile_w)
+	local by = math.floor(y / engine.Map.tile_h)
+	if gs[bx] and gs[bx][by] and rng.chance(2) then
+		print("block at angle", ad, radius, ":=>", gs[bx][by].radius)
+		radius = gs[bx][by].radius
+		sradius = (radius + 0.5) * (engine.Map.tile_w + engine.Map.tile_h) / 2
+		local r = rng.float(sradius - 5, sradius)
+		x = r * math.cos(a)
+		y = r * math.sin(a)
+	end
+	local static = rng.percent(40)
+
+	return {
+		trail = 1,
+		life = 12,
+		size = 3, sizev = static and 0.1 or 0.3, sizea = 0,
+
+		x = x, xv = 0, xa = 0,
+		y = y, yv = 0, ya = 0,
+		dir = static and a + math.rad(90 - rng.range(10, 20)) or a, dirv = 0, dira = 0,
+		vel = static and -1 or (-1-nb) * radius / 2.7, velv = 0, vela = static and -0.01 or rng.float(-0.3, -0.2),
+
+		r = rng.range(200, 255)/255,   rv = 0, ra = 0,
+		g = rng.range(120, 170)/255,   gv = 0.01, ga = 0.001,
+		b = rng.range(0, 10)/255,      bv = 0, ba = 0,
+		a = rng.range(25, 220)/255,    av = static and -0.07 or 0, aa = 0.01,
+	}
+end, },
+function(self)
+	if nb < 5 then
+		self.ps:emit(radius*266)
+		nb = nb + 1
+		self.ps:emit(radius*266)
+		nb = nb + 1
+		self.ps:emit(radius*266)
+		nb = nb + 1
+		self.ps:emit(radius*266)
+		nb = nb + 1
+		self.ps:emit(radius*266)
+		nb = nb + 1
+	end
+end,
+5*radius*266
+
+--[[
+local nb = 0
+return { generator = function()
+	local ad = rng.range(0, 360)
+	local a = math.rad(ad)
+	local r = rng.range(2, sradius)
+	local boundx = r * math.cos(a)
+	local boundy = r * math.sin(a)
+	local x = math.floor(boundx / engine.Map.tile_w) + tx
+	local y = math.floor(boundy / engine.Map.tile_h) + ty
+	if not grids[x] or not grids[x][y] then return end
+
+	return {
+		trail = 1,
+		life = 12,
+		size = 3, sizev = 0.3, sizea = 0,
+
+		x = boundx, xv = 0, xa = 0,
+		y = boundy, yv = 0, ya = 0,
+--		x = r * math.cos(a), xv = -0.1, xa = 0,
+--		y = r * math.sin(a), yv = -0.1, ya = 0,
+		dir = a + 5 * math.rad(rng.range(10, 20)), dirv = math.rad(rng.range(10, 20)), dira = -math.rad(2),
+		vel = 1, velv = 0, vela = 0.1,
+
+		r = rng.range(200, 255)/255,   rv = 0, ra = 0,
+		g = rng.range(120, 170)/255,   gv = 0, ga = 0,
+		b = rng.range(0, 10)/255,      bv = 0, ba = 0,
+		a = rng.range(25, 220)/255,    av = 0, aa = 0,
+	}
+end, },
+function(self)
+	if nb < 2 then
+		self.ps:emit(800)
+		nb = nb + 1
+	end
+end,
+5000
+]]
\ No newline at end of file

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

@@ -32,7 +32,7 @@ return { generator = function()
 		x = r * math.cos(a), xv = -0.1, xa = 0,
 		y = r * math.sin(a), yv = -0.1, ya = 0,
 		dir = dir, dirv = dirv, dira = 0,
-		vel = 1, velv = 0, vela = 0,
+		vel = rng.percent(50) and -1 or 1, velv = 0, vela = 0,
 
 		r = rng.range(220, 255)/255,  rv = 0, ra = 0,
 		g = rng.range(200, 230)/255,  gv = 0, ga = 0,

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

@@ -83,7 +83,11 @@ newTalent{
 		local tg = {type="ball", range=self:getTalentRange(t), radius=1 + self:getTalentLevelRaw(t), friendlyfire=self:spellFriendlyFire(), talent=t}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:project(tg, x, y, DamageType.FIRE, self:spellCrit(28 + self:combatSpellpower(0.6) * self:getTalentLevel(t)), {type="flame"})
+		local grids = self:project(tg, x, y, DamageType.FIRE, self:spellCrit(28 + self:combatSpellpower(0.6) * self:getTalentLevel(t)))
+
+		local _ _, x, y = self:canProject(tg, x, y)
+		game.level.map:particleEmitter(x, y, tg.radius, "fireflash", {radius=tg.radius, grids=grids, tx=x, ty=y})
+
 		game:playSoundNear(self, "talents/fireflash")
 		return true
 	end,

src/particles.c

@@ -199,46 +199,49 @@ static int particles_emit(lua_State *L)
 			{
 				lua_rawgeti(L, LUA_REGISTRYINDEX, ps->generator_ref);
 				lua_call(L, 0, 1);
-				float life;
-				float trail;
-				getparticulefield(L, "trail", &trail); p->trail = trail;
-
-				getparticulefield(L, "life", &life); p->life = life;
-				getparticulefield(L, "size", &(p->size));
-				getparticulefield(L, "sizev", &(p->sizev));
-				getparticulefield(L, "sizea", &(p->sizea));
-
-				getparticulefield(L, "x", &(p->x));
-				getparticulefield(L, "xv", &(p->xv));
-				getparticulefield(L, "xa", &(p->xa));
-
-				getparticulefield(L, "y", &(p->y));
-				getparticulefield(L, "yv", &(p->yv));
-				getparticulefield(L, "ya", &(p->ya));
-
-				getparticulefield(L, "dir", &(p->dir));
-				getparticulefield(L, "dirv", &(p->dirv));
-				getparticulefield(L, "dira", &(p->dira));
-
-				getparticulefield(L, "vel", &(p->vel));
-				getparticulefield(L, "velv", &(p->velv));
-				getparticulefield(L, "vela", &(p->vela));
-
-				getparticulefield(L, "r", &(p->r));
-				getparticulefield(L, "rv", &(p->rv));
-				getparticulefield(L, "ra", &(p->ra));
-
-				getparticulefield(L, "g", &(p->g));
-				getparticulefield(L, "gv", &(p->gv));
-				getparticulefield(L, "ga", &(p->ga));
-
-				getparticulefield(L, "b", &(p->b));
-				getparticulefield(L, "bv", &(p->bv));
-				getparticulefield(L, "ba", &(p->ba));
-
-				getparticulefield(L, "a", &(p->a));
-				getparticulefield(L, "av", &(p->av));
-				getparticulefield(L, "aa", &(p->aa));
+				if (!lua_isnil(L, -1))
+				{
+					float life;
+					float trail;
+					getparticulefield(L, "trail", &trail); p->trail = trail;
+
+					getparticulefield(L, "life", &life); p->life = life;
+					getparticulefield(L, "size", &(p->size));
+					getparticulefield(L, "sizev", &(p->sizev));
+					getparticulefield(L, "sizea", &(p->sizea));
+
+					getparticulefield(L, "x", &(p->x));
+					getparticulefield(L, "xv", &(p->xv));
+					getparticulefield(L, "xa", &(p->xa));
+
+					getparticulefield(L, "y", &(p->y));
+					getparticulefield(L, "yv", &(p->yv));
+					getparticulefield(L, "ya", &(p->ya));
+
+					getparticulefield(L, "dir", &(p->dir));
+					getparticulefield(L, "dirv", &(p->dirv));
+					getparticulefield(L, "dira", &(p->dira));
+
+					getparticulefield(L, "vel", &(p->vel));
+					getparticulefield(L, "velv", &(p->velv));
+					getparticulefield(L, "vela", &(p->vela));
+
+					getparticulefield(L, "r", &(p->r));
+					getparticulefield(L, "rv", &(p->rv));
+					getparticulefield(L, "ra", &(p->ra));
+
+					getparticulefield(L, "g", &(p->g));
+					getparticulefield(L, "gv", &(p->gv));
+					getparticulefield(L, "ga", &(p->ga));
+
+					getparticulefield(L, "b", &(p->b));
+					getparticulefield(L, "bv", &(p->bv));
+					getparticulefield(L, "ba", &(p->ba));
+
+					getparticulefield(L, "a", &(p->a));
+					getparticulefield(L, "av", &(p->av));
+					getparticulefield(L, "aa", &(p->aa));
+				}
 			}
 			p->ox = p->x;
 			p->oy = p->y;