Fixed some bugs with the /details stats
This commit is contained in:
+12
-4
@@ -1985,17 +1985,25 @@ local SimplePanel_frame_backdrop_border_color = {0, 0, 0, 1}
|
||||
function DF:CreateScaleBar (frame, config)
|
||||
local scaleBar, text = DF:CreateSlider (frame, 120, 14, 0.6, 1.6, 0.1, config.scale, true, "ScaleBar", nil, "Scale:", DF:GetTemplate ("slider", "OPTIONS_SLIDER_TEMPLATE"), DF:GetTemplate ("font", "ORANGE_FONT_TEMPLATE"))
|
||||
scaleBar.thumb:SetWidth(24)
|
||||
scaleBar:SetValueStep(0.1)
|
||||
scaleBar:SetObeyStepOnDrag()
|
||||
scaleBar.mouseDown = false
|
||||
|
||||
text:SetPoint ("topleft", frame, "topleft", 12, -7)
|
||||
scaleBar:SetFrameLevel (DF.FRAMELEVEL_OVERLAY)
|
||||
scaleBar.OnValueChanged = function (_, _, value)
|
||||
config.scale = value
|
||||
if (not scaleBar.IsValueChanging) then
|
||||
frame:SetScale (config.scale)
|
||||
if (scaleBar.mouseDown) then
|
||||
config.scale = value
|
||||
end
|
||||
end
|
||||
|
||||
scaleBar:SetHook ("OnMouseDown", function()
|
||||
scaleBar.mouseDown = true
|
||||
end)
|
||||
|
||||
scaleBar:SetHook ("OnMouseUp", function()
|
||||
frame:SetScale (config.scale)
|
||||
frame:SetScale(config.scale)
|
||||
scaleBar.mouseDown = false
|
||||
end)
|
||||
|
||||
scaleBar:SetAlpha (0.70)
|
||||
|
||||
+390
-415
File diff suppressed because it is too large
Load Diff
+135
-58
@@ -6,60 +6,141 @@ local C_Timer = _G.C_Timer
|
||||
local DetailsFramework = _G.DetailsFramework
|
||||
local tinsert = _G.tinsert
|
||||
|
||||
do
|
||||
--> data for Castle Nathria (Shadowlands tier 1)
|
||||
--F:\World of Warcraft\_retail_\BlizzardInterfaceArt\Interface\GLUES\LOADINGSCREENS\Expansion07\Main\LOADINGSCREEN_NzothRAID
|
||||
local INSTANCE_EJID = 1190
|
||||
local INSTANCE_MAPID = 2296
|
||||
local HDIMAGESPATH = [[Details\images\raid]]
|
||||
local HDFILEPREFIX = "CastleNathriaRaid"
|
||||
local LOADINGSCREEN_FILE, LOADINGSCREEN_COORDS = [[Expansion08\Main\LoadScreen_CastleNathriaRaid]], {0, 1, 285/1024, 875/1024}
|
||||
local EJ_LOREBG = "UI-EJ-LOREBG-CastleNathria"
|
||||
local RAID_TIER = 26
|
||||
function Details.InstallRaidInfo()
|
||||
|
||||
local PORTRAIT_LIST = {
|
||||
3752190, --Shriekwing - Shriekwing
|
||||
3753151, --Huntsman Altimor - Huntsman Altimor
|
||||
3753157, --Kael'thas Sunstrider - Sun King's Salvation
|
||||
3752156, --Artificer Xy'Mox - Artificer Xy'mox
|
||||
3752174, --Hungering Destroyer - Hungering Destroyer
|
||||
3752178, --Lady Inerva Darkvein - Lady Inerva Darkvein
|
||||
3753159, --Castellan Niklaus - The Council of Blood
|
||||
3752191, --Sludgefist - Sludgefist
|
||||
3753156, --General Kaal - Stone Legion Generals
|
||||
3752159, --Sire Denathrius - Sire Denathrius
|
||||
}
|
||||
do
|
||||
--> data for Sanctum of Domination (Shadowlands tier 1)
|
||||
local INSTANCE_EJID = 1193
|
||||
local INSTANCE_MAPID = 2450
|
||||
local HDIMAGESPATH = [[Details\images\raid]]
|
||||
local HDFILEPREFIX = 'SanctumofDominationRaid'
|
||||
local EJ_LOREBG = 'UI-EJ-LOREBG-SanctumofDomination'
|
||||
|
||||
local ENCOUNTER_ID_CL = {
|
||||
2398, 2418, 2402, 2405, 2383, 2406, 2412, 2399, 2417, 2407,
|
||||
[2398] = 1, --Shriekwing
|
||||
[2418] = 2, --Huntsman Altimor
|
||||
[2402] = 3, --Kael'thas
|
||||
[2405] = 4, --Artificer Xy'mox
|
||||
[2383] = 5, --Hungering Destroyer
|
||||
[2406] = 6, --Lady Inerva Darkvein
|
||||
[2412] = 7, --The Council of Blood
|
||||
[2399] = 8, --Sludgefist
|
||||
[2417] = 9, --Stone Legion Generals
|
||||
[2407] = 10, --Sire Denathrius
|
||||
}
|
||||
local ENCOUNTER_ID_CL = {
|
||||
[2423] = 1, --The Tarragrue
|
||||
[2433] = 2, --The Eye of the Jailer
|
||||
[2429] = 3, --The Nine
|
||||
[2432] = 4, --Remnant of Ner'zhul
|
||||
[2434] = 5, --Soulrender Dormazain
|
||||
[2430] = 6, --Painsmith Raznal
|
||||
[2436] = 7, --Guardian of the First Ones
|
||||
[2431] = 8, --Fatescribe Roh-Kalo
|
||||
[2422] = 9, --Kel'Thuzad
|
||||
[2435] = 10, --Sylvanas Windrunner
|
||||
2423, 2433, 2429, 2432, 2434, 2430, 2436, 2431, 2422, 2435,
|
||||
}
|
||||
|
||||
local ENCOUNTER_ID_EJ = {
|
||||
2393, 2429, 2422, 2418, 2428, 2420, 2426, 2394, 2425, 2424,
|
||||
[2393] = 1, --Shriekwing
|
||||
[2429] = 2, --Huntsman Altimor
|
||||
[2422] = 3, --Sun King's Salvation
|
||||
[2418] = 4, --Artificer Xy'mox
|
||||
[2428] = 5, --Hungering Destroyer
|
||||
[2420] = 6, --Lady Inerva Darkvein
|
||||
[2426] = 7, --The Council of Blood
|
||||
[2394] = 8, --Sludgefist
|
||||
[2425] = 9, --Stone Legion Generals
|
||||
[2424] = 10, --Sire Denathrius
|
||||
}
|
||||
|
||||
--> install the raid
|
||||
C_Timer.After (10, function()
|
||||
local ENCOUNTER_ID_EJ = {
|
||||
[2435] = 1, --The Tarragrue
|
||||
[2442] = 2, --The Eye of the Jailer
|
||||
[2439] = 3, --The Nine
|
||||
[2444] = 4, --Remnant of Ner'zhul
|
||||
[2445] = 5, --Soulrender Dormazain
|
||||
[2443] = 6, --Painsmith Raznal
|
||||
[2446] = 7, --Guardian of the First Ones
|
||||
[2447] = 8, --Fatescribe Roh-Kalo
|
||||
[2440] = 9, --Kel'Thuzad
|
||||
[2441] = 10, --Sylvanas Windrunner
|
||||
2435, 2442, 2439, 2444, 2445, 2443, 2446, 2447, 2440, 2441,
|
||||
}
|
||||
|
||||
--load encounter journal
|
||||
DetailsFramework.EncounterJournal.EJ_SelectInstance(INSTANCE_EJID)
|
||||
local InstanceName = DetailsFramework.EncounterJournal.EJ_GetInstanceInfo(INSTANCE_EJID)
|
||||
|
||||
local BOSSNAMES = {
|
||||
"The Tarragrue", --1
|
||||
"The Eye of the Jailer", --2
|
||||
"The Nine", --3
|
||||
"Remnant of Ner'zhul", --4
|
||||
"Soulrender Dormazain", --5
|
||||
"Painsmith Raznal", --6
|
||||
"Guardian of the First Ones", --7
|
||||
"Fatescribe Roh-Kalo", --8
|
||||
"Kel'Thuzad", --9
|
||||
"Sylvanas Windrunner", --10
|
||||
}
|
||||
|
||||
local ENCOUNTERS = {
|
||||
{boss = "The Tarragrue", portrait = 4071444},
|
||||
{boss = "The Eye of the Jailer", portrait = 4071426},
|
||||
{boss = "The Nine", portrait = 4071445},
|
||||
{boss = "Remnant of Ner'zhul", portrait = 4071439},
|
||||
{boss = "Soulrender Dormazain", portrait = 4071442},
|
||||
{boss = "Painsmith Raznal", portrait = 4079051},
|
||||
{boss = "Guardian of the First Ones", portrait = 4071428},
|
||||
{boss = "Fatescribe Roh-Kalo", portrait = 4071427},
|
||||
{boss = "Kel'Thuzad", portrait = 4071435},
|
||||
{boss = "Sylvanas Windrunner", portrait = 4071443},
|
||||
}
|
||||
|
||||
_detalhes:InstallEncounter ({
|
||||
id = INSTANCE_MAPID, --map id
|
||||
ej_id = INSTANCE_EJID, --encounter journal id
|
||||
name = InstanceName,
|
||||
icons = "Interface\\AddOns\\" .. HDIMAGESPATH .. "\\" .. HDFILEPREFIX .. "_BossFaces",
|
||||
icon = "Interface\\AddOns\\" .. HDIMAGESPATH .. "\\" .. HDFILEPREFIX .. "_Icon256x128",
|
||||
is_raid = true,
|
||||
backgroundEJ = "Interface\\EncounterJournal\\" .. EJ_LOREBG,
|
||||
encounter_ids = ENCOUNTER_ID_EJ,
|
||||
encounter_ids2 = ENCOUNTER_ID_CL,
|
||||
boss_names = BOSSNAMES,
|
||||
encounters = ENCOUNTERS,
|
||||
boss_ids = {
|
||||
--npc ids
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
do
|
||||
--> data for Castle Nathria (Shadowlands tier 1)
|
||||
--F:\World of Warcraft\_retail_\BlizzardInterfaceArt\Interface\GLUES\LOADINGSCREENS\Expansion07\Main\LOADINGSCREEN_NzothRAID
|
||||
local INSTANCE_EJID = 1190
|
||||
local INSTANCE_MAPID = 2296
|
||||
local HDIMAGESPATH = [[Details\images\raid]]
|
||||
local HDFILEPREFIX = "CastleNathriaRaid"
|
||||
local EJ_LOREBG = "UI-EJ-LOREBG-CastleNathria"
|
||||
|
||||
local PORTRAIT_LIST = {
|
||||
3752190, --Shriekwing - Shriekwing
|
||||
3753151, --Huntsman Altimor - Huntsman Altimor
|
||||
3753157, --Kael'thas Sunstrider - Sun King's Salvation
|
||||
3752156, --Artificer Xy'Mox - Artificer Xy'mox
|
||||
3752174, --Hungering Destroyer - Hungering Destroyer
|
||||
3752178, --Lady Inerva Darkvein - Lady Inerva Darkvein
|
||||
3753159, --Castellan Niklaus - The Council of Blood
|
||||
3752191, --Sludgefist - Sludgefist
|
||||
3753156, --General Kaal - Stone Legion Generals
|
||||
3752159, --Sire Denathrius - Sire Denathrius
|
||||
}
|
||||
|
||||
local ENCOUNTER_ID_CL = {
|
||||
2398, 2418, 2402, 2405, 2383, 2406, 2412, 2399, 2417, 2407,
|
||||
[2398] = 1, --Shriekwing
|
||||
[2418] = 2, --Huntsman Altimor
|
||||
[2402] = 3, --Kael'thas
|
||||
[2405] = 4, --Artificer Xy'mox
|
||||
[2383] = 5, --Hungering Destroyer
|
||||
[2406] = 6, --Lady Inerva Darkvein
|
||||
[2412] = 7, --The Council of Blood
|
||||
[2399] = 8, --Sludgefist
|
||||
[2417] = 9, --Stone Legion Generals
|
||||
[2407] = 10, --Sire Denathrius
|
||||
}
|
||||
|
||||
local ENCOUNTER_ID_EJ = {
|
||||
2393, 2429, 2422, 2418, 2428, 2420, 2426, 2394, 2425, 2424,
|
||||
[2393] = 1, --Shriekwing
|
||||
[2429] = 2, --Huntsman Altimor
|
||||
[2422] = 3, --Sun King's Salvation
|
||||
[2418] = 4, --Artificer Xy'mox
|
||||
[2428] = 5, --Hungering Destroyer
|
||||
[2420] = 6, --Lady Inerva Darkvein
|
||||
[2426] = 7, --The Council of Blood
|
||||
[2394] = 8, --Sludgefist
|
||||
[2425] = 9, --Stone Legion Generals
|
||||
[2424] = 10, --Sire Denathrius
|
||||
}
|
||||
|
||||
--load encounter journal
|
||||
DetailsFramework.EncounterJournal.EJ_SelectInstance (INSTANCE_EJID)
|
||||
@@ -69,7 +150,7 @@ do
|
||||
--build the boss name list
|
||||
local BOSSNAMES = {}
|
||||
local ENCOUNTERS = {}
|
||||
|
||||
|
||||
for i = 1, #PORTRAIT_LIST do
|
||||
local bossName = DetailsFramework.EncounterJournal.EJ_GetEncounterInfoByIndex (i, INSTANCE_EJID)
|
||||
if (bossName) then
|
||||
@@ -85,24 +166,20 @@ do
|
||||
end
|
||||
|
||||
_detalhes:InstallEncounter ({
|
||||
raidTier = RAID_TIER,
|
||||
id = INSTANCE_MAPID, --map id
|
||||
ej_id = INSTANCE_EJID, --encounter journal id
|
||||
name = InstanceName,
|
||||
icons = "Interface\\AddOns\\" .. HDIMAGESPATH .. "\\" .. HDFILEPREFIX .. "_BossFaces",
|
||||
icon = "Interface\\AddOns\\" .. HDIMAGESPATH .. "\\" .. HDFILEPREFIX .. "_Icon256x128",
|
||||
is_raid = true,
|
||||
backgroundFile = {file = [[Interface\GLUES\LOADINGSCREENS\]] .. LOADINGSCREEN_FILE, coords = LOADINGSCREEN_COORDS},
|
||||
backgroundEJ = "Interface\\EncounterJournal\\" .. EJ_LOREBG,
|
||||
|
||||
encounter_ids = ENCOUNTER_ID_EJ,
|
||||
encounter_ids2 = ENCOUNTER_ID_CL,
|
||||
boss_names = BOSSNAMES,
|
||||
encounters = ENCOUNTERS,
|
||||
|
||||
boss_ids = {
|
||||
--npc ids
|
||||
},
|
||||
})
|
||||
end)
|
||||
end
|
||||
end
|
||||
end
|
||||
+1
-1
@@ -476,7 +476,7 @@ function Details:StartMeUp() --I'll never stop!
|
||||
--enforce to show 6 abilities on the tooltip
|
||||
--_detalhes.tooltip.tooltip_max_abilities = 6 freeeeeedooommmmm
|
||||
|
||||
|
||||
Details.InstallRaidInfo()
|
||||
|
||||
--Plater integration
|
||||
C_Timer.After(2, function()
|
||||
|
||||
Reference in New Issue
Block a user