Fixed the Storming the City quest: gwelgoroths will have the correct level now

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

game/modules/tome/class/Actor.lua

@@ -1977,16 +1977,16 @@ function _M:postUseTalent(ab, ret)
 
 	self.changed = true
 
--- [[
 	-- Handle inscriptions (delay it so it does not affect current inscription)
 	game:onTickEnd(function()
 		if ab.type[1] == "inscriptions/infusions" then
 			self:setEffect(self.EFF_INFUSION_COOLDOWN, 10, {power=1})
 		elseif ab.type[1] == "inscriptions/runes" then
 			self:setEffect(self.EFF_RUNE_COOLDOWN, 10, {power=1})
+		elseif ab.type[1] == "inscriptions/taints" then
+			self:setEffect(self.EFF_TAINT_COOLDOWN, 10, {power=1})
 		end
 	end)
---]]
 
 	if not ab.no_energy then
 		if ab.is_spell then
@@ -2212,15 +2212,16 @@ function _M:getTalentCooldown(t)
 	if type(cd) == "function" then cd = cd(self, t) end
 	if not cd then return end
 
--- [[
 	if t.type[1] == "inscriptions/infusions" then
 		local eff = self:hasEffect(self.EFF_INFUSION_COOLDOWN)
 		if eff and eff.power then cd = cd + eff.power end
 	elseif t.type[1] == "inscriptions/runes" then
 		local eff = self:hasEffect(self.EFF_RUNE_COOLDOWN)
 		if eff and eff.power then cd = cd + eff.power end
+	elseif t.type[1] == "inscriptions/taints" then
+		local eff = self:hasEffect(self.EFF_TAINT_COOLDOWN)
+		if eff and eff.power then cd = cd + eff.power end
 	end
---]]
 
 	if self.talent_cd_reduction[t.id] then cd = cd - self.talent_cd_reduction[t.id] end
 	if self.talent_cd_reduction.all then cd = cd - self.talent_cd_reduction.all end

game/modules/tome/data/quests/lightning-overload.lua

@@ -118,7 +118,6 @@ enter_derth = function(self)
 	self.old_obscure = game.level.map.color_obscure
 	game.level.map:setShown(0.3, 0.3, 0.3, 1)
 	game.level.map:setObscure(0.3*0.6, 0.3*0.6, 0.3*0.6, 0.6)
-	game.level.level = util.bound(game.player.level, 12, 20)
 
 	-- Add random lightning firing off
 	game.level.data.background = function(level)

game/modules/tome/data/timed_effects.lua

@@ -52,6 +52,20 @@ newEffect{
 	end,
 }
 
+newEffect{
+	name = "TAINT_COOLDOWN",
+	desc = "Tainted",
+	long_desc = function(self, eff) return ("The more you use taints, the longer they will take to recharge (+%d cooldowns)."):format(eff.power) end,
+	type = "taint",
+	status = "detrimental",
+	parameters = { power=1 },
+	on_merge = function(self, old_eff, new_eff)
+		old_eff.dur = new_eff.dur
+		old_eff.power = old_eff.power + new_eff.power
+		return old_eff
+	end,
+}
+
 newEffect{
 	name = "CUT",
 	desc = "Bleeding",