Merge branch 'the_cure' into 'master'

The cure

Achievement and something I tried to sneak into my last more_fixes branch but just missed the deadline

game/modules/tome/data/achievements/talents.lua

@@ -64,3 +64,13 @@ newAchievement{
 	desc = [[Achieved your wild dreams of power and eternal life: you turned into a Lich!]],
 	show = "name",
 }
+newAchievement{
+	name = "Best album ever!", id = "THE_CURE",
+	desc = [[Removed 89 beneficial effects from enemies via Disintegration.]],
+	show = "full", 	mode = "player",
+	can_gain = function(self, who)
+		self.nb = (self.nb or 0) + 1
+		if self.nb >= 89 then return true end
+	end,
+	track = function(self) return tstring{tostring(self.nb or 0)," / 89"} end,
+}
\ No newline at end of file

game/modules/tome/data/talents/chronomancy/matter.lua

@@ -296,6 +296,12 @@ newTalent{
 					game.logSeen(self, "#CRIMSON#%s's beneficial effect was stripped!#LAST#", target.name:capitalize())
 					if what == "physical" then p.physical[target] = true end
 					if what == "magical" then p.magical[target] = true end
+					
+					-- The Cure achievement
+					local acheive = self.player and not target.training_dummy and target ~= self
+					if acheive then
+						world:gainAchievement("THE_CURE", self)
+					end
 				end
 			end
 		end

game/modules/tome/data/talents/chronomancy/spacetime-folding.lua

@@ -404,6 +404,7 @@ newTalent{
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, nowarning=true, talent=t}
 	end,
+	no_energy = true,
 	requires_target = true,
 	direct_hit = true,
 	action = function(self, t)
@@ -411,7 +412,6 @@ newTalent{
 		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 hit = false
 
 		self:project(tg, x, y, function(px, py)
 			local target = game.level.map(px, py, Map.ACTOR)
@@ -423,20 +423,11 @@ newTalent{
 				else
 					target:setEffect(target.EFF_CONTINUUM_DESTABILIZATION, 100, {power=getParadoxSpellpower(self, t, 0.3)})
 					game.level.map:particleEmitter(target.x, target.y, 1, "temporal_teleport")
-					hit = true
 				end
 			else
 				game.logSeen(target, "%s resists the banishment!", target.name:capitalize())
 			end
 		end)
-		
-		if not hit then
-			game:onTickEnd(function()
-				if not self:attr("no_talents_cooldown") then
-					self.talents_cd[self.T_BANISH] = math.floor(self.talents_cd[self.T_BANISH] /2)
-				end
-			end)
-		end
 
 		game:playSoundNear(self, "talents/teleport")
 
@@ -446,7 +437,6 @@ newTalent{
 		local radius = self:getTalentRadius(t)
 		local range = t.getTeleport(self, t)
 		return ([[Randomly teleports all other targets within a radius of %d.  Targets will be teleported between %d and %d tiles from their current location.
-		If no targets are teleported the cooldown will be halved.
 		The chance of teleportion will scale with your Spellpower.]]):format(radius, range / 2, range)
 	end,
 }