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

hopefully the deposit is now correct

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2015-10-20 22:03:58 +02:00
parent 62e32dcc4e
commit 11599c4ba8
5 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+42 -40
View File
@@ -4,7 +4,9 @@
<list default="true" id="3c1af1d3-ae57-470d-8daa-a9295703c6fc" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/buy.lua" afterPath="$PROJECT_DIR$/buy.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.lua" afterPath="$PROJECT_DIR$/core.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.xml" afterPath="$PROJECT_DIR$/core.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/info.lua" afterPath="$PROJECT_DIR$/info.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/sell.lua" afterPath="$PROJECT_DIR$/sell.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="Aux-Addon.iws" />
<ignored path=".idea/workspace.xml" />
@@ -70,8 +72,8 @@
<file leaf-file-name="core.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1448" max-vertical-offset="8806">
<caret line="101" column="27" selection-start-line="101" selection-start-column="27" selection-end-line="101" selection-end-column="27" />
<state vertical-scroll-proportion="0.0" vertical-offset="4406" max-vertical-offset="8806">
<caret line="286" column="25" selection-start-line="286" selection-start-column="25" selection-end-line="286" selection-end-column="25" />
<folding />
</state>
</provider>
@@ -87,11 +89,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="buy.lua" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="buy.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.39177102" vertical-offset="529" max-vertical-offset="15895">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
<state vertical-scroll-proportion="-11.5" vertical-offset="8212" max-vertical-offset="15878">
<caret line="502" column="155" selection-start-line="502" selection-start-column="155" selection-end-line="502" selection-end-column="155" />
<folding />
</state>
</provider>
@@ -110,18 +112,18 @@
<file leaf-file-name="info.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/info.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="2992">
<caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
<state vertical-scroll-proportion="0.0" vertical-offset="272" max-vertical-offset="3060">
<caret line="43" column="58" selection-start-line="43" selection-start-column="58" selection-end-line="43" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="sell.lua" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="sell.lua" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2608" max-vertical-offset="10336">
<caret line="181" column="11" selection-start-line="181" selection-start-column="11" selection-end-line="181" selection-end-column="11" />
<state vertical-scroll-proportion="0.33273703" vertical-offset="3520" max-vertical-offset="10353">
<caret line="218" column="203" selection-start-line="218" selection-start-column="203" selection-end-line="218" selection-end-column="203" />
<folding />
</state>
</provider>
@@ -182,14 +184,14 @@
<list>
<option value="$PROJECT_DIR$/list.lua" />
<option value="$PROJECT_DIR$/stack.lua" />
<option value="$PROJECT_DIR$/info.lua" />
<option value="$PROJECT_DIR$/buy.xml" />
<option value="$PROJECT_DIR$/sell.lua" />
<option value="$PROJECT_DIR$/sell.xml" />
<option value="$PROJECT_DIR$/util.lua" />
<option value="$PROJECT_DIR$/core.lua" />
<option value="$PROJECT_DIR$/core.xml" />
<option value="$PROJECT_DIR$/core.lua" />
<option value="$PROJECT_DIR$/buy.lua" />
<option value="$PROJECT_DIR$/info.lua" />
<option value="$PROJECT_DIR$/sell.lua" />
</list>
</option>
</component>
@@ -435,14 +437,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/info.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="2992">
<caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/util.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-137.21428" vertical-offset="408" max-vertical-offset="4420">
@@ -475,14 +469,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1448" max-vertical-offset="8806">
<caret line="101" column="27" selection-start-line="101" selection-start-column="27" selection-end-line="101" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="2261">
@@ -491,14 +477,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2863" max-vertical-offset="10336">
<caret line="181" column="11" selection-start-line="181" selection-start-column="11" selection-end-line="181" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="7670" max-vertical-offset="9588">
@@ -507,10 +485,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4406" max-vertical-offset="8806">
<caret line="286" column="25" selection-start-line="286" selection-start-column="25" selection-end-line="286" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.39177102" vertical-offset="529" max-vertical-offset="15895">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
<state vertical-scroll-proportion="-11.5" vertical-offset="8212" max-vertical-offset="15878">
<caret line="502" column="155" selection-start-line="502" selection-start-column="155" selection-end-line="502" selection-end-column="155" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/info.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="272" max-vertical-offset="3060">
<caret line="43" column="58" selection-start-line="43" selection-start-column="58" selection-end-line="43" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33273703" vertical-offset="3520" max-vertical-offset="10353">
<caret line="218" column="203" selection-start-line="218" selection-start-column="203" selection-end-line="218" selection-end-column="203" />
<folding />
</state>
</provider>
buy.lua
+2 -2
View File
@@ -500,8 +500,8 @@ function update_sheet()
local mode = UIDropDownMenu_GetSelectedValue(AuxBuyModeDropDown)
if mode == BUYOUT then
local buyout_auctions = auctions and Aux.util.filter(auctions, function(auction) return auction.name ~= UnitName('player') and auction.buyout_price > 0 end) or {}
Aux.list.populate(AuxBuyBuyList.sheet, auctions and Aux.util.group_by(buyout_auctions, function(a1, a2) return a1.hyperlink == a2.hyperlink and a1.stack_size == a2.stack_size and a1.buyout_price = a2.buyout_price end) or {})
local buyout_auctions = auctions and Aux.util.filter(auctions, function(auction) return auction.name ~= UnitName('player') and auction.buyout_price end) or {}
Aux.list.populate(AuxBuyBuyList.sheet, auctions and Aux.util.group_by(buyout_auctions, function(a1, a2) return a1.hyperlink == a2.hyperlink and a1.stack_size == a2.stack_size and a1.buyout_price == a2.buyout_price end) or {})
elseif mode == BID then
local bid_auctions = auctions and Aux.util.filter(auctions, function(auction) return auction.name ~= UnitName('player') end) or {}
Aux.list.populate(AuxBuyBidList.sheet, bid_auctions)
core.lua
+1 -1
View File
@@ -284,7 +284,7 @@ function Aux_AuctionFrameTab_OnClick(index)
AuxBuyPanel:Show()
AuctionFrame:EnableMouse(false)
Aux_Buy_ScrollbarUpdate()
Aux.buy.on_open()
else
Aux.orig.AuctionFrameTab_OnClick(index)
lastItemPosted = nil
info.lua
+8 -7
View File
@@ -1,4 +1,4 @@
local TOOLTIP_LENGTH
local TOOLTIP_LENGTH = 30
Aux.info = {}
@@ -28,20 +28,21 @@ function Aux.info.container_item(bag, slot)
end
function Aux.info.auction_sell_item()
local name, texture, stack_size, quality, usable, vendor_price, vendor_price_per_unit, max_stack, total_count = GetAuctionSellItemInfo()
local deposit_factor = CalculateAuctionDeposit(120) / vendor_price
local name, texture, stack_size, quality, usable, vendor_price = GetAuctionSellItemInfo()
if name then
local deposit_factor = CalculateAuctionDeposit(120) / vendor_price
local vendor_price_per_unit = vendor_price / stack_size
auction_sell_item = {
name = name,
texture = texture,
stack_size = stack_size,
quality = quality,
usable = usable,
vendor_price_per_unit = vendor_price_per_unit,
vendor_price = vendor_price,
vendor_price_per_unit = vendor_price_per_unit,
max_stack = max_stack, -- TODO not working??
total_count = total_count,
deposit_factor = deposit_factor,
}
sell.lua
+1 -1
View File
@@ -216,7 +216,7 @@ function update_recommendation()
AuxSellRefreshButton:Enable()
MoneyFrame_Update("AuctionsDepositMoneyFrame", floor(current_auction.vendor_price_per_unit * current_auction.base_deposit * (current_auction.has_charges and 1 or get_stack_size_slider_value()) * AuxSellStackCountSlider:GetValue()) * AuctionFrameAuctions.duration / 120)
MoneyFrame_Update("AuctionsDepositMoneyFrame", floor(current_auction.vendor_price_per_unit * current_auction.deposit_factor * (current_auction.has_charges and 1 or get_stack_size_slider_value())) * AuxSellStackCountSlider:GetValue() * AuctionFrameAuctions.duration / 120)
if auxSellEntries[current_auction.name] and auxSellEntries[current_auction.name].selected then
if not auxSellEntries[current_auction.name].created or GetTime() - auxSellEntries[current_auction.name].created > 1800 then