Added an animation when search is being populated

This commit is contained in:
merstrax
2022-08-12 10:12:12 -04:00
parent 3e971fb24b
commit f71d9be51d
10 changed files with 283 additions and 124 deletions
+1 -5
View File
@@ -28,18 +28,14 @@
## SavedVariablesPerCharacter: AtlasLootCharDB, AtlasLootFilterDB
## OptionalDeps: LootLink, ItemSync, DewdropLib, FuBarPlugin-3.0, FuBar, Ace3, LibBabble-Boss-3.0, LibBabble-Faction-3.0, LibBabble-Inventory-3.0, LibBabble-Zone-3.0
embeds.xml
Locales\Locales.xml
Add_Ons\Addons.xml
Core\AtlasLoot.xml
Menus\Menus.xml
DefaultFrame\AtlaslootDefaultFrameCreate.lua
DefaultFrame\AtlaslootDefaultFrame.lua
DefaultFrame\AtlaslootAdvancedSearchCreate.lua
DefaultFrame\Frames.xml
modules.xml
+12
View File
@@ -625,6 +625,11 @@ end
local function DoSearch(searchText)
AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "Search", Back = true};
AtlasLootCharDB.LastSearchedText = searchText;
AtlasLoot_SearchProgress:Show();
AtlasLoot_SearchProgress.Loop:Play();
local items_total = 0;
local items_checked = 0;
local items_queried = false;
local count = 0;
local tablenum = 1;
@@ -676,8 +681,14 @@ local function DoSearch(searchText)
elseif ItemMatchesAllTerms(searchTerms, itemDetails) then
AddItemToSearchResult(itemId, itemType, atlasName, dataID, itemIdBackup, AtlasLoot_Difficulty:getMaxDifficulty(data.Type), dataPage);
end
items_checked = items_checked + 1;
if(items_checked >= items_total and items_queried) then
AtlasLoot_SearchProgress.Loop:Stop();
AtlasLoot_SearchProgress:Hide()
end
end
end)
items_total = items_total + 1;
elseif not equipableFilterOn and itemId and itemId ~= "" and string.sub(itemId, 1, 1) == "s" then
local spellName = GetSpellName(itemId, atlasName)
if nameMatches(spellName, searchText) then
@@ -689,6 +700,7 @@ local function DoSearch(searchText)
end
end
end
items_queried = true;
end
function AtlasLoot:ShowSearchResult()
@@ -221,4 +221,60 @@ clearbtn:SetScript("OnClick", function()
AtlasLootDefaultFrame_AdvancedSearchPanel_SearchBox:ClearFocus();
end);
AtlasLoot_AdvancedSearchSetup()
AtlasLoot_AdvancedSearchSetup()
function StreamingIcon_UpdateIcon(status, tooltip)
if(status > 0) then
AtlasLoot_SearchProgressSpinner:SetVertexColor(0,1,0);
AtlasLoot_SearchProgressFrameBackground:SetVertexColor(0,1,0);
AtlasLoot_SearchProgress.tooltip = tooltip;
AtlasLoot_SearchProgress.Loop:Play();
AtlasLoot_SearchProgress:Show();
else
AtlasLoot_SearchProgress.Loop:Stop();
AtlasLoot_SearchProgress:Hide();
end
end
local streamIcon = CreateFrame("Frame", "AtlasLoot_SearchProgress", AtlasLootDefaultFrame_LootBackground);
streamIcon:SetPoint("TOPRIGHT", AtlasLootDefaultFrame_LootBackground, "TOPRIGHT");
streamIcon:SetSize(48, 48);
streamIcon.tooltip = "Searching...";
streamIcon.icon = streamIcon:CreateTexture("$parentSpinner", "BACKGROUND");
streamIcon.icon:SetTexture("Interface\\Addons\\AtlasLoot\\Images\\streamcircle");
streamIcon.icon:SetVertexColor(0,1,0);
streamIcon.icon:SetAllPoints();
streamIcon.spark = streamIcon:CreateTexture("OVERLAY");
streamIcon.spark:SetTexture("Interface\\Addons\\AtlasLoot\\Images\\streamspark");
streamIcon.spark:SetAllPoints();
streamIcon.frame = CreateFrame("Frame", "$parentFrame", AtlasLoot_SearchProgress);
streamIcon.frame:SetAllPoints();
streamIcon.frame.bg = streamIcon.frame:CreateTexture("$parentBackground", "BACKGROUND");
streamIcon.frame.bg:SetTexture("Interface\\Addons\\AtlasLoot\\Images\\streambackground");
streamIcon.frame.bg:SetVertexColor(0,1,0);
streamIcon.frame.bg:SetAllPoints();
streamIcon.frame.alpha = streamIcon.frame:CreateTexture("$parentAlpha", "ARTWORK");
streamIcon.frame.alpha:SetTexture("Interface\\Addons\\AtlasLoot\\Images\\streamframe");
streamIcon.frame.alpha:SetAllPoints();
streamIcon.Loop = streamIcon:CreateAnimationGroup("$parentLoopAnim");
streamIcon.Loop:SetLooping("REPEAT");
local rotAnim = streamIcon.Loop:CreateAnimation("ROTATION");
rotAnim:SetOrder(1);
rotAnim:SetDuration(8);
rotAnim:SetDegrees(-360);
streamIcon:SetScript("OnEnter",
function(self)
if(self.tooltip ~= nil) then
GameTooltip:SetOwner(self, "ANCHOR_LEFT");
GameTooltip:SetText(self.tooltip, nil, nil, nil, nil, true);
end
end);
streamIcon:SetScript("OnLeave", GameTooltip_Hide);
streamIcon:SetScript("OnShow", function(self) self:SetFrameLevel( (self:GetParent()):GetFrameLevel() + 1 ) end);
streamIcon:SetPoint("TOPRIGHT", AtlasLootDefaultFrame_LootBackground, "TOPRIGHT");
streamIcon:Hide();
+6
View File
@@ -0,0 +1,6 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
<Script file="AtlaslootDefaultFrameCreate.lua"/>
<Script file="AtlaslootDefaultFrame.lua"/>
<Script file="AtlasLootAdvancedSearchCreate.lua"/>
</Ui>
+112
View File
@@ -5,8 +5,120 @@ This mod is distributed under Version 2 of the GPL. A copy of the GPL is includ
-Daviesh
Patch Notes
v5.13.11 08/29/2021
Added forward and previous arrows to all classic dungeons (Credit: alexs and Powerthegreat)
Added forward and previous arrows to all classic world bosses (Credit: Powerthegreat)
Moved TBC world boss to the bottom of the dropdown
Added missing Keys to High Risk Balcksmithing and Crusader High Risk craft (Credit: Rvng)
Added missing Lures to High Risk Cooking
Added forward and previous arrows to High Risk crafting
v5.13.10 08/28/2021
Fixed lua Error when "Query Server" is used to query all items on the page
Added High Risk crafting materials and crafts (Credit: Rvng)
(Actually) Fixed Heroic ZG pages
v5.13.9 08/20/2021
Added Heroic and Mythic Vanilla dungeons
Added back the Normal/Heroic versions of TBC dungeons. You can now use the same Heroic/Ascended button to swap between Themios
Fixed Heroic ZG showing the same as Ascended ZG
v5.13.8 07/15/2021
Moved Undaunted Might drop to Maulgar
v5.13.7 07/13/2021
Added Ascension custom enchants: Crushing Wave, Undaunted Might, and Faith
Added t5 Glaive Vials from Vashj and Kael'thas
Added Magtheridon's Agility version of his Polearm
Added "armour" and "armourpen" / "armourpenetration" as a keyword
Fixed armor penetration stat search filter
v5.13.6 06/25/2021
THIS REPLACES NORMAL/HEROIC MODE LOOT
Fixed Normal SSC loot
Fixed some m0 items like keys and recipes
Added @Krazh's initial search filter (allows to search for items with ">40 crit" from your cached items)
v5.13.5 05/13/2021
Fixed Heroic Flex Gruul's Lair and Magtheridon's Lair item IDs.
v5.13.4 04/29/2021
Added new Heroic Flex difficulty
Repurposed the 10/25 man button to go between Normal/Heroic/Ascended items
This still works as normal for Wotlk raids, but the button text will be wrong
Added Heroic Flex raid dropped items
Added Heroic Flex set items to Sets/Collections using the old 10/25 man button
Renamed "Heroic Mode" to "Ascended Mode"
This still works as normal for TBC Heroic dungeons, and will be fixed when mythic dungeons comes out.
---------------------------------------------------------------------------------------------------------------------------
v5.13.3 04/25/2021
Fixed the order of t2.5 warrior set
Added T3 warrior dps set
Fixed the names of t1 and t2 warrior dps set
Added additional drop locations of some BWL items
Added Naxxramas heroic items and new item from Sapphiron
v5.13.2 03/26/2021
Added cross boss loot in BWL for first three bosses
Added cross boss loot in BWL to Nefarion
Removed extra warrior set on heroic tier 1/2 tab
v5.13.1 03/05/2021
Sets/Collections Menu now lists T1-T10 sets instead of having submenus
Removed Mount, Pet, and Tabard collections
PVP link from Sets/Collections removed, but is still accessible through Loot Table dropdown
New custom DPS warrior has it's own listing under T1/2/3
Added T2 DPS Warrior set
Level 70 Blue PVP items added
Weapons are listed under Arena Season 0
Armor is available under the PVP Reputation sets Sub-menu
Wintergrasp and Grizzly Hills PVP menus moved to BG/Open PVP sub-menu
Added Smoldering Emberwyrm and Magmatic Steed to Prince and Ragnaros respectively
v5.13.0 02/08/2021
Added new T1 Warrior DPS set
Added Heroic Thunderfury and Sulfuras
Added Magtheridon's Glaive to Heroic Magtheridon
Corrected item ID of Heroic Magtheridon head
v5.12.5 09/08/2020
Added new 2H tank sets
Bloody item server query
Optional query on page load
Bloody Link in chat
To link bloody items, click the Query Server button which will load all items and bloody versions
v5.12.4 06/07/2020
Sets collection cleanup for TBC
Added Heroic gear
Dropdown menu visuals/order changed.
To view keys click the Dungeon/Raid headers
v5.12.3 05/31/2020
Updated Druid class name/descriptions from "Hero" to "Druid"
Rep window shows TBC reputations by default
Karazhan boss order correction
TBC tokens show class
v5.12.2 05/30/2020
Fixed item quality on various PVP items
v5.12.1 05/30/2020
Fixed KT (Naxx 60) Phylactory for Ascension itemID
Readded ilvl 68 Rare PVP gear along with ilvl 63 Rare PVP gear
Added Ascension Rare PVP Weapons
Added missing navigation arrows to: Karazhan, Misc PVP Rewards
Added Ascension custom cooking recipes
Corrected Honor prices on assortment of items
Corrected Kazzak (Classic) item slots
Added Setis item slots
v5.12.0 05/29/2020
Initial release based off PrimalWoW edited Atlasloot
Added Ascension PVP Enchants
Added Ascension Epic Progression5 PVP Gear
Added Ascension Epic PVP Accessories
Added Setis Loot as new World boss
v5.11.04
Added support for Atlas 1.17.0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+95 -118
View File
@@ -1,119 +1,96 @@
v2.02 08/29/2021
- Added forward and previous arrows to all classic dungeons (Credit: alexs and Powerthegreat)
- Added forward and previous arrows to all classic world bosses (Credit: Powerthegreat)
- Moved TBC world boss to the bottom of the dropdown
- Added missing Keys to High Risk Balcksmithing and Crusader High Risk craft (Credit: Rvng)
- Added missing Lures to High Risk Cooking
- Added forward and previous arrows to High Risk crafting
---------------------------------------------------------------------------------------------------------------------------
v2.01 08/28/2021
- Fixed lua Error when "Query Server" is used to query all items on the page
- Added High Risk crafting materials and crafts (Credit: Rvng)
- (Actually) Fixed Heroic ZG pages
---------------------------------------------------------------------------------------------------------------------------
v2.0 08/20/2021
- Added Heroic and Mythic Vanilla dungeons
- Added back the Normal/Heroic versions of TBC dungeons. You can now use the same Heroic/Ascended button to swap between Themios
- Fixed Heroic ZG showing the same as Ascended ZG
---------------------------------------------------------------------------------------------------------------------------
v1.8.1 07/15/2021
- Moved Undaunted Might drop to Maulgar
---------------------------------------------------------------------------------------------------------------------------
v1.8 07/13/2021
- Added Ascension custom enchants: Crushing Wave, Undaunted Might, and Faith
- Added t5 Glaive Vials from Vashj and Kael'thas
- Added Magtheridon's Agility version of his Polearm
- Added "armour" and "armourpen" / "armourpenetration" as a keyword
- Fixed armor penetration stat search filter
---------------------------------------------------------------------------------------------------------------------------
v1.7 06/25/2021
THIS REPLACES NORMAL/HEROIC MODE LOOT
- Fixed Normal SSC loot
- Fixed some m0 items like keys and recipes
- Added @Krazh's initial search filter (allows to search for items with ">40 crit" from your cached items)
---------------------------------------------------------------------------------------------------------------------------
v1.6.1 05/13/2021
- Fixed Heroic Flex Gruul's Lair and Magtheridon's Lair item IDs.
---------------------------------------------------------------------------------------------------------------------------
v1.6 04/29/2021
- Added new Heroic Flex difficulty
- Repurposed the 10/25 man button to go between Normal/Heroic/Ascended items
- This still works as normal for Wotlk raids, but the button text will be wrong
- Added Heroic Flex raid dropped items
- Added Heroic Flex set items to Sets/Collections using the old 10/25 man button
- Renamed "Heroic Mode" to "Ascended Mode"
- This still works as normal for TBC Heroic dungeons, and will be fixed when mythic dungeons comes out.
---------------------------------------------------------------------------------------------------------------------------
v1.5.4 04/25/2021
- Fixed the order of t2.5 warrior set
- Added T3 warrior dps set
- Fixed the names of t1 and t2 warrior dps set
- Added additional drop locations of some BWL items
- Added Naxxramas heroic items and new item from Sapphiron
---------------------------------------------------------------------------------------------------------------------------
v1.5.3 03/26/2021
- Added cross boss loot in BWL for first three bosses
- Added cross boss loot in BWL to Nefarion
- Removed extra warrior set on heroic tier 1/2 tab
---------------------------------------------------------------------------------------------------------------------------
v1.5.2 03/05/2021
- Sets/Collections Menu now lists T1-T10 sets instead of having submenus
- Removed Mount, Pet, and Tabard collections
- PVP link from Sets/Collections removed, but is still accessible through Loot Table dropdown
- New custom DPS warrior has it's own listing under T1/2/3
- Added T2 DPS Warrior set
- Level 70 Blue PVP items added
- Weapons are listed under Arena Season 0
- Armor is available under the PVP Reputation sets Sub-menu
- Wintergrasp and Grizzly Hills PVP menus moved to BG/Open PVP sub-menu
- Added Smoldering Emberwyrm and Magmatic Steed to Prince and Ragnaros respectively
---------------------------------------------------------------------------------------------------------------------------
v1.5.1 02/08/2021
- Added new T1 Warrior DPS set
- Added Heroic Thunderfury and Sulfuras
- Added Magtheridon's Glaive to Heroic Magtheridon
- Corrected item ID of Heroic Magtheridon head
---------------------------------------------------------------------------------------------------------------------------
v1.5 09/08/2020
- Added new 2H tank sets
- Bloody item server query
- Optional query on page load
- Bloody Link in chat
- To link bloody items, click the Query Server button which will load all items and bloody versions
Then right click an item and the bloody version will show in chat.
(Must have 'Safe Chat Links' enabled in your options)
---------------------------------------------------------------------------------------------------------------------------
v1.4 06/07/2020
- Sets collection cleanup for TBC
- Added Heroic gear
- Dropdown menu visuals/order changed.
- To view keys click the Dungeon/Raid headers
---------------------------------------------------------------------------------------------------------------------------
v1.3 05/31/2020
- Updated Druid class name/descriptions from "Hero" to "Druid"
v6.5.0 August 31, 2022
- Reworked UI
- Reworked Module/Expansion Selections
- Implemented auto refresh when an item's data has been loaded
- Searching continues to add to your results as you cache items and it meets your parameters
- Fixed adding Searched items to your Wishlist
- Fixed adding Spells (Professions) to your Wishlist
- Clicking an item in your wishlist will take you to the items source page
- Categories with more then one page can be scrolled with mouse wheel now
TBC improvements contributed by Szyler:
- Rep window shows TBC reputations by default
- Karazhan boss order correction
- TBC tokens show class
---------------------------------------------------------------------------------------------------------------------------
v1.2 05/30/2020
- Fixed item quality on various PVP items
---------------------------------------------------------------------------------------------------------------------------
v1.1 05/30/2020
- Fixed KT (Naxx 60) Phylactory for Ascension itemID
- Readded ilvl 68 Rare PVP gear along with ilvl 63 Rare PVP gear
- Added Ascension Rare PVP Weapons
- Added missing navigation arrows to: Karazhan, Misc PVP Rewards
- Added Ascension custom cooking recipes
- Corrected Honor prices on assortment of items
- Corrected Kazzak (Classic) item slots
- Added Setis item slots
---------------------------------------------------------------------------------------------------------------------------
v1.0 05/29/2020
- Initial release based off PrimalWoW edited Atlasloot
- Added Ascension PVP Enchants
- Added Ascension Epic Progression5 PVP Gear
- Added Ascension Epic PVP Accessories
- Added Setis Loot as new World boss
---------------------------------------------------------------------------------------------------------------------------
V6.4.2 June 29, 2022
- Added TBC High Risk Crafting patterns and items
V6.4.1 June 23, 2022
- Enabled difficulty for world epics
V6.4.0 June 16, 2022
- Added new system to handle Expansions will default to servers current active expansion
- Updated most of the crafted tables to be sorted by expansion
- Fixed Violet Eye Rings showing up wrong
- Raid Tokens now have a (Click) beside them to remind or let ppl no that clicking will show the loot from that token
V6.3.0 May 16, 2022
- Enabled Mythic+ 11-20 for TBC dungeons
- Fixed missing mana trinket from SSC
V6.2.9 April 7, 2022
- Enabled Mythic+ 1-10 for TBC dungeons
- Fixed bug that caused some wishlist to break
V6.2.8 March 31, 2022
- Reworked Sets/Collections, PVP Rewards, World Bosses and Reputation pages to be sorted based on expansion. The default page selected for these pages will now change depending on what server you are currently on.
- Enabled difficulty select for 60 world bosses.
V6.2.7a March 13, 2022
- Actually fixed the Search functions
V6.2.6 March 7, 2022
- Added missing mana tombs yor.
V6.2.5 February 24, 2022
- Added Bloodforge menu to pvp gear
- Fixed Doom Lord Kazzak / Doomwalker from loading properly
- New Feature clicking on a tier token in a bosses page will now send you to a page with what loot that token can give.
V6.2.4 February 14, 2022
- Fixed Shaman T5
- Fixed Horde PvP Weapons (Page 2 and 4 of level 60 weapons)
V6.2.3 February 1, 2022
- Fixed Back Search not working
V6.2.2 January 31, 2022
- Added Mythic+ 31 to 40
- Removed Old Raid Tokens
- Added Difficulty Select to Atlas Integration
- Fixed TK Neck Quest items
V6.2.1 January 25, 2022
- Fixed incorrect tags for a couple of the search filters
- Reworked the search UI
V6.2.0 January 17, 2022
- Added Mythic+ 21 to 30
- Reworked the search feature (Credits: @EricTBoneJackson )
- Added an Advanced Search UI
V6.1.2 December 22, 2021
- Applied @Frieza changes:
Fixed some items not showing their Heroic and Ascended versions in TK.
Added Mmrgrg glm nuubs to SSC trash drop table, and Bottled Nethergron Extract to the Eye trash.
Fixed Kael Verdant Sphere Neck rewards.
- Added Prev and Next options for AQ20 and AQ40 trash mob pages.
- Fixed a couple duplicate name links for Heroic and Ascended difficulties.
V6.1.1 November 19, 2021
- Fixed Magtheridon weapon IDs
- Added legendary necklace to Garr
V6.1.0 November 2, 2021
- Mythic+ sub-categories 1-10 and 11-20
- Added the token drops to Vanilla Raids
- Removed Mythic+ options from TBC dungeons as they seem to be a work in progress on Ascensions side.
- Re-Added Ascended Magtheridon weapons
V6.0.2 October 31, 2022
- Fixed crafting tables
- Fixed Wishlist
- Corrected T3 sets with proper IDs
- Fixed crafting items showing up in higher difficulties
V6.0.0 October 30, 2022
- Difficulty selection rewrite (Credits: Anch / Rvng)
- Added Mythic+ 11-20
- Added some missing items for Vanilla Raids (Heroic/Ascended)
- Added option to swap boss and difficulty select drop down positions