diff --git a/Interface/AddOns/SVUI/SVUI.xml b/Interface/AddOns/SVUI/SVUI.xml index 3e0927f..2021972 100644 --- a/Interface/AddOns/SVUI/SVUI.xml +++ b/Interface/AddOns/SVUI/SVUI.xml @@ -8,9 +8,9 @@ <Layer level="OVERLAY"> <Texture name="$parentTitleBG"> <Anchors> - <Anchor point="TOPLEFT"/> - <Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT"> - <Offset x="0" y="-30"/> + <Anchor point="BOTTOMLEFT" relativeTo="$parentBG" relativePoint="TOPLEFT"/> + <Anchor point="TOPRIGHT" relativeTo="$parentBG" relativePoint="TOPRIGHT"> + <Offset x="0" y="30"/> </Anchor> </Anchors> </Texture> diff --git a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua index 8da8b8f..a3413d1 100644 --- a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua +++ b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua @@ -837,13 +837,13 @@ do if db.enable then bar:SetScale(1) bar:SetAlpha(db.alpha) + RegisterStateDriver(bar, "visibility", barVisibility) else bar:SetScale(0.000001) bar:SetAlpha(0) + UnregisterStateDriver(bar, "visibility") end - if isPet then - RegisterStateDriver(bar, "show", barVisibility) - end + --RegisterStateDriver(bar, "show", barVisibility) else local page = _getPage(id, data.page, data.conditions) if data.conditions:find("[form, noform]") then diff --git a/Interface/AddOns/SVUI/packages/actionbar/common/microbar.lua b/Interface/AddOns/SVUI/packages/actionbar/common/microbar.lua index 645381b..3193f8f 100644 --- a/Interface/AddOns/SVUI/packages/actionbar/common/microbar.lua +++ b/Interface/AddOns/SVUI/packages/actionbar/common/microbar.lua @@ -44,8 +44,8 @@ local function RefreshMicrobar() local buttonSize = MOD.db.Micro.buttonsize or 30; local spacing = MOD.db.Micro.buttonspacing or 1; local barWidth = (buttonSize + spacing) * 13; - SVUI_MicroBar:Size(barWidth, buttonSize + 6) - SVUI_MicroBar:Point('TOP', SuperVillain.UIParent, 'TOP', 0, 4) + SVUI_MicroBar_MOVE:Size(barWidth, buttonSize + 6) + SVUI_MicroBar:SetAllPoints(SVUI_MicroBar_MOVE) for i=1,13 do local data = ICON_DATA[i] local button = _G[data[1]] @@ -143,19 +143,20 @@ local CreateMicroBar = function(self) local button = _G[data[1]] button:SetParent(SVUI_MicroBar) button:Size(buttonSize, buttonSize + 28) - button.Flash:SetTexture(nil) - if button:GetPushedTexture()then - button:SetPushedTexture(nil) + button.Flash:SetTexture("") + if button.SetPushedTexture then + button:SetPushedTexture("") end; - if button:GetNormalTexture()then - button:SetNormalTexture(nil) + if button.SetNormalTexture then + button:SetNormalTexture("") end; - if button:GetDisabledTexture()then - button:SetDisabledTexture(nil) + if button.SetDisabledTexture then + button:SetDisabledTexture("") end; - if button:GetHighlightTexture()then - button:SetHighlightTexture(nil) + if button.SetHighlightTexture then + button:SetHighlightTexture("") end; + button:Formula409() local buttonMask = NewFrame("Frame",nil,button) buttonMask:SetPoint("TOPLEFT",button,"TOPLEFT",0,-28) @@ -186,6 +187,9 @@ local CreateMicroBar = function(self) SVUIMicroButtonsParent(microBar) SVUIMicroButton_SetNormal() + + SuperVillain:SetSVMovable(microBar, "SVUI_MicroBar_MOVE", L["Micro Bar"]) + RefreshMicrobar() microBar.screenMarker = NewFrame('Frame',nil,SuperVillain.UIParent) diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 2469785..79fa812 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -248,7 +248,7 @@ function MOD:RefreshSlot(bag, slotID) end; if bagType then local r, g, b = bagType[1], bagType[2], bagType[3]; - slot:SetBackdropColor(r, g, b, 0.25) + slot:SetBackdropColor(r, g, b, 0.5) slot:SetBackdropBorderColor(r, g, b, 1) elseif itemLink then local class, subclass, maxStack; @@ -1302,6 +1302,11 @@ end; function MOD:PLAYERBANKBAGSLOTS_CHANGED() MOD:Layout(true) end; + +function MOD:PLAYER_ENTERING_WORLD() + self:UpdateGoldText() + self.BagFrame:RefreshBagsSlots() +end; --[[ ########################################################## BUILD FUNCTION / UPDATE @@ -1328,7 +1333,7 @@ function MOD:ConstructThisPackage() SuperVillain:ExecuteTimer(MOD.BreakStuffLoader, 5) self:RegisterEvent("INVENTORY_SEARCH_UPDATE") self:RegisterEvent("PLAYER_MONEY", "UpdateGoldText") - self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateGoldText") + self:RegisterEvent("PLAYER_ENTERING_WORLD") self:RegisterEvent("PLAYER_TRADE_MONEY", "UpdateGoldText") self:RegisterEvent("TRADE_MONEY_CHANGED", "UpdateGoldText") self:RegisterEvent("PLAYERBANKBAGSLOTS_CHANGED"); diff --git a/Interface/AddOns/SVUI/packages/bag/common/breakstuff.lua b/Interface/AddOns/SVUI/packages/bag/common/breakstuff.lua index 42d2a69..1ddd237 100644 --- a/Interface/AddOns/SVUI/packages/bag/common/breakstuff.lua +++ b/Interface/AddOns/SVUI/packages/bag/common/breakstuff.lua @@ -4,11 +4,11 @@ _____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # - ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # - _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # - __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # - _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# - ___\///////////___________\///___________\/////////_____\///////////_# + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# ############################################################################## S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## @@ -40,6 +40,7 @@ local TTIP = SuperVillain.Registry:Expose('SVTip'); LOCAL VARS ########################################################## ]]-- +local BreakStuff_Cache = {} local DE, PICK, SMITH, BreakStuffParser; local ICONARTFILE = [[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-BREAKSTUFF]]; local BreakStuffHandler = CreateFrame('Button', "BreakStuffHandler", UIParent, 'SecureActionButtonTemplate, AutoCastShineTemplate') @@ -53,225 +54,227 @@ ITEM PARSING ]]-- do local SkellyKeys = { - [GetSpellInfo(130100)] = true, -- Ghostly Skeleton Key - [GetSpellInfo(94574)] = true, -- Obsidium Skeleton Key - [GetSpellInfo(59403)] = true, -- Titanium Skeleton Key - [GetSpellInfo(59404)] = true, -- Colbat Skeleton Key - [GetSpellInfo(20709)] = true, -- Arcanite Skeleton Key - [GetSpellInfo(19651)] = true, -- Truesilver Skeleton Key - [GetSpellInfo(19649)] = true, -- Golden Skeleton Key - [GetSpellInfo(19646)] = true, -- Silver Skeleton Key + [GetSpellInfo(130100)] = true, -- Ghostly Skeleton Key + [GetSpellInfo(94574)] = true, -- Obsidium Skeleton Key + [GetSpellInfo(59403)] = true, -- Titanium Skeleton Key + [GetSpellInfo(59404)] = true, -- Colbat Skeleton Key + [GetSpellInfo(20709)] = true, -- Arcanite Skeleton Key + [GetSpellInfo(19651)] = true, -- Truesilver Skeleton Key + [GetSpellInfo(19649)] = true, -- Golden Skeleton Key + [GetSpellInfo(19646)] = true, -- Silver Skeleton Key } local BreakableFilter = { - ["Pickables"]={['68729']=true,['63349']=true,['45986']=true,['43624']=true,['43622']=true,['43575']=true,['31952']=true,['12033']=true,['29569']=true,['5760']=true,['13918']=true,['5759']=true,['16885']=true,['5758']=true,['13875']=true,['4638']=true,['16884']=true,['4637']=true,['4636']=true,['6355']=true,['16883']=true,['4634']=true,['4633']=true,['6354']=true,['16882']=true,['4632']=true,['88165']=true,['88567']=true},["SafeItems"]={['89392']=true,['89393']=true,['89394']=true,['89395']=true,['89396']=true,['89397']=true,['89398']=true,['89399']=true,['89400']=true,['83260']=true,['83261']=true,['83262']=true,['83263']=true,['83264']=true,['83265']=true,['83266']=true,['83267']=true,['83268']=true,['83269']=true,['83270']=true,['83271']=true,['83274']=true,['83275']=true,['82706']=true,['82707']=true,['82708']=true,['82709']=true,['82710']=true,['82711']=true,['82712']=true,['82713']=true,['82714']=true,['82715']=true,['82716']=true,['82717']=true,['82720']=true,['82721']=true,['81671']=true,['81672']=true,['81673']=true,['81674']=true,['81675']=true,['81676']=true,['81677']=true,['81678']=true,['81679']=true,['81680']=true,['81681']=true,['81682']=true,['81685']=true,['81686']=true,['64377']=true,['64489']=true,['64880']=true,['64885']=true,['62454']=true,['62455']=true,['62456']=true,['62457']=true,['62458']=true,['62459']=true,['62460']=true,['68740']=true,['49888']=true,['49497']=true,['49301']=true,['72980']=true,['72981']=true,['72989']=true,['72990']=true,['72991']=true,['72992']=true,['72993']=true,['72994']=true,['72995']=true,['72996']=true,['72997']=true,['72998']=true,['72999']=true,['73000']=true,['73001']=true,['73002']=true,['73003']=true,['73006']=true,['73007']=true,['73008']=true,['73009']=true,['73010']=true,['73011']=true,['73012']=true,['73325']=true,['73326']=true,['73336']=true,['88622']=true,['88648']=true,['88649']=true,['64460']=true,['44050']=true,['44173']=true,['44174']=true,['44192']=true,['44193']=true,['44199']=true,['44244']=true,['44245']=true,['44249']=true,['44250']=true,['44051']=true,['44052']=true,['44053']=true,['44108']=true,['44166']=true,['44187']=true,['44214']=true,['44241']=true,['38454']=true,['38455']=true,['38456']=true,['38457']=true,['38460']=true,['38461']=true,['38464']=true,['38465']=true,['29115']=true,['29130']=true,['29133']=true,['29137']=true,['29138']=true,['29166']=true,['29167']=true,['29185']=true,['34665']=true,['34666']=true,['34667']=true,['34670']=true,['34671']=true,['34672']=true,['34673']=true,['34674']=true,['29121']=true,['29124']=true,['29125']=true,['29151']=true,['29152']=true,['29153']=true,['29155']=true,['29156']=true,['29165']=true,['29171']=true,['29175']=true,['29182']=true,['30830']=true,['30832']=true,['29456']=true,['29457']=true,['25835']=true,['25836']=true,['25823']=true,['25825']=true,['77559']=true,['77570']=true,['77583']=true,['77586']=true,['77587']=true,['77588']=true,['21392']=true,['21395']=true,['21398']=true,['21401']=true,['21404']=true,['21407']=true,['21410']=true,['21413']=true,['21416']=true,['38632']=true,['38633']=true,['38707']=true,['34661']=true,['11290']=true,['11289']=true,['45858']=true,['84661']=true,['11288']=true,['28164']=true,['11287']=true,['44180']=true,['44202']=true,['44302']=true,['44200']=true,['44256']=true,['44104']=true,['44116']=true,['44196']=true,['44061']=true,['44062']=true,['29117']=true,['29129']=true,['29174']=true,['30836']=true,['35328']=true,['35329']=true,['35330']=true,['35331']=true,['35332']=true,['35333']=true,['35334']=true,['35335']=true,['35336']=true,['35337']=true,['35338']=true,['35339']=true,['35340']=true,['35341']=true,['35342']=true,['35343']=true,['35344']=true,['35345']=true,['35346']=true,['35347']=true,['35464']=true,['35465']=true,['35466']=true,['35467']=true,['30847']=true,['29122']=true,['29183']=true,['90079']=true,['90080']=true,['90081']=true,['90082']=true,['90083']=true,['90084']=true,['90085']=true,['90086']=true,['90110']=true,['90111']=true,['90112']=true,['90113']=true,['90114']=true,['90115']=true,['90116']=true,['90117']=true,['90136']=true,['90137']=true,['90138']=true,['90139']=true,['90140']=true,['90141']=true,['90142']=true,['90143']=true,['64643']=true,['77678']=true,['77679']=true,['77682']=true,['77692']=true,['77694']=true,['77695']=true,['77709']=true,['77710']=true,['77712']=true,['77886']=true,['77889']=true,['77890']=true,['77899']=true,['77900']=true,['77901']=true,['77917']=true,['77919']=true,['77920']=true,['77680']=true,['77681']=true,['77683']=true,['77690']=true,['77691']=true,['77693']=true,['77708']=true,['77711']=true,['77713']=true,['77887']=true,['77888']=true,['77891']=true,['77898']=true,['77902']=true,['77903']=true,['77916']=true,['77918']=true,['77921']=true,['77778']=true,['77779']=true,['77784']=true,['77795']=true,['77796']=true,['77800']=true,['77801']=true,['77844']=true,['77845']=true,['77846']=true,['77850']=true,['77777']=true,['77781']=true,['77782']=true,['77785']=true,['77797']=true,['77798']=true,['77799']=true,['77802']=true,['77847']=true,['77848']=true,['77851']=true,['77852']=true,['77724']=true,['77725']=true,['77728']=true,['77729']=true,['77732']=true,['77733']=true,['77773']=true,['77783']=true,['77803']=true,['77804']=true,['77843']=true,['77849']=true,['77614']=true,['77615']=true,['77616']=true,['77617']=true,['77618']=true,['77619']=true,['77620']=true,['77627']=true,['77628']=true,['77629']=true,['77630']=true,['77631']=true,['77632']=true,['77647']=true,['77648']=true,['77649']=true,['77650']=true,['77651']=true,['77652']=true,['77770']=true,['77771']=true,['77772']=true,['77774']=true,['77775']=true,['77776']=true,['77786']=true,['77789']=true,['77790']=true,['77791']=true,['77792']=true,['77793']=true,['77794']=true,['77837']=true,['77838']=true,['77839']=true,['77840']=true,['77841']=true,['77842']=true,['20406']=true,['20407']=true,['20408']=true,['77787']=true,['77788']=true,['28155']=true,['22986']=true,['22991']=true,['33292']=true,['86566']=true,['95517']=true,['95518']=true,['95523']=true,['95526']=true,['95527']=true,['95532']=true,['83158']=true,['83162']=true,['83167']=true,['83171']=true,['83176']=true,['83180']=true,['83185']=true,['83189']=true,['83194']=true,['83198']=true,['83203']=true,['83207']=true,['83212']=true,['83216']=true,['83221']=true,['83225']=true,['82614']=true,['82618']=true,['82623']=true,['82627']=true,['82632']=true,['82636']=true,['82641']=true,['82645']=true,['82650']=true,['82654']=true,['82659']=true,['82663']=true,['82668']=true,['82672']=true,['82677']=true,['82681']=true,['81579']=true,['81583']=true,['81588']=true,['81592']=true,['81597']=true,['81601']=true,['81606']=true,['81610']=true,['81615']=true,['81619']=true,['81624']=true,['81628']=true,['81633']=true,['81637']=true,['81642']=true,['81646']=true,['70118']=true,['62364']=true,['62386']=true,['62450']=true,['62441']=true,['62356']=true,['62406']=true,['62424']=true,['72621']=true,['72622']=true,['72623']=true,['72624']=true,['72625']=true,['72626']=true,['72627']=true,['72628']=true,['72638']=true,['72639']=true,['72640']=true,['72641']=true,['72642']=true,['72643']=true,['72644']=true,['72645']=true,['72646']=true,['72647']=true,['72648']=true,['72649']=true,['72650']=true,['72651']=true,['72652']=true,['72653']=true,['72655']=true,['72656']=true,['72657']=true,['72658']=true,['72659']=true,['72660']=true,['72661']=true,['72662']=true,['44180']=true,['44202']=true,['44302']=true,['44200']=true,['44256']=true,['44181']=true,['44203']=true,['44297']=true,['44303']=true,['44179']=true,['44194']=true,['44258']=true,['44106']=true,['44170']=true,['44190']=true,['44117']=true,['44054']=true,['44055']=true,['29116']=true,['29131']=true,['29141']=true,['29142']=true,['29147']=true,['29148']=true,['35356']=true,['35357']=true,['35358']=true,['35359']=true,['35360']=true,['35361']=true,['35362']=true,['35363']=true,['35364']=true,['35365']=true,['35366']=true,['35367']=true,['35368']=true,['35369']=true,['35370']=true,['35371']=true,['35372']=true,['35373']=true,['35374']=true,['35375']=true,['35468']=true,['35469']=true,['35470']=true,['35471']=true,['25838']=true,['90059']=true,['90060']=true,['90061']=true,['90062']=true,['90063']=true,['90064']=true,['90065']=true,['90066']=true,['90088']=true,['90089']=true,['90090']=true,['90091']=true,['90092']=true,['90093']=true,['90094']=true,['90095']=true,['90119']=true,['90120']=true,['90121']=true,['90122']=true,['90123']=true,['90124']=true,['90125']=true,['90126']=true,['77667']=true,['77670']=true,['77671']=true,['77697']=true,['77700']=true,['77701']=true,['77874']=true,['77876']=true,['77878']=true,['77907']=true,['77908']=true,['77909']=true,['77666']=true,['77668']=true,['77669']=true,['77696']=true,['77698']=true,['77699']=true,['77875']=true,['77877']=true,['77879']=true,['77904']=true,['77905']=true,['77906']=true,['77742']=true,['77746']=true,['77748']=true,['77752']=true,['77813']=true,['77815']=true,['77819']=true,['77820']=true,['77744']=true,['77745']=true,['77749']=true,['77811']=true,['77812']=true,['77818']=true,['77821']=true,['77720']=true,['77721']=true,['77730']=true,['77731']=true,['77747']=true,['77750']=true,['77816']=true,['77817']=true,['77598']=true,['77599']=true,['77600']=true,['77601']=true,['77602']=true,['77603']=true,['77604']=true,['77633']=true,['77634']=true,['77635']=true,['77636']=true,['77637']=true,['77638']=true,['77639']=true,['77736']=true,['77737']=true,['77738']=true,['77739']=true,['77740']=true,['77741']=true,['77743']=true,['77805']=true,['77806']=true,['77807']=true,['77808']=true,['77809']=true,['77810']=true,['77814']=true,['77605']=true,['77640']=true,['77753']=true,['77822']=true,['28158']=true,['22987']=true,['22992']=true,['95519']=true,['95521']=true,['95528']=true,['95530']=true,['83159']=true,['83163']=true,['83168']=true,['83172']=true,['83177']=true,['83181']=true,['83186']=true,['83190']=true,['83195']=true,['83199']=true,['83204']=true,['83208']=true,['83213']=true,['83217']=true,['83222']=true,['83226']=true,['82615']=true,['82619']=true,['82624']=true,['82628']=true,['82633']=true,['82637']=true,['82642']=true,['82646']=true,['82651']=true,['82655']=true,['82660']=true,['82664']=true,['82669']=true,['82673']=true,['82678']=true,['82682']=true,['81580']=true,['81584']=true,['81589']=true,['81593']=true,['81598']=true,['81602']=true,['81607']=true,['81611']=true,['81616']=true,['81620']=true,['81625']=true,['81629']=true,['81634']=true,['81638']=true,['81643']=true,['81647']=true,['70114']=true,['70122']=true,['62417']=true,['62420']=true,['62431']=true,['62433']=true,['62358']=true,['62381']=true,['62446']=true,['62374']=true,['62404']=true,['62405']=true,['62425']=true,['62426']=true,['72664']=true,['72665']=true,['72666']=true,['72667']=true,['72668']=true,['72669']=true,['72670']=true,['72671']=true,['72672']=true,['72673']=true,['72674']=true,['72675']=true,['72676']=true,['72677']=true,['72678']=true,['72679']=true,['72681']=true,['72682']=true,['72683']=true,['72684']=true,['72685']=true,['72686']=true,['72687']=true,['72688']=true,['72689']=true,['72690']=true,['72691']=true,['72692']=true,['72693']=true,['72694']=true,['72695']=true,['72696']=true,['88614']=true,['88615']=true,['88616']=true,['88617']=true,['88618']=true,['88619']=true,['88620']=true,['88621']=true,['88623']=true,['88624']=true,['88625']=true,['88626']=true,['88627']=true,['88628']=true,['88629']=true,['88630']=true,['44181']=true,['44203']=true,['44297']=true,['44303']=true,['44179']=true,['44194']=true,['44258']=true,['44182']=true,['44204']=true,['44295']=true,['44305']=true,['44248']=true,['44257']=true,['44109']=true,['44110']=true,['44122']=true,['44171']=true,['44189']=true,['44059']=true,['44060']=true,['29135']=true,['29136']=true,['29180']=true,['30835']=true,['35376']=true,['35377']=true,['35378']=true,['35379']=true,['35380']=true,['35381']=true,['35382']=true,['35383']=true,['35384']=true,['35385']=true,['35386']=true,['35387']=true,['35388']=true,['35389']=true,['35390']=true,['35391']=true,['35392']=true,['35393']=true,['35394']=true,['35395']=true,['35472']=true,['35473']=true,['35474']=true,['35475']=true,['64644']=true,['90068']=true,['90069']=true,['90070']=true,['90071']=true,['90072']=true,['90073']=true,['90074']=true,['90075']=true,['90127']=true,['90128']=true,['90129']=true,['90130']=true,['90131']=true,['90132']=true,['90133']=true,['90134']=true,['77673']=true,['77674']=true,['77676']=true,['77704']=true,['77705']=true,['77707']=true,['77880']=true,['77882']=true,['77883']=true,['77910']=true,['77913']=true,['77914']=true,['77672']=true,['77675']=true,['77677']=true,['77702']=true,['77703']=true,['77706']=true,['77881']=true,['77884']=true,['77885']=true,['77911']=true,['77912']=true,['77915']=true,['77642']=true,['77645']=true,['77762']=true,['77763']=true,['77765']=true,['77766']=true,['77831']=true,['77832']=true,['77641']=true,['77643']=true,['77760']=true,['77761']=true,['77768']=true,['77769']=true,['77829']=true,['77834']=true,['77644']=true,['77646']=true,['77722']=true,['77723']=true,['77764']=true,['77767']=true,['77830']=true,['77833']=true,['77606']=true,['77607']=true,['77608']=true,['77609']=true,['77610']=true,['77611']=true,['77612']=true,['77754']=true,['77755']=true,['77756']=true,['77757']=true,['77758']=true,['77759']=true,['77823']=true,['77824']=true,['77825']=true,['77826']=true,['77827']=true,['77828']=true,['77835']=true,['28162']=true,['22985']=true,['22993']=true,['95522']=true,['95525']=true,['95531']=true,['95534']=true,['83160']=true,['83164']=true,['83169']=true,['83173']=true,['83178']=true,['83182']=true,['83187']=true,['83191']=true,['83196']=true,['83200']=true,['83205']=true,['83209']=true,['83214']=true,['83218']=true,['83223']=true,['83227']=true,['82616']=true,['82620']=true,['82625']=true,['82629']=true,['82634']=true,['82638']=true,['82643']=true,['82647']=true,['82652']=true,['82656']=true,['82661']=true,['82665']=true,['82670']=true,['82674']=true,['82679']=true,['82683']=true,['81581']=true,['81585']=true,['81590']=true,['81594']=true,['81599']=true,['81603']=true,['81608']=true,['81612']=true,['81617']=true,['81621']=true,['81626']=true,['81630']=true,['81635']=true,['81639']=true,['81644']=true,['81648']=true,['70115']=true,['70123']=true,['62363']=true,['62385']=true,['62380']=true,['62409']=true,['62429']=true,['62445']=true,['62353']=true,['62407']=true,['62423']=true,['62439']=true,['72698']=true,['72699']=true,['72700']=true,['72701']=true,['72702']=true,['72703']=true,['72704']=true,['72705']=true,['72889']=true,['72890']=true,['72891']=true,['72892']=true,['72893']=true,['72894']=true,['72895']=true,['72896']=true,['72902']=true,['72903']=true,['72904']=true,['72905']=true,['72906']=true,['72907']=true,['72908']=true,['72909']=true,['72910']=true,['72911']=true,['72912']=true,['72913']=true,['72914']=true,['72915']=true,['72916']=true,['72917']=true,['44182']=true,['44204']=true,['44295']=true,['44305']=true,['44248']=true,['44257']=true,['44183']=true,['44205']=true,['44296']=true,['44306']=true,['44176']=true,['44195']=true,['44198']=true,['44201']=true,['44247']=true,['44111']=true,['44112']=true,['44120']=true,['44121']=true,['44123']=true,['44197']=true,['44239']=true,['44240']=true,['44243']=true,['44057']=true,['44058']=true,['40440']=true,['40441']=true,['40442']=true,['40443']=true,['40444']=true,['29127']=true,['29134']=true,['29184']=true,['35402']=true,['35403']=true,['35404']=true,['35405']=true,['35406']=true,['35407']=true,['35408']=true,['35409']=true,['35410']=true,['35411']=true,['35412']=true,['35413']=true,['35414']=true,['35415']=true,['35416']=true,['35476']=true,['35477']=true,['35478']=true,['90049']=true,['90050']=true,['90051']=true,['90052']=true,['90053']=true,['90054']=true,['90055']=true,['90056']=true,['90096']=true,['90097']=true,['90098']=true,['90099']=true,['90100']=true,['90101']=true,['90102']=true,['90103']=true,['90147']=true,['90148']=true,['90149']=true,['90150']=true,['90151']=true,['90152']=true,['90153']=true,['90154']=true,['77687']=true,['77688']=true,['77689']=true,['77714']=true,['77715']=true,['77718']=true,['77892']=true,['77894']=true,['77897']=true,['77923']=true,['77924']=true,['77927']=true,['77684']=true,['77685']=true,['77686']=true,['77716']=true,['77717']=true,['77719']=true,['77893']=true,['77895']=true,['77896']=true,['77922']=true,['77925']=true,['77926']=true,['77664']=true,['77665']=true,['77859']=true,['77867']=true,['77868']=true,['77869']=true,['77871']=true,['77872']=true,['38661']=true,['38663']=true,['38665']=true,['38666']=true,['38667']=true,['38668']=true,['38669']=true,['38670']=true,['77661']=true,['77662']=true,['77663']=true,['77858']=true,['77864']=true,['77865']=true,['77866']=true,['77873']=true,['77726']=true,['77727']=true,['77734']=true,['77735']=true,['77862']=true,['77863']=true,['77928']=true,['77929']=true,['77621']=true,['77622']=true,['77623']=true,['77624']=true,['77625']=true,['77626']=true,['77653']=true,['77654']=true,['77655']=true,['77656']=true,['77657']=true,['77658']=true,['77659']=true,['77853']=true,['77854']=true,['77855']=true,['77856']=true,['77857']=true,['77860']=true,['77861']=true,['34648']=true,['34649']=true,['34650']=true,['34651']=true,['34652']=true,['34653']=true,['34655']=true,['34656']=true,['77660']=true,['95520']=true,['95524']=true,['95529']=true,['95533']=true,['83161']=true,['83165']=true,['83166']=true,['83170']=true,['83174']=true,['83175']=true,['83179']=true,['83183']=true,['83184']=true,['83188']=true,['83192']=true,['83193']=true,['83197']=true,['83201']=true,['83202']=true,['83206']=true,['83210']=true,['83211']=true,['83215']=true,['83219']=true,['83220']=true,['83224']=true,['83228']=true,['83229']=true,['82617']=true,['82621']=true,['82622']=true,['82626']=true,['82630']=true,['82631']=true,['82635']=true,['82639']=true,['82640']=true,['82644']=true,['82648']=true,['82649']=true,['82653']=true,['82657']=true,['82658']=true,['82662']=true,['82666']=true,['82667']=true,['82671']=true,['82675']=true,['82676']=true,['82680']=true,['82684']=true,['82685']=true,['81582']=true,['81586']=true,['81587']=true,['81591']=true,['81595']=true,['81596']=true,['81600']=true,['81604']=true,['81605']=true,['81609']=true,['81613']=true,['81614']=true,['81618']=true,['81622']=true,['81623']=true,['81627']=true,['81631']=true,['81632']=true,['81636']=true,['81640']=true,['81641']=true,['81645']=true,['81649']=true,['81650']=true,['70108']=true,['70116']=true,['70117']=true,['70120']=true,['70121']=true,['62365']=true,['62384']=true,['62418']=true,['62432']=true,['62448']=true,['62449']=true,['62359']=true,['62382']=true,['62408']=true,['62410']=true,['62428']=true,['62430']=true,['62355']=true,['62438']=true,['72918']=true,['72919']=true,['72920']=true,['72921']=true,['72922']=true,['72923']=true,['72924']=true,['72925']=true,['72929']=true,['72930']=true,['72931']=true,['72932']=true,['72933']=true,['72934']=true,['72935']=true,['72936']=true,['72937']=true,['72938']=true,['72939']=true,['72940']=true,['72941']=true,['72942']=true,['72943']=true,['72944']=true,['72945']=true,['72946']=true,['72947']=true,['72948']=true,['72949']=true,['72950']=true,['72951']=true,['72952']=true,['72955']=true,['72956']=true,['72957']=true,['72958']=true,['72959']=true,['72960']=true,['72961']=true,['72962']=true,['72963']=true,['72964']=true,['72965']=true,['72966']=true,['72967']=true,['72968']=true,['72969']=true,['72970']=true,['72971']=true,['72972']=true,['72973']=true,['72974']=true,['72975']=true,['72976']=true,['72977']=true,['72978']=true,['44183']=true,['44205']=true,['44296']=true,['44306']=true,['44176']=true,['44195']=true,['44198']=true,['44201']=true,['44247']=true,['29278']=true,['29282']=true,['29286']=true,['29291']=true,['31113']=true,['34675']=true,['34676']=true,['34677']=true,['34678']=true,['34679']=true,['34680']=true,['29128']=true,['29132']=true,['29139']=true,['29140']=true,['29145']=true,['29146']=true,['29168']=true,['29169']=true,['29173']=true,['29179']=true,['29276']=true,['29280']=true,['29284']=true,['29288']=true,['30841']=true,['32538']=true,['32539']=true,['29277']=true,['29281']=true,['29285']=true,['29289']=true,['32864']=true,['31341']=true,['29119']=true,['29123']=true,['29126']=true,['29170']=true,['29172']=true,['29176']=true,['29177']=true,['29181']=true,['32770']=true,['32771']=true,['30834']=true,['25824']=true,['25826']=true,['21200']=true,['21205']=true,['21210']=true,['52252']=true,['21199']=true,['21204']=true,['21209']=true,['49052']=true,['49054']=true,['21198']=true,['21203']=true,['21208']=true,['32695']=true,['38662']=true,['38664']=true,['38671']=true,['38672']=true,['38674']=true,['38675']=true,['39320']=true,['39322']=true,['32694']=true,['21394']=true,['21397']=true,['21400']=true,['21403']=true,['21406']=true,['21409']=true,['21412']=true,['21415']=true,['21418']=true,['21197']=true,['21202']=true,['21207']=true,['21393']=true,['21396']=true,['21399']=true,['21402']=true,['21405']=true,['21408']=true,['21411']=true,['21414']=true,['21417']=true,['17904']=true,['17909']=true,['21196']=true,['21201']=true,['21206']=true,['65274']=true,['65360']=true,['17902']=true,['17903']=true,['17907']=true,['17908']=true,['40476']=true,['40477']=true,['17690']=true,['17691']=true,['17900']=true,['17901']=true,['17905']=true,['17906']=true,['34657']=true,['34658']=true,['34659']=true,['38147']=true,['21766']=true,['64886']=true,['64887']=true,['64888']=true,['64889']=true,['64890']=true,['64891']=true,['64892']=true,['64893']=true,['64894']=true,['64895']=true,['64896']=true,['64897']=true,['64898']=true,['64899']=true,['64900']=true,['64901']=true,['64902']=true,['64903']=true,['64905']=true,['64906']=true,['64907']=true,['64908']=true,['64909']=true,['64910']=true,['64911']=true,['64912']=true,['64913']=true,['64914']=true,['64915']=true,['64916']=true,['64917']=true,['64918']=true,['64919']=true,['64920']=true,['64921']=true,['64922']=true,['4614']=true,['22990']=true,['34484']=true,['34486']=true,['23705']=true,['23709']=true,['38309']=true,['38310']=true,['38311']=true,['38312']=true,['38313']=true,['38314']=true,['40643']=true,['43300']=true,['43348']=true,['43349']=true,['98162']=true,['35279']=true,['35280']=true,['40483']=true,['46874']=true,['89401']=true,['89784']=true,['89795']=true,['89796']=true,['89797']=true,['89798']=true,['89799']=true,['89800']=true,['95591']=true,['95592']=true,['97131']=true,['50384']=true,['50386']=true,['50387']=true,['50388']=true,['52570']=true,['50375']=true,['50376']=true,['50377']=true,['50378']=true,['52569']=true,['72982']=true,['72983']=true,['72984']=true,['73004']=true,['73005']=true,['73013']=true,['73014']=true,['73015']=true,['73016']=true,['73017']=true,['73018']=true,['73019']=true,['73020']=true,['73021']=true,['73022']=true,['73023']=true,['73024']=true,['73025']=true,['73026']=true,['73027']=true,['73042']=true,['73060']=true,['73061']=true,['73062']=true,['73063']=true,['73064']=true,['73065']=true,['73066']=true,['73067']=true,['73068']=true,['73101']=true,['73102']=true,['73103']=true,['73104']=true,['73105']=true,['73106']=true,['73107']=true,['73108']=true,['73109']=true,['73110']=true,['73111']=true,['73112']=true,['73113']=true,['73114']=true,['73115']=true,['73116']=true,['73117']=true,['73118']=true,['73119']=true,['73120']=true,['73121']=true,['73122']=true,['73123']=true,['73124']=true,['73125']=true,['73126']=true,['73127']=true,['73128']=true,['73129']=true,['73130']=true,['73131']=true,['73132']=true,['73133']=true,['73134']=true,['73135']=true,['73136']=true,['73137']=true,['73138']=true,['73139']=true,['73140']=true,['73141']=true,['73142']=true,['73143']=true,['73144']=true,['73145']=true,['73146']=true,['73147']=true,['73148']=true,['73149']=true,['73150']=true,['73151']=true,['73152']=true,['73153']=true,['73154']=true,['73155']=true,['73156']=true,['73157']=true,['73158']=true,['73159']=true,['73160']=true,['73161']=true,['73162']=true,['73163']=true,['73164']=true,['73165']=true,['73166']=true,['73167']=true,['73168']=true,['73169']=true,['73170']=true,['73306']=true,['73307']=true,['73308']=true,['73309']=true,['73310']=true,['73311']=true,['73312']=true,['73313']=true,['73314']=true,['73315']=true,['73316']=true,['73317']=true,['73318']=true,['73319']=true,['73320']=true,['73321']=true,['73322']=true,['73323']=true,['73324']=true,['88632']=true,['88633']=true,['88634']=true,['88635']=true,['88636']=true,['88637']=true,['88638']=true,['88639']=true,['88640']=true,['88641']=true,['88642']=true,['88643']=true,['88644']=true,['88645']=true,['88646']=true,['88647']=true,['88667']=true,['44073']=true,['44074']=true,['44283']=true,['44167']=true,['44188']=true,['44216']=true,['44242']=true,['38452']=true,['38453']=true,['38458']=true,['38459']=true,['38462']=true,['38463']=true,['29297']=true,['29301']=true,['29305']=true,['29309']=true,['29296']=true,['29308']=true,['32485']=true,['32486']=true,['32487']=true,['32488']=true,['32489']=true,['32490']=true,['32491']=true,['32492']=true,['32493']=true,['32649']=true,['32757']=true,['29295']=true,['29299']=true,['29303']=true,['29306']=true,['29300']=true,['29304']=true,['29279']=true,['29283']=true,['29287']=true,['29290']=true,['29294']=true,['29298']=true,['29302']=true,['29307']=true,['29278']=true,['29282']=true,['29286']=true,['29291']=true,['98146']=true,['98147']=true,['98148']=true,['98149']=true,['98150']=true,['98335']=true,['92782']=true,['92783']=true,['92784']=true,['92785']=true,['92786']=true,['92787']=true,['93391']=true,['93392']=true,['93393']=true,['93394']=true,['93395']=true,['95425']=true,['95427']=true,['95428']=true,['95429']=true,['95430']=true,['88166']=true,['88167']=true,['88168']=true,['88169']=true,['75274']=true,['83230']=true,['83231']=true,['83232']=true,['83233']=true,['83234']=true,['83235']=true,['83236']=true,['83237']=true,['83238']=true,['83239']=true,['83245']=true,['83246']=true,['83247']=true,['83248']=true,['83249']=true,['83255']=true,['83256']=true,['83257']=true,['83258']=true,['83259']=true,['83272']=true,['83273']=true,['86567']=true,['86570']=true,['86572']=true,['86576']=true,['86579']=true,['86585']=true,['86587']=true,['87780']=true,['82686']=true,['82687']=true,['82688']=true,['82689']=true,['82690']=true,['82691']=true,['82692']=true,['82693']=true,['82694']=true,['82695']=true,['82696']=true,['82697']=true,['82698']=true,['82699']=true,['82700']=true,['82701']=true,['82702']=true,['82703']=true,['82704']=true,['82705']=true,['82718']=true,['82719']=true,['81651']=true,['81652']=true,['81653']=true,['81654']=true,['81655']=true,['81656']=true,['81657']=true,['81658']=true,['81659']=true,['81660']=true,['81661']=true,['81662']=true,['81663']=true,['81664']=true,['81665']=true,['81666']=true,['81667']=true,['81668']=true,['81669']=true,['81670']=true,['81683']=true,['81684']=true,['70105']=true,['70106']=true,['70107']=true,['70110']=true,['70112']=true,['70113']=true,['70119']=true,['70124']=true,['70126']=true,['70127']=true,['70141']=true,['70142']=true,['70143']=true,['70144']=true,['58483']=true,['62362']=true,['62383']=true,['62416']=true,['62434']=true,['62447']=true,['62463']=true,['62464']=true,['62465']=true,['62466']=true,['62467']=true,['64645']=true,['64904']=true,['68775']=true,['68776']=true,['68777']=true,['69764']=true,['62348']=true,['62350']=true,['62351']=true,['62352']=true,['62357']=true,['62361']=true,['62378']=true,['62415']=true,['62427']=true,['62440']=true,['62354']=true,['62375']=true,['62376']=true,['62377']=true,['62436']=true,['62437']=true,['65175']=true,['65176']=true,['50398']=true,['50400']=true,['50402']=true,['50404']=true,['52572']=true,['50397']=true,['50399']=true,['50401']=true,['50403']=true,['52571']=true} - }; + ["Pickables"]={['68729']=true,['63349']=true,['45986']=true,['43624']=true,['43622']=true,['43575']=true,['31952']=true,['12033']=true,['29569']=true,['5760']=true,['13918']=true,['5759']=true,['16885']=true,['5758']=true,['13875']=true,['4638']=true,['16884']=true,['4637']=true,['4636']=true,['6355']=true,['16883']=true,['4634']=true,['4633']=true,['6354']=true,['16882']=true,['4632']=true,['88165']=true,['88567']=true},["SafeItems"]={['89392']=true,['89393']=true,['89394']=true,['89395']=true,['89396']=true,['89397']=true,['89398']=true,['89399']=true,['89400']=true,['83260']=true,['83261']=true,['83262']=true,['83263']=true,['83264']=true,['83265']=true,['83266']=true,['83267']=true,['83268']=true,['83269']=true,['83270']=true,['83271']=true,['83274']=true,['83275']=true,['82706']=true,['82707']=true,['82708']=true,['82709']=true,['82710']=true,['82711']=true,['82712']=true,['82713']=true,['82714']=true,['82715']=true,['82716']=true,['82717']=true,['82720']=true,['82721']=true,['81671']=true,['81672']=true,['81673']=true,['81674']=true,['81675']=true,['81676']=true,['81677']=true,['81678']=true,['81679']=true,['81680']=true,['81681']=true,['81682']=true,['81685']=true,['81686']=true,['64377']=true,['64489']=true,['64880']=true,['64885']=true,['62454']=true,['62455']=true,['62456']=true,['62457']=true,['62458']=true,['62459']=true,['62460']=true,['68740']=true,['49888']=true,['49497']=true,['49301']=true,['72980']=true,['72981']=true,['72989']=true,['72990']=true,['72991']=true,['72992']=true,['72993']=true,['72994']=true,['72995']=true,['72996']=true,['72997']=true,['72998']=true,['72999']=true,['73000']=true,['73001']=true,['73002']=true,['73003']=true,['73006']=true,['73007']=true,['73008']=true,['73009']=true,['73010']=true,['73011']=true,['73012']=true,['73325']=true,['73326']=true,['73336']=true,['88622']=true,['88648']=true,['88649']=true,['64460']=true,['44050']=true,['44173']=true,['44174']=true,['44192']=true,['44193']=true,['44199']=true,['44244']=true,['44245']=true,['44249']=true,['44250']=true,['44051']=true,['44052']=true,['44053']=true,['44108']=true,['44166']=true,['44187']=true,['44214']=true,['44241']=true,['38454']=true,['38455']=true,['38456']=true,['38457']=true,['38460']=true,['38461']=true,['38464']=true,['38465']=true,['29115']=true,['29130']=true,['29133']=true,['29137']=true,['29138']=true,['29166']=true,['29167']=true,['29185']=true,['34665']=true,['34666']=true,['34667']=true,['34670']=true,['34671']=true,['34672']=true,['34673']=true,['34674']=true,['29121']=true,['29124']=true,['29125']=true,['29151']=true,['29152']=true,['29153']=true,['29155']=true,['29156']=true,['29165']=true,['29171']=true,['29175']=true,['29182']=true,['30830']=true,['30832']=true,['29456']=true,['29457']=true,['25835']=true,['25836']=true,['25823']=true,['25825']=true,['77559']=true,['77570']=true,['77583']=true,['77586']=true,['77587']=true,['77588']=true,['21392']=true,['21395']=true,['21398']=true,['21401']=true,['21404']=true,['21407']=true,['21410']=true,['21413']=true,['21416']=true,['38632']=true,['38633']=true,['38707']=true,['34661']=true,['11290']=true,['11289']=true,['45858']=true,['84661']=true,['11288']=true,['28164']=true,['11287']=true,['44180']=true,['44202']=true,['44302']=true,['44200']=true,['44256']=true,['44104']=true,['44116']=true,['44196']=true,['44061']=true,['44062']=true,['29117']=true,['29129']=true,['29174']=true,['30836']=true,['35328']=true,['35329']=true,['35330']=true,['35331']=true,['35332']=true,['35333']=true,['35334']=true,['35335']=true,['35336']=true,['35337']=true,['35338']=true,['35339']=true,['35340']=true,['35341']=true,['35342']=true,['35343']=true,['35344']=true,['35345']=true,['35346']=true,['35347']=true,['35464']=true,['35465']=true,['35466']=true,['35467']=true,['30847']=true,['29122']=true,['29183']=true,['90079']=true,['90080']=true,['90081']=true,['90082']=true,['90083']=true,['90084']=true,['90085']=true,['90086']=true,['90110']=true,['90111']=true,['90112']=true,['90113']=true,['90114']=true,['90115']=true,['90116']=true,['90117']=true,['90136']=true,['90137']=true,['90138']=true,['90139']=true,['90140']=true,['90141']=true,['90142']=true,['90143']=true,['64643']=true,['77678']=true,['77679']=true,['77682']=true,['77692']=true,['77694']=true,['77695']=true,['77709']=true,['77710']=true,['77712']=true,['77886']=true,['77889']=true,['77890']=true,['77899']=true,['77900']=true,['77901']=true,['77917']=true,['77919']=true,['77920']=true,['77680']=true,['77681']=true,['77683']=true,['77690']=true,['77691']=true,['77693']=true,['77708']=true,['77711']=true,['77713']=true,['77887']=true,['77888']=true,['77891']=true,['77898']=true,['77902']=true,['77903']=true,['77916']=true,['77918']=true,['77921']=true,['77778']=true,['77779']=true,['77784']=true,['77795']=true,['77796']=true,['77800']=true,['77801']=true,['77844']=true,['77845']=true,['77846']=true,['77850']=true,['77777']=true,['77781']=true,['77782']=true,['77785']=true,['77797']=true,['77798']=true,['77799']=true,['77802']=true,['77847']=true,['77848']=true,['77851']=true,['77852']=true,['77724']=true,['77725']=true,['77728']=true,['77729']=true,['77732']=true,['77733']=true,['77773']=true,['77783']=true,['77803']=true,['77804']=true,['77843']=true,['77849']=true,['77614']=true,['77615']=true,['77616']=true,['77617']=true,['77618']=true,['77619']=true,['77620']=true,['77627']=true,['77628']=true,['77629']=true,['77630']=true,['77631']=true,['77632']=true,['77647']=true,['77648']=true,['77649']=true,['77650']=true,['77651']=true,['77652']=true,['77770']=true,['77771']=true,['77772']=true,['77774']=true,['77775']=true,['77776']=true,['77786']=true,['77789']=true,['77790']=true,['77791']=true,['77792']=true,['77793']=true,['77794']=true,['77837']=true,['77838']=true,['77839']=true,['77840']=true,['77841']=true,['77842']=true,['20406']=true,['20407']=true,['20408']=true,['77787']=true,['77788']=true,['28155']=true,['22986']=true,['22991']=true,['33292']=true,['86566']=true,['95517']=true,['95518']=true,['95523']=true,['95526']=true,['95527']=true,['95532']=true,['83158']=true,['83162']=true,['83167']=true,['83171']=true,['83176']=true,['83180']=true,['83185']=true,['83189']=true,['83194']=true,['83198']=true,['83203']=true,['83207']=true,['83212']=true,['83216']=true,['83221']=true,['83225']=true,['82614']=true,['82618']=true,['82623']=true,['82627']=true,['82632']=true,['82636']=true,['82641']=true,['82645']=true,['82650']=true,['82654']=true,['82659']=true,['82663']=true,['82668']=true,['82672']=true,['82677']=true,['82681']=true,['81579']=true,['81583']=true,['81588']=true,['81592']=true,['81597']=true,['81601']=true,['81606']=true,['81610']=true,['81615']=true,['81619']=true,['81624']=true,['81628']=true,['81633']=true,['81637']=true,['81642']=true,['81646']=true,['70118']=true,['62364']=true,['62386']=true,['62450']=true,['62441']=true,['62356']=true,['62406']=true,['62424']=true,['72621']=true,['72622']=true,['72623']=true,['72624']=true,['72625']=true,['72626']=true,['72627']=true,['72628']=true,['72638']=true,['72639']=true,['72640']=true,['72641']=true,['72642']=true,['72643']=true,['72644']=true,['72645']=true,['72646']=true,['72647']=true,['72648']=true,['72649']=true,['72650']=true,['72651']=true,['72652']=true,['72653']=true,['72655']=true,['72656']=true,['72657']=true,['72658']=true,['72659']=true,['72660']=true,['72661']=true,['72662']=true,['44180']=true,['44202']=true,['44302']=true,['44200']=true,['44256']=true,['44181']=true,['44203']=true,['44297']=true,['44303']=true,['44179']=true,['44194']=true,['44258']=true,['44106']=true,['44170']=true,['44190']=true,['44117']=true,['44054']=true,['44055']=true,['29116']=true,['29131']=true,['29141']=true,['29142']=true,['29147']=true,['29148']=true,['35356']=true,['35357']=true,['35358']=true,['35359']=true,['35360']=true,['35361']=true,['35362']=true,['35363']=true,['35364']=true,['35365']=true,['35366']=true,['35367']=true,['35368']=true,['35369']=true,['35370']=true,['35371']=true,['35372']=true,['35373']=true,['35374']=true,['35375']=true,['35468']=true,['35469']=true,['35470']=true,['35471']=true,['25838']=true,['90059']=true,['90060']=true,['90061']=true,['90062']=true,['90063']=true,['90064']=true,['90065']=true,['90066']=true,['90088']=true,['90089']=true,['90090']=true,['90091']=true,['90092']=true,['90093']=true,['90094']=true,['90095']=true,['90119']=true,['90120']=true,['90121']=true,['90122']=true,['90123']=true,['90124']=true,['90125']=true,['90126']=true,['77667']=true,['77670']=true,['77671']=true,['77697']=true,['77700']=true,['77701']=true,['77874']=true,['77876']=true,['77878']=true,['77907']=true,['77908']=true,['77909']=true,['77666']=true,['77668']=true,['77669']=true,['77696']=true,['77698']=true,['77699']=true,['77875']=true,['77877']=true,['77879']=true,['77904']=true,['77905']=true,['77906']=true,['77742']=true,['77746']=true,['77748']=true,['77752']=true,['77813']=true,['77815']=true,['77819']=true,['77820']=true,['77744']=true,['77745']=true,['77749']=true,['77811']=true,['77812']=true,['77818']=true,['77821']=true,['77720']=true,['77721']=true,['77730']=true,['77731']=true,['77747']=true,['77750']=true,['77816']=true,['77817']=true,['77598']=true,['77599']=true,['77600']=true,['77601']=true,['77602']=true,['77603']=true,['77604']=true,['77633']=true,['77634']=true,['77635']=true,['77636']=true,['77637']=true,['77638']=true,['77639']=true,['77736']=true,['77737']=true,['77738']=true,['77739']=true,['77740']=true,['77741']=true,['77743']=true,['77805']=true,['77806']=true,['77807']=true,['77808']=true,['77809']=true,['77810']=true,['77814']=true,['77605']=true,['77640']=true,['77753']=true,['77822']=true,['28158']=true,['22987']=true,['22992']=true,['95519']=true,['95521']=true,['95528']=true,['95530']=true,['83159']=true,['83163']=true,['83168']=true,['83172']=true,['83177']=true,['83181']=true,['83186']=true,['83190']=true,['83195']=true,['83199']=true,['83204']=true,['83208']=true,['83213']=true,['83217']=true,['83222']=true,['83226']=true,['82615']=true,['82619']=true,['82624']=true,['82628']=true,['82633']=true,['82637']=true,['82642']=true,['82646']=true,['82651']=true,['82655']=true,['82660']=true,['82664']=true,['82669']=true,['82673']=true,['82678']=true,['82682']=true,['81580']=true,['81584']=true,['81589']=true,['81593']=true,['81598']=true,['81602']=true,['81607']=true,['81611']=true,['81616']=true,['81620']=true,['81625']=true,['81629']=true,['81634']=true,['81638']=true,['81643']=true,['81647']=true,['70114']=true,['70122']=true,['62417']=true,['62420']=true,['62431']=true,['62433']=true,['62358']=true,['62381']=true,['62446']=true,['62374']=true,['62404']=true,['62405']=true,['62425']=true,['62426']=true,['72664']=true,['72665']=true,['72666']=true,['72667']=true,['72668']=true,['72669']=true,['72670']=true,['72671']=true,['72672']=true,['72673']=true,['72674']=true,['72675']=true,['72676']=true,['72677']=true,['72678']=true,['72679']=true,['72681']=true,['72682']=true,['72683']=true,['72684']=true,['72685']=true,['72686']=true,['72687']=true,['72688']=true,['72689']=true,['72690']=true,['72691']=true,['72692']=true,['72693']=true,['72694']=true,['72695']=true,['72696']=true,['88614']=true,['88615']=true,['88616']=true,['88617']=true,['88618']=true,['88619']=true,['88620']=true,['88621']=true,['88623']=true,['88624']=true,['88625']=true,['88626']=true,['88627']=true,['88628']=true,['88629']=true,['88630']=true,['44181']=true,['44203']=true,['44297']=true,['44303']=true,['44179']=true,['44194']=true,['44258']=true,['44182']=true,['44204']=true,['44295']=true,['44305']=true,['44248']=true,['44257']=true,['44109']=true,['44110']=true,['44122']=true,['44171']=true,['44189']=true,['44059']=true,['44060']=true,['29135']=true,['29136']=true,['29180']=true,['30835']=true,['35376']=true,['35377']=true,['35378']=true,['35379']=true,['35380']=true,['35381']=true,['35382']=true,['35383']=true,['35384']=true,['35385']=true,['35386']=true,['35387']=true,['35388']=true,['35389']=true,['35390']=true,['35391']=true,['35392']=true,['35393']=true,['35394']=true,['35395']=true,['35472']=true,['35473']=true,['35474']=true,['35475']=true,['64644']=true,['90068']=true,['90069']=true,['90070']=true,['90071']=true,['90072']=true,['90073']=true,['90074']=true,['90075']=true,['90127']=true,['90128']=true,['90129']=true,['90130']=true,['90131']=true,['90132']=true,['90133']=true,['90134']=true,['77673']=true,['77674']=true,['77676']=true,['77704']=true,['77705']=true,['77707']=true,['77880']=true,['77882']=true,['77883']=true,['77910']=true,['77913']=true,['77914']=true,['77672']=true,['77675']=true,['77677']=true,['77702']=true,['77703']=true,['77706']=true,['77881']=true,['77884']=true,['77885']=true,['77911']=true,['77912']=true,['77915']=true,['77642']=true,['77645']=true,['77762']=true,['77763']=true,['77765']=true,['77766']=true,['77831']=true,['77832']=true,['77641']=true,['77643']=true,['77760']=true,['77761']=true,['77768']=true,['77769']=true,['77829']=true,['77834']=true,['77644']=true,['77646']=true,['77722']=true,['77723']=true,['77764']=true,['77767']=true,['77830']=true,['77833']=true,['77606']=true,['77607']=true,['77608']=true,['77609']=true,['77610']=true,['77611']=true,['77612']=true,['77754']=true,['77755']=true,['77756']=true,['77757']=true,['77758']=true,['77759']=true,['77823']=true,['77824']=true,['77825']=true,['77826']=true,['77827']=true,['77828']=true,['77835']=true,['28162']=true,['22985']=true,['22993']=true,['95522']=true,['95525']=true,['95531']=true,['95534']=true,['83160']=true,['83164']=true,['83169']=true,['83173']=true,['83178']=true,['83182']=true,['83187']=true,['83191']=true,['83196']=true,['83200']=true,['83205']=true,['83209']=true,['83214']=true,['83218']=true,['83223']=true,['83227']=true,['82616']=true,['82620']=true,['82625']=true,['82629']=true,['82634']=true,['82638']=true,['82643']=true,['82647']=true,['82652']=true,['82656']=true,['82661']=true,['82665']=true,['82670']=true,['82674']=true,['82679']=true,['82683']=true,['81581']=true,['81585']=true,['81590']=true,['81594']=true,['81599']=true,['81603']=true,['81608']=true,['81612']=true,['81617']=true,['81621']=true,['81626']=true,['81630']=true,['81635']=true,['81639']=true,['81644']=true,['81648']=true,['70115']=true,['70123']=true,['62363']=true,['62385']=true,['62380']=true,['62409']=true,['62429']=true,['62445']=true,['62353']=true,['62407']=true,['62423']=true,['62439']=true,['72698']=true,['72699']=true,['72700']=true,['72701']=true,['72702']=true,['72703']=true,['72704']=true,['72705']=true,['72889']=true,['72890']=true,['72891']=true,['72892']=true,['72893']=true,['72894']=true,['72895']=true,['72896']=true,['72902']=true,['72903']=true,['72904']=true,['72905']=true,['72906']=true,['72907']=true,['72908']=true,['72909']=true,['72910']=true,['72911']=true,['72912']=true,['72913']=true,['72914']=true,['72915']=true,['72916']=true,['72917']=true,['44182']=true,['44204']=true,['44295']=true,['44305']=true,['44248']=true,['44257']=true,['44183']=true,['44205']=true,['44296']=true,['44306']=true,['44176']=true,['44195']=true,['44198']=true,['44201']=true,['44247']=true,['44111']=true,['44112']=true,['44120']=true,['44121']=true,['44123']=true,['44197']=true,['44239']=true,['44240']=true,['44243']=true,['44057']=true,['44058']=true,['40440']=true,['40441']=true,['40442']=true,['40443']=true,['40444']=true,['29127']=true,['29134']=true,['29184']=true,['35402']=true,['35403']=true,['35404']=true,['35405']=true,['35406']=true,['35407']=true,['35408']=true,['35409']=true,['35410']=true,['35411']=true,['35412']=true,['35413']=true,['35414']=true,['35415']=true,['35416']=true,['35476']=true,['35477']=true,['35478']=true,['90049']=true,['90050']=true,['90051']=true,['90052']=true,['90053']=true,['90054']=true,['90055']=true,['90056']=true,['90096']=true,['90097']=true,['90098']=true,['90099']=true,['90100']=true,['90101']=true,['90102']=true,['90103']=true,['90147']=true,['90148']=true,['90149']=true,['90150']=true,['90151']=true,['90152']=true,['90153']=true,['90154']=true,['77687']=true,['77688']=true,['77689']=true,['77714']=true,['77715']=true,['77718']=true,['77892']=true,['77894']=true,['77897']=true,['77923']=true,['77924']=true,['77927']=true,['77684']=true,['77685']=true,['77686']=true,['77716']=true,['77717']=true,['77719']=true,['77893']=true,['77895']=true,['77896']=true,['77922']=true,['77925']=true,['77926']=true,['77664']=true,['77665']=true,['77859']=true,['77867']=true,['77868']=true,['77869']=true,['77871']=true,['77872']=true,['38661']=true,['38663']=true,['38665']=true,['38666']=true,['38667']=true,['38668']=true,['38669']=true,['38670']=true,['77661']=true,['77662']=true,['77663']=true,['77858']=true,['77864']=true,['77865']=true,['77866']=true,['77873']=true,['77726']=true,['77727']=true,['77734']=true,['77735']=true,['77862']=true,['77863']=true,['77928']=true,['77929']=true,['77621']=true,['77622']=true,['77623']=true,['77624']=true,['77625']=true,['77626']=true,['77653']=true,['77654']=true,['77655']=true,['77656']=true,['77657']=true,['77658']=true,['77659']=true,['77853']=true,['77854']=true,['77855']=true,['77856']=true,['77857']=true,['77860']=true,['77861']=true,['34648']=true,['34649']=true,['34650']=true,['34651']=true,['34652']=true,['34653']=true,['34655']=true,['34656']=true,['77660']=true,['95520']=true,['95524']=true,['95529']=true,['95533']=true,['83161']=true,['83165']=true,['83166']=true,['83170']=true,['83174']=true,['83175']=true,['83179']=true,['83183']=true,['83184']=true,['83188']=true,['83192']=true,['83193']=true,['83197']=true,['83201']=true,['83202']=true,['83206']=true,['83210']=true,['83211']=true,['83215']=true,['83219']=true,['83220']=true,['83224']=true,['83228']=true,['83229']=true,['82617']=true,['82621']=true,['82622']=true,['82626']=true,['82630']=true,['82631']=true,['82635']=true,['82639']=true,['82640']=true,['82644']=true,['82648']=true,['82649']=true,['82653']=true,['82657']=true,['82658']=true,['82662']=true,['82666']=true,['82667']=true,['82671']=true,['82675']=true,['82676']=true,['82680']=true,['82684']=true,['82685']=true,['81582']=true,['81586']=true,['81587']=true,['81591']=true,['81595']=true,['81596']=true,['81600']=true,['81604']=true,['81605']=true,['81609']=true,['81613']=true,['81614']=true,['81618']=true,['81622']=true,['81623']=true,['81627']=true,['81631']=true,['81632']=true,['81636']=true,['81640']=true,['81641']=true,['81645']=true,['81649']=true,['81650']=true,['70108']=true,['70116']=true,['70117']=true,['70120']=true,['70121']=true,['62365']=true,['62384']=true,['62418']=true,['62432']=true,['62448']=true,['62449']=true,['62359']=true,['62382']=true,['62408']=true,['62410']=true,['62428']=true,['62430']=true,['62355']=true,['62438']=true,['72918']=true,['72919']=true,['72920']=true,['72921']=true,['72922']=true,['72923']=true,['72924']=true,['72925']=true,['72929']=true,['72930']=true,['72931']=true,['72932']=true,['72933']=true,['72934']=true,['72935']=true,['72936']=true,['72937']=true,['72938']=true,['72939']=true,['72940']=true,['72941']=true,['72942']=true,['72943']=true,['72944']=true,['72945']=true,['72946']=true,['72947']=true,['72948']=true,['72949']=true,['72950']=true,['72951']=true,['72952']=true,['72955']=true,['72956']=true,['72957']=true,['72958']=true,['72959']=true,['72960']=true,['72961']=true,['72962']=true,['72963']=true,['72964']=true,['72965']=true,['72966']=true,['72967']=true,['72968']=true,['72969']=true,['72970']=true,['72971']=true,['72972']=true,['72973']=true,['72974']=true,['72975']=true,['72976']=true,['72977']=true,['72978']=true,['44183']=true,['44205']=true,['44296']=true,['44306']=true,['44176']=true,['44195']=true,['44198']=true,['44201']=true,['44247']=true,['29278']=true,['29282']=true,['29286']=true,['29291']=true,['31113']=true,['34675']=true,['34676']=true,['34677']=true,['34678']=true,['34679']=true,['34680']=true,['29128']=true,['29132']=true,['29139']=true,['29140']=true,['29145']=true,['29146']=true,['29168']=true,['29169']=true,['29173']=true,['29179']=true,['29276']=true,['29280']=true,['29284']=true,['29288']=true,['30841']=true,['32538']=true,['32539']=true,['29277']=true,['29281']=true,['29285']=true,['29289']=true,['32864']=true,['31341']=true,['29119']=true,['29123']=true,['29126']=true,['29170']=true,['29172']=true,['29176']=true,['29177']=true,['29181']=true,['32770']=true,['32771']=true,['30834']=true,['25824']=true,['25826']=true,['21200']=true,['21205']=true,['21210']=true,['52252']=true,['21199']=true,['21204']=true,['21209']=true,['49052']=true,['49054']=true,['21198']=true,['21203']=true,['21208']=true,['32695']=true,['38662']=true,['38664']=true,['38671']=true,['38672']=true,['38674']=true,['38675']=true,['39320']=true,['39322']=true,['32694']=true,['21394']=true,['21397']=true,['21400']=true,['21403']=true,['21406']=true,['21409']=true,['21412']=true,['21415']=true,['21418']=true,['21197']=true,['21202']=true,['21207']=true,['21393']=true,['21396']=true,['21399']=true,['21402']=true,['21405']=true,['21408']=true,['21411']=true,['21414']=true,['21417']=true,['17904']=true,['17909']=true,['21196']=true,['21201']=true,['21206']=true,['65274']=true,['65360']=true,['17902']=true,['17903']=true,['17907']=true,['17908']=true,['40476']=true,['40477']=true,['17690']=true,['17691']=true,['17900']=true,['17901']=true,['17905']=true,['17906']=true,['34657']=true,['34658']=true,['34659']=true,['38147']=true,['21766']=true,['64886']=true,['64887']=true,['64888']=true,['64889']=true,['64890']=true,['64891']=true,['64892']=true,['64893']=true,['64894']=true,['64895']=true,['64896']=true,['64897']=true,['64898']=true,['64899']=true,['64900']=true,['64901']=true,['64902']=true,['64903']=true,['64905']=true,['64906']=true,['64907']=true,['64908']=true,['64909']=true,['64910']=true,['64911']=true,['64912']=true,['64913']=true,['64914']=true,['64915']=true,['64916']=true,['64917']=true,['64918']=true,['64919']=true,['64920']=true,['64921']=true,['64922']=true,['4614']=true,['22990']=true,['34484']=true,['34486']=true,['23705']=true,['23709']=true,['38309']=true,['38310']=true,['38311']=true,['38312']=true,['38313']=true,['38314']=true,['40643']=true,['43300']=true,['43348']=true,['43349']=true,['98162']=true,['35279']=true,['35280']=true,['40483']=true,['46874']=true,['89401']=true,['89784']=true,['89795']=true,['89796']=true,['89797']=true,['89798']=true,['89799']=true,['89800']=true,['95591']=true,['95592']=true,['97131']=true,['50384']=true,['50386']=true,['50387']=true,['50388']=true,['52570']=true,['50375']=true,['50376']=true,['50377']=true,['50378']=true,['52569']=true,['72982']=true,['72983']=true,['72984']=true,['73004']=true,['73005']=true,['73013']=true,['73014']=true,['73015']=true,['73016']=true,['73017']=true,['73018']=true,['73019']=true,['73020']=true,['73021']=true,['73022']=true,['73023']=true,['73024']=true,['73025']=true,['73026']=true,['73027']=true,['73042']=true,['73060']=true,['73061']=true,['73062']=true,['73063']=true,['73064']=true,['73065']=true,['73066']=true,['73067']=true,['73068']=true,['73101']=true,['73102']=true,['73103']=true,['73104']=true,['73105']=true,['73106']=true,['73107']=true,['73108']=true,['73109']=true,['73110']=true,['73111']=true,['73112']=true,['73113']=true,['73114']=true,['73115']=true,['73116']=true,['73117']=true,['73118']=true,['73119']=true,['73120']=true,['73121']=true,['73122']=true,['73123']=true,['73124']=true,['73125']=true,['73126']=true,['73127']=true,['73128']=true,['73129']=true,['73130']=true,['73131']=true,['73132']=true,['73133']=true,['73134']=true,['73135']=true,['73136']=true,['73137']=true,['73138']=true,['73139']=true,['73140']=true,['73141']=true,['73142']=true,['73143']=true,['73144']=true,['73145']=true,['73146']=true,['73147']=true,['73148']=true,['73149']=true,['73150']=true,['73151']=true,['73152']=true,['73153']=true,['73154']=true,['73155']=true,['73156']=true,['73157']=true,['73158']=true,['73159']=true,['73160']=true,['73161']=true,['73162']=true,['73163']=true,['73164']=true,['73165']=true,['73166']=true,['73167']=true,['73168']=true,['73169']=true,['73170']=true,['73306']=true,['73307']=true,['73308']=true,['73309']=true,['73310']=true,['73311']=true,['73312']=true,['73313']=true,['73314']=true,['73315']=true,['73316']=true,['73317']=true,['73318']=true,['73319']=true,['73320']=true,['73321']=true,['73322']=true,['73323']=true,['73324']=true,['88632']=true,['88633']=true,['88634']=true,['88635']=true,['88636']=true,['88637']=true,['88638']=true,['88639']=true,['88640']=true,['88641']=true,['88642']=true,['88643']=true,['88644']=true,['88645']=true,['88646']=true,['88647']=true,['88667']=true,['44073']=true,['44074']=true,['44283']=true,['44167']=true,['44188']=true,['44216']=true,['44242']=true,['38452']=true,['38453']=true,['38458']=true,['38459']=true,['38462']=true,['38463']=true,['29297']=true,['29301']=true,['29305']=true,['29309']=true,['29296']=true,['29308']=true,['32485']=true,['32486']=true,['32487']=true,['32488']=true,['32489']=true,['32490']=true,['32491']=true,['32492']=true,['32493']=true,['32649']=true,['32757']=true,['29295']=true,['29299']=true,['29303']=true,['29306']=true,['29300']=true,['29304']=true,['29279']=true,['29283']=true,['29287']=true,['29290']=true,['29294']=true,['29298']=true,['29302']=true,['29307']=true,['29278']=true,['29282']=true,['29286']=true,['29291']=true,['98146']=true,['98147']=true,['98148']=true,['98149']=true,['98150']=true,['98335']=true,['92782']=true,['92783']=true,['92784']=true,['92785']=true,['92786']=true,['92787']=true,['93391']=true,['93392']=true,['93393']=true,['93394']=true,['93395']=true,['95425']=true,['95427']=true,['95428']=true,['95429']=true,['95430']=true,['88166']=true,['88167']=true,['88168']=true,['88169']=true,['75274']=true,['83230']=true,['83231']=true,['83232']=true,['83233']=true,['83234']=true,['83235']=true,['83236']=true,['83237']=true,['83238']=true,['83239']=true,['83245']=true,['83246']=true,['83247']=true,['83248']=true,['83249']=true,['83255']=true,['83256']=true,['83257']=true,['83258']=true,['83259']=true,['83272']=true,['83273']=true,['86567']=true,['86570']=true,['86572']=true,['86576']=true,['86579']=true,['86585']=true,['86587']=true,['87780']=true,['82686']=true,['82687']=true,['82688']=true,['82689']=true,['82690']=true,['82691']=true,['82692']=true,['82693']=true,['82694']=true,['82695']=true,['82696']=true,['82697']=true,['82698']=true,['82699']=true,['82700']=true,['82701']=true,['82702']=true,['82703']=true,['82704']=true,['82705']=true,['82718']=true,['82719']=true,['81651']=true,['81652']=true,['81653']=true,['81654']=true,['81655']=true,['81656']=true,['81657']=true,['81658']=true,['81659']=true,['81660']=true,['81661']=true,['81662']=true,['81663']=true,['81664']=true,['81665']=true,['81666']=true,['81667']=true,['81668']=true,['81669']=true,['81670']=true,['81683']=true,['81684']=true,['70105']=true,['70106']=true,['70107']=true,['70110']=true,['70112']=true,['70113']=true,['70119']=true,['70124']=true,['70126']=true,['70127']=true,['70141']=true,['70142']=true,['70143']=true,['70144']=true,['58483']=true,['62362']=true,['62383']=true,['62416']=true,['62434']=true,['62447']=true,['62463']=true,['62464']=true,['62465']=true,['62466']=true,['62467']=true,['64645']=true,['64904']=true,['68775']=true,['68776']=true,['68777']=true,['69764']=true,['62348']=true,['62350']=true,['62351']=true,['62352']=true,['62357']=true,['62361']=true,['62378']=true,['62415']=true,['62427']=true,['62440']=true,['62354']=true,['62375']=true,['62376']=true,['62377']=true,['62436']=true,['62437']=true,['65175']=true,['65176']=true,['50398']=true,['50400']=true,['50402']=true,['50404']=true,['52572']=true,['50397']=true,['50399']=true,['50401']=true,['50403']=true,['52571']=true} + } - local BreakStuff_Cache = {} + local function IsThisBreakable(link) + local _, _, quality = GetItemInfo(link) + if(IsEquippableItem(link) and quality and quality > 1 and quality < 5) then + return not BreakableFilter["SafeItems"][match(link, 'item:(%d+):')] + end + end - local function IsThisBreakable(link) - local _, _, quality = GetItemInfo(link) - if(IsEquippableItem(link) and quality and quality > 1 and quality < 5) then - return not BreakableFilter["SafeItems"][match(link, 'item:(%d+):')] - end - end + local function IsThisOpenable(link) + return BreakableFilter["Pickables"][match(link, 'item:(%d+)')] + end - local function IsThisOpenable(link) - return BreakableFilter["Pickables"][match(link, 'item:(%d+)')] - end + local function ApplyButton(itemLink, spell, r, g, b) + local slot = GetMouseFocus() + local bag = slot:GetParent():GetID() - local function ApplyButton(itemLink, spell, r, g, b) - local slot = GetMouseFocus() - local bag = slot:GetParent():GetID() + if(GetContainerItemLink(bag, slot:GetID()) == itemLink) then + BreakStuffHandler:SetAttribute('spell', spell) + BreakStuffHandler:SetAttribute('target-bag', bag) + BreakStuffHandler:SetAttribute('target-slot', slot:GetID()) + BreakStuffHandler:SetAllPoints(slot) + BreakStuffHandler:Show() - if(GetContainerItemLink(bag, slot:GetID()) == itemLink) then - BreakStuffHandler:SetAttribute('spell', spell) - BreakStuffHandler:SetAttribute('target-bag', bag) - BreakStuffHandler:SetAttribute('target-slot', slot:GetID()) - BreakStuffHandler:SetAllPoints(slot) - BreakStuffHandler:Show() + AutoCastShine_AutoCastStart(BreakStuffHandler, r, g, b) + end + end - AutoCastShine_AutoCastStart(BreakStuffHandler, r, g, b) - end - end + local function ScanTooltip(self) + for index = 1, self:NumLines() do + local info = BreakStuff_Cache[_G['GameTooltipTextLeft' .. index]:GetText()] + if(info) then + return unpack(info) + end + end + end - local function ScanTooltip(self) - for index = 1, self:NumLines() do - local info = BreakStuff_Cache[_G['GameTooltipTextLeft' .. index]:GetText()] - if(info) then - return unpack(info) - end - end - end + local function DoIHaveAKey() + for key in pairs(SkellyKeys) do + if(GetItemCount(key) > 0) then + return key + end + end + end - local function DoIHaveAKey() - for key in pairs(SkellyKeys) do - if(GetItemCount(key) > 0) then - return key - end - end - end + function BreakStuffParser(self) + local item, link = self:GetItem() + if(item and not InCombatLockdown() and (BreakStuffHandler.ReadyToSmash == true)) then + local spell, r, g, b = ScanTooltip(self) - function BreakStuffParser(self) - local item, link = self:GetItem() - if(item and not InCombatLockdown() and (BreakStuffHandler.ReadyToSmash == true)) then - local spell, r, g, b = ScanTooltip(self) - - if(spell) then - ApplyButton(link, spell, r, g, b) - else - if(DE and IsThisBreakable(link)) then - ApplyButton(link, DE, 1/2, 1/2, 1) - elseif(PICK and IsThisOpenable(link)) then - ApplyButton(link, PICK, 0, 1, 1) - elseif(SMITH and IsThisOpenable(link)) then - local hasKey = DoIHaveAKey() - ApplyButton(link, hasKey, 0, 1, 1) - end - end - end - end + if(spell) then + ApplyButton(link, spell, r, g, b) + else + if(DE and IsThisBreakable(link)) then + ApplyButton(link, DE, 0.5, 0.5, 1) + elseif(PICK and IsThisOpenable(link)) then + ApplyButton(link, PICK, 0, 1, 1) + elseif(SMITH and IsThisOpenable(link)) then + local hasKey = DoIHaveAKey() + ApplyButton(link, hasKey, 0, 1, 1) + end + end + end + end end --[[ ########################################################## BUILD FOR PACKAGE ########################################################## ]]-- -do - local BreakStuff_OnModifier = function(self, arg) - if(not self:IsShown() and not arg and (self.ReadyToSmash == false)) then return; end - if(InCombatLockdown()) then - self:SetAlpha(0) - self:RegisterEvent('PLAYER_REGEN_ENABLED') - else - self:ClearAllPoints() - self:SetAlpha(1) - self:Hide() - AutoCastShine_AutoCastStop(self) - end - end; +local BreakStuff_OnModifier = function(self, arg) + if(not self:IsShown() and not arg and (self.ReadyToSmash == false)) then return; end + if(InCombatLockdown()) then + self:SetAlpha(0) + self:RegisterEvent('PLAYER_REGEN_ENABLED') + else + self:ClearAllPoints() + self:SetAlpha(1) + self:Hide() + AutoCastShine_AutoCastStop(self) + end +end - BreakStuffHandler.MODIFIER_STATE_CHANGED = BreakStuff_OnModifier; +BreakStuffHandler.MODIFIER_STATE_CHANGED = BreakStuff_OnModifier; - local BreakStuff_OnHide = function() - BreakStuffHandler.ReadyToSmash = false - BreakStuffButton.ttText = "BreakStuff : OFF"; - end +local BreakStuff_OnHide = function() + BreakStuffHandler.ReadyToSmash = false + BreakStuffButton.ttText = "BreakStuff : OFF"; +end - local BreakStuff_OnEnter = function(self) - GameTooltip:SetOwner(self,"ANCHOR_TOP",0,4) - GameTooltip:ClearLines() - GameTooltip:AddLine(self.ttText) - GameTooltip:AddLine(self.subText) - if self.ttText2 then - GameTooltip:AddLine(' ') - GameTooltip:AddDoubleLine(self.ttText2,self.ttText2desc,1,1,1) - end; - if BreakStuffHandler.ReadyToSmash ~= true then - self:SetPanelColor("class") - self.icon:SetGradient(unpack(SuperVillain.Media.gradient.highlight)) - end - GameTooltip:Show() - end +local BreakStuff_OnEnter = function(self) + GameTooltip:SetOwner(self,"ANCHOR_TOP",0,4) + GameTooltip:ClearLines() + GameTooltip:AddLine(self.ttText) + GameTooltip:AddLine(self.subText) + if self.ttText2 then + GameTooltip:AddLine(' ') + GameTooltip:AddDoubleLine(self.ttText2,self.ttText2desc,1,1,1) + end + if BreakStuffHandler.ReadyToSmash ~= true then + self:SetPanelColor("class") + self.icon:SetGradient(unpack(SuperVillain.Media.gradient.highlight)) + end + GameTooltip:Show() +end - local BreakStuff_OnLeave = function(self) - if BreakStuffHandler.ReadyToSmash ~= true then - self:SetPanelColor("default") - self.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - end - GameTooltip:Hide() - end +local BreakStuff_OnLeave = function(self) + if BreakStuffHandler.ReadyToSmash ~= true then + self:SetPanelColor("default") + self.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) + GameTooltip:Hide() + end +end + +local BreakStuff_OnClick = function(self) + if InCombatLockdown() then print(ERR_NOT_IN_COMBAT) return end + if BreakStuffHandler.ReadyToSmash == true then + BreakStuffHandler:MODIFIER_STATE_CHANGED() + BreakStuffHandler.ReadyToSmash = false + self.ttText = "BreakStuff : OFF"; + self:SetPanelColor("default") + self.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) + else + BreakStuffHandler.ReadyToSmash = true + self.ttText = "BreakStuff : ON"; + self:SetPanelColor("green") + self.icon:SetGradient(unpack(SuperVillain.Media.gradient.green)) + if(not MOD.BagFrame:IsShown()) then + GameTooltip:Hide() + MOD.BagFrame:Show() + MOD.BagFrame:RefreshBagsSlots() + TTIP.GameTooltip_SetDefaultAnchor(GameTooltip,self) + end + end + GameTooltip:ClearLines() + GameTooltip:AddLine(self.ttText) + GameTooltip:AddLine(self.subText) +end - local BreakStuff_OnClick = function(self) - if InCombatLockdown() then print(ERR_NOT_IN_COMBAT) return end - if BreakStuffHandler.ReadyToSmash == true then - BreakStuffHandler:MODIFIER_STATE_CHANGED() - BreakStuffHandler.ReadyToSmash = false - self.ttText = "BreakStuff : OFF"; - self:SetPanelColor("default") - self.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - else - BreakStuffHandler.ReadyToSmash = true - self.ttText = "BreakStuff : ON"; - self:SetPanelColor("green") - self.icon:SetGradient(unpack(SuperVillain.Media.gradient.green)) - if(not MOD.BagFrame:IsShown()) then - GameTooltip:Hide() - MOD.BagFrame:Show() - MOD.BagFrame:RefreshBagsSlots() - TTIP:GameTooltip_SetDefaultAnchor(GameTooltip) - end - end - GameTooltip:ClearLines() - GameTooltip:AddLine(self.ttText) - GameTooltip:AddLine(self.subText) - end +function BreakStuffHandler:PLAYER_REGEN_ENABLED() + self:UnregisterEvent('PLAYER_REGEN_ENABLED') + BreakStuff_OnModifier(self) +end - function BreakStuffHandler:PLAYER_REGEN_ENABLED() - self:UnregisterEvent('PLAYER_REGEN_ENABLED') - BreakStuff_OnModifier(self) - end; +function MOD:BreakStuffLoader() + local allowed, spellListing, spellName, _ = false, {}; - function MOD:BreakStuffLoader() - local allowed, spellListing, spellName = false, {}; - if(IsSpellKnown(51005)) then - spellName = GetSpellInfo(51005) - BreakStuff_Cache[ITEM_MILLABLE] = {spellName, 1/2, 1, 1/2} - tinsert(spellListing,spellName) - allowed = true - end + if(IsSpellKnown(51005)) then + --print("Milling") + allowed = true + spellName,_ = GetSpellInfo(51005) + BreakStuff_Cache[ITEM_MILLABLE] = {spellName, 0.5, 1, 0.5} + tinsert(spellListing, spellName) + end - if(IsSpellKnown(31252)) then - spellName = GetSpellInfo(31252) - BreakStuff_Cache[ITEM_PROSPECTABLE] = {spellName, 1, 1/3, 1/3} - tinsert(spellListing,spellName) - allowed = true - end + if(IsSpellKnown(31252)) then + --print("Prospecting") + allowed = true + spellName,_ = GetSpellInfo(31252) + BreakStuff_Cache[ITEM_PROSPECTABLE] = {spellName, 1, 0.33, 0.33} + tinsert(spellListing, spellName) + end - if(IsSpellKnown(13262)) then - DE = GetSpellInfo(13262) - tinsert(spellListing,DE) - allowed = true - end + if(IsSpellKnown(13262)) then + --print("Enchanting") + allowed = true + DE,_ = GetSpellInfo(13262) + tinsert(spellListing, DE) + end - if(IsSpellKnown(1804)) then - PICK = GetSpellInfo(1804) - tinsert(spellListing,PICK) - allowed = true - end + if(IsSpellKnown(1804)) then + --print("Lockpicking") + allowed = true + PICK,_ = GetSpellInfo(1804) + tinsert(spellListing, PICK) + end - if(IsSpellKnown(2018)) then - SMITH = GetSpellBookItemInfo((GetSpellInfo(2018))) - tinsert(spellListing,SMITH) - allowed = true - end + if(IsSpellKnown(2018)) then + --print("Blacksmithing") + allowed = true + SMITH,_ = GetSpellBookItemInfo((GetSpellInfo(2018))) + tinsert(spellListing, SMITH) + end - if not allowed then return end; - BreakStuffButton:Show(); - BreakStuffButton:SetFramedButtonTemplate() - BreakStuffButton.icon=BreakStuffButton:CreateTexture(nil,"OVERLAY") - BreakStuffButton.icon:FillInner(BreakStuffButton,2,2) - BreakStuffButton.icon:SetTexture(ICONARTFILE) - BreakStuffButton.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - BreakStuffButton.ttText = "BreakStuff : OFF"; - BreakStuffButton.subText = ""; - BreakStuffButton:SetScript("OnEnter", BreakStuff_OnEnter); - BreakStuffButton:SetScript("OnLeave", BreakStuff_OnLeave); - BreakStuffButton:SetScript("OnClick", BreakStuff_OnClick); - BreakStuffButton:SetScript("OnHide", BreakStuff_OnHide) - BreakStuffButton.subText = tcat(spellListing,"\n"); + if not allowed then return end + BreakStuffButton:Show(); + BreakStuffButton:SetFramedButtonTemplate() + BreakStuffButton.icon=BreakStuffButton:CreateTexture(nil,"OVERLAY") + BreakStuffButton.icon:FillInner(BreakStuffButton,2,2) + BreakStuffButton.icon:SetTexture(ICONARTFILE) + BreakStuffButton.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) + BreakStuffButton.ttText = "BreakStuff : OFF"; + BreakStuffButton.subText = ""; + BreakStuffButton:SetScript("OnEnter", BreakStuff_OnEnter); + BreakStuffButton:SetScript("OnLeave", BreakStuff_OnLeave); + BreakStuffButton:SetScript("OnClick", BreakStuff_OnClick); + BreakStuffButton:SetScript("OnHide", BreakStuff_OnHide) + BreakStuffButton.subText = tcat(spellListing,"\n"); - BreakStuffHandler:RegisterForClicks('AnyUp') - BreakStuffHandler:SetFrameStrata("TOOLTIP") - BreakStuffHandler:SetAttribute("type1","spell") - BreakStuffHandler:SetScript("OnLeave", BreakStuff_OnModifier) - BreakStuffHandler:RegisterEvent("MODIFIER_STATE_CHANGED") - BreakStuffHandler:Hide() + BreakStuffHandler:RegisterForClicks('AnyUp') + BreakStuffHandler:SetFrameStrata("TOOLTIP") + BreakStuffHandler:SetAttribute("type1","spell") + BreakStuffHandler:SetScript("OnLeave", BreakStuff_OnModifier) + BreakStuffHandler:RegisterEvent("MODIFIER_STATE_CHANGED") + BreakStuffHandler:Hide() - GameTooltip:HookScript('OnTooltipSetItem', BreakStuffParser) + GameTooltip:HookScript('OnTooltipSetItem', BreakStuffParser) - for _, sparks in pairs(BreakStuffHandler.sparkles) do - sparks:SetHeight(sparks:GetHeight() * 3) - sparks:SetWidth(sparks:GetWidth() * 3) - end - end -end; \ No newline at end of file + for _, sparks in pairs(BreakStuffHandler.sparkles) do + sparks:SetHeight(sparks:GetHeight() * 3) + sparks:SetWidth(sparks:GetWidth() * 3) + end +end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua index 69ca096..a8af7c4 100644 --- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua +++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua @@ -499,12 +499,12 @@ function MOD:CreateDockPanels() local topleftdata = CreateFrame("Frame", "TopLeftDataPanel", topanchor) topleftdata:Size(leftWidth - 1, buttonsize - 8) topleftdata:Point("LEFT", topanchor, "LEFT", 0, 0) - STATS:NewAnchor(topleftdata, 3, "ANCHOR_BOTTOMLEFT", 17, -4) + STATS:NewAnchor(topleftdata, 3, "ANCHOR_CURSOR", 17, -4) local toprightdata = CreateFrame("Frame", "TopRightDataPanel", topanchor) toprightdata:Size(leftWidth - 1, buttonsize - 8) toprightdata:Point("RIGHT", topanchor, "RIGHT", 0, 0) - STATS:NewAnchor(toprightdata, 3, "ANCHOR_BOTTOMLEFT", 17, -4) + STATS:NewAnchor(toprightdata, 3, "ANCHOR_CURSOR", 17, -4) --BOTTOM STAT HOLDERS local bottomanchor = CreateFrame("Frame", "SuperDockBottomDataAnchor", SuperVillain.UIParent) diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 3d9a4ce..ff8e66b 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -53,7 +53,7 @@ LOCAL VARS local gsub,upper = string.gsub,string.upper; local temp = gsub(SLASH_CALENDAR1, "/", ""); local calendar_string = gsub(temp, "^%l", upper) -local cColor = SVUI_CLASS_COLORS[SuperVillain.class]; +local cColor = RAID_CLASS_COLORS[SuperVillain.class]; local MM_COLOR = {"VERTICAL", 0.65, 0.65, 0.65, 0.95, 0.95, 0.95} local MM_BRDR = 0 local MM_SIZE = 240 diff --git a/Interface/AddOns/SVUI/packages/stats/SVStats.lua b/Interface/AddOns/SVUI/packages/stats/SVStats.lua index 37d81a0..4b5878d 100644 --- a/Interface/AddOns/SVUI/packages/stats/SVStats.lua +++ b/Interface/AddOns/SVUI/packages/stats/SVStats.lua @@ -12,7 +12,27 @@ _____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # ############################################################################## S U P E R - V I L L A I N - U I By: Munglunch # ############################################################################## ---]] +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local pairs = _G.pairs; +local type = _G.type; +local string = _G.string; +local math = _G.math; +--[[ STRING METHODS ]]-- +local join = string.join; +--[[ MATH METHODS ]]-- +local min = math.min; +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- local SuperVillain, L = unpack(select(2, ...)); local MOD = {}; MOD.Anchors = {}; @@ -115,15 +135,15 @@ function MOD:ShowTip(noSpace) MOD.tooltip:Show() end; -function MOD:NewAnchor(parent, max, tipAnchor, x, y) +function MOD:NewAnchor(parent, maxCount, tipAnchor, x, y) ListNeedsUpdate = true MOD.Anchors[parent:GetName()] = parent; parent.holders = {}; - parent.numPoints = max; + parent.numPoints = maxCount; parent.xOff = x; parent.yOff = y; parent.anchor = tipAnchor; - for i = 1, max do + for i = 1, maxCount do local this = MOD.PlotPoints[i] if not parent.holders[this] then parent.holders[this] = CreateFrame("Button", "DataText"..i, parent) @@ -170,7 +190,7 @@ function MOD:NewAnchor(parent, max, tipAnchor, x, y) parent.holders[this].text:SetJustifyV("middle") end; parent.holders[this].MenuList = {}; - parent.holders[this]:Point(GrabPlot(parent, i, max)) + parent.holders[this]:Point(GrabPlot(parent, i, maxCount)) end; parent:SetScript("OnSizeChanged", UpdateAnchor) UpdateAnchor(parent) @@ -266,6 +286,8 @@ do tinsert(UISpecialFrames, StatMenuFrame:GetName()) StatMenuFrame:Hide() end + local maxPerColumn = 25 + local cols = 1 for i=1, #StatMenuFrame.buttons do StatMenuFrame.buttons[i]:Hide() end @@ -292,18 +314,22 @@ do StatMenuFrame.buttons[i]:SetScript("OnClick", DD_OnClick) if i == 1 then StatMenuFrame.buttons[i]:SetPoint("TOPLEFT", StatMenuFrame, "TOPLEFT", 10, -10) + elseif((i -1) % maxPerColumn == 0) then + StatMenuFrame.buttons[i]:SetPoint("TOPLEFT", StatMenuFrame.buttons[i - maxPerColumn], "TOPRIGHT", 10, 0) + cols = cols + 1 else - StatMenuFrame.buttons[i]:SetPoint("TOPLEFT", StatMenuFrame.buttons[i-1], "BOTTOMLEFT") + StatMenuFrame.buttons[i]:SetPoint("TOPLEFT", StatMenuFrame.buttons[i - 1], "BOTTOMLEFT") end end - StatMenuFrame:SetHeight((#list * 16) + 20) - StatMenuFrame:SetWidth(155) + local maxHeight = (min(maxPerColumn, #list) * 16) + 20 + local maxWidth = (135 * cols) + (10 * cols) + StatMenuFrame:SetSize(maxWidth, maxHeight) StatMenuFrame:ClearAllPoints() local point = _locate(self:GetParent()) if strfind(point, "BOTTOM") then - StatMenuFrame:SetPoint("BOTTOMLEFT", self, "TOPLEFT", 0, 0) + StatMenuFrame:SetPoint("BOTTOMLEFT", self, "TOPLEFT", 10, 10) else - StatMenuFrame:SetPoint("TOPLEFT", self, "BOTTOMLEFT", 0, 0) + StatMenuFrame:SetPoint("TOPLEFT", self, "BOTTOMLEFT", 10, -10) end ToggleFrame(StatMenuFrame) end @@ -314,8 +340,9 @@ do elseif(self.onClick) then if(StatMenuFrame:IsShown()) then ToggleFrame(StatMenuFrame) + else + self.onClick(self, button); end - self.onClick(self, button); end end @@ -417,7 +444,6 @@ do end local function SetMenuLists() - -- print(table.dump(MOD.Anchors)) for place,parent in pairs(MOD.Anchors)do for h = 1, parent.numPoints do local this = MOD.PlotPoints[h] @@ -477,7 +503,7 @@ do end local BGStatColorUpdate = function() - BGStatString = string.join("","%s: ", hexString, "%s|r") + BGStatString = join("","%s: ", hexString, "%s|r") if BGStatPrev ~= nil then BG_OnUpdate(BGStatPrev) end @@ -505,7 +531,8 @@ function MOD:ConstructThisPackage() SuperVillain.Registry:RunTemp("SVStats") StatMenuFrame:SetParent(SuperVillain.UIParent); - StatMenuFrame:SetPanelTemplate("Button"); + StatMenuFrame:SetPanelTemplate("Transparent"); + StatMenuFrame:Hide() MOD.tooltip:SetParent(SuperVillain.UIParent) MOD.tooltip:SetFrameStrata("DIALOG") MOD.tooltip:HookScript("OnShow", _hook_TooltipOnShow) diff --git a/Interface/AddOns/SVUI/packages/stats/common/friends.lua b/Interface/AddOns/SVUI/packages/stats/common/friends.lua index 2910cff..0b2a300 100644 --- a/Interface/AddOns/SVUI/packages/stats/common/friends.lua +++ b/Interface/AddOns/SVUI/packages/stats/common/friends.lua @@ -56,7 +56,6 @@ local MOD = SuperVillain.Registry:Expose('SVStats'); LOCALIZED GLOBALS ########################################################## ]]-- -local SVUI_CLASS_COLORS = _G.SVUI_CLASS_COLORS local RAID_CLASS_COLORS = _G.RAID_CLASS_COLORS --[[ ########################################################## @@ -186,10 +185,12 @@ local function BuildBNTable(total) wipe(BNTableWTCG) local _, presenceID, presenceName, battleTag, isBattleTagPresence, toonName, toonID, client, isOnline, lastOnline, isAFK, isDND, messageText, noteText, isRIDFriend, messageTime, canSoR - local hasFocus, realmName, realmID, faction, race, class, guild, zoneName, level, gameText + local toonName, client, realmName, realmID, faction, race, class, zoneName, level, gameText, broadcastText, broadcastTime for i = 1, total do + -- presenceID, presenceName, battleTag, isBattleTagPresence, toonName, toonID, client, isOnline, lastOnline, isAFK, isDND, messageText, noteText, isRIDFriend, broadcastTime, canSoR presenceID, presenceName, battleTag, isBattleTagPresence, toonName, toonID, client, isOnline, lastOnline, isAFK, isDND, messageText, noteText, isRIDFriend, messageTime, canSoR = BNGetFriendInfo(i) - hasFocus, _, _, realmName, realmID, faction, race, class, guild, zoneName, level, gameText = BNGetToonInfo(presenceID); + -- unknown, toonName, client, realmName, realmID, faction, race, class, unknown, zoneName, level, gameText, broadcastText, broadcastTime, unknown, presenceID + _, _, _, realmName, realmID, faction, race, class, _, zoneName, level, gameText, broadcastText, broadcastTime, _, _ = BNGetToonInfo(presenceID); if isOnline then for k,v in pairs(LOCALIZED_CLASS_NAMES_MALE) do if class == v then class = k end end @@ -207,7 +208,7 @@ local function BuildBNTable(total) end end - sort(BNTable, Sort) + --sort(BNTable, Sort) sort(BNTableWoW, Sort) sort(BNTableSC, Sort) sort(BNTableD3, Sort) @@ -251,7 +252,7 @@ local function Click(self, btn) menuCountInvites = menuCountInvites + 1 menuCountWhispers = menuCountWhispers + 1 - classc, levelc = (SVUI_CLASS_COLORS or RAID_CLASS_COLORS)[info[3]], GetQuestDifficultyColor(info[2]) + classc, levelc = RAID_CLASS_COLORS[info[3]], GetQuestDifficultyColor(info[2]) classc = classc or GetQuestDifficultyColor(info[2]); menuList[2].menuList[menuCountInvites] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info[2],classc.r*255,classc.g*255,classc.b*255,info[1]), arg1 = info[1],notCheckable=true, func = inviteClick} @@ -269,7 +270,7 @@ local function Click(self, btn) menuList[3].menuList[menuCountWhispers] = {text = realID, arg1 = realID, arg2 = true, notCheckable=true, func = whisperClick} if info[6] == wowString and UnitFactionGroup("player") == info[12] then - classc, levelc = (SVUI_CLASS_COLORS or RAID_CLASS_COLORS)[info[14]], GetQuestDifficultyColor(info[16]) + classc, levelc = RAID_CLASS_COLORS[info[14]], GetQuestDifficultyColor(info[16]) classc = classc or GetQuestDifficultyColor(info[16]) if UnitInParty(info[4]) or UnitInRaid(info[4]) then grouped = 1 else grouped = 2 end @@ -315,7 +316,7 @@ local function OnEnter(self) info = friendTable[i] if info[5] then if GetRealZoneText() == info[4] then zonec = activezone else zonec = inactivezone end - classc, levelc = (SVUI_CLASS_COLORS or RAID_CLASS_COLORS)[info[3]], GetQuestDifficultyColor(info[2]) + classc, levelc = RAID_CLASS_COLORS[info[3]], GetQuestDifficultyColor(info[2]) classc = classc or GetQuestDifficultyColor(info[2]) @@ -327,25 +328,32 @@ local function OnEnter(self) if numBNetOnline > 0 then local status = 0 - for client, BNTable in pairs(tableList) do - if #BNTable > 0 then + for client, list in pairs(tableList) do + if #list > 0 then MOD.tooltip:AddLine(' ') MOD.tooltip:AddLine(battleNetString..' ('..client..')') - for i = 1, #BNTable do - info = BNTable[i] + for i = 1, #list do + info = list[i] + -- for x = 1, #info do + -- print(x) + -- print(info[x]) + -- print("-----") + -- end if info[6] then if info[5] == wowString then if (info[7] == true) then status = 1 elseif (info[8] == true) then status = 2 else status = 3 end - classc = (SVUI_CLASS_COLORS or RAID_CLASS_COLORS)[info[13]] + classc = RAID_CLASS_COLORS[info[13]] + + if UnitInParty(info[4]) or UnitInRaid(info[4]) then grouped = 1 else grouped = 2 end + if info[15] ~= '' then levelc = GetQuestDifficultyColor(info[15]) + MOD.tooltip:AddDoubleLine(format(levelNameString, levelc.r*255, levelc.g*255, levelc.b*255, info[15], classc.r*255, classc.g*255, classc.b*255, info[3], groupedTable[grouped], 255, 0, 0, statusTable[status]), info[2], 238, 238, 238, 238, 238, 238) else - levelc = RAID_CLASS_COLORS["PRIEST"] - classc = RAID_CLASS_COLORS["PRIEST"] + classc = classc or RAID_CLASS_COLORS["PRIEST"] + MOD.tooltip:AddDoubleLine(format("|cff%02x%02x%02x%s|r", classc.r*255, classc.g*255, classc.b*255, info[3], groupedTable[grouped], 255, 0, 0, statusTable[status]), info[2], 238, 238, 238, 238, 238, 238) end - if UnitInParty(info[4]) or UnitInRaid(info[4]) then grouped = 1 else grouped = 2 end - MOD.tooltip:AddDoubleLine(format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info[15],classc.r*255,classc.g*255,classc.b*255,info[3],groupedTable[grouped], 255, 0, 0, statusTable[status]),info[2],238,238,238,238,238,238) if IsShiftKeyDown() then if GetRealZoneText() == info[14] then zonec = activezone else zonec = inactivezone end if GetRealmName() == info[10] then realmc = activezone else realmc = inactivezone end diff --git a/Interface/AddOns/SVUI/packages/stats/common/guild.lua b/Interface/AddOns/SVUI/packages/stats/common/guild.lua index 8e95a52..3858dbe 100644 --- a/Interface/AddOns/SVUI/packages/stats/common/guild.lua +++ b/Interface/AddOns/SVUI/packages/stats/common/guild.lua @@ -211,7 +211,7 @@ local function Guild_OnClick(self, button) for i = 1, #GuildStatMembers do info = GuildStatMembers[i] if info[7] and info[1] ~= SuperVillain.name then - local classc, levelc = CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS[info[9]], GetQuestDifficultyColor(info[3]) + local classc, levelc = RAID_CLASS_COLORS[info[9]], GetQuestDifficultyColor(info[3]) if UnitInParty(info[1])or UnitInRaid(info[1]) then grouped = "|cffaaaaaa*|r" elseif not info[11] then @@ -291,7 +291,7 @@ local function Guild_OnEnter(self, _, ap) else zoneColor = {r=0.65,g=0.65,b=0.65} end; - classColor, questColor = CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS[member[9]], GetQuestDifficultyColor(member[3]) + classColor, questColor = RAID_CLASS_COLORS[member[9]], GetQuestDifficultyColor(member[3]) if UnitInParty(member[1]) or UnitInRaid(member[1]) then groupFormat = "|cffaaaaaa*|r" else diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua index 133740c..9ae50c5 100644 --- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua +++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua @@ -485,7 +485,7 @@ do local function AppendUpdateHandler(unit) return function() local db = MOD.db[unit] - if db.enable ~= true then + if db.enable ~= true then UnregisterAttributeDriver(MOD[unit], "state-visibility") MOD[unit]:Hide() return @@ -606,6 +606,11 @@ do local GroupUpdate = function(self) --<< local unitName = self.NameKey; MOD[unitName].db = MOD.db[unitName] + if MOD[unitName].db.enable ~= true then + UnregisterAttributeDriver(MOD[unitName], "state-visibility") + MOD[unitName]:Hide() + return + end for i=1,#self.subunits do self.subunits[i].db = MOD.db[unitName] self.subunits[i]:Update() diff --git a/Interface/AddOns/SVUI/packages/unit/common/castbar.lua b/Interface/AddOns/SVUI/packages/unit/common/castbar.lua index fa312fa..b866cfe 100644 --- a/Interface/AddOns/SVUI/packages/unit/common/castbar.lua +++ b/Interface/AddOns/SVUI/packages/unit/common/castbar.lua @@ -445,7 +445,7 @@ local colors = oUF_SuperVillain.colors end; self:SetStatusBarColor(r, g, b) if self.bg:IsShown() then - self.bg:SetVertexColor(r * 0.1, g * 0.1, b * 0.1, 0.8) + self.bg:SetVertexColor(r * 0.2, g * 0.2, b * 0.2) end if(self.Spark and self.Spark[1]) then @@ -475,62 +475,42 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) castbar:SetClampedToScreen(true) castbar:SetFrameLevel(2) - castbar.Time = castbar:CreateFontString(nil, "OVERLAY") - castbar.Time:SetFont(SuperVillain.Media.font.numbers, 14) - castbar.Time:SetShadowOffset(1, -1) - castbar.Time:SetTextColor(1, 1, 1, 0.9) - - castbar.Text = castbar:CreateFontString(nil, "OVERLAY") - castbar.Text:SetFont(SuperVillain.Media.font.alert, 14) - castbar.Text:SetShadowOffset(1, -1) - castbar.Text:SetTextColor(1, 1, 1) - castbar.LatencyTexture = castbar:CreateTexture(nil, "OVERLAY") + local castbarHolder = CreateFrame("Frame", nil, castbar) local iconHolder = CreateFrame("Frame", nil, castbar) - local castbarHolder = CreateFrame("Frame", nil, castbar) iconHolder:SetFixedPanelTemplate("Inset", false) + local buttonIcon = iconHolder:CreateTexture(nil, "BORDER") + buttonIcon:FillInner() + buttonIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + buttonIcon.bg = iconHolder; + castbar.Icon = buttonIcon; + local shieldIcon = iconHolder:CreateTexture(nil, "ARTWORK") + shieldIcon:Point("TOPLEFT",buttonIcon,"TOPLEFT",-7,7) + shieldIcon:Point("BOTTOMRIGHT",buttonIcon,"BOTTOMRIGHT",7,-8) + shieldIcon:SetTexture("Interface\\Addons\\SVUI\\assets\\artwork\\Unitframe\\Castbar\\SHIELD") + castbar.Shield = shieldIcon; + + castbar.Time = iconHolder:CreateFontString(nil, "OVERLAY") + castbar.Text = castbar:CreateFontString(nil, "OVERLAY") - + local bgFrame = CreateFrame("Frame", nil, castbar) local hadouken = CreateFrame("Frame", nil, castbar) if ryu then + castbar.Time:SetFont(SuperVillain.Media.font.numbers, 12, "OUTLINE") + castbar.Time:SetShadowOffset(1, -1) + castbar.Time:SetTextColor(1, 1, 1, 0.9) + castbar.Text:SetFont(SuperVillain.Media.font.alert, 13) + castbar.Text:SetShadowOffset(1, -1) + castbar.Text:SetTextColor(1, 1, 1) + castbar:SetStatusBarTexture(SuperVillain.Media.bar.lazer) - local bgFrame = CreateFrame("Frame", nil, castbar) bgFrame:FillInner(castbar, -2, 10) bgFrame:SetFrameLevel(bgFrame:GetFrameLevel() - 1) - castbar.bg = bgFrame:CreateTexture(nil, "BACKGROUND") - castbar.bg:SetAllPoints(bgFrame) - castbar.bg:SetTexture(SuperVillain.Media.bar.glow) - castbar.bg:SetVertexColor(0,0,0,0.8) - - local borderB = bgFrame:CreateTexture(nil,"OVERLAY") - borderB:SetTexture(0,0,0) - borderB:SetPoint("BOTTOMLEFT") - borderB:SetPoint("BOTTOMRIGHT") - borderB:SetHeight(2) - - local borderT = bgFrame:CreateTexture(nil,"OVERLAY") - borderT:SetTexture(0,0,0) - borderT:SetPoint("TOPLEFT") - borderT:SetPoint("TOPRIGHT") - borderT:SetHeight(2) - - local borderL = bgFrame:CreateTexture(nil,"OVERLAY") - borderL:SetTexture(0,0,0) - borderL:SetPoint("TOPLEFT") - borderL:SetPoint("BOTTOMLEFT") - borderL:SetWidth(2) - - local borderR = bgFrame:CreateTexture(nil,"OVERLAY") - borderR:SetTexture(0,0,0) - borderR:SetPoint("TOPRIGHT") - borderR:SetPoint("BOTTOMRIGHT") - borderR:SetWidth(2) - castbar.LatencyTexture:SetTexture(SuperVillain.Media.bar.lazer) castbar.noupdate = true; castbar.pewpew = true @@ -538,6 +518,7 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) hadouken:SetHeight(50) hadouken:SetWidth(50) hadouken:SetAlpha(0.9) + castbarHolder:Point("TOP", frame, "BOTTOM", 0, isBoss and -4 or -35) if reversed then @@ -573,11 +554,10 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) SuperVillain.Animate:Sprite(hadouken[2],false,false,true) castbar:Point("BOTTOMLEFT", castbarHolder, "BOTTOMLEFT", 1, 1) - castbar.Time:Point("RIGHT", castbar, "RIGHT", -4, 0) - castbar.Time:SetJustifyH("RIGHT") - castbar.Text:SetPoint("LEFT", castbar, "LEFT", 4, 0) - castbar.Text:SetJustifyH("LEFT") - iconHolder:Point("LEFT", castbar, "RIGHT", 6, 0) + iconHolder:Point("LEFT", castbar, "RIGHT", 4, 0) + + castbar.Time:Point("RIGHT", castbar, "LEFT", -4, 0) + castbar.Time:SetJustifyH("CENTER") else hadouken[1] = hadouken:CreateTexture(nil, "ARTWORK") hadouken[1]:SetAllPoints(hadouken) @@ -610,29 +590,41 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) SuperVillain.Animate:Sprite(hadouken[2],false,false,true) castbar:Point("BOTTOMRIGHT", castbarHolder, "BOTTOMRIGHT", -1, 1) - castbar.Text:Point("RIGHT", castbar, "RIGHT", -4, 0) - castbar.Text:SetJustifyH("RIGHT") - castbar.Time:SetPoint("LEFT", castbar, "LEFT", 4, 0) - castbar.Time:SetJustifyH("LEFT") - iconHolder:Point("RIGHT", castbar, "LEFT", -6, 0) - end; + iconHolder:Point("RIGHT", castbar, "LEFT", -4, 0) + + castbar.Time:Point("LEFT", castbar, "RIGHT", 4, 0) + castbar.Time:SetJustifyH("CENTER") + end + + -- castbar.Time:Point("CENTER", iconHolder, "CENTER", 0, 0) + -- castbar.Time:SetJustifyH("CENTER") + + castbar.Text:SetPoint("CENTER", castbar, "CENTER", 0, 0) + castbar.Text:SetJustifyH("CENTER") else + castbar.Time:SetFont(SuperVillain.Media.font.roboto, 11) + castbar.Time:SetShadowOffset(1, -1) + castbar.Time:SetTextColor(1, 1, 1, 0.9) + castbar.Time:SetPoint("RIGHT", castbar, "LEFT", -1, 0) + castbar.Time:SetJustifyH("RIGHT") + + castbar.Text:SetFont(SuperVillain.Media.font.roboto, 11) + castbar.Text:SetShadowOffset(1, -1) + castbar.Text:SetTextColor(1, 1, 1, 0.9) + castbar.Text:Point("CENTER", castbar, "CENTER", 0, 0) + castbar.Text:SetJustifyH("CENTER") + castbar.pewpew = false - castbar.Text:Point("RIGHT", castbar, "RIGHT", -4, 0) - castbar.Text:SetJustifyH("RIGHT") - castbar.Time:SetPoint("LEFT", castbar, "LEFT", 4, 0) - castbar.Time:SetJustifyH("LEFT") + castbar:SetStatusBarTexture(SuperVillain.Media.bar.glow) + castbarHolder:Point("TOP", frame, "BOTTOM", 0, -4) + castbar:FillInner(castbarHolder, 2, 2) + + bgFrame:SetAllPoints(castbarHolder) + bgFrame:SetFrameLevel(bgFrame:GetFrameLevel() - 1) - MOD:SetUnitStatusbar(castbar) - castbar.bg = castbar:CreateTexture(nil, "BACKGROUND") - castbar.bg:WrapOuter(castbar) - MOD:SetUnitStatusbar(castbar.bg) - MOD:SetUnitStatusbar(castbar.LatencyTexture) - castbar.bg:SetVertexColor(0,0,0,0.5) + castbar.LatencyTexture:SetTexture(SuperVillain.Media.bar.default) - castbarHolder:Point("TOP", frame, "BOTTOM", 0, -1) - castbar:WrapOuter(castbarHolder, 0, 2) if reversed then castbar:SetReverseFill(true) iconHolder:Point("LEFT", castbar, "RIGHT", 6, 0) @@ -641,6 +633,35 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) end end; + castbar.bg = bgFrame:CreateTexture(nil, "BACKGROUND") + castbar.bg:SetAllPoints(bgFrame) + castbar.bg:SetTexture(SuperVillain.Media.bar.default) + castbar.bg:SetVertexColor(0,0,0,0.5) + + local borderB = bgFrame:CreateTexture(nil,"OVERLAY") + borderB:SetTexture(0,0,0) + borderB:SetPoint("BOTTOMLEFT") + borderB:SetPoint("BOTTOMRIGHT") + borderB:SetHeight(2) + + local borderT = bgFrame:CreateTexture(nil,"OVERLAY") + borderT:SetTexture(0,0,0) + borderT:SetPoint("TOPLEFT") + borderT:SetPoint("TOPRIGHT") + borderT:SetHeight(2) + + local borderL = bgFrame:CreateTexture(nil,"OVERLAY") + borderL:SetTexture(0,0,0) + borderL:SetPoint("TOPLEFT") + borderL:SetPoint("BOTTOMLEFT") + borderL:SetWidth(2) + + local borderR = bgFrame:CreateTexture(nil,"OVERLAY") + borderR:SetTexture(0,0,0) + borderR:SetPoint("TOPRIGHT") + borderR:SetPoint("BOTTOMRIGHT") + borderR:SetWidth(2) + castbar:SetStatusBarColor(colors.casting[1],colors.casting[2],colors.casting[3]) castbar.LatencyTexture:SetVertexColor(0.1, 1, 0.2, 0.5) @@ -653,16 +674,7 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss) if moverName then SuperVillain:SetSVMovable(castbar.Holder, frame:GetName().."Castbar_MOVE", moverName, nil, -6, nil, "ALL, SOLO") end; - local buttonIcon = iconHolder:CreateTexture(nil, "ARTWORK") - buttonIcon:FillInner() - buttonIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - buttonIcon.bg = iconHolder; - castbar.Icon = buttonIcon; - local shieldIcon = iconHolder:CreateTexture(nil, "OVERLAY") - shieldIcon:Point("TOPLEFT",buttonIcon,"TOPLEFT",-7,7) - shieldIcon:Point("BOTTOMRIGHT",buttonIcon,"BOTTOMRIGHT",7,-8) - shieldIcon:SetTexture("Interface\\Addons\\SVUI\\assets\\artwork\\Unitframe\\Castbar\\SHIELD") - castbar.Shield = shieldIcon; + if useFader then SetCastbarFading(frame, castbar, SuperVillain.Media.bar.lazer) end; diff --git a/Interface/AddOns/SVUI/packages/unit/frames/all_units.lua b/Interface/AddOns/SVUI/packages/unit/frames/all_units.lua index 9c2be0d..113773f 100644 --- a/Interface/AddOns/SVUI/packages/unit/frames/all_units.lua +++ b/Interface/AddOns/SVUI/packages/unit/frames/all_units.lua @@ -447,8 +447,8 @@ function MOD:RefreshUnitLayout(frame, template) end castbar:SetFrameStrata("HIGH") if castbar.Holder then - castbar.Holder:Width(castWidth + (1 * 2)) - castbar.Holder:Height(castHeight + (1 * 2)) + castbar.Holder:Width(castWidth + 2) + castbar.Holder:Height(castHeight + 6) local holderUpdate = castbar.Holder:GetScript('OnSizeChanged') if holderUpdate then holderUpdate(castbar.Holder) @@ -464,8 +464,8 @@ function MOD:RefreshUnitLayout(frame, template) end if castbar.Icon then if db.castbar.icon then - castbar.Icon.bg:Width(castHeight + (1 * 2)) - castbar.Icon.bg:Height(castHeight + (1 * 2)) + castbar.Icon.bg:Width(castHeight + 2) + castbar.Icon.bg:Height(castHeight + 2) castbar.Icon.bg:Show() else castbar.Icon.bg:Hide() diff --git a/Interface/AddOns/SVUI/packages/unit/frames/extra/arena.lua b/Interface/AddOns/SVUI/packages/unit/frames/extra/arena.lua index 6332c95..f010073 100644 --- a/Interface/AddOns/SVUI/packages/unit/frames/extra/arena.lua +++ b/Interface/AddOns/SVUI/packages/unit/frames/extra/arena.lua @@ -54,14 +54,13 @@ end function MOD.Construct:arena(frame) MOD:SetActionPanel(frame) - frame.ActionPanel:SetFrameLevel(5) frame.Health = MOD:CreateHealthBar(frame, true, true, true) frame.Power = MOD:CreatePowerBar(frame, true, true, "LEFT") frame.Name = MOD:CreateNameText(frame, "arena") MOD:CreatePortrait(frame) frame.Buffs = MOD:CreateBuffs(frame) frame.Debuffs = MOD:CreateDebuffs(frame) - frame.Castbar = MOD:CreateCastbar(frame, true) + frame.Castbar = MOD:CreateCastbar(frame, true, nil, true, nil, true) --frame.HealPrediction = MOD:CreateHealPrediction(frame) frame.Trinket = MOD:CreateTrinket(frame) frame.PVPSpecIcon = MOD:CreatePVPSpecIcon(frame) @@ -70,7 +69,7 @@ function MOD.Construct:arena(frame) if not frame.prepFrame then frame.prepFrame = CreateFrame("Frame", frame:GetName().."PrepFrame", UIParent) - frame.prepFrame:SetFrameStrata("BACKGROUND") + frame.prepFrame:SetFrameStrata("MEDIUM") frame.prepFrame:SetAllPoints(frame) frame.prepFrame:SetID(frame:GetID()) frame.prepFrame.Health = CreateFrame("StatusBar", nil, frame.prepFrame) diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua index 81f656e..a01ce5f 100644 --- a/Interface/AddOns/SVUI/system/alerts.lua +++ b/Interface/AddOns/SVUI/system/alerts.lua @@ -83,7 +83,8 @@ SuperVillain.SystemAlert["FAILED_UISCALE"] = { text = L["You have changed your UIScale, however you still have the AutoScale option enabled in SVUI. Press accept if you would like to disable the Auto Scale option."], button1 = ACCEPT, button2 = CANCEL, - OnAccept = function() SuperVillain.db.system.autoScale = false; ReloadUI(); end, + OnAccept = function() SuperVillain.db.system.autoScale = false; ReloadUI(); end, + OnCancel = function() ReloadUI() end, timeout = 0, whileDead = 1, hideOnEscape = false, diff --git a/Interface/AddOns/SVUI/system/classes/Database.lua b/Interface/AddOns/SVUI/system/classes/Database.lua index 441e940..6eccc9a 100644 --- a/Interface/AddOns/SVUI/system/classes/Database.lua +++ b/Interface/AddOns/SVUI/system/classes/Database.lua @@ -198,7 +198,8 @@ local DatabaseDefaults = { ["framelocations"] = {}, ["system"] = { ["cooldown"] = true, - ["autoScale"] = true, + ["autoScale"] = true, + ["multiMonitor"] = false, ["taintLog"] = false, ["stickyFrames"] = true, ["loginmessage"] = true, @@ -559,7 +560,7 @@ local DatabaseDefaults = { ["buttonsize"] = 24, ["buttonspacing"] = 3, ["useCustomVisibility"] = false, - ["customVisibility"] = "[petbattle] hide;[pet, novehicleui, nooverridebar, nopossessbar] show;hide", + ["customVisibility"] = "[petbattle] hide; [pet, novehicleui, nooverridebar, nopossessbar] show; hide", ["alpha"] = 1 }, ["Stance"] = { @@ -572,6 +573,8 @@ local DatabaseDefaults = { ["backdrop"] = false, ["buttonsize"] = 24, ["buttonspacing"] = 5, + ["useCustomVisibility"] = false, + ["customVisibility"] = "[petbattle] hide; show", ["alpha"] = 1 }, }, @@ -864,7 +867,7 @@ local DatabaseDefaults = { ["height"] = 60, ["lowmana"] = 30, ["combatfade"] = false, - ["predict"] = true, + ["predict"] = false, ["threatEnabled"] = true, ["playerExpBar"] = false, ["playerRepBar"] = false, @@ -1061,7 +1064,7 @@ local DatabaseDefaults = { ["height"] = 60, ["threatEnabled"] = true, ["rangeCheck"] = true, - ["predict"] = true, + ["predict"] = false, ["smartAuraDisplay"] = "DISABLED", ["middleClickFocus"] = true, ["formatting"] = { diff --git a/Interface/AddOns/SVUI/system/mentalo.lua b/Interface/AddOns/SVUI/system/mentalo.lua index ace5b30..1395de8 100644 --- a/Interface/AddOns/SVUI/system/mentalo.lua +++ b/Interface/AddOns/SVUI/system/mentalo.lua @@ -777,7 +777,7 @@ function SuperVillain:MentaloFocusUpdate(frame) SVUI_MentaloPrecisionSetY:SetText(w) SVUI_MentaloPrecisionSetX.CurrentValue = v; SVUI_MentaloPrecisionSetY.CurrentValue = w; - SVUI_MentaloPrecision.Title:SetText(frame.textSting) + SVUI_MentaloPrecision.Title:SetText(frame.textString) end function SuperVillain:MovableFocused() diff --git a/Interface/AddOns/SVUI/system/mentalo.xml b/Interface/AddOns/SVUI/system/mentalo.xml index 46610a2..9d35127 100644 --- a/Interface/AddOns/SVUI/system/mentalo.xml +++ b/Interface/AddOns/SVUI/system/mentalo.xml @@ -25,7 +25,7 @@ </Frame> <Frame name="SVUI_MentaloPrecision" inherits="SVUI_PanelTemplate" hidden="true" frameStrata="DIALOG"> - <Size x="200" y="110"/> + <Size x="130" y="60"/> <Anchors> <Anchor point="CENTER"/> </Anchors> @@ -33,9 +33,25 @@ <Layer level="ARTWORK"> <FontString parentKey="Title" inherits="GameFontNormal" text="Focused Position"> <Anchors> - <Anchor point="TOPLEFT" relativeTo="$parentTitleBG"/> - <Anchor point="BOTTOMRIGHT" relativeTo="$parentTitleBG"/> + <Anchor point="TOPLEFT" relativeTo="$parentTitleBG" relativePoint="TOPLEFT"/> + <Anchor point="BOTTOMRIGHT" relativeTo="$parentTitleBG" relativePoint="BOTTOMRIGHT"/> + </Anchors> + </FontString> + <FontString inherits="NumberFont_Outline_Huge" text="X"> + <Anchors> + <Anchor point="RIGHT" relativeTo="$parent" relativePoint="LEFT"> + <Offset x="-3" y="0"/> + </Anchor> + </Anchors> + <Color r="1" g="0.5" b="0" a="1"/> + </FontString> + <FontString inherits="NumberFont_Outline_Huge" text="Y"> + <Anchors> + <Anchor point="LEFT" relativeTo="$parent" relativePoint="RIGHT"> + <Offset x="3" y="0"/> + </Anchor> </Anchors> + <Color r="1" g="0.5" b="0" a="1"/> </FontString> </Layer> </Layers> @@ -44,19 +60,9 @@ <Size x="50" y="17"/> <Anchors> <Anchor point="BOTTOMRIGHT" relativeTo="$parentBG" relativePoint="CENTER"> - <Offset x="-8" y="8"/> + <Offset x="-12" y="3"/> </Anchor> </Anchors> - <Layers> - <Layer level="ARTWORK"> - <FontString inherits="GameFontNormal" text="Horizontal"> - <Size x="90" y="17"/> - <Anchors> - <Anchor point="BOTTOM" relativeTo="$parent" relativePoint="TOP"/> - </Anchors> - </FontString> - </Layer> - </Layers> <Scripts> <OnEscapePressed function="SVUI_MentaloPrecisionInput_EscapePressed"/> <OnEnterPressed function="SVUI_MentaloPrecisionInput_EnterPressed"/> @@ -71,19 +77,9 @@ <Size x="50" y="17"/> <Anchors> <Anchor point="BOTTOMLEFT" relativeTo="$parentBG" relativePoint="CENTER"> - <Offset x="8" y="8"/> + <Offset x="12" y="3"/> </Anchor> </Anchors> - <Layers> - <Layer level="ARTWORK"> - <FontString inherits="GameFontNormal" text="Vertical"> - <Size x="90" y="17"/> - <Anchors> - <Anchor point="BOTTOM" relativeTo="$parent" relativePoint="TOP"/> - </Anchors> - </FontString> - </Layer> - </Layers> <Scripts> <OnEscapePressed function="SVUI_MentaloPrecisionInput_EscapePressed"/> <OnEnterPressed function="SVUI_MentaloPrecisionInput_EnterPressed"/> @@ -105,9 +101,10 @@ </Button> --> <Button name="$parentUpButton" inherits="UIPanelSquareButton"> + <Size x="25" y="20"/> <Anchors> - <Anchor point="BOTTOMLEFT" relativeTo="$parentBG" relativePoint="BOTTOM"> - <Offset x="6" y="4"/> + <Anchor point="TOPLEFT" relativeTo="$parentBG" relativePoint="CENTER"> + <Offset x="10" y="-3"/> </Anchor> </Anchors> <Scripts> @@ -124,9 +121,10 @@ </Button> <Button name="$parentDownButton" inherits="UIPanelSquareButton"> + <Size x="25" y="20"/> <Anchors> <Anchor point="LEFT" relativeTo="$parentUpButton" relativePoint="RIGHT"> - <Offset x="6" y="0"/> + <Offset x="2" y="0"/> </Anchor> </Anchors> <Scripts> @@ -143,9 +141,10 @@ </Button> <Button name="$parentRightButton" inherits="UIPanelSquareButton"> + <Size x="25" y="20"/> <Anchors> <Anchor point="RIGHT" relativeTo="$parentUpButton" relativePoint="LEFT"> - <Offset x="-6" y="0"/> + <Offset x="-20" y="0"/> </Anchor> </Anchors> <Scripts> @@ -162,9 +161,10 @@ </Button> <Button name="$parentLeftButton" inherits="UIPanelSquareButton"> + <Size x="25" y="20"/> <Anchors> <Anchor point="RIGHT" relativeTo="$parentRightButton" relativePoint="LEFT"> - <Offset x="-6" y="0"/> + <Offset x="-2" y="0"/> </Anchor> </Anchors> <Scripts> @@ -205,7 +205,7 @@ </Texture> </Layer> <Layer level="ARTWORK"> - <FontString parentKey="Title" inherits="GameFontNormal" justifyH="LEFT" text="Mentalo The Frame Mover!"> + <FontString parentKey="Title" inherits="SystemFont_Small" justifyH="LEFT" text="Mentalo The Frame Mover!"> <Anchors> <Anchor point="TOPLEFT" relativeTo="$parentTitleBG"> <Offset x="4" y="0"/> @@ -214,6 +214,17 @@ </Anchors> <Color r="1" g="1" b="1" a="1"/> </FontString> + <FontString parentKey="SubTitle" inherits="FriendsFont_Small" justifyH="CENTER" text="Right-click frames to move with precision."> + <Anchors> + <Anchor point="TOPLEFT" relativeTo="$parentTitleBG" relativePoint="BOTTOMLEFT"> + <Offset x="4" y="-4"/> + </Anchor> + <Anchor point="TOPRIGHT" relativeTo="$parentTitleBG" relativePoint="BOTTOMRIGHT"> + <Offset x="-4" y="-4"/> + </Anchor> + </Anchors> + <Color r="1" g="1" b="0" a="0.8"/> + </FontString> <Texture parentKey="Avatar" file="Interface\AddOns\SVUI\assets\artwork\Doodads\MENTALO-OFF"> <Size x="132" y="132"/> <Anchors> diff --git a/Interface/AddOns/SVUI/system/screen.lua b/Interface/AddOns/SVUI/system/screen.lua index d3283e6..57d7df4 100644 --- a/Interface/AddOns/SVUI/system/screen.lua +++ b/Interface/AddOns/SVUI/system/screen.lua @@ -65,17 +65,29 @@ function SuperVillain:UIScale(event) elseif self.screenwidth >= 3840 then local width = self.screenwidth; local height = self.screenheight; - if width >= 9840 then width = 3280; end - if width >= 7680 and width < 9840 then width = 2560; end - if width >= 5760 and width < 7680 then width = 1920; end - if width >= 5040 and width < 5760 then width = 1680; end - if width >= 4800 and width < 5760 and height == 900 then width = 1600; end - if width >= 4320 and width < 4800 then width = 1440; end - if width >= 4080 and width < 4320 then width = 1360; end - if width >= 3840 and width < 4080 then width = 1224; end - if width < 1600 then - self.ghettoMonitor = true; + if(self.db.system.multiMonitor) then + if width >= 9840 then width = 3280; end + if width >= 7680 and width < 9840 then width = 2560; end + if width >= 5760 and width < 7680 then width = 1920; end + if width >= 5040 and width < 5760 then width = 1680; end + if width >= 4800 and width < 5760 and height == 900 then width = 1600; end + if width >= 4320 and width < 4800 then width = 1440; end + if width >= 4080 and width < 4320 then width = 1360; end + if width >= 3840 and width < 4080 then width = 1224; end + if width < 1600 then + self.ghettoMonitor = true; + end + else + if width >= 9840 then width = 9840; end + if width >= 7680 and width < 9840 then width = 7680; end + if width >= 5760 and width < 7680 then width = 5760; end + if width >= 5040 and width < 5760 then width = 5040; end + if width >= 4800 and width < 5040 then width = 4800; end + if width >= 4320 and width < 4800 then width = 4320; end + if width >= 4080 and width < 4320 then width = 4080; end + if width >= 3840 and width < 4080 then width = 3840; end end + self.evaluatedWidth = width; end diff --git a/Interface/AddOns/SVUI/system/system.lua b/Interface/AddOns/SVUI/system/system.lua index 352038b..c80707d 100644 --- a/Interface/AddOns/SVUI/system/system.lua +++ b/Interface/AddOns/SVUI/system/system.lua @@ -438,7 +438,7 @@ local function FullLoad(self) _G["SVUI_Mentalo"]:SetFixedPanelTemplate("Component") _G["SVUI_Mentalo"]:SetPanelColor("yellow") - _G["SVUI_MentaloPrecision"]:SetFixedPanelTemplate("Default") + _G["SVUI_MentaloPrecision"]:SetPanelTemplate("Transparent") Consuela:RegisterAllEvents() Consuela:SetScript("OnEvent", function(self, event) @@ -471,7 +471,7 @@ local Registry_OnEvent = function(self, event, arg, ...) elseif(event == "ACTIVE_TALENT_GROUP_CHANGED" or event == "PLAYER_TALENT_UPDATE" or event == "CHARACTER_POINTS_CHANGED" or event == "UNIT_INVENTORY_CHANGED" or event == "UPDATE_BONUS_ACTIONBAR") then SuperVillain:DefinePlayerRole() elseif(event == "UI_SCALE_CHANGED") then - SuperVillain:UIScale() + SuperVillain:UIScale("UI_SCALE_CHANGED") elseif(event == "PLAYER_ENTERING_WORLD") then SuperVillain:DefinePlayerRole() if(not SuperVillain.MediaUpdated) then diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua index 5825877..7742c2e 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua @@ -239,8 +239,16 @@ SuperVillain.Options.args.common = { get = function(j)return SuperVillain.db.system.autoScale end, set = function(j,value)SuperVillain.db.system.autoScale = value;SuperVillain:StaticPopup_Show("RL_CLIENT")end }, - hideErrorFrame = { + multiMonitor = { order = 2, + name = L["Multi Monitor"], + desc = L["Adjust UI dimensions to accomodate for multiple monitor setups"], + type = "toggle", + get = function(j)return SuperVillain.db.system.multiMonitor end, + set = function(j,value)SuperVillain.db.system.multiMonitor = value;SuperVillain:StaticPopup_Show("RL_CLIENT")end + }, + hideErrorFrame = { + order = 3, name = L["Hide Error Text"], desc = L["Hides the red error text at the top of the screen while in combat."], type = "toggle", @@ -248,7 +256,7 @@ SuperVillain.Options.args.common = { set = function(j,value)SuperVillain.db.system.hideErrorFrame = value;SuperVillain:StaticPopup_Show("RL_CLIENT")end }, LoginMessage = { - order = 3, + order = 4, type = 'toggle', name = L['Login Message'], get = function(j)return SuperVillain.db.system.loginmessage end, diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua index 382bcda..029ca03 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/bar.lua @@ -396,7 +396,7 @@ local function BarConfigLoader() } }, customGroup = { - name = L["Stateful Options"], + name = L["Visibility Options"], type = "group", order = 6, guiInline = true, @@ -432,7 +432,7 @@ local function BarConfigLoader() get = function(e)return SuperVillain.db.SVBar["Pet"].customVisibility end, set = function(e,f) SuperVillain.db.SVBar["Pet"].customVisibility = f; - MOD.db["Bar"..d].customVisibility = f; + MOD.db["Pet"].customVisibility = f; MOD:RefreshBar("Pet") end, disabled = function()return not SuperVillain.db.SVBar["Pet"].useCustomVisibility end, @@ -547,14 +547,14 @@ local function BarConfigLoader() } }, customGroup = { - name = L["Stateful Options"], + name = L["Visibility Options"], type = "group", order = 6, guiInline = true, disabled = function()return not SuperVillain.db.SVBar["Stance"].enable end, args = { style = { - order = 13, + order = 1, type = "select", name = L["Style"], desc = L["This setting will be updated upon changing stances."], @@ -562,7 +562,53 @@ local function BarConfigLoader() ["darkenInactive"] = L["Darken Inactive"], ["classic"] = L["Classic"] } - } + }, + spacer1 = { + order = 2, + type = "description", + name = "", + }, + spacer2 = { + order = 3, + type = "description", + name = "", + }, + useCustomVisibility = { + order = 4, + type = "toggle", + name = L["Enable"], + desc = L["Allow the use of custom paging for this bar"], + get = function()return SuperVillain.db.SVBar["Stance"].useCustomVisibility end, + set = function(e,f) + SuperVillain.db.SVBar["Stance"].useCustomVisibility = f; + MOD.db["Stance"].useCustomVisibility = f; + MOD:RefreshBar("Stance") + end + }, + resetVisibility = { + order = 5, + type = "execute", + name = L["Restore Defaults"], + desc = L["Restore default visibility attributes for this bar"], + func = function() + SuperVillain.db:SetDefault("SVBar", "Stance", "customVisibility") + MOD:RefreshBar("Stance") + end + }, + customVisibility = { + order = 6, + type = "input", + width = "full", + name = L["Visibility"], + desc = L["|cffFF0000ADVANCED:|r Set the visibility attributes for this bar"], + get = function(e)return SuperVillain.db.SVBar["Stance"].customVisibility end, + set = function(e,f) + SuperVillain.db.SVBar["Stance"].customVisibility = f; + MOD.db["Stance"].customVisibility = f; + MOD:RefreshBar("Stance") + end, + disabled = function()return not SuperVillain.db.SVBar["Stance"].useCustomVisibility end, + }, } } } diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua index a8970a1..3318c5a 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua @@ -839,7 +839,7 @@ local function SystemPanelQue() local QueuedFrames = _G[SystemFrameList13[i]] if QueuedFrames then QueuedFrames:Formula409() - QueuedFrames:SetPanelTemplate("Default", true) + QueuedFrames:SetFixedPanelTemplate("Inset") if QueuedFrames ~= _G["VideoOptionsFramePanelContainer"] and QueuedFrames ~= _G["InterfaceOptionsFramePanelContainer"] then QueuedFrames.Panel:Point("TOPLEFT",-1,0) QueuedFrames.Panel:Point("BOTTOMRIGHT",0,1) diff --git a/Interface/BUTTONS/UI-MicroButton-MainMenu-Disabled.blp b/Interface/BUTTONS/UI-MicroButton-MainMenu-Disabled.blp new file mode 100644 index 0000000..f960eac Binary files /dev/null and b/Interface/BUTTONS/UI-MicroButton-MainMenu-Disabled.blp differ diff --git a/Interface/BUTTONS/UI-MicroButton-MainMenu-Down.blp b/Interface/BUTTONS/UI-MicroButton-MainMenu-Down.blp new file mode 100644 index 0000000..d458649 Binary files /dev/null and b/Interface/BUTTONS/UI-MicroButton-MainMenu-Down.blp differ diff --git a/Interface/BUTTONS/UI-MicroButton-MainMenu-Up.blp b/Interface/BUTTONS/UI-MicroButton-MainMenu-Up.blp new file mode 100644 index 0000000..6b76c93 Binary files /dev/null and b/Interface/BUTTONS/UI-MicroButton-MainMenu-Up.blp differ