added unique shaders

Refitted all damage formulas to use more explicit and generic (and bound) functions


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

@@ -526,7 +526,7 @@ function _M:setupCommands()
 		[{"_d","ctrl"}] = function()
 			if config.settings.tome.cheat then
 				self.player:forceLevelup(50)
-				self:changeLevel(1, "rak-shor-pride")
+				self:changeLevel(1, "moria")
 			end
 		end,
 	}

@@ -493,6 +493,13 @@ function _M:combatTalentSpellDamage(t, base, max)
 	return (base + self:combatSpellpower()) * ((math.sqrt(self:getTalentLevel(t)) - 1) * 0.8 + 1) * mod
 end
 
+--- Gets weapon damage mult based on talent
+function _M:combatTalentWeaponDamage(t, base, max, t2)
+	if t2 then t2 = t2 / 2 else t2 = 0 end
+	local diff = max - base
+	return base + diff * math.sqrt((self:getTalentLevel(t) + t2) / 5)
+end
+
 --- Gets spellcrit
 function _M:combatSpellCrit()
 	return self.combat_spellcrit + (self:getCun() - 10) * 0.3 + (self:getLck() - 50) * 0.30 + 1

+uniform vec2 texSize;
+uniform sampler2D tex;
+uniform sampler3D noiseVol;
+uniform vec4 color;
+uniform float tick;
+
+int blursize = 2;
+
+void main(void)
+{
+	float fTime0_1 = tick / 1000;
+	vec2 offset = 1.0/texSize;
+
+	// Center Pixel
+	vec4 sample = vec4(0.0,0.0,0.0,0.0);
+	vec4 center = texture2D(tex, vec2(gl_TexCoord[0].st));
+	float factor = ((float(blursize)*2.0)+1.0);
+	factor = factor*factor;
+
+	for(int i = -blursize; i <= blursize; i++)
+	{
+		for(int j = -blursize; j <= blursize; j++)
+		{
+			sample += texture2D(tex, vec2(gl_TexCoord[0].xy+vec2(float(i)*offset.x, float(j)*offset.y)));
+		}
+	}
+
+	// keycolor trick
+	float a = 1.0-center.a;
+	// float a = 1.0-center.r;
+
+	float delta = sample.a;
+	// float delta = max(max(sample.r,sample.g),sample.b)/factor;
+	float noise = texture3D(noiseVol, vec3(gl_TexCoord[0].xy,fTime0_1)).r;
+	gl_FragColor = mix(center,delta*color*noise,a);
+
+	/*
+	 float delta = sample.a;
+	 // float delta = max(max(sample.r,sample.g),sample.b)/factor;
+	 gl_FragColor = mix(center,delta*color,a);
+	 */
+
+	/*
+	 gl_FragColor = mix(center,sample/factor,a);
+	 */
+}

+-- 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
+
+return {
+	frag = "unique_glow",
+	vert = nil,
+	args = {
+		color = color or {1,1,1,1},
+		texSize = size or {32, 32},
+	},
+	clone = false,
+}

@@ -31,7 +31,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hitted = self:attackTarget(target, nil, 0.2 + self:getTalentLevel(t) / 12, true)
+		local hitted = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.2, 0.7), true)
 
 		if hitted then
 			if target:checkHit(self:combatAttackDex(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) and target:canBe("stun") then
@@ -45,7 +45,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[You hit your target doing %d%% damage, trying to stun it instead of damaging it. If your attack hits, the target is stunned for %d turns.]]):
-		format(100 * (0.2 + self:getTalentLevel(t) / 12), 3 + math.ceil(self:getTalentLevel(t)))
+		format(100 * self:combatTalentWeaponDamage(t, 0.2, 0.7), 3 + math.ceil(self:getTalentLevel(t)))
 	end,
 }
 
@@ -107,7 +107,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hitted = self:attackTarget(target, nil, 0.9 + self:getTalentLevel(t) / 9, true)
+		local hitted = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.9, 1.4), true)
 
 		if hitted then
 			if target:checkHit(self:combatAttackDex(), target:combatPhysicalResist(), 0, 95, 5 - self:getTalentLevel(t) / 2) then
@@ -128,6 +128,6 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[You hit your target doing %d%% damage. If your attack hits, the target is crippled for %d turns, losing %d%% attack and %d%% damage.]]):
-		format(100 * (0.9 + self:getTalentLevel(t) / 9), 3 + math.ceil(self:getTalentLevel(t)), 10 + self:getTalentLevel(t) * 3, 10 + self:getTalentLevel(t) * 4)
+		format(100 * self:combatTalentWeaponDamage(t, 0.9, 1.4), 3 + math.ceil(self:getTalentLevel(t)), 10 + self:getTalentLevel(t) * 3, 10 + self:getTalentLevel(t) * 4)
 	end,
 }

@@ -41,7 +41,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hitted = self:attackTarget(target, nil, 0.8 + self:getTalentLevel(t) / 10, true)
+		local hitted = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.8, 1.4), true)
 
 		if hitted then
 			local dur = 5 + math.ceil(self:getTalentLevel(t))
@@ -54,7 +54,7 @@ newTalent{
 	info = function(self, t)
 		return ([[You hit your target doing %d%% damage. If your attack hits, you gain %d armour penetration for %d turns.
 		The APR will increase with Cunning.]]):
-		format(100 * (0.8 + self:getTalentLevel(t) / 10), 4 + (self:getTalentLevel(t) * self:getCun()) / 20, 5 + math.ceil(self:getTalentLevel(t)))
+		format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.4), 4 + (self:getTalentLevel(t) * self:getCun()) / 20, 5 + math.ceil(self:getTalentLevel(t)))
 	end,
 }
 

@@ -43,8 +43,8 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelChants(self)
-		local power = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.12)
-		local dam = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07)
+		local power = self:combatTalentSpellDamage(t, 5, 70)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
 			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=dam}),
