reintroduce saturations

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

game/engines/default/engine/HotkeysDisplay.lua

@@ -150,8 +150,9 @@ function _M:onMouse(button, mx, my, click, on_over)
 				a.changed = true
 			else
 				a.changed = true
+				local oldsel = self.cur_sel
 				self.cur_sel = i
-				if on_over then
+				if on_over and self.cur_sel ~= oldsel then
 					local text = ""
 					if a.hotkey[i] and a.hotkey[i][1] == "talent" then
 						local t = self.actor:getTalentFromId(a.hotkey[i][2])

game/modules/tome/class/Actor.lua

@@ -1657,14 +1657,16 @@ function _M:postUseTalent(ab, ret)
 
 	self.changed = true
 
---[[
-	-- Handle inscriptions
-	if ab.type[1] == "inscriptions/infusions" then
-		self:setEffect(self.EFF_INFUSION_COOLDOWN, 15, {power=2})
-	elseif ab.type[1] == "inscriptions/runes" then
-		self:setEffect(self.EFF_RUNE_COOLDOWN, 15, {power=2})
-	end
-]]
+-- [[
+	-- 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})
+		end
+	end)
+--]]
 
 	if not ab.no_energy then
 		if ab.is_spell then
@@ -1881,7 +1883,7 @@ 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
@@ -1889,7 +1891,7 @@ function _M:getTalentCooldown(t)
 		local eff = self:hasEffect(self.EFF_RUNE_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/general/objects/boss-artifacts.lua

@@ -262,7 +262,7 @@ newEntity{ base = "BASE_RING",
 newEntity{ base = "BASE_RING",
 	power_source = {arcane=true},
 	define_as = "NIGHT_SONG", rarity=false,
-	name = "Nightsong", unique=true, image="object/artifact/nightsong.png",
+	name = "Nightsong", unique=true,
 	desc = [[A pitch black ring, unadorned. It seems as though tendrils of darkness crept upon it.]],
 	unided_name = "obsidian ring",
 	level_range = {15, 23},