Updated Credits, IDs used in damage types, and unlock condition.

@@ -38,6 +38,11 @@ Musics:
 - "Anne_van_Schothorst_-_Passed_Tense.ogg" by Anne van Schothorst (http://freemusicarchive.org/music/Anne_van_Schothorst)
 - Nearly every other songs by Celestial Aeon Project (http://www.jamendo.com/en/artist/celestial.aeon.project)
 
+Sounds:
+- Mike Koenig for 'breaking' sound effects
+- Mark DiAngelo for 'whooshing' sound effects
+- Marianne Gragnon for 'mystic chanting' sound effects
+
 Fonts:
 - Vera*: http://www.gnome.org/fonts/
 - INSULA, USENET: http://www.dafont.com/fr/apostrophic-labs.d128
@@ -47,6 +52,6 @@ Fonts:
 
 Others:
 - The good people at lua.org who made the world a better place
-- J.R.R. Tolkien who made the (real) world an interresting place
+- J.R.R. Tolkien who made the (real) world an interesting place
 
 Also a big general thanks to the whole ToME community which is always very nice, polite, supporting, full of marvelous ideas and great people!

@@ -119,6 +119,7 @@ Please, make sure the world is safe.]],
 		{_t"You will never be forgotten.", action=function(npc, player)
 			local aeryn = aeryn_alive(npc, player)
 			game.level:removeEntity(aeryn, true)
+			game:setAllowedBuild("paladin_fallen", true)
 			player:hasQuest("high-peak"):win("aeryn-sacrifice")
 		end},
 	}

