diff --git a/info.lua b/info.lua index 2c445fe..09be260 100644 --- a/info.lua +++ b/info.lua @@ -5,6 +5,7 @@ Aux.info = public function public.inventory_index(slot) local inventory_index_map = { + INVTYPE_AMMO = {0}, INVTYPE_HEAD = {1}, INVTYPE_NECK = {2}, INVTYPE_SHOULDER = {3}, @@ -18,14 +19,16 @@ function public.inventory_index(slot) INVTYPE_HAND = {10}, INVTYPE_FINGER = {11, 12}, INVTYPE_TRINKET = {13, 14}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, - INVTYPE_HEAD = {1}, + INVTYPE_CLOAK = {15}, + INVTYPE_2HWEAPON = {16}, + INVTYPE_WEAPONMAINHAND = {16}, + INVTYPE_WEAPON = {16, 17}, + INVTYPE_WEAPONOFFHAND = {17}, + INVTYPE_HOLDABLE = {17}, + INVTYPE_SHIELD = {17}, + INVTYPE_RANGED = {18}, + INVTYPE_RANGEDRIGHT = {18}, + INVTYPE_TABARD = {19}, } return unpack(inventory_index_map[slot] or {}) @@ -191,15 +194,19 @@ function public.set_tooltip(itemstring, EnhTooltip_info, owner, anchor, x_offset if index1 then ShoppingTooltip1:SetOwner(GameTooltip, 'ANCHOR_BOTTOMRIGHT') ShoppingTooltip1:SetInventoryItem('player', index1) + ShoppingTooltip1:SetAlpha(0) Aux.control.on_next_update(function() ShoppingTooltip1:SetPoint('TOPLEFT', GameTooltip, 'TOPRIGHT', 0, -10) + ShoppingTooltip1:SetAlpha(1) end) if index2 then ShoppingTooltip2:SetOwner(ShoppingTooltip1, 'ANCHOR_BOTTOMRIGHT') ShoppingTooltip2:SetInventoryItem('player', index2) + ShoppingTooltip2:SetAlpha(0) Aux.control.on_next_update(function() ShoppingTooltip2:SetPoint('TOPLEFT', ShoppingTooltip1, 'TOPRIGHT') + ShoppingTooltip2:SetAlpha(1) end) end end diff --git a/scan_util.lua b/scan_util.lua index f07c6dc..704793d 100644 --- a/scan_util.lua +++ b/scan_util.lua @@ -192,7 +192,7 @@ function m.filter_to_string(filter) end if filter.exact then - add('/exact') + add('exact') end if filter.min_level then @@ -204,7 +204,7 @@ function m.filter_to_string(filter) end if filter.usable then - add('/usable') + add('usable') end if filter.class then @@ -232,7 +232,7 @@ function m.filter_to_string(filter) end if filter.discard then - add('/discard') + add('discard') end if filter.tooltip then diff --git a/search_frame.lua b/search_frame.lua index e059769..d5a89fa 100644 --- a/search_frame.lua +++ b/search_frame.lua @@ -785,7 +785,7 @@ function public.start_search() private.status_bar:update_status(100 * (current_page - 1) / current_total_pages, 100 * (current_query - 1) / getn(queries)) -- TODO private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, getn(queries), current_page, current_total_pages)) else - private.status_bar:update_status(0, 100 * current_query / getn(queries)) -- TODO + private.status_bar:update_status(0, 100 * (current_query - 1) / getn(queries)) -- TODO private.status_bar:set_text(format('Scanning %d / %d', current_query, getn(queries))) end end,