Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2015-09-09 22:28:32 +02:00
parent 5a63789668
commit e07c822310
4 changed files with 118 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Buy.lua
+3 -1
View File
@@ -180,7 +180,9 @@ function Auctionator_Buy_ScrollbarUpdate()
local lineEntry_stackSize = getglobal("AuctionatorBuyEntry"..line.."_StackSize") local lineEntry_stackSize = getglobal("AuctionatorBuyEntry"..line.."_StackSize")
local color = "ffffffff" local color = "ffffffff"
if(type(Auctionator.item_colors[entry.quality+1]) == "string") then color = Auctionator.item_colors[entry.quality+1]; end if Auctionator.qualityColor(entry.quality) then
color = Auctionator.qualityColor(entry.quality)
end
lineEntry_name:SetText("\124c" .. color .. entry.name .. "\124r") lineEntry_name:SetText("\124c" .. color .. entry.name .. "\124r")
Core.lua
+73 -8
View File
@@ -18,14 +18,21 @@ Auctionator = {
index = 5 index = 5
} }
}, },
item_colors = { qualityColor = function(code)
"ff9d9d9d", -- poor, gray if code == 0 then
"ffffffff", -- common, white return "ff9d9d9d" -- poor, gray
"ff1eff00", -- uncommon, green elseif code == 1 then
"ff0070dd", -- rare, blue return "ffffffff" -- common, white
"ffa335ee", -- epic, purple elseif code == 2 then
"ffff8000", -- legendary, orange return "ff1eff00" -- uncommon, green
} elseif code == 3 then -- rare, blue
return "ff0070dd"
elseif code == 4 then
return "ffa335ee" -- epic, purple
elseif code == 5 then
return "ffff8000" -- legendary, orange
end
end
} }
local relevel local relevel
@@ -313,4 +320,62 @@ function relevel(frame)
child:SetFrameLevel(myLevel) child:SetFrameLevel(myLevel)
relevel(child) relevel(child)
end end
end
-----------------------------------------
function Auctionator_BrowseButton_OnClick(button)
if arg1 == "LeftButton" then -- because we additionally registered right clicks we only let left ones pass here
Auctionator.orig.BrowseButton_OnClick(button)
end
end
-----------------------------------------
function Auctionator_BrowseButton_OnMouseDown()
if arg1 == "RightButton" and AUCTIONATOR_INSTANT_BUYOUT then
local index = this:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)
SetSelectedAuctionItem("list", index)
local _, _, _, _, _, _, _, _, buyoutPrice = GetAuctionItemInfo("list", index)
if buyoutPrice > 0 then
PlaceAuctionBid("list", index, buyoutPrice)
end
AuctionFrameBrowse_Update()
end
end
-----------------------------------------
function Auctionator_ContainerFrameItemButton_OnClick(button)
if button == "LeftButton"
and IsShiftKeyDown()
and not ChatFrameEditBox:IsVisible()
and (PanelTemplates_GetSelectedTab(AuctionFrame) == 1 or PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.buy.index)
then
local itemLink = GetContainerItemLink(this:GetParent():GetID(), this:GetID())
if itemLink then
local itemName = string.gsub(itemLink, "^.-%[(.*)%].*", "%1")
if PanelTemplates_GetSelectedTab(AuctionFrame) == 1 then
BrowseName:SetText(itemName)
elseif PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.buy.index then
AuctionatorBuySearchBox:SetText(itemName)
end
end
else
Auctionator.orig.ContainerFrameItemButton_OnClick(button)
if AUCTIONATOR_ENABLE_ALT and AuctionFrame:IsShown() and IsAltKeyDown() and button == "LeftButton" then
ClickAuctionSellItemButton()
ClearCursor()
if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Auctionator.tabs.sell.index then
AuctionFrameTab_OnClick(Auctionator.tabs.sell.index)
end
end
end
end end
Sell.lua
+26 -89
View File
@@ -26,43 +26,8 @@ end
----------------------------------------- -----------------------------------------
function Auctionator_ContainerFrameItemButton_OnClick(button)
if button == "LeftButton"
and IsShiftKeyDown()
and not ChatFrameEditBox:IsVisible()
and (PanelTemplates_GetSelectedTab(AuctionFrame) == 1 or PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.buy.index)
then
local itemLink = GetContainerItemLink(this:GetParent():GetID(), this:GetID())
if itemLink then
local itemName = string.gsub(itemLink, "^.-%[(.*)%].*", "%1")
if PanelTemplates_GetSelectedTab(AuctionFrame) == 1 then
BrowseName:SetText(itemName)
elseif PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.buy.index then
AuctionatorBuySearchBox:SetText(itemName)
end
end
else
Auctionator.orig.ContainerFrameItemButton_OnClick(button)
if AUCTIONATOR_ENABLE_ALT and AuctionFrame:IsShown() and IsAltKeyDown() and button == "LeftButton" then
ClickAuctionSellItemButton()
ClearCursor()
if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Auctionator.tabs.sell.index then
AuctionFrameTab_OnClick(Auctionator.tabs.sell.index)
end
end
end
end
-----------------------------------------
function Auctionator_AuctionFrameAuctions_Update() function Auctionator_AuctionFrameAuctions_Update()
Auctionator.orig.AuctionFrameAuctions_Update() Auctionator.orig.AuctionFrameAuctions_Update()
if PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.sell.index and AuctionFrame:IsShown() then if PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.sell.index and AuctionFrame:IsShown() then
Auctionator_HideElems(Auctionator.tabs.sell.hiddenElements) Auctionator_HideElems(Auctionator.tabs.sell.hiddenElements)
end end
@@ -73,25 +38,18 @@ end
-- that we can note the auction values -- that we can note the auction values
----------------------------------------- -----------------------------------------
function Auctionator_AuctionsCreateAuctionButton_OnClick() function Auctionator_AuctionsCreateAuctionButton_OnClick()
if PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.sell.index and AuctionFrame:IsShown() then
if PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.sell.index and AuctionFrame:IsShown() then
lastBuyoutPrice = MoneyInputFrame_GetCopper(BuyoutPrice) lastBuyoutPrice = MoneyInputFrame_GetCopper(BuyoutPrice)
lastItemPosted = currentAuctionItemName lastItemPosted = currentAuctionItemName
end end
Auctionator.orig.AuctionsCreateAuctionButton_OnClick() Auctionator.orig.AuctionsCreateAuctionButton_OnClick()
end end
----------------------------------------- -----------------------------------------
function Auctionator_OnAuctionOwnedUpdate() function Auctionator_OnAuctionOwnedUpdate()
if lastItemPosted then
if lastItemPosted then
Auctionator_Recommend_Text:SetText("Auction Created for "..lastItemPosted) Auctionator_Recommend_Text:SetText("Auction Created for "..lastItemPosted)
MoneyFrame_Update("Auctionator_RecommendPerStack_Price", lastBuyoutPrice) MoneyFrame_Update("Auctionator_RecommendPerStack_Price", lastBuyoutPrice)
@@ -113,31 +71,6 @@ end
----------------------------------------- -----------------------------------------
function Auctionator_BrowseButton_OnClick(button)
if arg1 == "LeftButton" then
Auctionator.orig.BrowseButton_OnClick(button)
end
end
-----------------------------------------
function Auctionator_BrowseButton_OnMouseDown()
if arg1 == "RightButton" and AUCTIONATOR_INSTANT_BUYOUT then
local index = this:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)
SetSelectedAuctionItem("list", index)
local _, _, _, _, _, _, _, _, buyoutPrice = GetAuctionItemInfo("list", index)
if buyoutPrice > 0 then
PlaceAuctionBid("list", index, buyoutPrice)
end
AuctionFrameBrowse_Update()
end
end
-----------------------------------------
function Auctionator_SetupHookFunctions() function Auctionator_SetupHookFunctions()
Auctionator.orig.BrowseButton_OnClick = BrowseButton_OnClick Auctionator.orig.BrowseButton_OnClick = BrowseButton_OnClick
@@ -223,10 +156,10 @@ end
function Auctionator_UpdateRecommendation() function Auctionator_UpdateRecommendation()
if not currentAuctionItemName then if not currentAuctionItemName then
AuctionatorRefreshButton:Disable() AuctionatorSellRefreshButton:Disable()
Auctionator_SetMessage("Drag an item to the Auction Item area\n\nto see recommended pricing information") Auctionator_SetMessage("Drag an item to the Auction Item area\n\nto see recommended pricing information")
else else
AuctionatorRefreshButton:Enable() AuctionatorSellRefreshButton:Enable()
if selectedAuctionatorEntry then if selectedAuctionatorEntry then
local newBuyoutPrice = selectedAuctionatorEntry.itemPrice * currentAuctionItemStackSize local newBuyoutPrice = selectedAuctionatorEntry.itemPrice * currentAuctionItemStackSize
@@ -341,7 +274,7 @@ function Auctionator_ScrollbarUpdate()
for line = 1,12 do for line = 1,12 do
local dataOffset = line + FauxScrollFrame_GetOffset(AuctionatorScrollFrame) local dataOffset = line + FauxScrollFrame_GetOffset(AuctionatorScrollFrame)
local lineEntry = getglobal("AuctionatorEntry"..line) local lineEntry = getglobal("AuctionatorSellEntry"..line)
if numrows <= 12 then if numrows <= 12 then
lineEntry:SetWidth(603) lineEntry:SetWidth(603)
@@ -353,38 +286,38 @@ function Auctionator_ScrollbarUpdate()
if currentAuctionItemName and dataOffset <= numrows and auctionatorEntries[currentAuctionItemName] then if currentAuctionItemName and dataOffset <= numrows and auctionatorEntries[currentAuctionItemName] then
local auctionatorEntry = auctionatorEntries[currentAuctionItemName][dataOffset] local entry = auctionatorEntries[currentAuctionItemName][dataOffset]
local lineEntry_avail = getglobal("AuctionatorEntry"..line.."_Availability") local lineEntry_avail = getglobal("AuctionatorSellEntry"..line.."_Availability")
local lineEntry_comm = getglobal("AuctionatorEntry"..line.."_Comment") local lineEntry_comm = getglobal("AuctionatorSellEntry"..line.."_Comment")
local lineEntry_stack = getglobal("AuctionatorEntry"..line.."_StackPrice") local lineEntry_stack = getglobal("AuctionatorSellEntry"..line.."_StackPrice")
if selectedAuctionatorEntry and auctionatorEntry.itemPrice == selectedAuctionatorEntry.itemPrice and auctionatorEntry.stackSize == selectedAuctionatorEntry.stackSize then if selectedAuctionatorEntry and entry.itemPrice == selectedAuctionatorEntry.itemPrice and entry.stackSize == selectedAuctionatorEntry.stackSize then
lineEntry:LockHighlight() lineEntry:LockHighlight()
else else
lineEntry:UnlockHighlight() lineEntry:UnlockHighlight()
end end
if auctionatorEntry.stackSize == currentAuctionItemStackSize then if entry.stackSize == currentAuctionItemStackSize then
lineEntry_avail:SetTextColor(0.2, 0.9, 0.2) lineEntry_avail:SetTextColor(0.2, 0.9, 0.2)
else else
lineEntry_avail:SetTextColor(1.0, 1.0, 1.0) lineEntry_avail:SetTextColor(1.0, 1.0, 1.0)
end end
if auctionatorEntry.numYours == 0 then if entry.numYours == 0 then
lineEntry_comm:SetText("") lineEntry_comm:SetText("")
elseif elseif
auctionatorEntry.numYours == auctionatorEntry.count then entry.numYours == entry.count then
lineEntry_comm:SetText("yours") lineEntry_comm:SetText("yours")
else else
lineEntry_comm:SetText("yours: "..auctionatorEntry.numYours) lineEntry_comm:SetText("yours: "..entry.numYours)
end end
local tx = string.format("%i %s of %i", auctionatorEntry.count, Auctionator_PluralizeIf("stack", auctionatorEntry.count), auctionatorEntry.stackSize) local tx = string.format("%i %s of %i", entry.count, Auctionator_PluralizeIf("stack", entry.count), entry.stackSize)
lineEntry_avail:SetText(tx) lineEntry_avail:SetText(tx)
MoneyFrame_Update("AuctionatorEntry"..line.."_UnitPrice", Auctionator_Round(auctionatorEntry.buyoutPrice/auctionatorEntry.stackSize)) MoneyFrame_Update("AuctionatorSellEntry"..line.."_UnitPrice", Auctionator_Round(entry.buyoutPrice/entry.stackSize))
MoneyFrame_Update("AuctionatorEntry"..line.."_TotalPrice", Auctionator_Round(auctionatorEntry.buyoutPrice)) MoneyFrame_Update("AuctionatorSellEntry"..line.."_TotalPrice", Auctionator_Round(entry.buyoutPrice))
lineEntry:Show() lineEntry:Show()
else else
@@ -395,7 +328,7 @@ end
----------------------------------------- -----------------------------------------
function Auctionator_EntryOnClick() function AuctionatorSellEntry_OnClick()
local entryIndex = this:GetID() local entryIndex = this:GetID()
selectedAuctionatorEntry = auctionatorEntries[currentAuctionItemName][entryIndex] selectedAuctionatorEntry = auctionatorEntries[currentAuctionItemName][entryIndex]
@@ -405,7 +338,9 @@ function Auctionator_EntryOnClick()
PlaySound("igMainMenuOptionCheckBoxOn") PlaySound("igMainMenuOptionCheckBoxOn")
end end
function Auctionator_RefreshButtonOnClick() -----------------------------------------
function AuctionatorSellRefreshButton_OnClick()
if not Auctionator_Scan_IsIdle() then if not Auctionator_Scan_IsIdle() then
Auctionator_Scan_Abort() Auctionator_Scan_Abort()
end end
@@ -485,13 +420,15 @@ function ItemType2AuctionClass(itemType)
end end
end end
end end
else Auctionator_Log("Can't GetAuctionItemClasses") end else
Auctionator_Log("Can't GetAuctionItemClasses")
end
end end
----------------------------------------- -----------------------------------------
function SubType2AuctionSubclass(auctionClass, itemSubtype) function SubType2AuctionSubclass(auctionClass, itemSubtype)
local itemClasses = { GetAuctionItemSubClasses(auctionClass.number) }; local itemClasses = { GetAuctionItemSubClasses(auctionClass.number) }
if itemClasses.n > 0 then if itemClasses.n > 0 then
local itemClass local itemClass
for x, itemClass in pairs(itemClasses) do for x, itemClass in pairs(itemClasses) do
Sell.xml
+16 -16
View File
@@ -14,7 +14,7 @@
</Scripts> </Scripts>
</Frame> </Frame>
<Button name="AuctionatorEntryTemplate" virtual="true" hidden="true"> <Button name="AuctionatorSellEntryTemplate" virtual="true" hidden="true">
<Size><AbsDimension y="16" /></Size> <Size><AbsDimension y="16" /></Size>
<Frames> <Frames>
<Frame> <Frame>
@@ -80,7 +80,7 @@
</HighlightTexture> </HighlightTexture>
<Scripts> <Scripts>
<OnClick> <OnClick>
Auctionator_EntryOnClick() AuctionatorSellEntry_OnClick()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
@@ -256,7 +256,7 @@
</Frames> </Frames>
</Frame> </Frame>
<Button name="AuctionatorRefreshButton" inherits="UIPanelButtonTemplate" text="Refresh"> <Button name="AuctionatorSellRefreshButton" inherits="UIPanelButtonTemplate" text="Refresh">
<Size><AbsDimension x="126" y="22"/></Size> <Size><AbsDimension x="126" y="22"/></Size>
<Anchors> <Anchors>
<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT"> <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT">
@@ -267,7 +267,7 @@
</Anchors> </Anchors>
<Scripts> <Scripts>
<OnClick> <OnClick>
Auctionator_RefreshButtonOnClick() AuctionatorSellRefreshButton_OnClick()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
@@ -286,20 +286,20 @@
</Scripts> </Scripts>
</ScrollFrame> </ScrollFrame>
<Button name="AuctionatorEntry1" inherits="AuctionatorEntryTemplate"> <Button name="AuctionatorSellEntry1" inherits="AuctionatorSellEntryTemplate">
<Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorScrollFrame" relativePoint="TOPLEFT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor></Anchors> <Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorScrollFrame" relativePoint="TOPLEFT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor></Anchors>
</Button> </Button>
<Button name="AuctionatorEntry2" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry1" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry2" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry1" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry3" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry2" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry3" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry2" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry4" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry3" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry4" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry3" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry5" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry4" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry5" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry4" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry6" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry5" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry6" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry5" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry7" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry6" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry7" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry6" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry8" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry7" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry8" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry7" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry9" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry8" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry9" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry8" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry10" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry9" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry10" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry9" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry11" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry10" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry11" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry10" relativePoint="BOTTOMLEFT"/></Anchors></Button>
<Button name="AuctionatorEntry12" inherits="AuctionatorEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorEntry11" relativePoint="BOTTOMLEFT"/></Anchors></Button> <Button name="AuctionatorSellEntry12" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry11" relativePoint="BOTTOMLEFT"/></Anchors></Button>
</Frames> </Frames>
</Frame> </Frame>
</Ui> </Ui>