@@ -4417,7 +4417,7 @@ newDamageType{
 
 -- physical that pulls and might reduce knockback resistance
 newDamageType{
-	name = "black-hole gravity", type = "REK_FLN_GRAVITY_PULL",
+	name = "black-hole gravity", type = "BLACK_HOLE_GRAVITY",
 	projector = function(src, x, y, type, dam, state)
 		state = initState(state)
 		useImplicitCrit(src, state)
@@ -4429,7 +4429,7 @@ newDamageType{
 			if dam.slow then
 				target:setEffect(target.EFF_SLOW, dam.dur, {power=dam.slow, apply_power=src:combatPhysicalpower(), no_ct_effect=true})
 			end
-			if src:isTalentActive(src.T_FLN_BLACKSUN_SINGULARITY) then
+			if src:isTalentActive(src.T_SINGULARITY_ARMOR) then
 				target:setEffect(target.EFF_ANTI_GRAVITY, 2, {})
 			end
 		end
@@ -4448,7 +4448,7 @@ newDamageType{
 
 -- blinding light that restores positive energy to its caster
 newDamageType{
-	name = "solar blood", type = "FLN_TEMPLAR_SIGIL",
+	name = "solar blood", type = "SOLAR_BLOOD",
 	projector = function(src, x, y, type, dam, state)
 		state = initState(state)
 		useImplicitCrit(src, state)
@@ -4457,7 +4457,7 @@ newDamageType{
 			if target == src then
 				target:incPositive(2)
 			elseif target:reactionToward(src) < 0 then
-				target:setEffect(target.EFF_FLN_BLINDING_LIGHT, 1, {src=src, power=dam.dam, apply_power=dam.pow, no_ct_effect=true})
+				target:setEffect(target.EFF_BLINDING_LIGHT, 1, {src=src, power=dam.dam, apply_power=dam.pow, no_ct_effect=true})
 				DamageType:get(DamageType.LIGHT).projector(src, x, y, DamageType.LIGHT, dam.dam, state)
 			end
 		end

@@ -94,7 +94,7 @@ newTalent{
 				for i, target in ipairs(tgts) do
 					local old_source = self.summoner.__project_source
 					self.summoner.__project_source = self
-					DamageType:get(DamageType.REK_FLN_GRAVITY_PULL).projector(self.summoner, target.actor.x, target.actor.y, DamageType.REK_FLN_GRAVITY_PULL, self.dam)
+					DamageType:get(DamageType.BLACK_HOLE_GRAVITY).projector(self.summoner, target.actor.x, target.actor.y, DamageType.BLACK_HOLE_GRAVITY, self.dam)
 					self.summoner.__project_source = old_source
 				end
 				
@@ -213,7 +213,7 @@ newTalent{
 		self:project(tg2, self.x, self.y, function(px, py, tg, self)
 									 local target = game.level.map(px, py, Map.ACTOR)
 									 if target and target ~= self then
-										 self:attackTarget(target, DamageType.REK_FLN_GRAVITY_PULL, t.getOuterDamage(self, t), true)
+										 self:attackTarget(target, DamageType.BLACK_HOLE_GRAVITY, t.getOuterDamage(self, t), true)
 									 end
 																			end)
 		

@@ -141,11 +141,6 @@ newTalent{
 		self:talentTemporaryValue(p, "combat_spellcrit", t.getCrit(self, t))
 		self:talentTemporaryValue(p, "combat_physcrit", t.getCrit(self, t))
 	end,
-	callbackOnKill = function(self, t, src, msg)
-		if src.getHate and src:getHate() > 0 then
-      game:setAllowedBuild("paladin_fallen", true)
-		end
-	end,
 	callbackOnCrit = function(self, t, kind, dam, chance)
 		if kind ~= "spell" and kind ~= "physical" then return end
 		if not rng.percent(t.getProcChance(self, t)) then return end

@@ -100,11 +100,11 @@ newTalent{
 		-- Add a lasting map effect
 		game.level.map:addEffect(self,
 														 x, y, self:spellCrit(t.getDuration(self, t)),
-														 DamageType.FLN_TEMPLAR_SIGIL, {dam=self:spellCrit(t.getStrength(self, t)), pow=self:combatSpellpower()},
+														 DamageType.SOLAR_BLOOD, {dam=self:spellCrit(t.getStrength(self, t)), pow=self:combatSpellpower()},
 														 self:getTalentRadius(t),
 														 5, nil,
 														 MapEffect.new{zdepth=6, overlay_particle={zdepth=6, only_one=true, type="circle", args={appear=8, oversize=0, img="fln_celestial_circle", radius=self:getTalentRadius(t)*2}}, color_br=255, color_bg=187, color_bb=187, alpha=10, effect_shader="shader_images/sunlight_effect.png"},
-														 nil, true --self:spellFriendlyFire(true)
+														 nil, true
 														)
 	end,
 	

@@ -3158,6 +3158,11 @@ newEffect{
 	parameters = {},
 	on_gain = function(self, err) return _t"#Target# is filled with the Sun's fury!", _t"+Sun's Vengeance" end,
 	on_lose = function(self, err) return _t"#Target#'s solar fury subsides.", _t"-Sun's Vengeance" end,
+	callbackOnKill = function(self, eff, src, msg)
+		if src.getHate and src:getHate() > 0 then
+      game:setAllowedBuild("paladin_fallen", true)
+		end
+	end,
 	activate = function(self, eff)
 		self:effectTemporaryValue(eff, "amplify_sun_beam", 25)
 	end
@@ -5409,7 +5414,7 @@ newEffect{
 }
 
 newEffect{
-	name = "FLN_DIRGE_LINGER_FAMINE", image = "talents/fln_dirge_famine.png",
+	name = "DIRGE_OF_FAMINE", image = "talents/fln_dirge_famine.png",
 	desc = "Dirge of Famine",
 	long_desc = function(self, eff) return ("The target is regenerating health"):format() end,
 	type = "magical",
@@ -5425,7 +5430,7 @@ newEffect{
 }
 
 newEffect{
-	name = "FLN_DIRGE_LINGER_CONQUEST", image = "talents/fln_dirge_conquest.png",
+	name = "DIRGE_OF_CONQUEST", image = "talents/fln_dirge_conquest.png",
 	desc = "Dirge of Conquest",
 	long_desc = function(self, eff) return ("The target will gain a surge of energy on kill or crit"):format() end,
 	type = "magical",
@@ -5461,7 +5466,7 @@ newEffect{
 }
 
 newEffect{
-	name = "FLN_DIRGE_LINGER_PESTILENCE", image = "talents/fln_dirge_pestilence.png",
+	name = "DIRGE_OF_PESTILENCE", image = "talents/fln_dirge_pestilence.png",
 	desc = "Dirge of Pestilence",
 	long_desc = function(self, eff) return ("The target will gain a shield upon suffering a detrimental effect"):format() end,
 	type = "magical",
@@ -5483,7 +5488,7 @@ newEffect{
 }
 
 newEffect{
-	name = "FLN_BLINDING_LIGHT", image = "talents/fln_templar_sigil.png",
+	name = "BLINDING_LIGHT", image = "talents/fln_templar_sigil.png",
 	desc = "Blinding Light",
 	long_desc = function(self, eff) return ("The target is blinded by a magical light and unable to see anything."):format(eff.dam) end,
 	type = "magical",