@@ -65,7 +65,7 @@ newTalent{
 		return ([[Chant the glory of the sun, granting you %d physical and spell resistance.
 		In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
 		You may only have one Chant active at once.
-		The resistance and damage will increase with the Magic stat]]):format(5 + self:getTalentLevel(t) * self:combatSpellpower(0.12), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 70), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -83,8 +83,8 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelChants(self)
-		local power = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.08)
-		local dam = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07)
+		local power = self:combatTalentSpellDamage(t, 5, 35)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
 			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=dam}),
@@ -103,7 +103,7 @@ newTalent{
 		return ([[Chant the glory of the sun, granting you %d%% physical damage resistance.
 		In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
 		You may only have one Chant active at once.
-		The resistance and damage will increase with the Magic stat]]):format(5 + self:getTalentLevel(t) * self:combatSpellpower(0.08), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 35), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -121,8 +121,8 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelChants(self)
-		local power = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.08)
-		local dam = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07)
+		local power = self:combatTalentSpellDamage(t, 5, 35)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
 			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=dam}),
@@ -146,7 +146,7 @@ newTalent{
 		return ([[Chant the glory of the sun, granting you %d%% elemental resistances.
 		In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
 		You may only have one Chant active at once.
-		The resistance and damage will increase with the Magic stat]]):format(5 + self:getTalentLevel(t) * self:combatSpellpower(0.08), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 35), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -164,8 +164,8 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelChants(self)
-		local power = 10 + self:getTalentLevel(t) * self:combatSpellpower(0.10)
-		local dam = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07)
+		local power = self:combatTalentSpellDamage(t, 10, 50)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
 			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.LIGHT]=dam}),
@@ -184,6 +184,6 @@ newTalent{
 		return ([[Chant the glory of the sun, granting you %d%% more light damage.
 		In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
 		You may only have one Chant active at once.
-		The damage will increase with the Magic stat]]):format(10 + self:getTalentLevel(t) * self:combatSpellpower(0.10), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }

@@ -98,7 +98,7 @@ newTalent{
 		local _ _, x, y = self:canProject(tg, x, y)
 		local target = game.level.map(x, y, Map.ACTOR)
 		if target then
-			self:attackTarget(target, nil, 1.1 + self:getTalentLevel(t) / 7, true)
+			self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 1.1, 1.9), true)
 		else
 			return
 		end
@@ -107,7 +107,7 @@ newTalent{
 	info = function(self, t)
 		return ([[In a pure display of power you project a melee attack up to a range of %d, doing %d%% damage.
 		The range will increase with the Strength stat]]):
-		format(self:getTalentRange(t), 100 * (1.1 + self:getTalentLevel(t) / 7))
+		format(self:getTalentRange(t), 100 * self:combatTalentWeaponDamage(t, 1.1, 1.9))
 	end,
 }
 
@@ -127,11 +127,11 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		self:attackTarget(target, DamageType.LIGHT, 1.1 + self:getTalentLevel(t) / 7, true)
+		self:attackTarget(target, DamageType.LIGHT, self:combatTalentWeaponDamage(t, 1.1, 1.9), true)
 		return true
 	end,
 	info = function(self, t)
 		return ([[Concentrate the power of the sun in a single blow doing %d%% light damage.]]):
-		format(100 * (1.1 + self:getTalentLevel(t) / 7))
+		format(100 * self:combatTalentWeaponDamage(t, 1.1, 1.9))
 	end,
 }

@@ -77,7 +77,7 @@ newTalent{
 	cooldown = 20,
 	positive = -10,
 	action = function(self, t)
-		local dam = 15 + self:combatSpellpower(0.37) * self:getTalentLevel(t)
+		local dam = self:combatTalentSpellDamage(t, 20, 150)
 		local trap = Trap.new{
 			name = "glyph of explosion",
 			type = "elemental", id_by_type=true, unided_name = "trap",
@@ -116,7 +116,7 @@ newTalent{
 	info = function(self, t)
 		return ([[You bind light in a glyph on the floor, the first target passing by will be hit by a blast of light doing %0.2f damage.
 		The glyph lasts for %d turns.
-		The damage will increase with the Magic stat]]):format(15 + self:combatSpellpower(0.37) * self:getTalentLevel(t), 2 + self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 150), 2 + self:getTalentLevel(t))
 	end,
 }
 

@@ -43,8 +43,8 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelHymns(self)
-		local power = 10 + self:getTalentLevel(t) * self:combatSpellpower(0.10)
-		local dam = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07)
+		local power = self:combatTalentSpellDamage(t, 10, 50)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
 			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.DARKNESS]=dam}),
@@ -63,7 +63,7 @@ newTalent{
 		return ([[Chant the glory of the moon, granting you %d%% more darkness damage.
 		In addition it surrounds you with a shield of shadows, damaging anything that attacks you for %0.2f darkness damage.
 		You may only have one Hymn active at once.
-		The damage will increase with the Magic stat]]):format(10 + self:getTalentLevel(t) * self:combatSpellpower(0.10), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 50), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -81,8 +81,10 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelHymns(self)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
+			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.DARKNESS]=dam}),
 			infravision = self:addTemporaryValue("infravision", math.floor(5 + self:getTalentLevel(t))),
 			particle = self:addParticles(Particles.new("darkness_shield", 1))
 		}
