shaga/AtlasLoot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.0.6 update

Browse Source 
Added little preview frame for things like tier tokens and sets
added ability to change page with mouse wheel
some minor fixes
This commit is contained in:
Spit
2025-01-04 01:23:43 +03:00
parent 0282c19601
commit 2c4f7d8580
22 changed files with 4003 additions and 1876 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AtlasLoot.toc
+1 -1
View File
@@ -3,7 +3,7 @@
## Notes: Shows possible loot from dungeon bosses and other sources.
## Author: Shagu (pfUI update code), Lexie (Turtle WoW fixes/updates), Otari (overhaul/revamp, menu changes, bugfixes/updates)
## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons)
## Version: 3.0.5
## Version: 3.0.6
## SavedVariables: AtlasLoot_updateavailable
## SavedVariablesPerCharacter: AtlasLootCharDB
## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare
Core/AtlasLoot.lua
+333 -330
View File
File diff suppressed because it is too large Load Diff
Core/AtlasLoot.xml
+135 -46
View File
@@ -15,6 +15,57 @@
<Script file="Dungeons.lua"/>
<Script file="Tooltip.lua"/>
<Button name="AtlasLootContainerItemTemplate" virtual="true">
<Size x="40" y="40"/>
<Backdrop name="$parentBackdrop" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<EdgeSize>
<AbsValue val="19"/>
</EdgeSize>
<TileSize>
<AbsValue val="8"/>
</TileSize>
<BackgroundInsets>
<AbsInset left="0" right="0" top="0" bottom="0"/>
</BackgroundInsets>
</Backdrop>
<Layers>
<Layer level="BACKGROUND">
<Texture name="$parentIcon">
<Size>
<AbsDimension x="32" y="32"/>
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="4" y="-4"/>
</Offset>
</Anchor>
</Anchors>
</Texture>
<FontString name="$parent_Quantity" font="Fonts\ARIALN.TTF" outline="NORMAL" justifyH="RIGHT" hidden="false">
<Size>
<AbsDimension x="25" y="0"/>
</Size>
<FontHeight>
<AbsValue val="12"/>
</FontHeight>
<Anchors>
<Anchor point="BOTTOMRIGHT" relativeTo="$parentIcon" relativePoint="BOTTOMRIGHT">
<Offset>
<AbsDimension x="0" y="1"/>
</Offset>
</Anchor>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnClick>
AtlasLoot_ContainerItem_OnClick(arg1)
</OnClick>
</Scripts>
</Button>
<Button name="AtlasLootDefaultFrameButtonTemplate" inherits="OptionsButtonTemplate" virtual="true">
<Size>
<AbsDimension x="105" y="20"/>
@@ -577,7 +628,7 @@
this:SetMovable(1);
this:SetBackdropColor(0.75, 0, 0.75);
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
getglobal("AtlasLootDefaultFrame_Notice"):SetText(AL["NoticeFrame"]);
AtlasLootDefaultFrame_Notice:SetText(AL["NoticeFrame"]);
</OnLoad>
<OnMouseUp>
CloseDropDownMenus();
@@ -590,11 +641,9 @@
</OnHide>
<OnDragStart>
this:StartMoving();
this.isMoving = true;
</OnDragStart>
<OnDragStop>
this:StopMovingOrSizing();
this.isMoving = false;
</OnDragStop>
</Scripts>
</Frame>
@@ -840,6 +889,18 @@
</Anchors>
<Color r="1" g="0" b="0" a="1"/>
</Texture>
<Texture name="$parentBorder" file="Interface\Buttons\UI-Quickslot-Depress" hidden="true">
<Size>
<AbsDimension x="29" y="29"/>
</Size>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT">
<Offset>
<AbsDimension x="-1" y="1"/>
</Offset>
</Anchor>
</Anchors>
</Texture>
</Layer>
</Layers>
</Button>
@@ -884,14 +945,14 @@
<AbsDimension x="128" y="75"/>
</Size>
<Frames>
<Button name="$parentHidePanel" inherits="OptionsButtonTemplate">
<Button name="$parentHidePanel" inherits="UIPanelButtonTemplate2">
<Size>
<AbsDimension x="140" y="20"/>
<AbsDimension x="80" y="32"/>
</Size>
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="-5" y="-3"/>
<AbsDimension x="-7" y="-3"/>
</Offset>
</Anchor>
</Anchors>
@@ -899,8 +960,7 @@
<OnShow>
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
this:SetText(AL["Toggle AL Panel"]);
getglobal("AtlasLootInfo_Text2"):SetText("");
this:SetText(AL["AL Panel"]);
</OnShow>
<OnClick>
if AtlasLootCharDB.HidePanel then
@@ -923,6 +983,30 @@
</OnClick>
</Scripts>
</Button>
<Button name="$parent_AtlasLoot" inherits="UIPanelButtonTemplate2">
<Size x="80" y="32"/>
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="$parentHidePanel" relativePoint="BOTTOMRIGHT">
<Offset>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLootSearchBox:GetText() ~= "" then
AtlasLootDefaultFrameSearchBox:SetText(AtlasLootSearchBox:GetText())
AtlasLootDefaultFrameSearchBox:ClearFocus();
end
AtlasLoot_Toggle();
</OnClick>
<OnShow>
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
this:SetText(AL["AtlasLoot"]);
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
</Frames>
<Layers>
<Layer level="OVERLAY">
@@ -1293,6 +1377,29 @@
</OnShow>
</Scripts>
</Button>
<Frame name="$parentContainer" enableMouse="true" frameStrata="TOOLTIP" hidden="true" toplevel="true" movable="true" clampedToScreen="true">
<Size x="40" y="40"/>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPRIGHT">
<Offset>
<AbsDimension x="0" y="0" />
</Offset>
</Anchor>
</Anchors>
<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<EdgeSize>
<AbsValue val="16"/>
</EdgeSize>
<TileSize>
<AbsValue val="16"/>
</TileSize>
<BackgroundInsets>
<AbsInset left="4" right="4" top="4" bottom="4"/>
</BackgroundInsets>
<Color r="1" g="1" b="1" a="1" />
<BorderColor r="1" g="0.82" b="0" a="1" />
</Backdrop>
</Frame>
</Frames>
<Layers>
<Layer level="BACKGROUND">
@@ -1331,12 +1438,19 @@
<OnLoad>
AtlasLoot_OnLoad();
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
getglobal("AtlasLootItemsFrame_BACK"):SetText(AL["Back"]);
getglobal("AtlasLoot_QuickLooks"):SetText(AL["Add to QuickLooks:"]);
AtlasLootItemsFrame_BACK:SetText(AL["Back"]);
AtlasLoot_QuickLooks:SetText(AL["Add to QuickLooks:"]);
</OnLoad>
<OnEvent>
AtlasLoot_OnEvent(event, arg1, arg2);
AtlasLoot_OnEvent();
</OnEvent>
<OnMouseWheel>
if arg1 == 1 and AtlasLootItemsFrame_NEXT:IsVisible() then
AtlasLootItemsFrame_NEXT:Click()
elseif arg1 == -1 and AtlasLootItemsFrame_PREV:IsVisible() then
AtlasLootItemsFrame_PREV:Click()
end
</OnMouseWheel>
</Scripts>
</Frame>
@@ -1736,20 +1850,18 @@
this:RegisterForDrag("LeftButton");
this:SetMovable(1);
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
getglobal("AtlasLootOptionsFrame_Title"):SetText(AL["Atlasloot Options"]);
AtlasLootOptionsFrame_Title:SetText(AL["Atlasloot Options"]);
</OnLoad>
<OnDragStart>
this:StartMoving();
this.isMoving = true;
</OnDragStart>
<OnDragStop>
this:StopMovingOrSizing();
this.isMoving = false;
</OnDragStop>
</Scripts>
</Frame>
<Frame name="AtlasLootPanel" parent="UIParent" hidden="true">
<Frame name="AtlasLootPanel" parent="UIParent" hidden="true" enableMouse="true">
<Size>
<AbsDimension x="745" y="110"/>
</Size>
@@ -1948,29 +2060,6 @@
</OnShow>
</Scripts>
</Button>
<Button name="$parent_AtlasLoot" inherits="AtlasLootPanelButtonTemplate">
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Sets" relativePoint="BOTTOM">
<Offset>
<AbsDimension x="0" y="-2"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
if AtlasLootSearchBox:GetText() ~= "" then
AtlasLootDefaultFrameSearchBox:SetText(AtlasLootSearchBox:GetText())
AtlasLootDefaultFrameSearchBox:ClearFocus();
end
AtlasLoot_Toggle();
</OnClick>
<OnShow>
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
this:SetText(AL["AtlasLoot"]);
this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
</OnShow>
</Scripts>
</Button>
<Button name="$parent_Preset1" inherits="AtlasLootPanelButtonTemplate">
<Anchors>
<Anchor point="TOP" relativeTo="$parent_Reputation" relativePoint="BOTTOM">
@@ -2002,9 +2091,9 @@
</OnMouseUp>
<OnClick>
if AtlasLoot_IsLootTableAvailable(AtlasLootCharDB["QuickLooks"][1][1]) then
if getglobal("AtlasLootPanel"):GetParent() == AtlasFrame then
if AtlasLootPanel:GetParent() == AtlasFrame then
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][1][1], AtlasLootCharDB["QuickLooks"][1][2], AtlasLootCharDB["QuickLooks"][1][3], nil);
elseif getglobal("AtlasLootPanel"):GetParent() == AlphaMapAlphaMapFrame then
elseif AtlasLootPanel:GetParent() == AlphaMapAlphaMapFrame then
pFrame = { "TOPLEFT", AlphaMapAlphaMapFrame, "TOPLEFT", 0, 0 };
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][1][1], AtlasLootCharDB["QuickLooks"][1][2], AtlasLootCharDB["QuickLooks"][1][3], pFrame);
else
@@ -2053,9 +2142,9 @@
</OnMouseUp>
<OnClick>
if AtlasLoot_IsLootTableAvailable(AtlasLootCharDB["QuickLooks"][2][1]) then
if getglobal("AtlasLootPanel"):GetParent() == AtlasFrame then
if AtlasLootPanel:GetParent() == AtlasFrame then
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][2][1], AtlasLootCharDB["QuickLooks"][2][2], AtlasLootCharDB["QuickLooks"][2][3], nil);
elseif getglobal("AtlasLootPanel"):GetParent() == AlphaMapAlphaMapFrame then
elseif AtlasLootPanel:GetParent() == AlphaMapAlphaMapFrame then
pFrame = { "TOPLEFT", AlphaMapAlphaMapFrame, "TOPLEFT", 0, 0 };
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][2][1], AtlasLootCharDB["QuickLooks"][2][2], AtlasLootCharDB["QuickLooks"][2][3], pFrame);
else
@@ -2104,9 +2193,9 @@
</OnMouseUp>
<OnClick>
if AtlasLoot_IsLootTableAvailable(AtlasLootCharDB["QuickLooks"][3][1]) then
if getglobal("AtlasLootPanel"):GetParent() == AtlasFrame then
if AtlasLootPanel:GetParent() == AtlasFrame then
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][3][1], AtlasLootCharDB["QuickLooks"][3][2], AtlasLootCharDB["QuickLooks"][3][3], nil);
elseif getglobal("AtlasLootPanel"):GetParent() == AlphaMapAlphaMapFrame then
elseif AtlasLootPanel:GetParent() == AlphaMapAlphaMapFrame then
pFrame = { "TOPLEFT", AlphaMapAlphaMapFrame, "TOPLEFT", 0, 0 };
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][3][1], AtlasLootCharDB["QuickLooks"][3][2], AtlasLootCharDB["QuickLooks"][3][3], pFrame);
else
@@ -2155,9 +2244,9 @@
</OnMouseUp>
<OnClick>
if AtlasLoot_IsLootTableAvailable(AtlasLootCharDB["QuickLooks"][4][1]) then
if getglobal("AtlasLootPanel"):GetParent() == AtlasFrame then
if AtlasLootPanel:GetParent() == AtlasFrame then
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][4][1], AtlasLootCharDB["QuickLooks"][4][2], AtlasLootCharDB["QuickLooks"][4][3], nil);
elseif getglobal("AtlasLootPanel"):GetParent() == AlphaMapAlphaMapFrame then
elseif AtlasLootPanel:GetParent() == AlphaMapAlphaMapFrame then
pFrame = { "TOPLEFT", AlphaMapAlphaMapFrame, "TOPLEFT", 0, 0 };
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][4][1], AtlasLootCharDB["QuickLooks"][4][2], AtlasLootCharDB["QuickLooks"][4][3], pFrame);
else
Core/ButtonRegistry.lua
-9
View File
@@ -5038,20 +5038,11 @@ AtlasLoot_ButtonRegistry = {
};
["Winterviel2"] = {
Title = AtlasLoot_TableNames["Winterviel2"][1];
Next_Page = "WintervielSnowball";
Next_Title = "Snowball";
Prev_Page = "Winterviel1";
Prev_Title = AL["Feast of Winter Veil"];
Back_Page = "WORLDEVENTMENU";
Back_Title = AL["World Events"];
};
["WintervielSnowball"] = {
Title = "Snowball";
Prev_Page = "Winterviel2";
Prev_Title = AtlasLoot_TableNames["Winterviel2"][1];
Back_Page = "WORLDEVENTMENU";
Back_Title = AL["World Events"];
};
["Halloween1"] = {
Title = AL["Hallow's End"];
Next_Page = "Halloween2";
Core/Crafting.lua
+11 -171
View File
@@ -5,19 +5,9 @@ local ORANGE = "|cffFF8400";
local WHITE = "|cffFFFFFF";
function AtlasLoot_CraftingMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["Crafting"])
AtlasLootCharDB.LastBoss = "CRAFTINGMENU"
AtlasLootCharDB.LastBossText = "Crafting"
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLootCharDB.LastBossText = AL["Crafting"]
--Alchemy
AtlasLootMenuItem_1_Name:SetText(AL["Alchemy"]);
AtlasLootMenuItem_1_Extra:SetText("");
@@ -114,26 +104,10 @@ function AtlasLoot_CraftingMenu()
AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Hammer_Unique_Sulfuras");
AtlasLootMenuItem_18.lootpage="CraftedWeapons1";
AtlasLootMenuItem_18:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Crafting"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootCraftedSetMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Crafted Sets"])
--Tailoring Header
AtlasLootMenuItem_1_Name:SetText(RED..AL["Tailoring"]);
AtlasLootMenuItem_1_Extra:SetText("");
@@ -297,26 +271,10 @@ function AtlasLootCraftedSetMenu()
AtlasLootMenuItem_29_Icon:SetTexture("Interface\\Icons\\INV_Pants_03");
AtlasLootMenuItem_29.lootpage="BlackDragonM";
AtlasLootMenuItem_29:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Crafted Sets"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_AlchemyMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Alchemy"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Alchemy"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -383,26 +341,10 @@ function AtlasLoot_AlchemyMenu()
AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\Trade_Alchemy");
AtlasLootMenuItem_13.lootpage="AlchemyOther1";
AtlasLootMenuItem_13:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Alchemy"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_SmithingMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Blacksmithing"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Blacksmithing"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -547,26 +489,10 @@ function AtlasLoot_SmithingMenu()
AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\INV_Sword_41");
AtlasLootMenuItem_28.lootpage="Swordsmith1";
AtlasLootMenuItem_28:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Blacksmithing"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_EnchantingMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Enchanting"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Enchanting"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -645,26 +571,10 @@ function AtlasLoot_EnchantingMenu()
AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\Trade_Engraving");
AtlasLootMenuItem_15.lootpage="EnchantingMisc1";
AtlasLootMenuItem_15:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Enchanting"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_EngineeringMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Engineering"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Engineering"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -737,26 +647,10 @@ function AtlasLoot_EngineeringMenu()
AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\Trade_Engineering");
AtlasLootMenuItem_18.lootpage="Goblin1";
AtlasLootMenuItem_18:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Engineering"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_LeatherworkingMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Leatherworking"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Leatherworking"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -799,7 +693,6 @@ function AtlasLoot_LeatherworkingMenu()
AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\Spell_Nature_NullWard");
AtlasLootMenuItem_22.lootpage="Tribal1";
AtlasLootMenuItem_22:Show();
--Leatherworking Helm
AtlasLootMenuItem_7_Name:SetText(AL["Leatherworking"]..": "..AL["Helm"]);
AtlasLootMenuItem_7_Extra:SetText("");
@@ -866,26 +759,10 @@ function AtlasLoot_LeatherworkingMenu()
AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Misc_ArmorKit_17");
AtlasLootMenuItem_18.lootpage="LeatherMisc1";
AtlasLootMenuItem_18:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Leatherworking"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_TailoringMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Tailoring"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Tailoring"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -983,26 +860,10 @@ function AtlasLoot_TailoringMenu()
AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\Trade_Tailoring");
AtlasLootMenuItem_19.lootpage="TailoringMisc1";
AtlasLootMenuItem_19:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Tailoring"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_CookingMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Cooking"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Cooking"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -1027,26 +888,10 @@ function AtlasLoot_CookingMenu()
AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\INV_Misc_Food_15");
AtlasLootMenuItem_5.lootpage="CookingArtisan1";
AtlasLootMenuItem_5:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Cooking"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_JewelcraftingMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "CRAFTINGMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("CRAFTINGMENU", AL["Jewelcrafting"])
--Apprentice
AtlasLootMenuItem_2_Name:SetText(AL["Jewelcrafting"]..": "..AL["Apprentice"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -1137,9 +982,4 @@ function AtlasLoot_JewelcraftingMenu()
AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Ring_03");
AtlasLootMenuItem_18.lootpage="JewelcraftingGoldsmithing1";
AtlasLootMenuItem_18:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Jewelcrafting"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
Core/Dungeons.lua
+4 -37
View File
@@ -1,23 +1,10 @@
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
local RED = "|cffff0000";
local ORANGE = "|cffFF8400";
local WHITE = "|cffFFFFFF";
function AtlasLoot_DungeonsMenu1()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["Dungeons & Raids"])
AtlasLootCharDB.LastBoss = "DUNGEONSMENU1"
AtlasLootCharDB.LastBossText = AL["Dungeons & Raids"]
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootItemsFrame_NEXT"):Show();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLootItemsFrame_NEXT:Show()
--RFC
AtlasLootMenuItem_1_Name:SetText(AL["[13-18] Ragefire Chasm"]);
AtlasLootMenuItem_1_Extra:SetText(AL["Orgrimmar"]);
@@ -198,28 +185,13 @@ function AtlasLoot_DungeonsMenu1()
AtlasLootMenuItem_30_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
AtlasLootMenuItem_30.lootpage="COTBMChronar";
AtlasLootMenuItem_30:Show()
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Dungeons & Raids"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLoot_DungeonsMenu2()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["Dungeons & Raids"])
AtlasLootCharDB.LastBoss = "DUNGEONSMENU2"
AtlasLootCharDB.LastBossText = AL["Dungeons & Raids"]
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Show();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLootItemsFrame_PREV:Show()
--SWV
AtlasLootMenuItem_1_Name:SetText(AL["[60] Stormwind Vault"]);
AtlasLootMenuItem_1_Extra:SetText(AL["Stormwind"]);
@@ -280,9 +252,4 @@ function AtlasLoot_DungeonsMenu2()
AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
AtlasLootMenuItem_11.lootpage="NAXPatchwerk";
AtlasLootMenuItem_11:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Dungeons & Raids"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
Core/Factions.lua
+1 -19
View File
@@ -1,21 +1,9 @@
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
local ORANGE = "|cffFF8400";
function AtlasLootRepMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["Factions"])
AtlasLootCharDB.LastBoss = "REPMENU"
AtlasLootCharDB.LastBossText = "Factions"
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
--Argent Dawn
AtlasLootMenuItem_1_Name:SetText(AL["Argent Dawn"]);
AtlasLootMenuItem_1_Extra:SetText("");
@@ -184,10 +172,4 @@ function AtlasLootRepMenu()
AtlasLootMenuItem_30_Icon:SetTexture("Interface\\Icons\\INV_Misc_Foot_Centaur");
AtlasLootMenuItem_30.lootpage="ThunderBluff";
AtlasLootMenuItem_30:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Factions"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
Core/PvP.lua
+16 -112
View File
@@ -4,19 +4,9 @@ local RED = "|cffff0000";
local ORANGE = "|cffFF8400";
function AtlasLootPvPMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["PvP Rewards"])
AtlasLootCharDB.LastBoss = "PVPMENU"
AtlasLootCharDB.LastBossText = "PvP Rewards"
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLootCharDB.LastBossText = AL["PvP Rewards"]
-- Alterac Valley Rewards
AtlasLootMenuItem_2_Name:SetText(AL["Alterac Valley"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -65,26 +55,10 @@ function AtlasLootPvPMenu()
AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\INV_Sword_11");
AtlasLootMenuItem_22.lootpage="PVPWeapons1";
AtlasLootMenuItem_22:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["PvP Rewards"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootBRRepMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "PVPMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("PVPMENU", AL["Blood Ring"])
--Friendly
AtlasLootMenuItem_2_Name:SetText("Friendly Reputation Rewards");
AtlasLootMenuItem_2_Extra:SetText("");
@@ -115,27 +89,10 @@ function AtlasLootBRRepMenu()
AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\inv_jewelry_talisman_04");
AtlasLootMenuItem_6.lootpage="BRRepTokens";
AtlasLootMenuItem_6:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Blood Ring"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootWSGRepMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "PVPMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("PVPMENU", AL["Warsong Gulch"])
--Friendly Header
AtlasLootMenuItem_2_Name:SetText(RED..AL["Friendly"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -244,26 +201,10 @@ function AtlasLootWSGRepMenu()
AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\INV_Misc_Rune_07");
AtlasLootMenuItem_22.lootpage="WSGRepRevered5059";
AtlasLootMenuItem_22:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Warsong Gulch"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootABRepMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "PVPMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("PVPMENU", AL["Arathi Basin"])
--Friendly Header
AtlasLootMenuItem_2_Name:SetText(RED..AL["Friendly"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -348,26 +289,10 @@ function AtlasLootABRepMenu()
AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Amulet_07");
AtlasLootMenuItem_21.lootpage="ABRepRevered5059";
AtlasLootMenuItem_21:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Arathi Basin"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootAVRepMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "PVPMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("PVPMENU", AL["Alterac Valley"])
--Friendly
AtlasLootMenuItem_2_Name:SetText(AL["Friendly Reputation Rewards"]);
AtlasLootMenuItem_2_Extra:SetText("");
@@ -404,83 +329,62 @@ function AtlasLootAVRepMenu()
AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Necklace_21");
AtlasLootMenuItem_7.lootpage="AVLokholarIvus";
AtlasLootMenuItem_7:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Alterac Valley"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootPVPSetMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "PVPMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLoot_PrepMenu("PVPMENU", AL["PvP Armor Sets"])
--Priest
AtlasLootMenuItem_3_Name:SetText("|cffffffff"..AL["Priest"]);
AtlasLootMenuItem_3_Extra:SetText("");
AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\Spell_Holy_PowerWordShield");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_3_Icon, "priest")
AtlasLootMenuItem_3.lootpage="PVPPriest";
AtlasLootMenuItem_3:Show();
--Mage
AtlasLootMenuItem_4_Name:SetText("|cff68ccef"..AL["Mage"]);
AtlasLootMenuItem_4_Extra:SetText("");
AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\Spell_Frost_IceStorm");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_4_Icon, "mage")
AtlasLootMenuItem_4.lootpage="PVPMage";
AtlasLootMenuItem_4:Show();
--Warlock
AtlasLootMenuItem_5_Name:SetText("|cff9382c9"..AL["Warlock"]);
AtlasLootMenuItem_5_Extra:SetText("");
AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\Spell_Shadow_CurseOfTounges");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_5_Icon, "warlock")
AtlasLootMenuItem_5.lootpage="PVPWarlock";
AtlasLootMenuItem_5:Show();
--Rogue
AtlasLootMenuItem_6_Name:SetText("|cfffff468"..AL["Rogue"]);
AtlasLootMenuItem_6_Extra:SetText("");
AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\Ability_BackStab");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_6_Icon, "rogue")
AtlasLootMenuItem_6.lootpage="PVPRogue";
AtlasLootMenuItem_6:Show();
--Druid
AtlasLootMenuItem_7_Name:SetText("|cffff7c0a"..AL["Druid"]);
AtlasLootMenuItem_7_Extra:SetText("");
AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\Spell_Nature_Regeneration");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_7_Icon, "druid")
AtlasLootMenuItem_7.lootpage="PVPDruid";
AtlasLootMenuItem_7:Show();
--Hunter
AtlasLootMenuItem_18_Name:SetText("|cffaad372"..AL["Hunter"]);
AtlasLootMenuItem_18_Extra:SetText("");
AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\Ability_Hunter_RunningShot");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_18_Icon, "hunter")
AtlasLootMenuItem_18.lootpage="PVPHunter";
AtlasLootMenuItem_18:Show();
--Shaman
AtlasLootMenuItem_19_Name:SetText("|cff2773ff"..AL["Shaman"]);
AtlasLootMenuItem_19_Extra:SetText("");
AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\Spell_FireResistanceTotem_01");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_19_Icon, "shaman")
AtlasLootMenuItem_19.lootpage="PVPShaman";
AtlasLootMenuItem_19:Show();
--Paladin
AtlasLootMenuItem_20_Name:SetText("|cfff48cba"..AL["Paladin"]);
AtlasLootMenuItem_20_Extra:SetText("");
AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\Spell_Holy_SealOfMight");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_20_Icon, "paladin")
AtlasLootMenuItem_20.lootpage="PVPPaladin";
AtlasLootMenuItem_20:Show();
--Warrior
AtlasLootMenuItem_21_Name:SetText("|cffc69b6d"..AL["Warrior"]);
AtlasLootMenuItem_21_Extra:SetText("");
AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Shield_05");
AtlasLoot_SetClassIcon(AtlasLootMenuItem_21_Icon, "warrior")
AtlasLootMenuItem_21.lootpage="PVPWarrior";
AtlasLootMenuItem_21:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["PvP Armor Sets"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
Core/Search.lua
+56 -47
View File
@@ -14,6 +14,10 @@ function AtlasLoot:ShowSearchResult()
AtlasLoot_ShowItemsFrame("SearchResult", "SearchResultPage"..currentPage, string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""), pFrame);
end
local function strtrim(s)
return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
end
function AtlasLoot:Search(Text)
if not Text then return end
Text = strtrim(Text);
@@ -24,57 +28,62 @@ function AtlasLoot:Search(Text)
local partial = AtlasLootCharDB.PartialMatching;
for dataID, data in pairs(AtlasLoot_Data[dataSource]) do
for _, v in ipairs(data) do
if type(v[1]) == "number" and v[1] > 0 then
local itemName = GetItemInfo(v[1]);
if not itemName then itemName = gsub(v[3], "=q%d=", "") end
local found;
if partial then
found = string.find(string.lower(itemName), text);
else
found = string.lower(itemName) == text;
end
if found then
local _, _, quality = string.find(v[3], "=q(%d)=");
if quality then itemName = "=q"..quality.."="..itemName end
table.insert(AtlasLootCharDB["SearchResult"], { v[1], v[2], itemName, v[4], dataID.."|"..dataSource });
end
elseif (v[1] ~= nil) and (v[1] ~= "") and (string.sub(v[1], 1, 1) == "s") then
local spellName
if not spellName then
if (string.sub(v[3], 1, 2) == "=d") then
spellName = gsub(v[3], "=ds=", "");
if type(v[1]) ~= "table" then
-- item
if type(v[1]) == "number" and v[1] > 0 then
local itemName = GetItemInfo(v[1]);
if not itemName then itemName = gsub(v[3], "=q%d=", "") end
local found;
if partial then
found = string.find(string.lower(itemName), text);
else
spellName = gsub(v[3], "=q%d=", "");
found = string.lower(itemName) == text;
end
end
local found;
if partial then
found = string.find(string.lower(spellName), text);
else
found = string.lower(spellName) == text;
end
if found then
spellName = string.sub(v[3], 1, 4)..spellName;
table.insert(AtlasLootCharDB["SearchResult"], { v[1], v[2], spellName, v[4], dataID.."|"..dataSource });
end
elseif (v[1] ~= nil) and (v[1] ~= "") and (string.sub(v[1], 1, 1) == "e") then
local spellName
if not spellName then
if (string.sub(v[3], 1, 2) == "=d") then
spellName = gsub(v[3], "=ds=", "");
if found then
local _, _, quality = string.find(v[3], "=q(%d)=");
if quality then itemName = "=q"..quality.."="..itemName end
table.insert(AtlasLootCharDB["SearchResult"], { v[1], v[2], itemName, v[4], dataID.."|"..dataSource });
end
-- spell
elseif (v[1] ~= nil) and (v[1] ~= "") and (string.sub(v[1], 1, 1) == "s") then
local spellName
if not spellName then
if (string.sub(v[3], 1, 2) == "=d") then
spellName = gsub(v[3], "=ds=", "");
else
spellName = gsub(v[3], "=q%d=", "");
end
end
local found;
if partial then
found = string.find(string.lower(spellName), text);
else
spellName = gsub(v[3], "=q%d=", "");
found = string.lower(spellName) == text;
end
if found then
spellName = string.sub(v[3], 1, 4)..spellName;
table.insert(AtlasLootCharDB["SearchResult"], { v[1], v[2], spellName, v[4], dataID.."|"..dataSource });
end
-- enchant
elseif (v[1] ~= nil) and (v[1] ~= "") and (string.sub(v[1], 1, 1) == "e") then
local spellName
if not spellName then
if (string.sub(v[3], 1, 2) == "=d") then
spellName = gsub(v[3], "=ds=", "");
else
spellName = gsub(v[3], "=q%d=", "");
end
end
local found;
if partial then
found = string.find(string.lower(spellName), text);
else
found = string.lower(spellName) == text;
end
if found then
spellName = string.sub(v[3], 1, 4)..spellName;
table.insert(AtlasLootCharDB["SearchResult"], { v[1], v[2], spellName, v[4], dataID.."|"..dataSource });
end
end
local found;
if partial then
found = string.find(string.lower(spellName), text);
else
found = string.lower(spellName) == text;
end
if found then
spellName = string.sub(v[3], 1, 4)..spellName;
table.insert(AtlasLootCharDB["SearchResult"], { v[1], v[2], spellName, v[4], dataID.."|"..dataSource });
end
end
end
Core/Sets.lua
+458 -471
View File
File diff suppressed because it is too large Load Diff
Core/Spells.lua
+30
View File
@@ -15792,6 +15792,36 @@ GetSpellInfoAtlasLootDB = {
[2] = {7067},
},
},
[45455] = {
["name"] = "Leatherworking: Dreamhide",
["requires"] = "",
["tools"] = "",
["castTime"] = 12.5,
["text"] = "",
["craftItem"] = 61229,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {61198},
[2] = {8170},
[3] = {20381},
},
},
[45453] = {
["name"] = "Tailoring: Dreamthread",
["requires"] = "",
["tools"] = "",
["castTime"] = 12.5,
["text"] = "",
["craftItem"] = 61230,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {61198},
[2] = {14341},
[3] = {20381},
},
},
[2881] = {
["name"] = "Leatherworking: Light Leather",
["requires"] = "",
Core/Tooltip.lua
+159 -100
View File
@@ -4,28 +4,28 @@ local AtlasLootTip = CreateFrame("Frame", "AtlasLootTip", GameTooltip)
local GREY = "|cff999999"
local lastSearchName = nil
local lastSearchLink = nil
local function GetItemLinkByName(name)
local lastSearchID = nil
local function GetItemIDByName(name)
if name ~= lastSearchName then
for itemID = 1, 90000 do
local itemName, hyperLink, itemQuality = GetItemInfo(itemID)
for itemID = 1, 99999 do
local itemName = GetItemInfo(itemID)
if (itemName and itemName == name) then
local _, _, _, hex = GetItemQualityColor(tonumber(itemQuality))
lastSearchLink = hex.. "|H"..hyperLink.."|h["..itemName.."]|h|r"
lastSearchID = itemID
break
end
end
lastSearchName = name
end
return lastSearchLink
return lastSearchID
end
local HookSetItemRef = SetItemRef
SetItemRef = function(link, text, button)
local item, _, id = string.find(link, "item:(%d+):.*")
local item, _, id = string.find(link, "item:(%d+)")
ItemRefTooltip.itemID = id
HookSetItemRef(link, text, button)
if not IsShiftKeyDown() and not IsControlKeyDown() and item then
AtlasLootTip.extendTooltip(ItemRefTooltip, "ItemRefTooltip")
AtlasLootTip.extendTooltip(ItemRefTooltip)
end
end
@@ -34,7 +34,7 @@ function GameTooltip.SetHyperlink(self, arg1)
if arg1 then
local _, _, linktype = string.find(arg1, "^(.-):(.+)$")
if linktype == "item" then
local _, _, id = string.find(arg1,"item:(%d+):.*")
local _, _, id = string.find(arg1,"item:(%d+)")
GameTooltip.itemID = id
end
end
@@ -44,7 +44,7 @@ end
local HookSetBagItem = GameTooltip.SetBagItem
function GameTooltip.SetBagItem(self, container, slot)
if GetContainerItemLink(container, slot) then
local _, _, id = string.find(GetContainerItemLink(container, slot),"item:(%d+):.*")
local _, _, id = string.find(GetContainerItemLink(container, slot),"item:(%d+)")
GameTooltip.itemID = id
end
return HookSetBagItem(self, container, slot)
@@ -54,8 +54,7 @@ local HookSetInboxItem = GameTooltip.SetInboxItem
function GameTooltip.SetInboxItem(self, mailID, attachmentIndex)
local itemName = GetInboxItem(mailID)
if itemName then
local _, _, id = string.find(GetItemLinkByName(itemName),"item:(%d+):.*")
GameTooltip.itemID = id
GameTooltip.itemID = GetItemIDByName(itemName)
end
return HookSetInboxItem(self, mailID, attachmentIndex)
end
@@ -63,7 +62,7 @@ end
local HookSetInventoryItem = GameTooltip.SetInventoryItem
function GameTooltip.SetInventoryItem(self, unit, slot)
if GetInventoryItemLink(unit, slot) then
local _, _, id = string.find(GetInventoryItemLink(unit, slot),"item:(%d+):.*")
local _, _, id = string.find(GetInventoryItemLink(unit, slot),"item:(%d+)")
GameTooltip.itemID = id
end
return HookSetInventoryItem(self, unit, slot)
@@ -72,7 +71,7 @@ end
local HookSetCraftItem = GameTooltip.SetCraftItem
function GameTooltip.SetCraftItem(self, skill, slot)
if GetCraftReagentItemLink(skill, slot) then
local _, _, id = string.find(GetCraftReagentItemLink(skill, slot),"item:(%d+):.*")
local _, _, id = string.find(GetCraftReagentItemLink(skill, slot),"item:(%d+)")
GameTooltip.itemID = id
end
return HookSetCraftItem(self, skill, slot)
@@ -82,12 +81,12 @@ local HookSetTradeSkillItem = GameTooltip.SetTradeSkillItem
function GameTooltip.SetTradeSkillItem(self, skillIndex, reagentIndex)
if reagentIndex then
if GetTradeSkillReagentItemLink(skillIndex, reagentIndex) then
local _, _, id = string.find(GetTradeSkillReagentItemLink(skillIndex, reagentIndex),"item:(%d+):.*")
local _, _, id = string.find(GetTradeSkillReagentItemLink(skillIndex, reagentIndex),"item:(%d+)")
GameTooltip.itemID = id
end
else
if GetTradeSkillItemLink(skillIndex) then
local _, _, id = string.find(GetTradeSkillItemLink(skillIndex),"item:(%d+):.*")
local _, _, id = string.find(GetTradeSkillItemLink(skillIndex),"item:(%d+)")
GameTooltip.itemID = id
end
end
@@ -98,8 +97,7 @@ local HookSetAuctionItem = GameTooltip.SetAuctionItem
function GameTooltip.SetAuctionItem(self, atype, index)
local itemName = GetAuctionItemInfo(atype, index)
if itemName then
local _, _, id = string.find(GetItemLinkByName(itemName),"item:(%d+):.*")
GameTooltip.itemID = id
GameTooltip.itemID = GetItemIDByName(itemName)
end
return HookSetAuctionItem(self, atype, index)
end
@@ -108,8 +106,7 @@ local HookSetAuctionSellItem = GameTooltip.SetAuctionSellItem
function GameTooltip.SetAuctionSellItem(self)
local itemName = GetAuctionSellItemInfo()
if itemName then
local _, _, id = string.find(GetItemLinkByName(itemName),"item:(%d+):.*")
GameTooltip.itemID = id
GameTooltip.itemID = GetItemIDByName(itemName)
end
return HookSetAuctionSellItem(self)
end
@@ -117,7 +114,7 @@ end
local HookSetTradePlayerItem = GameTooltip.SetTradePlayerItem
function GameTooltip.SetTradePlayerItem(self, index)
if GetTradePlayerItemLink(index) then
local _, _, id = string.find(GetTradePlayerItemLink(index),"item:(%d+):.*")
local _, _, id = string.find(GetTradePlayerItemLink(index),"item:(%d+)")
GameTooltip.itemID = id
end
return HookSetTradePlayerItem(self, index)
@@ -126,27 +123,51 @@ end
local HookSetTradeTargetItem = GameTooltip.SetTradeTargetItem
function GameTooltip.SetTradeTargetItem(self, index)
if GetTradeTargetItemLink(index) then
local _, _, id = string.find(GetTradeTargetItemLink(index),"item:(%d+):.*")
local _, _, id = string.find(GetTradeTargetItemLink(index),"item:(%d+)")
GameTooltip.itemID = id
end
return HookSetTradeTargetItem(self, index)
end
local sets = {
["SpiritofEskhandar"]=true,
["HakkariBlades"]=true,
["PrimalBlessing"]=true,
["ShardOfGods"]=true,
["DalRend"]=true,
["SpiderKiss"]=true,
["UnobMounts"]=true,
["Legendaries"]=true,
["Artifacts"]=true,
["ZGRings"]=true,
["Tabards"]=true,
}
local function SetContains(set, key)
if not set or not key then
return false
end
return set[key] ~= nil
end
local lastItemID, lastSourceStr, lastDropRate
function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
function AtlasLootTip.extendTooltip(tooltip)
if AtlasLootCharDB.ShowSource ~= true or IsShiftKeyDown() then
return
end
local strfind = string.find
local pairs = pairs
local tooltipName = tooltip:GetName()
local originalTooltip = {}
local itemName = getglobal(tooltipTypeStr .. "TextLeft1"):GetText()
local line2 = getglobal(tooltipTypeStr .. "TextLeft2")
local itemName = getglobal(tooltipName .. "TextLeft1"):GetText()
local line2 = getglobal(tooltipName .. "TextLeft2")
local craftSpell, source, sourceStr, dropRate
local isCraft, isWBLoot, isPvP, isRepReward, isSetPiece, isWorldEvent = false, false, false, false, false, false
if itemName and itemName ~= "Fashion Coin" and tooltip.itemID then
if tooltip.itemID ~= lastItemID then
local itemID = tonumber(tooltip.itemID)
if itemName and itemName ~= "Fashion Coin" and itemID then
if itemID ~= lastItemID then
for row = 1, 30 do
local tooltipRowLeft = getglobal(tooltipTypeStr .. 'TextLeft' .. row)
local tooltipRowLeft = getglobal(tooltipName .. 'TextLeft' .. row)
if tooltipRowLeft then
local rowtext = tooltipRowLeft:GetText()
if rowtext then
@@ -156,47 +177,50 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
end
end
for row=1, table.getn(originalTooltip) do
if string.find(originalTooltip[row].text, "—",1,true) then -- skip items that state which rep they require
if strfind(originalTooltip[row].text, "—",1,true) then -- skip items that state which rep they require
return
end
end
-- first check if its craftable item
for k,v in pairs(GetSpellInfoAtlasLootDB["craftspells"]) do
if v["craftItem"] == tonumber(tooltip.itemID) then
if v["craftItem"] == itemID then
craftSpell = "s"..tostring(k)
end
end
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootCrafting"]) do
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootCrafting"][k1]) do
for k1, v1 in pairs(AtlasLoot_Data["AtlasLootCrafting"]) do
if source then
break
end
for k2, v2 in pairs(AtlasLoot_Data["AtlasLootCrafting"][k1]) do
if v2[1] ~= 0 and v2[1] ~= "" and string.sub(v2[1], 1, 1) ~= "e" then
if (v2[1] == craftSpell or v2[1] == tonumber(tooltip.itemID))
and
(string.find(k1, "Apprentice",1,true) or
string.find(k1, "Journeyman",1,true) or
string.find(k1, "Expert",1,true) or
string.find(k1, "Artisan",1,true) or
string.find(k1, "Goblin",1,true) or
string.find(k1, "Gnomish",1,true) or
string.find(k1, "Survival",1,true) or
string.find(k1, "Herbalism",1,true) or
string.find(k1, "FirstAid",1,true) or
string.find(k1, "Poisons",1,true) or
string.find(k1, "Mining",1,true) or
string.find(k1, "Smelting",1,true) or
string.find(k1, "Elemental",1,true) or
string.find(k1, "Tribal",1,true) or
string.find(k1, "Dragonscale",1,true)or
string.find(k1, "Weaponsmith",1,true)or
string.find(k1, "Axesmith",1,true)or
string.find(k1, "Hammersmith",1,true)or
string.find(k1, "Swordsmith",1,true)or
string.find(k1, "Armorsmith",1,true)or
string.find(k1, "Gemology",1,true)or
string.find(k1, "Goldsmithing",1,true))
if (v2[1] == craftSpell or v2[1] == itemID) and
(strfind(k1, "Apprentice", 1, true) or
strfind(k1, "Journeyman", 1, true) or
strfind(k1, "Expert", 1, true) or
strfind(k1, "Artisan", 1, true) or
strfind(k1, "Goblin", 1, true) or
strfind(k1, "Gnomish", 1, true) or
strfind(k1, "Survival", 1, true) or
strfind(k1, "Herbalism", 1, true) or
strfind(k1, "FirstAid", 1, true) or
strfind(k1, "Poisons", 1, true) or
strfind(k1, "Mining", 1, true) or
strfind(k1, "Smelting", 1, true) or
strfind(k1, "Elemental", 1, true) or
strfind(k1, "Tribal", 1, true) or
strfind(k1, "Dragonscale", 1, true) or
strfind(k1, "Weaponsmith", 1, true) or
strfind(k1, "Axesmith", 1, true) or
strfind(k1, "Hammersmith", 1, true) or
strfind(k1, "Swordsmith", 1, true) or
strfind(k1, "Armorsmith", 1, true) or
strfind(k1, "Gemology", 1, true) or
strfind(k1, "Goldsmithing", 1, true))
then
source = k1
isCraft = true
lastDropRate = nil
break
end
end
end
@@ -204,8 +228,11 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
-- check if its world boss loot
if not isCraft then
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootWBItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootWBItems"][k1]) do
if v2[1] == tonumber(tooltip.itemID) then
if v2[1] == itemID then
source = k1
isWBLoot = true
if v2[5] then
@@ -214,6 +241,7 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
else
lastDropRate = nil
end
break
end
end
end
@@ -221,11 +249,15 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
-- check if its a pvp reward
if not isCraft and not isWBLoot then
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootGeneralPvPItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootGeneralPvPItems"][k1]) do
if v2[1] == tonumber(tooltip.itemID) then
if v2[1] == itemID then
source = k1
isPvP = true
lastDropRate = nil
break
end
end
end
@@ -234,8 +266,11 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
-- bgs
if not isCraft and not isWBLoot and not isPvP then
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootBGItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootBGItems"][k1]) do
if v2[1] == tonumber(tooltip.itemID) then
if v2[1] == itemID then
source = k1
isRepReward = true
if v2[5] then
@@ -244,21 +279,26 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
else
lastDropRate = nil
end
break
end
end
end
-- factions
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootRepItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootRepItems"][k1]) do
if v2[1] == tonumber(tooltip.itemID) then
if v2[1] == itemID then
source = k1
isRepReward = true
if v2[5] and source ~= "Darkmoon" and not string.find(source, "Cenarion",1,true) then
if v2[5] and source ~= "Darkmoon" and not strfind(source, "Cenarion",1,true) then
dropRate = v2[5]
lastDropRate = dropRate
else
lastDropRate = nil
end
break
end
end
end
@@ -266,25 +306,19 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
-- check if its a set piece
if not isCraft and not isWBLoot and not isPvP and not isRepReward then
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootSetItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootSetItems"][k1]) do
if v2[1] == tonumber(tooltip.itemID) then
if v2[1] == itemID then
source = k1
isSetPiece = true
if (source == "SpiritofEskhandar" or
source == "HakkariBlades" or
source == "PrimalBlessing" or
source == "ShardOfGods" or
source == "DalRend" or
source == "SpiderKiss" or
source == "UnobMounts" or
source == "Legendaries" or
source == "Artifacts" or
source == "ZGRings" or
source == "Tabards" or string.find(source, "WorldEpics",1,true)) then
if (SetContains(sets, source) or strfind(source, "WorldEpics",1,true)) then
source = nil
isSetPiece = false
end
lastDropRate = nil
break
end
end
end
@@ -292,12 +326,12 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
-- check world events
if not isCraft and not isWBLoot and not isPvP and not isRepReward and not isSetPiece then
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootWorldEvents"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootWorldEvents"][k1]) do
if v2[1] == tonumber(tooltip.itemID) and string.find(v2[3], itemName, 1, true) then
if v2[1] == itemID then
source = k1
if source == "WintervielSnowball" and not (tonumber(tooltip.itemID) == 51249 or tonumber(tooltip.itemID) == 61089) then
return
end
isWorldEvent = true
if v2[5] then
dropRate = v2[5]
@@ -305,6 +339,7 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
else
lastDropRate = nil
end
break
end
end
end
@@ -312,34 +347,59 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
-- check if its a dungeon/raid loot
if not isCraft and not isWBLoot and not isPvP and not isRepReward and not isWorldEvent and not isSetPiece then
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootItems"][k1]) do
if v2[1] ~= 0 then
if v2[1] == tonumber(tooltip.itemID) then
if k1 ~= "VanillaKeys" then
source = k1
if v2[1] == itemID then
if k1 ~= "VanillaKeys" then
source = k1
end
if v2[5] then
dropRate = v2[5]
lastDropRate = dropRate
else
lastDropRate = nil
end
break
end
end
end
-- check containers
for k1,v1 in pairs(AtlasLoot_Data["AtlasLootItems"]) do
if source then
break
end
for k2,v2 in pairs(AtlasLoot_Data["AtlasLootItems"][k1]) do
if source then
break
end
if v2[16] then
for i, n in pairs(v2[16]) do
if source then
break
end
if v2[5] then
dropRate = v2[5]
lastDropRate = dropRate
else
lastDropRate = nil
for i2, n2 in pairs(v2[16][i]) do
if v2[16][i][i2][1] == itemID then
source = k1
break
end
end
end
end
end
end
end
lastItemID = tooltip.itemID
lastItemID = itemID
if not source then
lastSourceStr = nil
return
end
for k,v in pairs(AtlasLoot_TableNames) do
if k == source then
sourceStr = AtlasLoot_TableNames[k][1]
lastSourceStr = sourceStr
break
end
end
@@ -360,8 +420,7 @@ function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
tooltip:AddLine(GREY..sourceStr.."|r")
end
end
elseif tooltip.itemID == lastItemID then
elseif itemID == lastItemID then
if lastSourceStr then
if line2:GetText() then
if lastDropRate then
@@ -388,7 +447,7 @@ AtlasLootTip:SetScript("OnHide", function()
end)
AtlasLootTip:SetScript("OnShow", function()
AtlasLootTip.extendTooltip(GameTooltip, "GameTooltip")
AtlasLootTip.extendTooltip(GameTooltip)
end)
-- adapted from http://shagu.org/ShaguTweaks/
@@ -399,10 +458,10 @@ AtlasLootTip.HookAddonOrVariable = function(addon, func)
lurker:RegisterEvent("VARIABLES_LOADED")
lurker:RegisterEvent("PLAYER_ENTERING_WORLD")
lurker:SetScript("OnEvent",function()
if IsAddOnLoaded(addon) or getglobal(addon) then
this:func()
this:UnregisterAllEvents()
end
if IsAddOnLoaded(addon) or getglobal(addon) then
this:func()
this:UnregisterAllEvents()
end
end)
end
@@ -410,10 +469,10 @@ AtlasLootTip.HookAddonOrVariable("Tmog", function()
local tmog = CreateFrame("Frame", nil, TmogTooltip)
tmog:SetScript("OnHide", function()
for row=1, 30 do
getglobal("TmogTooltip" .. 'TextRight' .. row):SetText("")
getglobal("TmogTooltipTextRight" .. row):SetText("")
end
end)
tmog:SetScript("OnShow", function()
AtlasLootTip.extendTooltip(TmogTooltip, "TmogTooltip")
AtlasLootTip.extendTooltip(TmogTooltip)
end)
end)
Core/WishList.lua
+17 -32
View File
@@ -1,17 +1,4 @@
--[[
File containing functions related to the wish list.
Functions:
AtlasLoot_ShowWishList()
AtlasLoot_AddToWishlist(itemID, itemTexture, itemName, lootPage, sourcePage)
AtlasLoot_DeleteFromWishList(itemID)
AtlasLoot_WishListSort()
AtlasLoot_WishListSortCheck(temp1, temp2)
local RecursiveSearchZoneName(dataTable, zoneID)
AtlasLoot_GetWishListSubheading(dataID)
AtlasLoot_CategorizeWishList(wlTable)
AtlasLoot_GetWishListPage(page)
]]
--File containing functions related to the wish list.
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
@@ -74,25 +61,23 @@ AtlasLoot_WishListSort()
Sorts the Wishlist
]]
function AtlasLoot_WishListSort()
local j = 0;
local P = 2;
local temp = {};
local check = false;
j=0;
P=2;
temp={};
check=false;
while(P<31) do
temp=AtlasLootCharDB["WishList"][P];
j=P;
check=AtlasLoot_WishListSortCheck(AtlasLootCharDB["WishList"][j-1], temp);
while((j>1) and check) do
AtlasLootCharDB["WishList"][j] = AtlasLootCharDB["WishList"][j-1];
j=j-1;
check=AtlasLoot_WishListSortCheck(AtlasLootCharDB["WishList"][j-1], temp);
while (P < 31) do
temp = AtlasLootCharDB["WishList"][P];
j = P;
check = AtlasLoot_WishListSortCheck(AtlasLootCharDB["WishList"][j - 1], temp);
while ((j > 1) and check) do
AtlasLootCharDB["WishList"][j] = AtlasLootCharDB["WishList"][j - 1];
j = j - 1;
check = AtlasLoot_WishListSortCheck(AtlasLootCharDB["WishList"][j - 1], temp);
end
AtlasLootCharDB["WishList"][j]=temp;
P=P+1;
AtlasLootCharDB["WishList"][j] = temp;
P = P + 1;
end
end
--[[
@@ -111,8 +96,8 @@ function AtlasLoot_WishListSortCheck(temp1, temp2)
elseif temp1[1] == 0 then
return true;
else
prefix1=string.lower(string.sub(temp1[3], 1, 10));
prefix2=string.lower(string.sub(temp2[3], 1, 10));
local prefix1=string.lower(string.sub(temp1[3], 1, 10));
local prefix2=string.lower(string.sub(temp2[3], 1, 10));
if prefix1 ~= prefix2 then
if prefix1 == "|cffff0000" then
return false;
Core/WorldBoss.lua
+4 -18
View File
@@ -1,19 +1,11 @@
local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
local WHITE = "|cffFFFFFF";
function AtlasLoot_WorldBossMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["World Bosses"])
AtlasLootCharDB.LastBoss = "WORLDBOSSMENU"
AtlasLootCharDB.LastBossText = "World Bosses"
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLootCharDB.LastBossText = AL["World Bosses"]
--Azuregos
AtlasLootMenuItem_1_Name:SetText(AL["Azuregos"]);
AtlasLootMenuItem_1_Extra:SetText(WHITE..AL["Azshara"]);
@@ -86,10 +78,4 @@ function AtlasLoot_WorldBossMenu()
AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Misc_Birdbeck_02");
AtlasLootMenuItem_14.lootpage="Clackora";
AtlasLootMenuItem_14:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["World Bosses"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
Core/WorldEvents.lua
+2 -55
View File
@@ -3,19 +3,9 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
local ORANGE = "|cffFF8400";
function AtlasLootWorldEventMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
AtlasLoot_PrepMenu(nil, AL["World Events"])
AtlasLootCharDB.LastBoss = "WORLDEVENTMENU"
AtlasLootCharDB.LastBossText = "World Events"
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootItemsFrame_BACK"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
AtlasLootCharDB.LastBossText = AL["World Events"]
--Abyssal Council
AtlasLootMenuItem_2_Name:SetText(AL["Abyssal Council"]);
AtlasLootMenuItem_2_Extra:SetText(ORANGE..AL["Silithus"]);
@@ -94,47 +84,4 @@ function AtlasLootWorldEventMenu()
AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\INV_Fishingpole_01");
AtlasLootMenuItem_8.lootpage="FishingExtravaganza";
AtlasLootMenuItem_8:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["World Events"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
function AtlasLootAbyssalCouncilMenu()
for i = 1, 30, 1 do
getglobal("AtlasLootItem_"..i):Hide();
end
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i):Hide();
getglobal("AtlasLootMenuItem_"..i).isheader = false;
end
getglobal("AtlasLootItemsFrame_BACK"):Show();
getglobal("AtlasLootItemsFrame_BACK").lootpage = "WORLDEVENTMENU";
getglobal("AtlasLootItemsFrame_NEXT"):Hide();
getglobal("AtlasLootItemsFrame_PREV"):Hide();
getglobal("AtlasLootServerQueryButton"):Hide();
--Templars
AtlasLootMenuItem_2_Name:SetText(AL["Abyssal Council"].." - "..AL["Templars"]);
AtlasLootMenuItem_2_Extra:SetText("");
AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Talisman_05");
AtlasLootMenuItem_2.lootpage="AbyssalTemplars";
AtlasLootMenuItem_2:Show();
--Dukes
AtlasLootMenuItem_3_Name:SetText(AL["Abyssal Council"].." - "..AL["Dukes"]);
AtlasLootMenuItem_3_Extra:SetText("");
AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Ring_36");
AtlasLootMenuItem_3.lootpage="AbyssalDukes";
AtlasLootMenuItem_3:Show();
--High Council
AtlasLootMenuItem_4_Name:SetText(AL["Abyssal Council"].." - "..AL["High Council"]);
AtlasLootMenuItem_4_Extra:SetText("");
AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Staff_13");
AtlasLootMenuItem_4.lootpage="AbyssalLords";
AtlasLootMenuItem_4:Show();
for i = 1, 30, 1 do
getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show();
end
AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Abyssal Council"]);
AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame);
end
Crafting/crafting.en.lua
+4 -1
View File
@@ -1864,6 +1864,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
{ "s45475", "inv_bracer_12", "=q4=Dreamhide Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
{ "s45473", "inv_shoulder_18", "=q4=Dreamhide Mantle", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
{ "s45483", "INV_Bracer_07", "=q4=Inscribed Runic Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
{ "s45455", "INV_Misc_MonsterScales_04", "=q2=Dreamhide", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
};
Dragonscale1 = {
@@ -2227,10 +2228,10 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
{ "s3818", "inv_misc_pelt_wolf_02", "=q1=Cured Heavy Hide", "=ds=#sr# =so1=150 =so2=160 =so3=165 =so4=170" },
{ "s10482", "inv_misc_pelt_bear_01", "=q1=Cured Thick Hide", "=ds=#sr# =so1=200 =so2=200 =so3=200 =so4=200" },
{ "s19047", "inv_misc_pelt_bear_03", "=q1=Cured Rugged Hide", "=ds=#sr# =so1=250 =so2=250 =so3=255 =so4=260" },
{ "s45455", "INV_Misc_MonsterScales_04", "=q2=Dreamhide", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" },
{ "", "", ""},
{ "s23190", "inv_misc_throwingball_01", "=q1=Heavy Leather Ball", "=ds=#sr# =so1=150 =so2=150 =so3=155 =so4=160" },
{ "", "", ""},
{ "", "", ""},
{ "s2152", "inv_misc_armorkit_17", "=q1=Light Armor Kit", "=ds=#sr# =so1=1 =so2=30 =so3=45 =so4=60" },
{ "s2165", "inv_misc_armorkit_15", "=q1=Medium Armor Kit", "=ds=#sr# =so1=100 =so2=115 =so3=122 =so4=130" },
{ "s3780", "inv_misc_armorkit_16", "=q1=Heavy Armor Kit", "=ds=#sr# =so1=150 =so2=170 =so3=180 =so4=190" },
@@ -2528,6 +2529,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
{ "s45461", "inv_bracer_06", "=q4=Dreamthread Bracers", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
{ "s45463", "inv_gauntlets_23", "=q4=Dreamthread Gloves", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
{ "s45457", "INV_Shoulder_05", "=q4=Dreamthread Mantle", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
{ "s45453", "INV_Misc_Herb_18", "=q2=Dreamthread", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300"},
};
TailoringHelm1 = {
{ "s8760", "inv_helmet_29", "=q2=Azure Silk Hood", "=ds=#sr# =so1=145 =so2=155 =so3=160 =so4=165" },
@@ -2797,6 +2799,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
{ "s3865", "inv_fabric_mageweave_03", "=q1=Bolt of Mageweave", "=ds=#sr# =so1=175 =so2=180 =so3=182 =so4=185" },
{ "s18401", "inv_fabric_purplefire_02", "=q1=Bolt of Runecloth", "=ds=#sr# =so1=250 =so2=255 =so3=257 =so4=260" },
{ "s18560", "inv_fabric_moonrag_01", "=q1=Mooncloth", "=ds=#sr# =so1=250 =so2=290 =so3=305 =so4=320" },
{ "s45453", "INV_Misc_Herb_18", "=q2=Dreamthread", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300"},
},
-----------------
Instances/instances.en.lua
+1657 -301
View File
File diff suppressed because it is too large Load Diff
Locale/locale.en.lua
+1
View File
@@ -43,6 +43,7 @@ AL:RegisterTranslations("enUS", function() return {
["Desolace"] = true,
["Moomoo Grove"] = true,
["NoticeFrame"] = " ",
["AL Panel"] = true,
["Toggle AL Panel"] = true,
[" is safe."] = true,
["Server queried for "] = true,
PvP/Battlegrounds.en.lua
+9 -10
View File
@@ -240,13 +240,13 @@ AtlasLoot_Data["AtlasLootBGItems"] = {
BRRepHonored = {
{ 83421, "INV_Gauntlets_05", "=q3=Bloody Gladiator's Handwraps", "=ds=#a1#, #s9#" },
{ 83420, "INV_Belt_04", "=q3=Bloody Gladiator's Sash", "=ds=#a1#, #s10#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 83430, "INV_Gauntlets_21", "=q3=Bloody Gladiator's Gloves", "=ds=#a2#, #s9#" },
{ 83429, "INV_Belt_16", "=q3=Bloody Gladiator's Belt", "=ds=#a2#, #s10#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 60351, "INV_Gauntlets_11", "=q3=Bloody Gladiator's Handguards", "=ds=#a3#, #s9#" },
{ 60350, "INV_Belt_23", "=q3=Bloody Gladiator's Cord", "=ds=#a3#, #s10#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 60359, "INV_Gauntlets_31", "=q3=Bloody Gladiator's Gauntlets", "=ds=#a4#, #s9#" },
{ 60358, "INV_Belt_12", "=q3=Bloody Gladiator's Girdle", "=ds=#a4#, #s10#" },
};
@@ -254,15 +254,15 @@ AtlasLoot_Data["AtlasLootBGItems"] = {
{ 83425, "INV_Bracer_07", "=q3=Bloody Gladiator's Wraps", "=ds=#a1#, #s8#" },
{ 83423, "INV_Pants_01", "=q3=Bloody Gladiator's Britches", "=ds=#a1#, #s11#" },
{ 83424, "INV_Boots_03", "=q3=Bloody Gladiator's Footwraps", "=ds=#a1#, #s12#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 83433, "INV_Bracer_04", "=q3=Bloody Gladiator's Bands", "=ds=#a2#, #s8#" },
{ 83431, "INV_Pants_06", "=q3=Bloody Gladiator's Pants", "=ds=#a2#, #s11#" },
{ 83432, "INV_Boots_03", "=q3=Bloody Gladiator's Boots", "=ds=#a2#, #s12#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 60354, "INV_Bracer_03", "=q3=Bloody Gladiator's Wristguards", "=ds=#a3#, #s8#" },
{ 60352, "INV_Pants_03", "=q3=Bloody Gladiator's Leggings", "=ds=#a3#, #s11#" },
{ 60353, "INV_Boots_Plate_09", "=q3=Bloody Gladiator's Trudgeons", "=ds=#a3#, #s12#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 60362, "INV_Bracer_07", "=q3=Bloody Gladiator's Bracers", "=ds=#a4#, #s8#" },
{ 60360, "INV_Pants_Plate_20", "=q3=Bloody Gladiator's Legguards", "=ds=#a4#, #s11#" },
{ 60361, "INV_Boots_Plate_04", "=q3=Bloody Gladiator's Greaves", "=ds=#a4#, #s12#" },
@@ -271,19 +271,18 @@ AtlasLoot_Data["AtlasLootBGItems"] = {
{ 83428, "INV_Belt_26", "=q4=Bloody Gladiator's Circlet", "=ds=#a1#, #s1#" },
{ 83427, "INV_Shoulder_05", "=q4=Bloody Gladiator's Amice", "=ds=#a1#, #s3#" },
{ 83426, "INV_Shirt_05", "=q4=Bloody Gladiator's Vestments", "=ds=#a1#, #s5#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 83436, "INV_Misc_Bandage_13", "=q4=Bloody Gladiator's Headband", "=ds=#a2#, #s1#" },
{ 83435, "INV_Shoulder_23", "=q4=Bloody Gladiator's Shoulders", "=ds=#a2#, #s3#" },
{ 83434, "INV_Chest_Leather_05", "=q4=Bloody Gladiator's Tunic", "=ds=#a2#, #s5#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 60357, "INV_Helmet_02", "=q4=Bloody Gladiator's Helmet", "=ds=#a3#, #s1#" },
{ 60356, "INV_Shoulder_13", "=q4=Bloody Gladiator's Pauldrons", "=ds=#a3#, #s3#" },
{ 60355, "INV_Chest_Plate01", "=q4=Bloody Gladiator's Armor", "=ds=#a3#, #s5#" },
{ "", "", "", "" },
{ 0, "", "", "" },
{ 60365, "INV_Helmet_20", "=q4=Bloody Gladiator's Helm", "=ds=#a4#, #s1#" },
{ 60364, "INV_Shoulder_13", "=q4=Bloody Gladiator's Spaulders", "=ds=#a4#, #s3#" },
{ 60363, "INV_Chest_Chain_17", "=q4=Bloody Gladiator's Breastplate", "=ds=#a4#, #s5#" },
{ "", "", "", "" },
{ 60004, "INV_Jewelry_Ring_12", "=q4=Loop of Triage", "=ds=#s13#" },
{ 60005, "INV_Jewelry_Ring_09", "=q4=Signet of the Battlecaster", "=ds=#s13#" },
{ 60006, "INV_Jewelry_Ring_23", "=q4=Ring of Blood", "=ds=#s13#" },
Sets/sets.lua
+1104 -83
View File
File diff suppressed because it is too large Load Diff
TableRegister/loottables.en.lua
-2
View File
@@ -752,7 +752,6 @@ AtlasLoot_TableNames = {
["Winterviel"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
["WintervielSnowball"] = { AL["Feast of Winter Veil"].." - Snowball", "AtlasLootWorldEvents" },
--Other
["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" },
["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" },
@@ -1908,7 +1907,6 @@ AtlasLoot_TableNamesBoss = {
["Valentineday"] = { AL["Love is in the Air"], "AtlasLootWorldEvents" },
["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
["WintervielSnowball"] = { "Snowball", "AtlasLootWorldEvents" },
--Other
["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" },
["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" },
WorldEvents/worldevents.lua
+1 -31
View File
@@ -304,38 +304,8 @@ AtlasLoot_Data["AtlasLootWorldEvents"] = {
{ 17303, "INV_Holiday_Christmas_Wrapping_03", "=q1=Blue Ribboned Wrapping Paper", "=ds=#m33#" },
{ 17304, "INV_Holiday_Christmas_Wrapping_01", "=q1=Green Ribboned Wrapping Paper", "=ds=#m33#" },
{ 17307, "INV_Holiday_Christmas_Wrapping_02", "=q1=Purple Ribboned Wrapping Paper", "=ds=#m33#" },
};
WintervielSnowball = {
{ 0,"","","" },
{ 51249, "Ability_Mount_WhiteDireWolf", "=q3=Snowball", "=ds=#e7#" },
{ 0,"","","" },
{ 647, "INV_Sword_19", "=q4=Destiny", "=ds=#h2#, #w10#" },
{ 811, "INV_Axe_07", "=q4=Axe of the Deep Woods", "=ds=#h3#, #w1#" },
{ 833, "INV_Ore_TrueSilver_01", "=q4=Lifestone", "=ds=#s14#" },
{ 944, "INV_Staff_07", "=q4=Elemental Mage Staff", "=ds=#h2#, #w9#" },
{ 1168, "INV_Shield_01", "=q4=Skullflame Shield", "=ds=#w8#" },
{ 1263, "INV_Weapon_Halberd_10", "=q4=Brain Hacker", "=ds=#h2#, #w1#" },
{ 1443, "INV_Jewelry_Amulet_01", "=q4=Jeweled Amulet of Cainwyn", "=ds=#s2#" },
{ 1728, "INV_Sword_22", "=q4=Teebu's Blazing Longsword", "=ds=#h3#, #w10#" },
{ 2099, "INV_Weapon_Rifle_09", "=q4=Dwarven Hand Cannon", "=ds=#w5#" },
{ 2243, "INV_Mace_14", "=q4=Hand of Edward the Odd", "=ds=#h1#, #w6#" },
{ 2244, "INV_Sword_18", "=q4=Krol Blade", "=ds=#h3#, #w10#" },
{ 2245, "INV_Helmet_05", "=q4=Helm of Narv", "=ds=#s1#, #a3#" },
{ 2246, "INV_Jewelry_Ring_05", "=q4=Myrmidon's Signet", "=ds=#s13#" },
{ 61089, "INV_Misc_Bag_10_Red", "=q3=The Great Sack of Winter Veil", "=ds=#e10#, #m4#" },
{ 0,"","","" },
{ 2801, "INV_Sword_10", "=q4=Blade of Hanna", "=ds=#h2#, #w10#" },
{ 3475, "INV_Misc_Cape_08", "=q4=Cloak of Flames", "=ds=#s4#" },
{ 14552, "INV_Shoulder_20", "=q4=Stockade Pauldrons", "=ds=#s3#, #a4#" },
{ 14553, "INV_Belt_09", "=q4=Sash of Mercy", "=ds=#s10#, #a2#" },
{ 14554, "INV_Pants_04", "=q4=Cloudkeeper Legplates", "=ds=#s11#, #a4#" },
{ 14555, "INV_Sword_34", "=q4=Alcor's Sunrazor", "=ds=#h1#, #w4#" },
{ 14557, "INV_Misc_Horn_03", "=q4=The Lion Horn of Stormwind", "=ds=#s14#" },
{ 14558, "INV_Jewelry_Necklace_08", "=q4=Lady Maye's Pendant", "=ds=#s2#" },
{ 20698, "INV_Sword_22", "=q4=Elemental Attuned Blade", "=ds=#h3#, #w10#" },
{ 60782, "INV_Weapon_Crossbow_15", "=q4=Shieldbreaker Arbalest", "=ds=#w3#" },
{ 60784, "INV_Chest_Leather_08", "=q4=Breastplate of Beast Mastery", "=ds=#s5#, #a3#" },
{ 80793, "INV_Misc_Horn_02", "=q4=The Wolf Horn of Orgrimmar", "=ds=#s14#" },
};
Noblegarden = {
{ 0, "INV_Egg_03", "=q6=#cb25#", "" },