plop

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

game/modules/tome/data/birth/classes/archer.lua

@@ -59,7 +59,6 @@ newBirthDescriptor{
 		["technique/combat-training"]={true, 0.3},
 		["technique/field-control"]={true, 0},
 		["cunning/survival"]={true, 0},
-		["cunning/packing"]={true, 0.2},
 		["cunning/dirty"]={false, 0},
 	},
 	talents = {
@@ -98,7 +97,6 @@ newBirthDescriptor{
 		["technique/combat-training"]={true, 0.3},
 		["technique/field-control"]={true, 0},
 		["cunning/survival"]={true, 0},
-		["cunning/packing"]={true, 0.2},
 		["cunning/dirty"]={false, 0},
 	},
 	talents = {

game/modules/tome/data/birth/classes/rogue.lua

@@ -66,7 +66,6 @@ newBirthDescriptor{
 		["cunning/dirty"]={true, 0.3},
 		["cunning/lethality"]={true, 0.3},
 		["cunning/survival"]={true, 0.3},
-		["cunning/packing"]={false, 0.1},
 	},
 	talents = {
 		[ActorTalents.T_STEALTH] = 1,

game/modules/tome/data/gfx/particles/bolt_elemental.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
+
+return { generator = function()
+	local radius = 0
+	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 / 4)
+	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)
+
+	return {
+		trail = 1,
+		life = 6,
+		size = 7, sizev = -1, sizea = 0,
+
+		x = x, xv = 0, xa = 0,
+		y = y, yv = 0, ya = 0,
+		dir = a, dirv = 0, dira = 0,
+		vel = sradius / 2 / 5, velv = 0, vela = 0,
+
+		r = rng.range(50, 255)/255,   rv = 0.05, ra = 0.2,
+		g = rng.range(50, 255)/255,   gv = 0.05, ga = 0.2,
+		b = rng.range(50, 255)/255,   bv = 0.05, ba = 0.2,
+		a = 1,	av = 1 or 0, aa = 0.005,
+	}
+end, },
+function(self)
+	self.ps:emit(5)
+end,
+350

game/modules/tome/data/gfx/particles/charge.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
+
+base_size = 32
+
+return { generator = function()
+	local life = rng.range(5, 10)
+	local size = rng.range(6, 7)
+	local angle = math.rad(rng.range(0, 360))
+	local distance = engine.Map.tile_w * rng.float(0.3, 0.7)
+	local vel = distance / life
+
+	return {
+		trail = 1,
+		life = life,
+		size = size, sizev = size / life / 3, sizea = 0,
+
+		x = -size / 2 + distance * math.cos(angle), xv = 0, xa = 0,
+		y = -size / 2 + distance * math.sin(angle), yv = 0, ya = 0,
+		dir = angle, dirv = 0, dira = 0,
+		vel = -vel, velv = 0, vela = 0,
+
+		r = rng.range(200, 255) / 255,  rv = 0, ra = 0,
+		g = rng.range(200, 255) / 255,  gv = 0, ga = 0,
+		b = rng.range(200, 255) / 255,  bv = 0, ba = 0,
+		a = alpha,  av = -alpha / life / 2, aa = 0,
+	}
+end, },
+function(self)
+	self.nb = (self.nb or 0) + 1
+	if self.nb < 6 then
+		self.ps:emit(20)
+	end
+end,
+20 * 6

game/modules/tome/data/gfx/particles/generictrail.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
+
+local nb = 0
+
+return { generator = function()
+	local radius = 0
+	local sradius = (radius + 0.5) * (engine.Map.tile_w + engine.Map.tile_h) * 0.5
+	local ad = rng.float(0, 360)
+	local a = math.rad(ad)
+	local r = rng.float(0.1, sradius * 0.5)
+	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)
+
+	return {
+		trail = 1,
+		life = 3 + 9 * (sradius - r) / sradius,
+		size = 3, sizev = 0, sizea = 0,
+
+		x = x, xv = 0, xa = 0,
+		y = y, yv = 0, ya = 0,
+		dir = 0, dirv = 0, dira = 0,
+		vel = 0, velv = 0, vela = 0,
+
+		r = rng.range(200, 255)/255,   rv = 0, ra = 1,
+		g = rng.range(200, 255)/255,   gv = 0, ga = 1,
+		b = rng.range(200, 255)/255,   bv = 0, ba = 1,
+		a = 1, av = 1, aa = 1,
+	}
+end, },
+function(self)
+	if nb < 1 then
+		self.ps:emit(5)
+	end
+	nb = nb + 1
+end,
+30