@@ -90,14 +92,15 @@ newTalent{
 	end,
 	deactivate = function(self, t, p)
 		self:removeParticles(p.particle)
+		self:removeTemporaryValue("on_melee_hit", p.onhit)
 		self:removeTemporaryValue("infravision", p.infravision)
 		return true
 	end,
 	info = function(self, t)
 		return ([[Chant the glory of the moon, granting you infravision up to %d grids.
-		In addition it surrounds you with a shield of darkness, damaging anything that attacks you for %0.2f light damage.
+		In addition it surrounds you with a shield of darkness, damaging anything that attacks you for %0.2f darkness damage.
 		You may only have one Hymn active at once.
-		The resistance and damage will increase with the Magic stat]]):format(math.floor(5 + self:getTalentLevel(t)), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The resistance and damage will increase with the Magic stat]]):format(math.floor(5 + self:getTalentLevel(t)), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -115,8 +118,7 @@ newTalent{
 	range = 20,
 	activate = function(self, t)
 		cancelHymns(self)
-		local power = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.08)
-		local dam = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07)
+		local dam = self:combatTalentSpellDamage(t, 5, 25)
 		game:playSoundNear(self, "talents/spell_generic2")
 		local ret = {
 			onhit = self:addTemporaryValue("on_melee_hit", {[DamageType.DARKNESS]=dam}),
@@ -139,7 +141,7 @@ newTalent{
 		return ([[Chant the glory of the moon, granting you %d%% stun, blindness and confusion resistances.
 		In addition it surrounds you with a shield of darkness, damaging anything that attacks you for %0.2f light damage.
 		You may only have one Hymn active at once.
-		The damage will increase with the Magic stat]]):format(100 * (0.2 + self:getTalentLevel(t) / 10), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.07))
+		The damage will increase with the Magic stat]]):format(100 * (0.2 + self:getTalentLevel(t) / 10), self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -180,7 +182,7 @@ newTalent{
 			local a, id = rng.table(tgts)
 			table.remove(tgts, id)
 
-			self:project(tg, a.x, a.y, DamageType.DARKNESS, rng.avg(1, self:spellCrit(20 + self:combatSpellpower(0.2) * self:getTalentLevel(t)), 3))
+			self:project(tg, a.x, a.y, DamageType.DARKNESS, rng.avg(1, self:spellCrit(self:combatTalentSpellDamage(t, 7, 80)), 3))
 			game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(a.x-self.x), math.abs(a.y-self.y)), "shadow_beam", {tx=a.x-self.x, ty=a.y-self.y})
 			game:playSoundNear(self, "talents/spell_generic")
 		end
@@ -202,6 +204,6 @@ newTalent{
 		return ([[Conjures a shroud of dancing shadows with a radius of 5 that follows you as long as this spell is active.
 		Each turn a random shadow beam will hit up to %d of your foes for 1 to %0.2f damage.
 		This powerful spell will continuously drain negative energy while active.
-		The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), 20 + self:combatSpellpower(0.2) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), self:combatTalentSpellDamage(t, 7, 80))
 	end,
 }

@@ -28,13 +28,13 @@ newTalent{
 		HEAL = 10,
 	},
 	action = function(self, t)
-		self:heal(self:spellCrit(20 + self:combatSpellpower(0.5) * self:getTalentLevel(t)), self)
+		self:heal(self:spellCrit(self:combatTalentSpellDamage(t, 20, 240)), self)
 		game:playSoundNear(self, "talents/heal")
 		return true
 	end,
 	info = function(self, t)
 		return ([[An invigorating ray of sun shines on you, healing your body for %d life.
-		The life healed will increase with the Magic stat]]):format(20 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
+		The life healed will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 240))
 	end,
 }
 
@@ -51,7 +51,7 @@ newTalent{
 	action = function(self, t)
 		local duration = self:getTalentLevel(t) + 2
 		local radius = 3
-		local dam = 5 + self:combatSpellpower(0.20) * self:getTalentLevel(t)
+		local dam = self:combatTalentSpellDamage(t, 4, 20)
 		local tg = {type="ball", range=self:getTalentRange(t), radius=radius}
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
@@ -67,7 +67,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[A magical zone of sunlight appears around you, healing all that stand within.
-		The life healed will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.20) * self:getTalentLevel(t))
+		The life healed will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 4, 20))
 	end,
 }
 
@@ -79,12 +79,12 @@ newTalent{
 	positive = -20,
 	cooldown = 60,
 	action = function(self, t)
-		self:setEffect(self.EFF_DAMAGE_SHIELD, 10, {power=(10 + self:getMag(30)) * self:getTalentLevel(t)})
+		self:setEffect(self.EFF_DAMAGE_SHIELD, 10, {power=self:combatTalentSpellDamage(t, 30, 170)})
 		game:playSoundNear(self, "talents/heal")
 		return true
 	end,
 	info = function(self, t)
-		return ([[A protective shield forms around you, negating %d damage.]]):format((10 + self:getMag(30)) * self:getTalentLevel(t))
+		return ([[A protective shield forms around you, negating %d damage.]]):format(self:combatTalentSpellDamage(t, 30, 170))
 	end,
 }
 

@@ -33,7 +33,7 @@ newTalent{
 		local tg = {type="beam", range=self:getTalentRange(t), talent=t}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:project(tg, x, y, DamageType.DARKNESS, self:spellCrit(14 + self:combatSpellpower(0.5) * self:getTalentLevel(t)))
+		self:project(tg, x, y, DamageType.DARKNESS, self:spellCrit(self:combatTalentSpellDamage(t, 14, 230)))
 		local _ _, x, y = self:canProject(tg, x, y)
 		game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(x-self.x), math.abs(y-self.y)), "shadow_beam", {tx=x-self.x, ty=y-self.y})
 		game:playSoundNear(self, "talents/flame")
@@ -41,7 +41,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Calls the power of the Moon into a beam of shadows doing %0.2f damage.
-		The damage will increase with the Magic stat]]):format(14 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 14, 230))
 	end,
 }
 
