Skip to content

Commit cfa11ac

Browse files
committed
Fix Tailoring Cooldowns
Integrated 5 Tailoring Recipes(Series of Dream) - Icons(of Volatiles needed), then Cooldown Fix Default value(Heroic Dungeon)
1 parent 0ef307c commit cfa11ac

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

Core.lua

+11-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ local dbDefault = {
3939
}
4040

4141
local _TranslationTable = {
42-
["color" ] = function(_, _, color) return ((color and color ~= "") and "|cff"..color or "|r"), false end, -- Do not wrap with color for [color] keyword
42+
["color" ] = function(_, _, color) return ((color and color ~= "") and "|cff"..color or "|r"), false end,
4343
["item" ] = function(db, option)
4444
local _, itemLink = C_Item.GetItemInfo(option)
4545
if itemLink then
@@ -292,7 +292,7 @@ function SavedClassic:InitPlayerDB()
292292
playerdb.info3_1 = format(" [%s] ([%s]) [%s]/[%s]", L["instName"], L["difficulty"], L["progress"], L["bosses"])
293293
playerdb.info3_2 = format("[%s]", L["time"])
294294
playerdb.info4 = true
295-
playerdb.info4_1 = format(" [%s/ffff99][%s] ([%s]) [%s]/[%s][%s]", L["color"], L["instName"], L["difficulty"], L["progress"], L["bosses"], L["color"])
295+
playerdb.info4_1 = format(" [%s/ffff99][%s] ([%s]) [%s]/[%s][/%s]", L["color"], L["instName"], L["difficulty"], L["progress"], L["bosses"], L["color"])
296296
playerdb.info4_2 = format("[%s/ffff99]", L["time"])
297297

298298
playerdb.raids = { }
@@ -537,11 +537,12 @@ function SavedClassic:ShowInstanceInfo(tooltip, character)
537537
local currentTime = time()
538538

539539
local tsstr = ""
540+
local ts_icon, ts_cooldown = "", "" -- for Tailoring cooldowns integration
540541
if db.tradeSkills then
541542
for id, cooldown in pairs(db.tradeSkills) do
542543
local ts = self.ts[id]
543544
if ts and cooldown and cooldown.ends then
544-
if ts.share then ts = self.ts[ts.share] end
545+
--if ts.share then ts = self.ts[ts.share] end
545546
local remain = cooldown.ends - currentTime
546547
if remain > 0 then
547548
local hh, mm = floor(remain / 3600), floor(remain % 3600 / 60)
@@ -551,7 +552,12 @@ function SavedClassic:ShowInstanceInfo(tooltip, character)
551552
else
552553
cooldown_str = format("%02d:%02d", hh, mm)
553554
end
554-
tsstr = tsstr..("|T"..(ts.icon or ts.altName or "")..":14:14|t")..cooldown_str
555+
if ts.tailoring then
556+
ts_icon = ts_icon..(ts.icon or ts.altName or "")
557+
ts_cooldown = cooldown_str
558+
else
559+
tsstr = tsstr..(ts.icon or ts.altName or "")..cooldown_str
560+
end
555561
else
556562
db.tradeSkills[id] = nil
557563
end
@@ -560,7 +566,7 @@ function SavedClassic:ShowInstanceInfo(tooltip, character)
560566
end
561567
end
562568
end
563-
db.tsstr = tsstr
569+
db.tsstr = tsstr..ts_icon..ts_cooldown
564570

565571
if db.dqResetReal and currentTime > db.dqResetReal then
566572
db.dqComplete = 0

Data.lua

+11-10
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ SavedClassic.version = "4.4.0.8"
88
local L = LibStub("AceLocale-3.0"):GetLocale(addonName, true)
99

1010
SavedClassic.ts = { -- Tradeskills of long cooldowns
11-
[80243] = { icon = "466847", }, -- (Alchemy) Transmute: Truegold
12-
-- Tailoring - 6 Dreamcloth recipe shares cooldown
13-
[75141] = { share = 75146 }, -- (Tailoring) Dream of Skywall (Air)
14-
[75142] = { share = 75146 }, -- (Tailoring) Dream of Deepholm (Earth)
15-
[75144] = { share = 75146 }, -- (Tailoring) Dream of Hyjal (Life)
16-
[75145] = { share = 75146 }, -- (Tailoring) Dream of Ragnaros (Fire)
17-
[75146] = { icon = "132698" }, -- (Tailoring) Dream of Azshara (Water)
18-
[73478] = { icon = "134128" }, -- (Jewelcraft) Fire Prism
19-
[86654] = { icon = "237446" }, -- (Inscription) Forged documents(Horde)
20-
[89244] = { icon = "237446" }, -- (Inscription) Forged documents(Alliance)
11+
[80243] = { icon = "|T466847:14:14|t" }, -- (Alchemy) Transmute: Truegold
12+
[73478] = { icon = "|T134128:14:14|t" }, -- (Jewelcraft) Fire Prism
13+
[86654] = { icon = "|T237446:14:14|t" }, -- (Inscription) Forged documents(Horde)
14+
[89244] = { icon = "|T237446:14:14|t" }, -- (Inscription) Forged documents(Alliance)
15+
-- Tailoring Recipes have same cooldowns
16+
[75141] = { icon = "|T463565:14:14|t", tailoring = true }, -- (Tailoring) Dream of Skywall (Air)
17+
[75142] = { icon = "|T463566:14:14|t", tailoring = true }, -- (Tailoring) Dream of Deepholm (Earth)
18+
[75144] = { icon = "|T468265:14:14|t", tailoring = true }, -- (Tailoring) Dream of Hyjal (Life)
19+
[75145] = { icon = "|T463567:14:14|t", tailoring = true }, -- (Tailoring) Dream of Ragnaros (Fire)
20+
[75146] = { icon = "|T463570:14:14|t", tailoring = true }, -- (Tailoring) Dream of Azshara (Water)
2121
}
22+
2223
SavedClassic.items = { -- Items to count always
2324
}
2425
SavedClassic.currencies = {

0 commit comments

Comments
 (0)