bug fixes
This commit is contained in:
Tercio Jose
+92
-91
@@ -123,169 +123,170 @@ DF:Mixin(ButtonMetaFunctions, DF.ScriptHookMixin)
|
||||
ButtonMetaFunctions.GetMembers["textfont"] = gmember_textfont --alias
|
||||
ButtonMetaFunctions.GetMembers["textsize"] = gmember_textsize --alias
|
||||
|
||||
ButtonMetaFunctions.__index = function(_table, _member_requested)
|
||||
|
||||
local func = ButtonMetaFunctions.GetMembers [_member_requested]
|
||||
ButtonMetaFunctions.__index = function(object, key)
|
||||
local func = ButtonMetaFunctions.GetMembers[key]
|
||||
if (func) then
|
||||
return func (_table, _member_requested)
|
||||
return func(object, key)
|
||||
end
|
||||
|
||||
local fromMe = rawget(_table, _member_requested)
|
||||
if (fromMe) then
|
||||
return fromMe
|
||||
local alreadyHaveKey = rawget(object, key)
|
||||
if (alreadyHaveKey) then
|
||||
return alreadyHaveKey
|
||||
end
|
||||
|
||||
return ButtonMetaFunctions [_member_requested]
|
||||
return ButtonMetaFunctions[key]
|
||||
end
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
--tooltip
|
||||
local smember_tooltip = function(_object, _value)
|
||||
return _object:SetTooltip (_value)
|
||||
local smember_tooltip = function(object, value)
|
||||
return object:SetTooltip (value)
|
||||
end
|
||||
|
||||
--show
|
||||
local smember_show = function(_object, _value)
|
||||
if (_value) then
|
||||
return _object:Show()
|
||||
local smember_show = function(object, value)
|
||||
if (value) then
|
||||
return object:Show()
|
||||
else
|
||||
return _object:Hide()
|
||||
return object:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
--hide
|
||||
local smember_hide = function(_object, _value)
|
||||
if (not _value) then
|
||||
return _object:Show()
|
||||
local smember_hide = function(object, value)
|
||||
if (not value) then
|
||||
return object:Show()
|
||||
else
|
||||
return _object:Hide()
|
||||
return object:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
--frame width
|
||||
local smember_width = function(_object, _value)
|
||||
return _object.button:SetWidth(_value)
|
||||
local smember_width = function(object, value)
|
||||
return object.button:SetWidth(value)
|
||||
end
|
||||
|
||||
--frame height
|
||||
local smember_height = function(_object, _value)
|
||||
return _object.button:SetHeight(_value)
|
||||
local smember_height = function(object, value)
|
||||
return object.button:SetHeight(value)
|
||||
end
|
||||
|
||||
--text
|
||||
local smember_text = function(_object, _value)
|
||||
return _object.button.text:SetText(_value)
|
||||
local smember_text = function(object, value)
|
||||
return object.button.text:SetText(value)
|
||||
end
|
||||
|
||||
--function
|
||||
local smember_function = function(_object, _value)
|
||||
return rawset(_object, "func", _value)
|
||||
local smember_function = function(object, value)
|
||||
return rawset(object, "func", value)
|
||||
end
|
||||
|
||||
--param1
|
||||
local smember_param1 = function(_object, _value)
|
||||
return rawset(_object, "param1", _value)
|
||||
local smember_param1 = function(object, value)
|
||||
return rawset(object, "param1", value)
|
||||
end
|
||||
|
||||
--param2
|
||||
local smember_param2 = function(_object, _value)
|
||||
return rawset(_object, "param2", _value)
|
||||
local smember_param2 = function(object, value)
|
||||
return rawset(object, "param2", value)
|
||||
end
|
||||
|
||||
--text color
|
||||
local smember_textcolor = function(_object, _value)
|
||||
local _value1, _value2, _value3, _value4 = DF:ParseColors(_value)
|
||||
return _object.button.text:SetTextColor(_value1, _value2, _value3, _value4)
|
||||
local smember_textcolor = function(object, value)
|
||||
local value1, value2, value3, value4 = DF:ParseColors(value)
|
||||
return object.button.text:SetTextColor(value1, value2, value3, value4)
|
||||
end
|
||||
|
||||
--text font
|
||||
local smember_textfont = function(_object, _value)
|
||||
return DF:SetFontFace (_object.button.text, _value)
|
||||
local smember_textfont = function(object, value)
|
||||
return DF:SetFontFace (object.button.text, value)
|
||||
end
|
||||
|
||||
--text size
|
||||
local smember_textsize = function(_object, _value)
|
||||
return DF:SetFontSize (_object.button.text, _value)
|
||||
local smember_textsize = function(object, value)
|
||||
return DF:SetFontSize (object.button.text, value)
|
||||
end
|
||||
|
||||
--texture
|
||||
local smember_texture = function(_object, _value)
|
||||
if (type(_value) == "table") then
|
||||
local _value1, _value2, _value3, _value4 = unpack(_value)
|
||||
if (_value1) then
|
||||
_object.button:SetNormalTexture(_value1)
|
||||
local smember_texture = function(object, value)
|
||||
if (type(value) == "table") then
|
||||
local value1, value2, value3, value4 = unpack(value)
|
||||
if (value1) then
|
||||
object.button:SetNormalTexture(value1)
|
||||
end
|
||||
if (_value2) then
|
||||
_object.button:SetHighlightTexture(_value2, "ADD")
|
||||
if (value2) then
|
||||
object.button:SetHighlightTexture(value2, "ADD")
|
||||
end
|
||||
if (_value3) then
|
||||
_object.button:SetPushedTexture(_value3)
|
||||
if (value3) then
|
||||
object.button:SetPushedTexture(value3)
|
||||
end
|
||||
if (_value4) then
|
||||
_object.button:SetDisabledTexture (_value4)
|
||||
if (value4) then
|
||||
object.button:SetDisabledTexture(value4)
|
||||
end
|
||||
else
|
||||
_object.button:SetNormalTexture(_value)
|
||||
_object.button:SetHighlightTexture(_value, "ADD")
|
||||
_object.button:SetPushedTexture(_value)
|
||||
_object.button:SetDisabledTexture (_value)
|
||||
object.button:SetNormalTexture(value)
|
||||
object.button:SetHighlightTexture(value, "ADD")
|
||||
object.button:SetPushedTexture(value)
|
||||
object.button:SetDisabledTexture(value)
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
--locked
|
||||
local smember_locked = function(_object, _value)
|
||||
if (_value) then
|
||||
_object.button:SetMovable(false)
|
||||
return rawset(_object, "is_locked", true)
|
||||
local smember_locked = function(object, value)
|
||||
if (value) then
|
||||
object.button:SetMovable(false)
|
||||
return rawset(object, "is_locked", true)
|
||||
else
|
||||
_object.button:SetMovable(true)
|
||||
rawset(_object, "is_locked", false)
|
||||
object.button:SetMovable(true)
|
||||
rawset(object, "is_locked", false)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
--text align
|
||||
local smember_textalign = function(_object, _value)
|
||||
if (_value == "left" or _value == "<") then
|
||||
_object.button.text:SetPoint("left", _object.button, "left", 2, 0)
|
||||
_object.capsule_textalign = "left"
|
||||
elseif (_value == "center" or _value == "|") then
|
||||
_object.button.text:SetPoint("center", _object.button, "center", 0, 0)
|
||||
_object.capsule_textalign = "center"
|
||||
elseif (_value == "right" or _value == ">") then
|
||||
_object.button.text:SetPoint("right", _object.button, "right", -2, 0)
|
||||
_object.capsule_textalign = "right"
|
||||
local smember_textalign = function(object, value)
|
||||
if (value == "left" or value == "<") then
|
||||
object.button.text:SetPoint("left", object.button, "left", 2, 0)
|
||||
object.capsule_textalign = "left"
|
||||
|
||||
elseif (value == "center" or value == "|") then
|
||||
object.button.text:SetPoint("center", object.button, "center", 0, 0)
|
||||
object.capsule_textalign = "center"
|
||||
|
||||
elseif (value == "right" or value == ">") then
|
||||
object.button.text:SetPoint("right", object.button, "right", -2, 0)
|
||||
object.capsule_textalign = "right"
|
||||
end
|
||||
end
|
||||
|
||||
ButtonMetaFunctions.SetMembers = ButtonMetaFunctions.SetMembers or {}
|
||||
ButtonMetaFunctions.SetMembers ["tooltip"] = smember_tooltip
|
||||
ButtonMetaFunctions.SetMembers ["show"] = smember_show
|
||||
ButtonMetaFunctions.SetMembers ["hide"] = smember_hide
|
||||
ButtonMetaFunctions.SetMembers ["width"] = smember_width
|
||||
ButtonMetaFunctions.SetMembers ["height"] = smember_height
|
||||
ButtonMetaFunctions.SetMembers ["text"] = smember_text
|
||||
ButtonMetaFunctions.SetMembers ["clickfunction"] = smember_function
|
||||
ButtonMetaFunctions.SetMembers ["param1"] = smember_param1
|
||||
ButtonMetaFunctions.SetMembers ["param2"] = smember_param2
|
||||
ButtonMetaFunctions.SetMembers ["textcolor"] = smember_textcolor
|
||||
ButtonMetaFunctions.SetMembers ["textfont"] = smember_textfont
|
||||
ButtonMetaFunctions.SetMembers ["textsize"] = smember_textsize
|
||||
ButtonMetaFunctions.SetMembers ["fontcolor"] = smember_textcolor--alias
|
||||
ButtonMetaFunctions.SetMembers ["fontface"] = smember_textfont--alias
|
||||
ButtonMetaFunctions.SetMembers ["fontsize"] = smember_textsize--alias
|
||||
ButtonMetaFunctions.SetMembers ["texture"] = smember_texture
|
||||
ButtonMetaFunctions.SetMembers ["locked"] = smember_locked
|
||||
ButtonMetaFunctions.SetMembers ["textalign"] = smember_textalign
|
||||
ButtonMetaFunctions.SetMembers= ButtonMetaFunctions.SetMembers or {}
|
||||
ButtonMetaFunctions.SetMembers["tooltip"] = smember_tooltip
|
||||
ButtonMetaFunctions.SetMembers["show"] = smember_show
|
||||
ButtonMetaFunctions.SetMembers["hide"] = smember_hide
|
||||
ButtonMetaFunctions.SetMembers["width"] = smember_width
|
||||
ButtonMetaFunctions.SetMembers["height"] = smember_height
|
||||
ButtonMetaFunctions.SetMembers["text"] = smember_text
|
||||
ButtonMetaFunctions.SetMembers["clickfunction"] = smember_function
|
||||
ButtonMetaFunctions.SetMembers["param1"] = smember_param1
|
||||
ButtonMetaFunctions.SetMembers["param2"] = smember_param2
|
||||
ButtonMetaFunctions.SetMembers["textcolor"] = smember_textcolor
|
||||
ButtonMetaFunctions.SetMembers["textfont"] = smember_textfont
|
||||
ButtonMetaFunctions.SetMembers["textsize"] = smember_textsize
|
||||
ButtonMetaFunctions.SetMembers["fontcolor"] = smember_textcolor--alias
|
||||
ButtonMetaFunctions.SetMembers["fontface"] = smember_textfont--alias
|
||||
ButtonMetaFunctions.SetMembers["fontsize"] = smember_textsize--alias
|
||||
ButtonMetaFunctions.SetMembers["texture"] = smember_texture
|
||||
ButtonMetaFunctions.SetMembers["locked"] = smember_locked
|
||||
ButtonMetaFunctions.SetMembers["textalign"] = smember_textalign
|
||||
|
||||
ButtonMetaFunctions.__newindex = function(_table, _key, _value)
|
||||
local func = ButtonMetaFunctions.SetMembers [_key]
|
||||
ButtonMetaFunctions.__newindex = function(object, key, value)
|
||||
local func = ButtonMetaFunctions.SetMembers[key]
|
||||
if (func) then
|
||||
return func (_table, _value)
|
||||
return func(object, value)
|
||||
else
|
||||
return rawset(_table, _key, _value)
|
||||
return rawset(object, key, value)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+1
-1
@@ -1134,7 +1134,7 @@ function DF:CreateCoolTip()
|
||||
|
||||
function gameCooltip:RefreshSpark(menuButton)
|
||||
menuButton.spark:ClearAllPoints()
|
||||
menuButton.spark:SetPoint("LEFT", menuButton.statusbar, "LEFT", (menuButton.statusbar:GetValue() * (menuButton.statusbar:GetWidth() / 100)) - 5, 0)
|
||||
menuButton.spark:SetPoint("left", menuButton.statusbar, "left", (menuButton.statusbar:GetValue() * (menuButton.statusbar:GetWidth() / 100)) - 5, 0)
|
||||
menuButton.spark2:ClearAllPoints()
|
||||
menuButton.spark2:SetPoint("left", menuButton.statusbar, "left", menuButton.statusbar:GetValue() * (menuButton.statusbar:GetWidth()/100) - 16, 0)
|
||||
end
|
||||
|
||||
@@ -2630,6 +2630,12 @@ end
|
||||
|
||||
DF.ClientLanguage = clientLanguage
|
||||
|
||||
function DF:DetectTextLanguage(text)
|
||||
for i = 1, #text do
|
||||
--or not
|
||||
end
|
||||
end
|
||||
|
||||
--returns which region the language the client is running, return "western", "russia" or "asia"
|
||||
function DF:GetClientRegion()
|
||||
if (clientLanguage == "zhCN" or clientLanguage == "koKR" or clientLanguage == "zhTW") then
|
||||
|
||||
+23
-26
@@ -421,8 +421,8 @@ DF:Mixin(DFSliderMetaFunctions, DF.ScriptHookMixin)
|
||||
buttonPlus:SetPushedTexture([[Interface\Buttons\UI-PlusButton-Down]])
|
||||
buttonMinor:SetPushedTexture([[Interface\Buttons\UI-MinusButton-Down]])
|
||||
|
||||
buttonPlus:SetDisabledTexture ([[Interface\Buttons\UI-PlusButton-Disabled]])
|
||||
buttonMinor:SetDisabledTexture ([[Interface\Buttons\UI-MinusButton-Disabled]])
|
||||
buttonPlus:SetDisabledTexture([[Interface\Buttons\UI-PlusButton-Disabled]])
|
||||
buttonMinor:SetDisabledTexture([[Interface\Buttons\UI-MinusButton-Disabled]])
|
||||
|
||||
buttonPlus:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
|
||||
buttonMinor:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
|
||||
@@ -1047,9 +1047,7 @@ function DF:CreateSlider (parent, w, h, min, max, step, defaultv, isDecemal, mem
|
||||
return slider, label
|
||||
end
|
||||
|
||||
function DF:NewSlider (parent, container, name, member, w, h, min, max, step, defaultv, isDecemal, isSwitch, with_label, slider_template, label_template)
|
||||
|
||||
--early checks
|
||||
function DF:NewSlider (parent, container, name, member, width, height, minValue, maxValue, step, defaultValue, isDecemal, isSwitch, with_label, slider_template, label_template)
|
||||
if (not name) then
|
||||
name = "DetailsFrameworkSlider" .. DF.SliderCounter
|
||||
DF.SliderCounter = DF.SliderCounter + 1
|
||||
@@ -1080,13 +1078,13 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
|
||||
end
|
||||
|
||||
--defaults
|
||||
min = min or 1
|
||||
max = max or 2
|
||||
minValue = minValue or 1
|
||||
maxValue = maxValue or 2
|
||||
step = step or 1
|
||||
defaultv = defaultv or min
|
||||
defaultValue = defaultValue or minValue
|
||||
|
||||
w = w or 130
|
||||
h = h or 19
|
||||
width = width or 130
|
||||
height = height or 19
|
||||
|
||||
--default members:
|
||||
SliderObject.lockdown = false
|
||||
@@ -1098,40 +1096,40 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
|
||||
SliderObject.useDecimals = isDecemal or false
|
||||
|
||||
if (SliderObject.useDecimals) then
|
||||
SliderObject.slider:SetValueStep (0.01)
|
||||
SliderObject.slider:SetValueStep(0.01)
|
||||
else
|
||||
SliderObject.slider:SetValueStep (step)
|
||||
SliderObject.slider:SetValueStep(step)
|
||||
end
|
||||
|
||||
if (not APISliderFunctions) then
|
||||
APISliderFunctions = true
|
||||
local idx = getmetatable(SliderObject.slider).__index
|
||||
for funcName, funcAddress in pairs(idx) do
|
||||
if (not DFSliderMetaFunctions [funcName]) then
|
||||
DFSliderMetaFunctions [funcName] = function(object, ...)
|
||||
if (not DFSliderMetaFunctions[funcName]) then
|
||||
DFSliderMetaFunctions[funcName] = function(object, ...)
|
||||
local x = loadstring ( "return _G['"..object.slider:GetName().."']:"..funcName.."(...)")
|
||||
return x (...)
|
||||
return x(...)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
SliderObject.slider.MyObject = SliderObject
|
||||
SliderObject.slider:SetWidth(w)
|
||||
SliderObject.slider:SetHeight(h)
|
||||
SliderObject.slider:SetWidth(width)
|
||||
SliderObject.slider:SetHeight(height)
|
||||
SliderObject.slider:SetOrientation ("horizontal")
|
||||
SliderObject.slider:SetMinMaxValues(min, max)
|
||||
SliderObject.slider:SetValue(defaultv)
|
||||
SliderObject.ivalue = defaultv
|
||||
SliderObject.slider:SetMinMaxValues(minValue, maxValue)
|
||||
SliderObject.slider:SetValue(defaultValue)
|
||||
SliderObject.ivalue = defaultValue
|
||||
|
||||
SliderObject.slider:SetBackdrop({edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", edgeSize = 8})
|
||||
SliderObject.slider:SetBackdropColor(0.9, 0.7, 0.7, 1.0)
|
||||
|
||||
SliderObject.thumb = SliderObject.slider:CreateTexture(nil, "artwork")
|
||||
SliderObject.thumb:SetTexture("Interface\\Buttons\\UI-ScrollBar-Knob")
|
||||
SliderObject.thumb:SetSize(30+(h*0.2), h*1.2)
|
||||
SliderObject.thumb:SetSize(30 + (height * 0.2), height * 1.2)
|
||||
SliderObject.thumb.originalWidth = SliderObject.thumb:GetWidth()
|
||||
SliderObject.thumb.originalHeight =SliderObject.thumb:GetHeight()
|
||||
SliderObject.thumb.originalHeight = SliderObject.thumb:GetHeight()
|
||||
SliderObject.thumb:SetAlpha(0.7)
|
||||
SliderObject.slider:SetThumbTexture (SliderObject.thumb)
|
||||
SliderObject.slider.thumb = SliderObject.thumb
|
||||
@@ -1142,9 +1140,9 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
|
||||
|
||||
SliderObject.amt = SliderObject.slider:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
|
||||
local amt = defaultv
|
||||
local amt = defaultValue
|
||||
if (amt < 10 and amt >= 1) then
|
||||
amt = "0"..amt
|
||||
amt = "0" .. amt
|
||||
end
|
||||
|
||||
if (SliderObject.useDecimals) then
|
||||
@@ -1157,7 +1155,7 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
|
||||
SliderObject.amt:SetPoint("center", SliderObject.thumb, "center")
|
||||
SliderObject.slider.amt = SliderObject.amt
|
||||
|
||||
SliderObject.previous_value = {defaultv or 0, 0, 0}
|
||||
SliderObject.previous_value = {defaultValue or 0, 0, 0}
|
||||
|
||||
--hooks
|
||||
SliderObject.HookList = {
|
||||
@@ -1200,7 +1198,6 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
|
||||
end
|
||||
|
||||
return SliderObject, with_label
|
||||
|
||||
end
|
||||
|
||||
DF.AdjustmentSliderOptions = {
|
||||
|
||||
@@ -43,10 +43,10 @@ TODO:
|
||||
- add into gear info how many tier set parts the player has
|
||||
- raid lockouts normal-heroic-mythic
|
||||
- soulbind character (covenant choise) - probably not used in 10.0
|
||||
|
||||
|
||||
BUGS:
|
||||
- after a /reload, it is not starting new tickers for spells under cooldown
|
||||
|
||||
|
||||
--]=]
|
||||
|
||||
local versionString, revision, launchDate, gameVersion = GetBuildInfo()
|
||||
@@ -63,9 +63,11 @@ if (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE and not isExpansion_Dragonflight()) t
|
||||
end
|
||||
|
||||
local major = "LibOpenRaid-1.0"
|
||||
local CONST_LIB_VERSION = 59
|
||||
local CONST_LIB_VERSION = 60
|
||||
LIB_OPEN_RAID_CAN_LOAD = false
|
||||
|
||||
local unpack = table.unpack or _G.unpack
|
||||
|
||||
--declae the library within the LibStub
|
||||
local libStub = _G.LibStub
|
||||
local openRaidLib = libStub:NewLibrary(major, CONST_LIB_VERSION)
|
||||
@@ -322,15 +324,15 @@ LIB_OPEN_RAID_CAN_LOAD = false
|
||||
openRaidLib.Schedules = {
|
||||
registeredUniqueTimers = {}
|
||||
}
|
||||
|
||||
|
||||
--run a scheduled function with its payload
|
||||
local triggerScheduledTick = function(tickerObject)
|
||||
local payload = tickerObject.payload
|
||||
local callback = tickerObject.callback
|
||||
|
||||
local result, errortext = pcall(callback, _G.unpack(payload))
|
||||
|
||||
local result, errortext = xpcall(callback, geterrorhandler(), unpack(payload))
|
||||
if (not result) then
|
||||
sendChatMessage("openRaidLib: error on scheduler:", tickerObject.scheduleName, tickerObject.stack, errortext)
|
||||
sendChatMessage("openRaidLib: error on scheduler:", tickerObject.scheduleName, tickerObject.stack)
|
||||
end
|
||||
|
||||
if (tickerObject.isUnique) then
|
||||
@@ -455,15 +457,14 @@ LIB_OPEN_RAID_CAN_LOAD = false
|
||||
local func = addonObject[functionName]
|
||||
|
||||
if (func) then
|
||||
--using pcall at the moment, should get a better caller in the future
|
||||
local okay, errorMessage = pcall(func, ...)
|
||||
local okay, errorMessage = xpcall(func, geterrorhandler(), ...)
|
||||
if (not okay) then
|
||||
sendChatMessage("error:", errorMessage)
|
||||
sendChatMessage("error on callback for event:", event)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function openRaidLib.RegisterCallback(addonObject, event, callbackMemberName)
|
||||
--check of integrity
|
||||
local integrity = checkRegisterDataIntegrity(addonObject, event, callbackMemberName)
|
||||
@@ -1211,7 +1212,7 @@ openRaidLib.internalCallback.RegisterCallback("onLeaveCombat", openRaidLib.UnitI
|
||||
weaponEnchant = 0,
|
||||
noGems = {},
|
||||
noEnchants = {},
|
||||
}
|
||||
}
|
||||
|
||||
function openRaidLib.GetAllUnitsGear()
|
||||
return openRaidLib.GearManager.GetAllUnitsGear()
|
||||
@@ -1376,7 +1377,7 @@ openRaidLib.internalCallback.RegisterCallback("onLeaveCombat", openRaidLib.UnitI
|
||||
--[2] int durability
|
||||
--[3] int weapon enchant
|
||||
--[4] table with integers of equipSlot without enchant
|
||||
--[5] table with integers of equipSlot which has a gem slot but the slot is empty
|
||||
--[5] table with integers of equipSlot which has a gem slot but the slot is empty
|
||||
|
||||
local dataToSend = CONST_COMM_GEARINFO_FULL_PREFIX .. ","
|
||||
local playerGearInfo = openRaidLib.GearManager.GetPlayerFullGearInfo()
|
||||
|
||||
@@ -323,21 +323,23 @@ elseif (isExpansion_Shadowlands()) then
|
||||
|
||||
elseif (isExpansion_Dragonflight()) then
|
||||
LIB_OPEN_RAID_BLOODLUST = {
|
||||
[2825] = true, --bloodlust
|
||||
[32182] = true, --heroism
|
||||
[80353] = true, --timewarp
|
||||
[90355] = true, --ancient hysteria
|
||||
[309658] = true, --current exp drums
|
||||
[2825] = true, --bloodlust (shaman)
|
||||
[32182] = true, --heroism (shaman)
|
||||
[80353] = true, --timewarp (mage)
|
||||
[90355] = true, --ancient hysteria (hunter)
|
||||
[309658] = true, --current exp drums (letherwork)
|
||||
--need to get the 30% haste buff from evokers
|
||||
}
|
||||
|
||||
LIB_OPEN_RAID_MYTHICKEYSTONE_ITEMID = 180653
|
||||
LIB_OPEN_RAID_AUGMENTATED_RUNE = 347901
|
||||
LIB_OPEN_RAID_AUGMENTATED_RUNE = 0 --need to update to dragonflight
|
||||
|
||||
LIB_OPEN_RAID_COVENANT_ICONS = {
|
||||
[[Interface\ICONS\UI_Sigil_Kyrian]], --kyrian
|
||||
[[Interface\ICONS\UI_Sigil_Venthyr]], --venthyr
|
||||
[[Interface\ICONS\UI_Sigil_NightFae]], --nightfae
|
||||
[[Interface\ICONS\UI_Sigil_Necrolord]], --necrolords
|
||||
--need to get the icon for the new 4 covanants in dragonflight
|
||||
--"Interface\\ICONS\\UI_Sigil_Kyrian", --kyrian
|
||||
--"Interface\\ICONS\\UI_Sigil_Venthyr", --venthyr
|
||||
--"Interface\\ICONS\\UI_Sigil_NightFae", --nightfae
|
||||
--"Interface\\ICONS\\UI_Sigil_Necrolord", --necrolords
|
||||
}
|
||||
|
||||
--which gear slots can be enchanted on the latest retail version of the game
|
||||
@@ -360,78 +362,68 @@ elseif (isExpansion_Dragonflight()) then
|
||||
-- local enchandId = select(3, strsplit(":", itemLink))
|
||||
-- print("enchantId:", enchandId)
|
||||
LIB_OPEN_RAID_ENCHANT_IDS = {
|
||||
--need to get this data to dragonflight
|
||||
--FEET
|
||||
--[6207] = INVSLOT_FEET, --[Enchant Boots - Speed of Soul]
|
||||
[6211] = INVSLOT_FEET, --[Enchant Boots - Eternal Agility] + 15 agi
|
||||
[6212] = INVSLOT_FEET, --[Enchant Boots - Agile Soulwalker] + 10 agi
|
||||
--[6211] = INVSLOT_FEET, --[Enchant Boots - Eternal Agility] + 15 agi
|
||||
--[6212] = INVSLOT_FEET, --[Enchant Boots - Agile Soulwalker] + 10 agi
|
||||
|
||||
--WRIST
|
||||
--[6222] = INVSLOT_WRIST, [Enchant Bracers - Shaded Hearthing]
|
||||
[6219] = INVSLOT_WRIST, --[Enchant Bracers - Illuminated Soul] + 10 int
|
||||
[6220] = INVSLOT_WRIST, --[Enchant Bracers - Eternal Intellect] + 15 int
|
||||
--[6219] = INVSLOT_WRIST, --[Enchant Bracers - Illuminated Soul] + 10 int
|
||||
--[6220] = INVSLOT_WRIST, --[Enchant Bracers - Eternal Intellect] + 15 int
|
||||
|
||||
--HAND
|
||||
--[6205] = INVSLOT_HAND, --[Enchant Gloves - Shadowlands Gathering]
|
||||
[6209] = INVSLOT_HAND, --[Enchant Gloves - Strength of Soul] +10 str
|
||||
[6210] = INVSLOT_HAND, --[Enchant Gloves - Eternal Strength] +15 str
|
||||
--[6209] = INVSLOT_HAND, --[Enchant Gloves - Strength of Soul] +10 str
|
||||
--[6210] = INVSLOT_HAND, --[Enchant Gloves - Eternal Strength] +15 str
|
||||
|
||||
--FINGER
|
||||
[6164] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Critical Strike] +16
|
||||
[6166] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Haste] +16
|
||||
[6168] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Mastery] +16
|
||||
[6170] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Versatility] +16
|
||||
--[6164] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Critical Strike] +16
|
||||
--[6166] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Haste] +16
|
||||
--[6168] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Mastery] +16
|
||||
--[6170] = INVSLOT_FINGER1, --[Enchant Ring - Tenet of Versatility] +16
|
||||
|
||||
--BACK
|
||||
[6202] = INVSLOT_BACK, --[Enchant Cloak - Fortified Speed] +20 stam +30 speed
|
||||
[6203] = INVSLOT_BACK, --[Enchant Cloak - Fortified Avoidance] +20 stam +30 avoidance
|
||||
[6204] = INVSLOT_BACK, --[Enchant Cloak - Fortified Leech]
|
||||
[6208] = INVSLOT_BACK, --[Enchant Cloak - Soul Vitality]
|
||||
--[6202] = INVSLOT_BACK, --[Enchant Cloak - Fortified Speed] +20 stam +30 speed
|
||||
--[6203] = INVSLOT_BACK, --[Enchant Cloak - Fortified Avoidance] +20 stam +30 avoidance
|
||||
--[6204] = INVSLOT_BACK, --[Enchant Cloak - Fortified Leech]
|
||||
--[6208] = INVSLOT_BACK, --[Enchant Cloak - Soul Vitality]
|
||||
|
||||
--CHEST
|
||||
[6213] = INVSLOT_CHEST, --[Enchant Chest - Eternal Bulwark] +25 armor +20 agi or str
|
||||
[6214] = INVSLOT_CHEST, --[Enchant Chest - Eternal Skirmish] +20 agi or str +more white damage
|
||||
[6217] = INVSLOT_CHEST, --[Enchant Chest - Eternal Bounds] +20 int + 6% mana
|
||||
[6216] = INVSLOT_CHEST, --[Enchant Chest - Sacred Stats] +20 all stats
|
||||
[6230] = INVSLOT_CHEST, --[Enchant Chest - Eternal Stats] +30 all stats
|
||||
--[6213] = INVSLOT_CHEST, --[Enchant Chest - Eternal Bulwark] +25 armor +20 agi or str
|
||||
--[6214] = INVSLOT_CHEST, --[Enchant Chest - Eternal Skirmish] +20 agi or str +more white damage
|
||||
--[6217] = INVSLOT_CHEST, --[Enchant Chest - Eternal Bounds] +20 int + 6% mana
|
||||
--[6216] = INVSLOT_CHEST, --[Enchant Chest - Sacred Stats] +20 all stats
|
||||
--[6230] = INVSLOT_CHEST, --[Enchant Chest - Eternal Stats] +30 all stats
|
||||
|
||||
--MAINHAND
|
||||
[6223] = INVSLOT_MAINHAND, --[Enchant Weapon - Lightless Force] + shadow wave damage
|
||||
[6226] = INVSLOT_MAINHAND, --[Enchant Weapon - Eternal Grace] + burst of healing done
|
||||
[6227] = INVSLOT_MAINHAND, --[Enchant Weapon - Ascended Vigor] + healing received increased
|
||||
[6228] = INVSLOT_MAINHAND, --[Enchant Weapon - Sinful Revelation] + 6% bleed damage
|
||||
[6229] = INVSLOT_MAINHAND, --[Enchant Weapon - Celestial Guidance] + 5% agility
|
||||
[6243] = INVSLOT_MAINHAND, --[Runeforging: Rune of Hysteria]
|
||||
[3370] = INVSLOT_MAINHAND, --[Runeforging: Rune of Razorice]
|
||||
[6241] = INVSLOT_MAINHAND, --[Runeforging: Rune of Sanguination]
|
||||
[6242] = INVSLOT_MAINHAND, --[Runeforging: Rune of Spellwarding]
|
||||
[6245] = INVSLOT_MAINHAND, --[Runeforging: Rune of the Apocalypse]
|
||||
[3368] = INVSLOT_MAINHAND, --[Runeforging: Rune of the Fallen Crusader]
|
||||
[3847] = INVSLOT_MAINHAND, --[Runeforging: Rune of the Stoneskin Gargoyle]
|
||||
[6244] = INVSLOT_MAINHAND, --[Runeforging: Rune of Unending Thirst]
|
||||
--[6223] = INVSLOT_MAINHAND, --[Enchant Weapon - Lightless Force] + shadow wave damage
|
||||
--[6226] = INVSLOT_MAINHAND, --[Enchant Weapon - Eternal Grace] + burst of healing done
|
||||
--[6227] = INVSLOT_MAINHAND, --[Enchant Weapon - Ascended Vigor] + healing received increased
|
||||
--[6228] = INVSLOT_MAINHAND, --[Enchant Weapon - Sinful Revelation] + 6% bleed damage
|
||||
--[6229] = INVSLOT_MAINHAND, --[Enchant Weapon - Celestial Guidance] + 5% agility
|
||||
--[6243] = INVSLOT_MAINHAND, --[Runeforging: Rune of Hysteria]
|
||||
--[3370] = INVSLOT_MAINHAND, --[Runeforging: Rune of Razorice]
|
||||
--[6241] = INVSLOT_MAINHAND, --[Runeforging: Rune of Sanguination]
|
||||
--[6242] = INVSLOT_MAINHAND, --[Runeforging: Rune of Spellwarding]
|
||||
--[6245] = INVSLOT_MAINHAND, --[Runeforging: Rune of the Apocalypse]
|
||||
--[3368] = INVSLOT_MAINHAND, --[Runeforging: Rune of the Fallen Crusader]
|
||||
--[3847] = INVSLOT_MAINHAND, --[Runeforging: Rune of the Stoneskin Gargoyle]
|
||||
--[6244] = INVSLOT_MAINHAND, --[Runeforging: Rune of Unending Thirst]
|
||||
}
|
||||
|
||||
-- how to get the gemId:
|
||||
-- local itemLink = GetInventoryItemLink("player", slotId)
|
||||
-- local gemId = select(4, strsplit(":", itemLink))
|
||||
-- print("gemId:", gemId)
|
||||
--how to get the gemId:
|
||||
--local itemLink = GetInventoryItemLink("player", slotId)
|
||||
--local gemId = select(4, strsplit(":", itemLink))
|
||||
--print("gemId:", gemId)
|
||||
LIB_OPEN_RAID_GEM_IDS = {
|
||||
[173126] = true, --Straddling Jewel Doublet (green, +12 speed)
|
||||
[173125] = true, --Revitalizing Jewel Doublet (green, +100 health)
|
||||
[173130] = true, --Masterful Jewel Cluster (blue, master)
|
||||
[173129] = true, --Versatile Jewel Cluster (blue, versatility)
|
||||
[173127] = true, --Deadly Jewel Cluster (blue, crit)
|
||||
[173128] = true, --Quick Jewel Cluster (blue, haste)
|
||||
[168636] = true, --Leviathan's Eye of Strength (purple, strength)
|
||||
[168638] = true, --Leviathan's Eye of Intellect (purple, intellect)
|
||||
[169220] = true, --Straddling Sage Agate (blue, movement speed)
|
||||
--need update to dragonflight
|
||||
}
|
||||
|
||||
--/dump GetWeaponEnchantInfo()
|
||||
LIB_OPEN_RAID_WEAPON_ENCHANT_IDS = {
|
||||
[6188] = true, --shadowcore oil
|
||||
[6190] = true, --embalmer's oil
|
||||
[6201] = true, --weighted
|
||||
[6200] = true, --sharpened
|
||||
--need update to dragonflight
|
||||
[5400] = true, --flametongue
|
||||
[5401] = true, --windfury
|
||||
}
|
||||
|
||||
@@ -954,7 +954,7 @@ do
|
||||
if ( index <= numMacroIcons and texture ) then
|
||||
macroPopupButton:SetNormalTexture(texture)
|
||||
macroPopupButton:SetPushedTexture(texture)
|
||||
macroPopupButton:SetDisabledTexture (texture)
|
||||
macroPopupButton:SetDisabledTexture(texture)
|
||||
macroPopupButton:SetHighlightTexture(texture, "ADD")
|
||||
macroPopupButton.IconID = index
|
||||
macroPopupButton:Show()
|
||||
@@ -978,7 +978,7 @@ do
|
||||
if ( index <= numMacroIcons and texture ) then
|
||||
macroPopupButton:SetNormalTexture(texture)
|
||||
macroPopupButton:SetPushedTexture(texture)
|
||||
macroPopupButton:SetDisabledTexture (texture)
|
||||
macroPopupButton:SetDisabledTexture(texture)
|
||||
macroPopupButton:SetHighlightTexture(texture, "ADD")
|
||||
macroPopupButton.IconID = index
|
||||
macroPopupButton:Show()
|
||||
|
||||
Reference in New Issue
Block a user