@@ -59,12 +59,12 @@ newTalent{
 	action = function(self, t)
 		local duration = self:getTalentLevel(t) + 2
 		local radius = 3
-		local dam = 4 + self:combatSpellpower(0.12) * self:getTalentLevel(t)
+		local dam = self:combatTalentSpellDamage(t, 4, 50)
 		local tg = {type="ball", range=self:getTalentRange(t), radius=radius, friendlyfire=self:spellFriendlyFire()}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
-		local grids = self:project(tg, x, y, DamageType.DARKNESS, self:spellCrit(5 + self:combatSpellpower(0.22) * self:getTalentLevel(t)), {type="shadow"})
+		local grids = self:project(tg, x, y, DamageType.DARKNESS, self:spellCrit(self:combatTalentSpellDamage(t, 5, 120)), {type="shadow"})
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
 			x, y, duration,
@@ -84,8 +84,8 @@ newTalent{
 		return ([[Invokes a blast of shadows dealing %0.2f darkness damage and leaving a field that does %0.2f darkness damage per turn for %d turns..
 		The damage will increase with the Magic stat]]):
 		format(
-			5 + self:combatSpellpower(0.22) * self:getTalentLevel(t),
-			4 + self:combatSpellpower(0.12) * self:getTalentLevel(t),
+			self:combatTalentSpellDamage(t, 5, 120),
+			self:combatTalentSpellDamage(t, 4, 50),
 			self:getTalentLevel(t) + 2
 		)
 	end,
@@ -117,8 +117,8 @@ newTalent{
 		It also regenerates both your negative and positive energies.
 		The damage will increase with the Magic stat]]):
 		format(
-			10 + self:combatSpellpower(0.2) * self:getTalentLevel(t),
-			10 + self:combatSpellpower(0.2) * self:getTalentLevel(t),
+			self:combatTalentSpellDamage(t, 10, 100),
+			self:combatTalentSpellDamage(t, 10, 100),
 			self:getTalentRange(t)
 		)
 	end,
@@ -139,7 +139,7 @@ newTalent{
 		local tg = {type="ball", range=self:getTalentRange(t), radius=1 + math.floor(self:getTalentLevelRaw(t) / 3), friendlyfire=self:spellFriendlyFire(), talent=t}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		local grids = self:project(tg, x, y, DamageType.DARKSTUN, self:spellCrit(28 + self:combatSpellpower(0.5) * self:getTalentLevel(t)))
+		local grids = self:project(tg, x, y, DamageType.DARKSTUN, self:spellCrit(self:combatTalentSpellDamage(t, 28, 170)))
 
 		local _ _, x, y = self:canProject(tg, x, y)
 		game.level.map:particleEmitter(x, y, tg.radius, "shadow_flash", {radius=tg.radius, grids=grids, tx=x, ty=y})
@@ -148,6 +148,6 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[A star falls onto the target, stunning all and doing %0.2f darkness damage.
-		The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), 28 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 28, 170))
 	end,
 }

@@ -33,13 +33,13 @@ newTalent{
 		local tg = {type="hit", range=self:getTalentRange(t), talent=t}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:project(tg, x, y, DamageType.LIGHT, self:spellCrit(6 + self:combatSpellpower(0.3) * self:getTalentLevel(t)), {type="light"})
+		self:project(tg, x, y, DamageType.LIGHT, self:spellCrit(self:combatTalentSpellDamage(t, 6, 160)), {type="light"})
 
 		local _ _, x, y = self:canProject(tg, x, y)
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
 			x, y, 4,
-			DamageType.LIGHT, 6 + self:combatSpellpower(0.3) * self:getTalentLevel(t),
+			DamageType.LIGHT, self:combatTalentSpellDamage(t, 6, 80),
 			0,
 			5, nil,
 			{type="light_zone"},
@@ -51,7 +51,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Calls the power of the Sun into a searing light doing %0.2f damage and leaving a spot on the ground for 4 turns doing %0.2f damage.
-		The damage will increase with the Magic stat]]):format(6 + self:combatSpellpower(0.3) * self:getTalentLevel(t), 6 + self:combatSpellpower(0.3) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 6, 160), self:combatTalentSpellDamage(t, 6, 80))
 	end,
 }
 
@@ -72,7 +72,7 @@ newTalent{
 		tg.friendlyfire = false
 		local grids = self:project(tg, self.x, self.y, DamageType.BLIND, 3 + self:getTalentLevel(t))
 		if self:getTalentLevel(t) then
-			self:project(tg, self.x, self.y, DamageType.LIGHT, 4 + self:combatSpellpower(0.15) * self:getTalentLevel(t))
+			self:project(tg, self.x, self.y, DamageType.LIGHT, self:combatTalentSpellDamage(t, 4, 80))
 		end
 		game.level.map:particleEmitter(self.x, self.y, tg.radius, "sunburst", {radius=tg.radius, grids=grids, tx=self.x, ty=self.y, max_alpha=80})
 		game:playSoundNear(self, "talents/flame")
@@ -83,7 +83,7 @@ newTalent{
 		At level 3 it will start dealing %0.2f light damage.
 		The damage will increase with the Magic stat]]):
 		format(
-			4 + self:combatSpellpower(0.15) * self:getTalentLevel(t)
+			self:combatTalentSpellDamage(t, 4, 80)
 		)
 	end,
 }
@@ -103,7 +103,7 @@ newTalent{
 		local tg = {type="beam", range=self:getTalentRange(t), 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(10 + self:combatSpellpower(0.4) * self:getTalentLevel(t)))
+		self:project(tg, x, y, DamageType.FIRE, self:spellCrit(self:combatTalentSpellDamage(t, 10, 200)))
 		local _ _, x, y = self:canProject(tg, x, y)
 		game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(x-self.x), math.abs(y-self.y)), "light_beam", {tx=x-self.x, ty=y-self.y})
 
@@ -113,7 +113,7 @@ newTalent{
 	info = function(self, t)
 		return ([[Fire a beam of sun flames at your foes, burning all those in line for %0.2f fire damage.
 		The damage will increase with the Magic stat]]):
-		format(10 + self:combatSpellpower(0.4) * self:getTalentLevel(t))
+		format(self:combatTalentSpellDamage(t, 10, 200))
 	end,
 }
 
