@@ -39,7 +39,7 @@ local dbDefault = {
39
39
}
40
40
41
41
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 ,
43
43
[" item" ] = function (db , option )
44
44
local _ , itemLink = C_Item .GetItemInfo (option )
45
45
if itemLink then
@@ -292,7 +292,7 @@ function SavedClassic:InitPlayerDB()
292
292
playerdb .info3_1 = format (" [%s] ([%s]) [%s]/[%s]" , L [" instName" ], L [" difficulty" ], L [" progress" ], L [" bosses" ])
293
293
playerdb .info3_2 = format (" [%s]" , L [" time" ])
294
294
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" ])
296
296
playerdb .info4_2 = format (" [%s/ffff99]" , L [" time" ])
297
297
298
298
playerdb .raids = { }
@@ -537,11 +537,12 @@ function SavedClassic:ShowInstanceInfo(tooltip, character)
537
537
local currentTime = time ()
538
538
539
539
local tsstr = " "
540
+ local ts_icon , ts_cooldown = " " , " " -- for Tailoring cooldowns integration
540
541
if db .tradeSkills then
541
542
for id , cooldown in pairs (db .tradeSkills ) do
542
543
local ts = self .ts [id ]
543
544
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
545
546
local remain = cooldown .ends - currentTime
546
547
if remain > 0 then
547
548
local hh , mm = floor (remain / 3600 ), floor (remain % 3600 / 60 )
@@ -551,7 +552,12 @@ function SavedClassic:ShowInstanceInfo(tooltip, character)
551
552
else
552
553
cooldown_str = format (" %02d:%02d" , hh , mm )
553
554
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
555
561
else
556
562
db .tradeSkills [id ] = nil
557
563
end
@@ -560,7 +566,7 @@ function SavedClassic:ShowInstanceInfo(tooltip, character)
560
566
end
561
567
end
562
568
end
563
- db .tsstr = tsstr
569
+ db .tsstr = tsstr .. ts_icon .. ts_cooldown
564
570
565
571
if db .dqResetReal and currentTime > db .dqResetReal then
566
572
db .dqComplete = 0
0 commit comments