From 36e4cb94b14bc8271574fec114365159e26d3e76 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 31 Jan 2011 08:59:35 +0000
Subject: [PATCH] reintroduce saturations
git-svn-id: http://svn.net-core.org/repos/t-engine4@2577 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../engines/default/engine/HotkeysDisplay.lua | 3 ++-
game/modules/tome/class/Actor.lua | 22 ++++++++++---------
.../data/general/objects/boss-artifacts.lua | 2 +-
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/game/engines/default/engine/HotkeysDisplay.lua b/game/engines/default/engine/HotkeysDisplay.lua
index b1dde594a3..ed6fe03415 100644
--- a/game/engines/default/engine/HotkeysDisplay.lua
+++ b/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])
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 9424a81fd6..d22d98aa53 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/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
diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index 1f649fa1c3..743d6fceb2 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/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},
--
GitLab