@@ -130,7 +130,7 @@ newTalent{
 	range = 3,
 	action = function(self, t)
 		local tg = {type="ball", range=0, radius=3, friendlyfire=false, talent=t}
-		local grids = self:project(tg, self.x, self.y, DamageType.LIGHT, self:spellCrit(10 + self:combatSpellpower(0.27) * self:getTalentLevel(t)))
+		local grids = self:project(tg, self.x, self.y, DamageType.LIGHT, self:spellCrit(self:combatTalentSpellDamage(t, 10, 160)))
 
 		game.level.map:particleEmitter(self.x, self.y, tg.radius, "sunburst", {radius=tg.radius, grids=grids, tx=self.x, ty=self.y})
 
@@ -139,6 +139,6 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Conjures a furious burst of sunlight, dealing %0.2f light damage to all those around you in a radius of 4.
-		The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), 10 + self:combatSpellpower(0.27) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:getTalentLevel(t), self:combatTalentSpellDamage(t, 10, 160))
 	end,
 }

@@ -90,7 +90,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
 		self.combat_apr = self.combat_apr + 1000
-		self:attackTarget(target, DamageType.ACID, 1 + self:getTalentLevel(t) / 3, true)
+		self:attackTarget(target, DamageType.ACID, self:combatTalentWeaponDamage(t, 1, 1.8), true)
 		self.combat_apr = self.combat_apr - 1000
 		return true
 	end,
@@ -113,7 +113,7 @@ newTalent{
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
 		self.combat_apr = self.combat_apr + 1000
-		self:attackTarget(target, DamageType.BLIND, 0.8 + self:getTalentLevel(t) / 10, true)
+		self:attackTarget(target, DamageType.BLIND, self:combatTalentWeaponDamage(t, 0.8, 1.4), true)
 		self.combat_apr = self.combat_apr - 1000
 		return true
 	end,
@@ -156,7 +156,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 0.5 + self:getTalentLevel(t) / 10, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.5, 1), true)
 
 		-- Try to stun !
 		if hit then
@@ -170,7 +170,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target doing %d%% damage, if the attack hits, the target is stunned.]]):format(100 * (0.5 + self:getTalentLevel(t) / 10))
+		return ([[Hits the target doing %d%% damage, if the attack hits, the target is stunned.]]):format(100 * self:combatTalentWeaponDamage(t, 0.5, 1))
 	end,
 }
 
@@ -186,7 +186,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 0.5 + self:getTalentLevel(t) / 10, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.5, 1), true)
 
 		-- Try to stun !
 		if hit then
@@ -200,7 +200,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target doing %d%% damage, if the attack hits, the target is constricted.]]):format(100 * (0.5 + self:getTalentLevel(t) / 10))
+		return ([[Hits the target doing %d%% damage, if the attack hits, the target is constricted.]]):format(100 * self:combatTalentWeaponDamage(t, 0.5, 1))
 	end,
 }
 
@@ -216,7 +216,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 1.5 + self:getTalentLevel(t) / 10, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 1.5, 2), true)
 
 		-- Try to knockback !
 		if hit then
@@ -230,7 +230,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target with your weapon doing %d%% damage, if the attack hits, the target is knocked back.]]):format(100 * (1.5 + self:getTalentLevel(t) / 10))
+		return ([[Hits the target with your weapon doing %d%% damage, if the attack hits, the target is knocked back.]]):format(100 * self:combatTalentWeaponDamage(t, 1.5, 2))
 	end,
 }
 
@@ -309,7 +309,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 0.5 + self:getTalentLevel(t) / 10, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.5, 1), true)
 
 		-- Try to rot !
 		if hit then
@@ -323,7 +323,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target doing %d%% damage, if the attack hits, the target is diseased.]]):format(100 * (0.5 + self:getTalentLevel(t) / 10))
+		return ([[Hits the target doing %d%% damage, if the attack hits, the target is diseased.]]):format(100 * self:combatTalentWeaponDamage(t, 0.5, 1))
 	end,
 }
 
@@ -338,7 +338,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 0.5 + self:getTalentLevel(t) / 10, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.5, 1), true)
 
 		-- Try to rot !
 		if hit then
@@ -352,7 +352,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target doing %d%% damage, if the attack hits, the target is diseased.]]):format(100 * (0.5 + self:getTalentLevel(t) / 10))
+		return ([[Hits the target doing %d%% damage, if the attack hits, the target is diseased.]]):format(100 * self:combatTalentWeaponDamage(t, 0.5, 1))
 	end,
 }
 
@@ -367,7 +367,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 0.5 + self:getTalentLevel(t) / 10, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.5, 1), true)
 
 		-- Try to rot !
 		if hit then
@@ -381,7 +381,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target doing %d%% damage, if the attack hits, the target is diseased.]]):format(100 * (0.5 + self:getTalentLevel(t) / 10))
+		return ([[Hits the target doing %d%% damage, if the attack hits, the target is diseased.]]):format(100 * self:combatTalentWeaponDamage(t, 0.5, 1))
 	end,
 }
 
@@ -441,7 +441,7 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
-		local hit = self:attackTarget(target, nil, 0.8 + self:getTalentLevel(t) / 7, true)
+		local hit = self:attackTarget(target, nil, self:combatTalentWeaponDamage(t, 0.8, 1.4), true)
 
 		-- Try to stun !
 		if hit then
@@ -455,7 +455,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hits the target doing %d%% damage; if the attack hits, the target is pinned to the ground.]]):format(100 * (0.8 + self:getTalentLevel(t) / 7))
+		return ([[Hits the target doing %d%% damage; if the attack hits, the target is pinned to the ground.]]):format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.4))
 	end,
 }
 

@@ -25,8 +25,9 @@ newTalent{
 	sustain_mana = 50,
 	points = 5,
 	cooldown = 30,
+	spellpower_increase = { 5, 9, 13, 16, 18 },
 	activate = function(self, t)
-		local power = 5 * self:getTalentLevelRaw(t)
+		local power = t.spellpower_increase[self:getTalentLevelRaw(t)]
 		game:playSoundNear(self, "talents/arcane")
 		return {
 			power = self:addTemporaryValue("combat_spellpower", power),
@@ -39,7 +40,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Your mastery of magic allows you to enter a deep concentration state, increasing your spellpower by %d.]]):format(5 * self:getTalentLevelRaw(t))
+		return ([[Your mastery of magic allows you to enter a deep concentration state, increasing your spellpower by %d.]]):format(t.spellpower_increase[self:getTalentLevelRaw(t)])
 	end,
 }
 
