Frostdusk provides darkness affinity

Meteor Rain doesnt do selffire
Meteoric Crash works with either spell or mind power


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

game/modules/tome/data/talents/misc/npcs.lua

@@ -1760,8 +1760,8 @@ newTalent{
 					game.nicer_tiles:updateAround(game.level, i, j)
 				end end
 
-				src:project({type="ball", radius=2, selffire=src:spellFriendlyFire()}, x, y, engine.DamageType.FIRE, dam/2)
-				src:project({type="ball", radius=2, selffire=src:spellFriendlyFire()}, x, y, engine.DamageType.PHYSICAL, dam/2)
+				src:project({type="ball", radius=2, selffire=false}, x, y, engine.DamageType.FIRE, dam/2)
+				src:project({type="ball", radius=2, selffire=false}, x, y, engine.DamageType.PHYSICAL, dam/2)
 				game:getPlayer(true):attr("meteoric_crash", 1)
 			end
 		end

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

@@ -247,11 +247,13 @@ newTalent{
 	tactical = { BUFF = 2 },
 	getDarknessDamageIncrease = function(self, t) return self:getTalentLevelRaw(t) * 2 end,
 	getResistPenalty = function(self, t) return self:getTalentLevelRaw(t) * 10 end,
+	getAffinity = function(self, t) return self:getTalentLevel(t) * 10 end,
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/spell_generic")
 		return {
 			dam = self:addTemporaryValue("inc_damage", {[DamageType.DARKNESS] = t.getDarknessDamageIncrease(self, t), [DamageType.COLD] = t.getDarknessDamageIncrease(self, t)}),
 			resist = self:addTemporaryValue("resists_pen", {[DamageType.DARKNESS] = t.getResistPenalty(self, t)}),
+			affinity = self:addTemporaryValue("damage_affinity", {[DamageType.DARKNESS] = t.getAffinity(self, t)}),
 			particle = self:addParticles(Particles.new("ultrashield", 1, {rm=0, rM=0, gm=0, gM=0, bm=10, bM=100, am=70, aM=180, radius=0.4, density=60, life=14, instop=20})),
 		}
 	end,
@@ -259,12 +261,15 @@ newTalent{
 		self:removeParticles(p.particle)
 		self:removeTemporaryValue("inc_damage", p.dam)
 		self:removeTemporaryValue("resists_pen", p.resist)
+		self:removeTemporaryValue("damage_affinity", p.affinity)
 		return true
 	end,
 	info = function(self, t)
 		local damageinc = t.getDarknessDamageIncrease(self, t)
 		local ressistpen = t.getResistPenalty(self, t)
-		return ([[Surround yourself with Frostdusk, increasing all your darkness and cold damage by %d%%, and ignoring %d%% of the darkness resistance of your targets.]])
-		:format(damageinc, ressistpen)
+		local affinity = t.getAffinity(self, t)
+		return ([[Surround yourself with Frostdusk, increasing all your darkness and cold damage by %d%%, and ignoring %d%% of the darkness resistance of your targets.
+		In addition, all darkness damage you take heals you for %d%% of the damage.]])
+		:format(damageinc, ressistpen, affinity)
 	end,
 }

game/modules/tome/data/talents/uber/wil.lua

@@ -40,7 +40,7 @@ uberTalent{
 	name = "Meteoric Crash",
 	mode = "passive",
 	cooldown = 15,
-	getDamage = function(self, t) return 100 + self:combatSpellpower() * 4 end,
+	getDamage = function(self, t) return math.max(100 + self:combatSpellpower() * 5, 100 + self:combatMindpower() * 5) end,
 	require = { special={desc="Witness a meteoric crash", fct=function(self) return game.state.birth.ignore_prodigies_special_reqs or self:attr("meteoric_crash") end} },
 	trigger = function(self, t, target)
 		self:startTalentCooldown(t)
@@ -105,7 +105,7 @@ uberTalent{
 		local dam = t.getDamage(self, t)/2
 		return ([[With the release of your willpower when casting damaging spells or mind attacks, you can call forth a meteor to crash down near your foes.
 		The affected area is turned into lava for 8 turns, and the crash will deal %0.2f fire and %0.2f physical damage.
-		The meteor also stuns affected creatures for 3 turns. The damage scales with your Spellpower.]])
+		The meteor also stuns affected creatures for 3 turns. The damage scales with your Spellpower or Mindpower.]])
 		:format(damDesc(self, DamageType.FIRE, dam), damDesc(self, DamageType.PHYSICAL, dam))
 	end,
 }