Fix Channel Staff with the staff of absorption

New effect for Blastwave
Flame now beams at level 5, what the pretty colors!


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

game/modules/tome/data/general/objects/quest-artifacts.lua

@@ -38,6 +38,7 @@ Light around it seems to dim and you can feel its tremendous power simply by tou
 		apr = 4,
 		atk = 20,
 		dammod = {mag=1},
+		damtype = DamageType.ARCANE,
 	},
 	wielder = {
 		combat_spellpower = 20,

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

@@ -17,28 +17,29 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-local nb = 0
+local nb = 12
+local dir
+local radius = radius or 6
+
 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(0, sradius / 2)
+	local r = 0
 	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)
 	local static = rng.percent(40)
+	local vel = sradius * ((24 - nb * 1.4) / 24) / 12
 
 	return {
 		trail = 1,
-		life = 10,
-		size = 3, sizev = 0, sizea = 0,
+		life = 12,
+		size = 12 - (12 - nb) * 0.7, sizev = 0, sizea = 0,
 
 		x = x, xv = 0, xa = 0,
 		y = y, yv = 0, ya = 0,
 		dir = a, dirv = 0, dira = 0,
-		vel = sradius / 2 / 10, velv = 0, vela = 0,
+		vel = rng.float(vel * 0.6, vel * 1.2), velv = 0, vela = 0,
 
 		r = rng.range(200, 255)/255,   rv = 0, ra = 0,
 		g = rng.range(120, 170)/255,   gv = 0.005, ga = 0.0005,
@@ -47,17 +48,12 @@ return { generator = function()
 	}
 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
+	if nb > 0 then
+		local i = math.min(nb, 6)
+		i = (i * i) * radius
+		self.ps:emit(i)
+		nb = nb - 1
 	end
 end,
-5*radius*266
+30*radius*7*12,
+"particle_cloud"

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

+-- ToME - Tales of Maj'Eyal
+-- 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 the ray
+local ray = {}
+local tiles = math.ceil(math.sqrt(tx*tx+ty*ty))
+local tx = tx * engine.Map.tile_w
+local ty = ty * engine.Map.tile_h
+ray.dir = math.atan2(ty, tx)
+ray.size = math.sqrt(tx*tx+ty*ty)
+
+-- Populate the beam based on the forks
+return { generator = function()
+	local a = ray.dir
+	local r = rng.range(1, ray.size - 32)
+
+	local ra = a + (rng.chance(2) and math.rad(-90) or math.rad(90))
+	local rr = rng.float(2, engine.Map.tile_w * 0.60)
+
+	local vel = rng.float(1.2, 6)
+
+	return {
+		life = 32 / vel,
+		size = rng.float(4, 10), sizev = -0.1, sizea = 0,
+
+		x = r * math.cos(a) + rr * math.cos(ra), xv = 0, xa = 0,
+		y = r * math.sin(a) + rr * math.sin(ra), yv = 0, ya = 0,
+		dir = ray.dir, dirv = 0, dira = 0,
+		vel = vel, velv = -0.1, vela = 0.01,
+
+		r = rng.range(200, 255)/255,   rv = 0, ra = 0,
+		g = rng.range(120, 170)/255,   gv = 0.005, ga = 0.0005,
+		b = rng.range(0, 10)/255,      bv = 0, ba = 0,
+		a = rng.range(25, 220)/255,    av = static and -0.034 or 0, aa = 0.005,
+	}
+end, },
+function(self)
+	self.nb = (self.nb or 0) + 1
+	if self.nb < 6 then
+		self.ps:emit(6*tiles)
+	end
+end,
+14*30*tiles,
+"particle_cloud"

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

@@ -34,14 +34,21 @@ newTalent{
 	requires_target = true,
 	action = function(self, t)
 		local tg = {type="bolt", range=self:getTalentRange(t), talent=t, display={particle="bolt_fire", trail="firetrail"}}
+		if self:getTalentLevel(t) >= 5 then tg.type = "beam" end
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:projectile(tg, x, y, DamageType.FIREBURN, self:spellCrit(self:combatTalentSpellDamage(t, 25, 290)), {type="flame"})
+		if self:getTalentLevel(t) < 5 then
+			self:projectile(tg, x, y, DamageType.FIREBURN, self:spellCrit(self:combatTalentSpellDamage(t, 25, 290)), {type="flame"})
+		else
+			self:project(tg, x, y, DamageType.FIREBURN, self:spellCrit(self:combatTalentSpellDamage(t, 25, 290)))
+			game.level.map:particleEmitter(self.x, self.y, tg.radius, "flamebeam", {tx=x-self.x, ty=y-self.y})
+		end
 		game:playSoundNear(self, "talents/fire")
 		return true
 	end,
 	info = function(self, t)
 		return ([[Conjures up a bolt of fire, setting the target ablaze and doing %0.2f fire damage over 3 turns.
+		At level 5 it will create a beam of flames.
 		The damage will increase with the Magic stat]]):format(damDesc(self, DamageType.FIRE, self:combatTalentSpellDamage(t, 25, 290)))
 	end,
 }

game/modules/tome/data/talents/spells/staff-combat.lua

@@ -42,13 +42,15 @@ newTalent{
 		local particle = "bolt_fire"
 		local explosion = "flame"
 
-		if     combat.damtype == DamageType.COLD then      explosion = "freeze"              particle = "ice_shards"     trail = "icetrail"
-		elseif combat.damtype == DamageType.ACID then      explosion = "acid"                particle = "bolt_acid"      trail = "acidtrail"
-		elseif combat.damtype == DamageType.LIGHTNING then explosion = "lightning_explosion" particle = "bolt_lightning" trail = "lightningtrail"
-		elseif combat.damtype == DamageType.LIGHT then     explosion = "light"               particle = "bolt_light"     trail = "lighttrail"
-		elseif combat.damtype == DamageType.DARKNESS then  explosion = "dark"                particle = "bolt_dark"      trail = "darktrail"
-		elseif combat.damtype == DamageType.NATURE then    explosion = "slime"               particle = "bolt_slime"     trail = "slimetrail"
-		elseif combat.damtype == DamageType.BLIGHT then    explosion = "slime"               particle = "bolt_slime"     trail = "slimetrail"
+		local damtype = combat.damtype
+		if     damtype == DamageType.COLD then      explosion = "freeze"              particle = "ice_shards"     trail = "icetrail"
+		elseif damtype == DamageType.ACID then      explosion = "acid"                particle = "bolt_acid"      trail = "acidtrail"
+		elseif damtype == DamageType.LIGHTNING then explosion = "lightning_explosion" particle = "bolt_lightning" trail = "lightningtrail"
+		elseif damtype == DamageType.LIGHT then     explosion = "light"               particle = "bolt_light"     trail = "lighttrail"
+		elseif damtype == DamageType.DARKNESS then  explosion = "dark"                particle = "bolt_dark"      trail = "darktrail"
+		elseif damtype == DamageType.NATURE then    explosion = "slime"               particle = "bolt_slime"     trail = "slimetrail"
+		elseif damtype == DamageType.BLIGHT then    explosion = "slime"               particle = "bolt_slime"     trail = "slimetrail"
+		else                                        explosion = "manathrust"          particle = "bolt_arcane"    trail = "arcanetrail" damtype = DamageType.ARCANE
 		end
 
 		local tg = {type="bolt", range=self:getTalentRange(t), talent=t, display = {particle=particle, trail=trail}}
@@ -62,7 +64,7 @@ newTalent{
 		dam = self:spellCrit(dam)
 		dam = dam * self:combatTalentWeaponDamage(t, 0.4, 1.1)
 
-		self:projectile(tg, x, y, combat.damtype, dam, {type=explosion})
+		self:projectile(tg, x, y, damtype, dam, {type=explosion})
 
 		game:playSoundNear(self, "talents/arcane")
 		return true