@@ -60,7 +61,7 @@ newTalent{
 		if self:getTalentLevel(t) >= 3 then tg.type = "beam" end
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:project(tg, x, y, DamageType.ARCANE, self:spellCrit(20 + self:combatSpellpower(0.5) * self:getTalentLevel(t)), nil)
+		self:project(tg, x, y, DamageType.ARCANE, self:spellCrit(self:combatTalentSpellDamage(t, 20, 230)), nil)
 		local _ _, x, y = self:canProject(tg, x, y)
 		if tg.type == "beam" then
 			game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(x-self.x), math.abs(y-self.y)), "mana_beam", {tx=x-self.x, ty=y-self.y})
@@ -73,7 +74,7 @@ newTalent{
 	info = function(self, t)
 		return ([[Conjures up mana into a powerful bolt doing %0.2f arcane damage.
 		At level 3 it becomes a beam.
-		The damage will increase with the Magic stat]]):format(20 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 20, 230))
 	end,
 }
 
@@ -89,14 +90,14 @@ newTalent{
 	},
 	action = function(self, t)
 		if not self:hasEffect(self.EFF_MANAFLOW) then
-			self:setEffect(self.EFF_MANAFLOW, 10, {power=5+self:combatSpellpower(0.06) * self:getTalentLevel(t)})
+			self:setEffect(self.EFF_MANAFLOW, 10, {power=self:combatTalentSpellDamage(t, 10, 20)})
 			game:playSoundNear(self, "talents/arcane")
 		end
 		return true
 	end,
 	info = function(self, t)
 		return ([[Engulf yourself in a surge of mana, quickly restoring %d mana every turns for 10 turns.
-		The mana restored will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.06) * self:getTalentLevel(t))
+		The mana restored will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 20))
 	end,
 }
 

@@ -127,7 +127,7 @@ newTalent{
 		if not tx or not ty or not target then return nil end
 
 		local dur = util.bound(10 + math.floor(self:getTalentLevel(t) * 3), 10, 25)
-		local power = 50 + self:combatSpellpower(0.4) * self:getTalentLevel(t)
+		local power = self:combatTalentSpellDamage(t, 20, 210)
 		local chance = 20 + self:getTalentLevel(t) * 5
 		self:setEffect(self.EFF_DISPLACEMENT_SHIELD, dur, {power=power, target=target, chance=chance})
 		game:playSoundNear(self, "talents/teleport")
@@ -137,7 +137,7 @@ newTalent{
 		return ([[This intricate spell erects a space distortion around the caster that is linked to another one around a target.
 		Any time the caster should take damage there is a %d%% chance that it will instead be warped by the shield and hit the designated target.
 		Once the maximum damage (%d) is absorbed, the time runs out (%d turns), or the target dies, the shield will crumble.
-		The duration and max absorption will increase with the Magic stat]]):format(20 + self:getTalentLevel(t) * 5, 50 + self:combatSpellpower(0.4) * self:getTalentLevel(t), util.bound(10 + math.floor(self:getTalentLevel(t) * 3), 10, 25))
+		The duration and max absorption will increase with the Magic stat]]):format(20 + self:getTalentLevel(t) * 5, self:combatTalentSpellDamage(t, 20, 210), util.bound(10 + math.floor(self:getTalentLevel(t) * 3), 10, 25))
 	end,
 }
 

@@ -32,7 +32,7 @@ newTalent{
 	},
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/earth")
-		local power = 4 + self:combatSpellpower(0.03) * self:getTalentLevel(t)
+		local power = self:combatTalentSpellDamage(t, 10, 20)
 		return {
 			armor = self:addTemporaryValue("combat_armor", power),
 			particle = self:addParticles(Particles.new("stone_skin", 1)),
@@ -45,7 +45,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[The caster's skin grows as hard as stone, granting %d bonus to armor.
-		The bonus to armor will increase with the Magic stat]]):format(4 + self:combatSpellpower(0.03) * self:getTalentLevel(t))
+		The bonus to armor will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 20))
 	end,
 }
 
@@ -88,7 +88,7 @@ newTalent{
 		local tg = {type="bolt", range=self:getTalentRange(t), talent=t}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:project(tg, x, y, DamageType.SPELLKNOCKBACK, self:spellCrit(8 + self:combatSpellpower(0.15) * self:getTalentLevel(t)))
+		self:project(tg, x, y, DamageType.SPELLKNOCKBACK, self:spellCrit(self:combatTalentSpellDamage(t, 8, 170)))
 		game:playSoundNear(self, "talents/earth")
 		return true
 	end,

@@ -31,8 +31,8 @@ newTalent{
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/fire")
 		return {
-			dam = self:addTemporaryValue("melee_project", {[DamageType.FIRE] = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.08)}),
-			per = self:addTemporaryValue("inc_damage", {[DamageType.FIRE] = 5 + self:getTalentLevel(t) * self:combatSpellpower(0.05)}),
+			dam = self:addTemporaryValue("melee_project", {[DamageType.FIRE] = self:combatTalentSpellDamage(t, 5, 20)}),
+			per = self:addTemporaryValue("inc_damage", {[DamageType.FIRE] = self:combatTalentSpellDamage(t, 5, 14)}),
 		}
 	end,
 	deactivate = function(self, t, p)
@@ -42,7 +42,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Engulfs your hands (and weapons) in a sheath of fire, dealing %d fire damage per melee attack and increasing all fire damage by %d%%.]]):
-		format(5 + self:getTalentLevel(t) * self:combatSpellpower(0.08), 5 + self:getTalentLevel(t) * self:combatSpellpower(0.05))
+		format(self:combatTalentSpellDamage(t, 5, 20), self:combatTalentSpellDamage(t, 5, 14))
 	end,
 }
 
