mirror of
https://github.com/Bluewhale1337/ElvUIModernized.git
synced 2026-07-27 08:24:44 +00:00
update
This commit is contained in:
@@ -7,7 +7,6 @@ local LW = LibStub:GetLibrary("LibWho-2.0");
|
|||||||
local split, upper = string.split, string.upper
|
local split, upper = string.split, string.upper
|
||||||
local wipe = table.wipe
|
local wipe = table.wipe
|
||||||
local pairs = pairs
|
local pairs = pairs
|
||||||
local select = select
|
|
||||||
--WoW API / Variables
|
--WoW API / Variables
|
||||||
local GetBattlefieldScore = GetBattlefieldScore
|
local GetBattlefieldScore = GetBattlefieldScore
|
||||||
local GetFriendInfo = GetFriendInfo
|
local GetFriendInfo = GetFriendInfo
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
|
|||||||
|
|
||||||
--Cache global variables
|
--Cache global variables
|
||||||
--Lua functions
|
--Lua functions
|
||||||
local select, unpack, assert, tonumber, type, pairs = select, unpack, assert, tonumber, type, pairs
|
local unpack, assert, tonumber, type, pairs = unpack, assert, tonumber, type, pairs
|
||||||
local getn, tinsert, tremove = table.getn, tinsert, tremove
|
local getn, tinsert, tremove = table.getn, tinsert, tremove
|
||||||
local abs, ceil, floor, modf, mod = math.abs, math.ceil, math.floor, math.modf, math.mod
|
local abs, ceil, floor, modf, mod = math.abs, math.ceil, math.floor, math.modf, math.mod
|
||||||
local find, format, byte, len, sub, gsub, upper, split, utf8sub = string.find, string.format, string.byte, string.len, string.sub, string.gsub, string.upper, string.split, string.utf8sub
|
local find, format, byte, len, sub, gsub, upper, split, utf8sub = string.find, string.format, string.byte, string.len, string.sub, string.gsub, string.upper, string.split, string.utf8sub
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ local Private = ns.oUF.Private
|
|||||||
function Private.argcheck(value, num, ...)
|
function Private.argcheck(value, num, ...)
|
||||||
assert(type(num) == 'number', "Bad argument #2 to 'argcheck' (number expected, got " .. type(num) .. ')')
|
assert(type(num) == 'number', "Bad argument #2 to 'argcheck' (number expected, got " .. type(num) .. ')')
|
||||||
|
|
||||||
for i = 1, select('#', arg) do
|
for i = 1, arg.n do
|
||||||
if(type(value) == select(i, unpack(arg))) then return end
|
if(type(value) == select(i, unpack(arg))) then return end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -359,10 +359,12 @@ function B:ScanBags()
|
|||||||
local bagSlot = B:Encode_BagSlot(bag, slot)
|
local bagSlot = B:Encode_BagSlot(bag, slot)
|
||||||
local itemID = ConvertLinkToID(B:GetItemLink(bag, slot))
|
local itemID = ConvertLinkToID(B:GetItemLink(bag, slot))
|
||||||
if itemID then
|
if itemID then
|
||||||
bagMaxStacks[bagSlot] = select(7, GetItemInfo(itemID))
|
local _, _, rarity, _, _, _, stackCount = GetItemInfo(itemID)
|
||||||
|
local _, itemCount = B:GetItemInfo(bag, slot)
|
||||||
|
bagMaxStacks[bagSlot] = stackCount
|
||||||
bagIDs[bagSlot] = itemID
|
bagIDs[bagSlot] = itemID
|
||||||
bagQualities[bagSlot] = select(3, GetItemInfo(itemID))
|
bagQualities[bagSlot] = rarity
|
||||||
bagStacks[bagSlot] = select(2, B:GetItemInfo(bag, slot))
|
bagStacks[bagSlot] = itemCount
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -666,7 +668,7 @@ function B:DoMove(move)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local stackSize = select(7, GetItemInfo(sourceItemID))
|
local _, _, _, _, _, _, stackSize = GetItemInfo(itemID)
|
||||||
if (sourceItemID == targetItemID) and (targetCount ~= stackSize) and ((targetCount + sourceCount) > stackSize) then
|
if (sourceItemID == targetItemID) and (targetCount ~= stackSize) and ((targetCount + sourceCount) > stackSize) then
|
||||||
B:SplitItem(sourceBag, sourceSlot, stackSize - targetCount)
|
B:SplitItem(sourceBag, sourceSlot, stackSize - targetCount)
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -303,7 +303,15 @@ end
|
|||||||
function M:CHAT_MSG_LOOT()
|
function M:CHAT_MSG_LOOT()
|
||||||
local playername, itemname, rolltype = self:ParseRollChoice(arg1)
|
local playername, itemname, rolltype = self:ParseRollChoice(arg1)
|
||||||
if playername and itemname and rolltype then
|
if playername and itemname and rolltype then
|
||||||
local class = select(2, UnitClass(playername))
|
for _, f in ipairs(M.RollBars) do
|
||||||
|
if f.rollID and f.button.link == itemname and not f.rolls[playername] then
|
||||||
|
f.rolls[playername] = { rolltype }
|
||||||
|
f[rolltype]:SetText(tonumber(f[rolltype]:GetText()) + 1)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
--[[
|
||||||
|
local _, class = UnitClass(playername)
|
||||||
for _, f in ipairs(M.RollBars) do
|
for _, f in ipairs(M.RollBars) do
|
||||||
if f.rollID and f.button.link == itemname and not f.rolls[playername] then
|
if f.rollID and f.button.link == itemname and not f.rolls[playername] then
|
||||||
f.rolls[playername] = { rolltype, class }
|
f.rolls[playername] = { rolltype, class }
|
||||||
@@ -311,7 +319,9 @@ function M:CHAT_MSG_LOOT()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
]]
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:LoadLootRoll()
|
function M:LoadLootRoll()
|
||||||
|
|||||||
Reference in New Issue
Block a user