@@ -56,11 +56,11 @@ newTalent{
 	range = 20,
 	action = function(self, t)
 		game:playSoundNear(self, "talents/spell_generic")
-		self:setEffect(self.EFF_EARTHEN_BARRIER, 10, {power=10 + self:getTalentLevel(t) * self:combatSpellpower(0.08)})
+		self:setEffect(self.EFF_EARTHEN_BARRIER, 10, {power=self:combatTalentSpellDamage(t, 10, 60)})
 		return true
 	end,
 	info = function(self, t)
-		return ([[Hardens your skin with the power of earth, reducing physical damage taken by %d%%.]]):format(10 + self:getTalentLevel(t) * self:combatSpellpower(0.08))
+		return ([[Hardens your skin with the power of earth, reducing physical damage taken by %d%%.]]):format(self:combatTalentSpellDamage(t, 10, 60))
 	end,
 }
 
@@ -78,8 +78,8 @@ newTalent{
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/ice")
 		return {
-			dam = self:addTemporaryValue("melee_project", {[DamageType.ICE] = 3 + self:getTalentLevel(t) * self:combatSpellpower(0.05)}),
-			per = self:addTemporaryValue("inc_damage", {[DamageType.COLD] = 4 + self:getTalentLevel(t) * self:combatSpellpower(0.04)}),
+			dam = self:addTemporaryValue("melee_project", {[DamageType.ICE] = self:combatTalentSpellDamage(t, 3, 15)}),
+			per = self:addTemporaryValue("inc_damage", {[DamageType.COLD] = self:combatTalentSpellDamage(t, 5, 14)}),
 		}
 	end,
 	deactivate = function(self, t, p)
@@ -89,7 +89,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Engulfs your hands (and weapons) in a sheath of ice, dealing %d ice damage per melee attack and increasing all cold damage by %d%%.]]):
-		format(3 + self:getTalentLevel(t) * self:combatSpellpower(0.05), 4 + self:getTalentLevel(t) * self:combatSpellpower(0.04))
+		format(self:combatTalentSpellDamage(t, 3, 15), self:combatTalentSpellDamage(t, 5, 14))
 	end,
 }
 
@@ -106,7 +106,7 @@ newTalent{
 	},
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/spell_generic")
-		local power = math.floor(2 + self:getTalentLevel(t) * self:combatSpellpower(0.06))
+		local power = math.floor(self:combatTalentSpellDamage(t, 2, 18))
 		return {
 			stats = self:addTemporaryValue("inc_stats", {
 				[self.STAT_STR] = power,
@@ -124,6 +124,6 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[You concentrate on your inner self, increasing your stats each by %d.]]):
-		format(2 + self:getTalentLevel(t) * self:combatSpellpower(0.06))
+		format(self:combatTalentSpellDamage(t, 2, 18))
 	end,
 }

@@ -28,13 +28,13 @@ newTalent{
 		HEAL = 10,
 	},
 	action = function(self, t)
-		self:setEffect(self.EFF_REGENERATION, 10, {power=5 + self:combatSpellpower(0.07) * self:getTalentLevel(t)})
+		self:setEffect(self.EFF_REGENERATION, 10, {power=self:combatTalentSpellDamage(t, 5, 25)})
 		game:playSoundNear(self, "talents/heal")
 		return true
 	end,
 	info = function(self, t)
 		return ([[Call upon the forces of nature to regenerate your body for %d life every turn for 10 turns.
-		The life healed will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.07) * self:getTalentLevel(t))
+		The life healed will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 25))
 	end,
 }
 
@@ -49,13 +49,13 @@ newTalent{
 		HEAL = 10,
 	},
 	action = function(self, t)
-		self:heal(self:spellCrit(10 + self:combatSpellpower(0.5) * self:getTalentLevel(t)), self)
+		self:heal(self:spellCrit(self:combatTalentSpellDamage(t, 40, 220)), self)
 		game:playSoundNear(self, "talents/heal")
 		return true
 	end,
 	info = function(self, t)
 		return ([[Call upon the forces of nature to heal your body for %d life.
-		The life healed will increase with the Magic stat]]):format(10 + self:combatSpellpower(0.5) * self:getTalentLevel(t))
+		The life healed will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 40, 220))
 	end,
 }
 

@@ -53,7 +53,7 @@ newTalent{
 		DEFEND = 10,
 	},
 	activate = function(self, t)
-		local power = 4 + self:combatSpellpower(0.04) * self:getTalentLevel(t)
+		local power = self:combatTalentSpellDamage(t, 4, 30)
 		game:playSoundNear(self, "talents/heal")
 		return {
 			particle = self:addParticles(Particles.new("phantasm_shield", 1)),
@@ -67,7 +67,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[The caster's image blurs, making them harder to hit, granting %d bonus to defense.
-		The bonus will increase with the Magic stat]]):format(4 + self:combatSpellpower(0.04) * self:getTalentLevel(t))
+		The bonus will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 4, 30))
 	end,
 }
 
@@ -83,7 +83,7 @@ newTalent{
 		DEFEND = 10,
 	},
 	activate = function(self, t)
-		local power = 10 + self:combatSpellpower(0.06) * self:getTalentLevel(t)
+		local power = self:combatTalentSpellDamage(t, 10, 170)
 		game:playSoundNear(self, "talents/heal")
 		return {
 			particle = self:addParticles(Particles.new("phantasm_shield", 1)),
@@ -97,7 +97,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[The caster surrounds themselves with a phantasmal shield. If hit in melee the shield will deal %d arcane damage to the attacker.
-		The damage will increase with the Magic stat]]):format(10 + self:combatSpellpower(0.06) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 170))
 	end,
 }
 
@@ -113,7 +113,7 @@ newTalent{
 		DEFEND = 10,
 	},
 	activate = function(self, t)
-		local power = 4 + self:combatSpellpower(0.04) * self:getTalentLevel(t)
+		local power = self:combatTalentSpellDamage(t, 10, 30)
 		game:playSoundNear(self, "talents/heal")
 		return {
 			invisible = self:addTemporaryValue("invisible", power),
@@ -129,6 +129,6 @@ newTalent{
 		return ([[The caster fades from sight, granting %d bonus to invisibility.
 		Beware, you should take off your light, otherwise you will still be easily spotted.
 		This powerful spell constantly drains your mana while active.
-		The bonus will increase with the Magic stat]]):format(4 + self:combatSpellpower(0.04) * self:getTalentLevel(t))
+		The bonus will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 10, 30))
 	end,
 }

@@ -109,7 +109,7 @@ newTalent{
 	range = 20,
 	action = function(self, t)
 		local dur = util.bound(5 + math.floor(self:getTalentLevel(t)), 5, 15)
-		local power = 50 + self:combatSpellpower(0.5) * self:getTalentLevel(t)
+		local power = self:combatTalentSpellDamage(t, 50, 170)
 		self:setEffect(self.EFF_TIME_SHIELD, dur, {power=power})
 		game:playSoundNear(self, "talents/spell_generic")
 		return true
@@ -117,6 +117,6 @@ newTalent{
 	info = function(self, t)
 		return ([[This intricate spell erects a time shield around the caster, preventing any incoming damage and sending it forward in time.
 		Once either the maximum damage (%d) is absorbed, or the time runs out (%d turns), the stored damage will return as self-damage over time (5 turns).
-		The duration and max absorption will increase with the Magic stat]]):format(50 + self:combatSpellpower(0.5) * self:getTalentLevel(t), util.bound(5 + math.floor(self:getTalentLevel(t)), 5, 15))
+		The duration and max absorption will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 50, 170), util.bound(5 + math.floor(self:getTalentLevel(t)), 5, 15))
 	end,
 }

@@ -31,7 +31,7 @@ newTalent{
 	action = function(self, t)
 		local duration = self:getTalentLevel(t) + 2
 		local radius = 3
-		local dam = 4 + self:combatSpellpower(0.17) * self:getTalentLevel(t)
+		local dam = self:combatTalentSpellDamage(t, 4, 70)
 		local tg = {type="ball", range=self:getTalentRange(t), radius=radius}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
@@ -50,7 +50,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Corrosive fumes rises from the ground doing %0.2f acid damage in a radius of 3 each turn for %d turns.
-		The damage and duration will increase with the Magic stat]]):format(4 + self:combatSpellpower(0.17) * self:getTalentLevel(t), self:getTalentLevel(t) + 2)
+		The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 4, 70), self:getTalentLevel(t) + 2)
 	end,
 }
 
@@ -70,14 +70,14 @@ newTalent{
 		local tg = {type="hit", range=self:getTalentRange(t), talent=t}
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
-		self:project(tg, x, y, DamageType.COLD, self:spellCrit(12 + self:combatSpellpower(0.25) * self:getTalentLevel(t)), {type="freeze"})
+		self:project(tg, x, y, DamageType.COLD, self:spellCrit(self:combatTalentSpellDamage(t, 12, 160)), {type="freeze"})
 		self:project(tg, x, y, DamageType.FREEZE, 3 + math.floor(self:getTalentLevel(t) / 3))
 		game:playSoundNear(self, "talents/ice")
 		return true
 	end,
 	info = function(self, t)
 		return ([[Condenses ambient water on a target, freezing it for a short while and damaging it for %0.2f.
-		The damage will increase with the Magic stat]]):format(12 + self:combatSpellpower(0.25) * self:getTalentLevel(t))
+		The damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 12, 160))
 	end,
 }
 
@@ -94,7 +94,7 @@ newTalent{
 	action = function(self, t)
 		local duration = 5 + self:combatSpellpower(0.01) * self:getTalentLevel(t)
 		local radius = 1
-		local dam = 5 + self:combatSpellpower(0.2) * self:getTalentLevel(t)
+		local dam = self:combatTalentSpellDamage(t, 5, 90)
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
 			self.x, self.y, duration,
@@ -112,7 +112,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[A wall of water rushes out from the caster doing %0.2f cold damage and knocking back targets each turn for %d turns.
-		The damage and duration will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.2) * self:getTalentLevel(t), 5 + self:combatSpellpower(0.01) * self:getTalentLevel(t))
+		The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 90), 5 + self:combatSpellpower(0.01) * self:getTalentLevel(t))
 	end,
 }
 
@@ -129,7 +129,7 @@ newTalent{
 	action = function(self, t)
 		local duration = 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t)
 		local radius = 3
-		local dam = 5 + self:combatSpellpower(0.15) * self:getTalentLevel(t)
+		local dam = self:combatTalentSpellDamage(t, 5, 90)
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
 			self.x, self.y, duration,
@@ -150,6 +150,6 @@ newTalent{
 	info = function(self, t)
 		return ([[A furious ice storm rages around the caster doing %0.2f cold damage in a radius of 3 each turn for %d turns.
 		It has 25%% chance to freeze damaged targets.
-		The damage and duration will increase with the Magic stat]]):format(5 + self:combatSpellpower(0.15) * self:getTalentLevel(t), 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t))
+		The damage and duration will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 90), 5 + self:combatSpellpower(0.05) + self:getTalentLevel(t))
 	end,
 }

@@ -71,14 +71,14 @@ newTalent{
 			local x, y = self.x + i, self.y + j
 			if (self.x ~= x or self.y ~= y) and game.level.map:isBound(x, y) and game.level.map(x, y, Map.ACTOR) then
 				local target = game.level.map(x, y, Map.ACTOR)
-				self:attackTargetWith(target, weapon.combat, nil, 1.4 + self:getTalentLevel(t) / 8)
+				self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1.4, 2.1))
 			end
 		end end