From 9ea6c075781c4281e36d3b710f6d0ba4be248629 Mon Sep 17 00:00:00 2001 From: Anch Date: Sun, 20 Feb 2022 12:29:12 +1300 Subject: [PATCH] Added Bloodforge items to pvp gear --- AtlasLoot/Core/AtlasDifficulty.lua | 9 ++++ AtlasLoot/Core/AtlasLoot.lua | 45 +++++++++-------- .../DefaultFrame/AtlaslootDefaultFrame.lua | 2 +- AtlasLoot_BurningCrusade/burningcrusade.lua | 48 +++++++++++++++++++ AtlasLoot_OriginalWoW/originalwow.lua | 31 ++++++++++++ 5 files changed, 113 insertions(+), 22 deletions(-) diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua index 713e365..d4afb5a 100644 --- a/AtlasLoot/Core/AtlasDifficulty.lua +++ b/AtlasLoot/Core/AtlasDifficulty.lua @@ -11,6 +11,15 @@ AtlasLoot_Difficulty = { }, }; + ["PVP"] = { + [1] = { + {"Normal", "", [4] = "Submenu"}, + }, + [2] = { + {"Bloodforged", "Bloodforged", [4] = "Submenu"}, + }, + }; + ["ClassicDungeonExt"] = { [1] = { {"Normal", "", [4] = "Submenu"}, diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 2b031f7..2cf5768 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -650,9 +650,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) if(toShow) then IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2]; - if ((dataID == "SearchResult") or (dataID == "WishList")) then - IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2]; - end + if ((dataID == "SearchResult") or (dataID == "WishList")) then + IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2]; + end if string.sub(IDfound, 1, 1) == "s" then isItem = false; @@ -661,29 +661,32 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) end if isItem then + if ItemindexID == "Bloodforged" then + IDfound = "60"..dataSource[dataID][i][2]; + else --Sets ItemindexID to normal(2) if it is nil for min/max difficulties. - if not tonumber(ItemindexID) then ItemindexID = AtlasLoot_Difficulty.Normal end; + if not tonumber(ItemindexID) then ItemindexID = AtlasLoot_Difficulty.Normal end; - --Checks if an item has a Maximum difficulty, this is to correct some items that have an entry for higher difficulties then they really do - if dataSource[dataID][i][AtlasLoot_Difficulty.MAX_DIF] then - if tonumber(dataSource[dataID][i][AtlasLoot_Difficulty.MAX_DIF]) < ItemindexID then ItemindexID = dataSource[dataID][i][AtlasLoot_Difficulty.MAX_DIF] end; - end - - if dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE] then - --Used if an item has more then 1 version with the same name eg Atiesh - IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5) .. " " .. dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE], ItemindexID) or dataSource[dataID][i][2]; - if ((dataID == "SearchResult") or (dataID == "WishList")) then - IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2]; - end - else - --If something was found in itemID database show that if not show default table item - IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2]; - if ((dataID == "SearchResult") or (dataID == "WishList")) then - IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2]; + --Checks if an item has a Maximum difficulty, this is to correct some items that have an entry for higher difficulties then they really do + if dataSource[dataID][i][AtlasLoot_Difficulty.MAX_DIF] then + if tonumber(dataSource[dataID][i][AtlasLoot_Difficulty.MAX_DIF]) < ItemindexID then ItemindexID = dataSource[dataID][i][AtlasLoot_Difficulty.MAX_DIF] end; end + if dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE] then + --Used if an item has more then 1 version with the same name eg Atiesh + IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5) .. " " .. dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE], ItemindexID) or dataSource[dataID][i][2]; + if ((dataID == "SearchResult") or (dataID == "WishList")) then + IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2]; + end + else + --If something was found in itemID database show that if not show default table item + IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2]; + if ((dataID == "SearchResult") or (dataID == "WishList")) then + IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2]; + end + end end - + itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemCount, itemEquipLoc, itemTexture = GetItemInfo(IDfound); --If the client has the name of the item in cache, use that instead. --This is poor man's localisation, English is replaced be whatever is needed diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua index e598654..4dc1477 100644 --- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua +++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua @@ -218,7 +218,7 @@ function AtlasLoot_DifficultyEnable(dataID, dataSource) --Enables Difficulty Men end function AtlasLootDefaultFrame_GetRaidDifficulty(raidtablename, itemID, itemColour) - if tonumber(itemID) then --used in itemID search feature for itemID database + if tonumber(itemID) or itemID:match("Bloodforged") then --used in itemID search feature for itemID database ItemindexID = itemID; isTablereference = false; notPattern = false; diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index 10c6964..bec7e80 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -4084,6 +4084,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 21, 24522, "", "=q1=Thrallmar Favor", "=ds=5 #markthrallmar#"}; { 22, 24581, "", "=q1=Mark of Thrallmar", "=ds=#m19#"}; Back = "PVPMENU2"; + Type = "PVP"; }; ---------------------------------- @@ -4116,6 +4117,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 29, 26044, "", "=q2=Halaa Research Token", "=ds=#m17#"}; Next = "Nagrand2"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["Nagrand2"] = { @@ -4132,6 +4134,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 22, 30568, "", "=q2=The Sharp Cookie", "=ds=#w11#"}; Prev = "Nagrand1"; Back = "PVPMENU2"; + Type = "PVP"; }; ------------------------------------------------ @@ -4158,6 +4161,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 22, 28559, "", "=q3=Exorcist's Plate Helm", "=ds=#a4# #s1#", "18 #spiritshard#", ""}; { 25, 32948, "", "=q1=Auchenai Mana Potion", "=ds=#e2#", "2 #spiritshard#", ""}; Back = "PVPMENU2"; + Type = "PVP"; }; ------------------------------------------------- @@ -4177,6 +4181,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 19, 27930, "", "=q3=Splintermark", "=ds=#w2#", "15 #markthrallmarhhold#", ""}; { 22, 24581, "", "=q1=Mark of Thrallmar", "=ds=#m19#"}; Back = "PVPMENU2"; + Type = "PVP"; }; ------------------------------------- @@ -4210,6 +4215,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 28, 35330, "", "=q3=Dreadweave Leggings", "=ds=#f2#, =ec1=#r3#"}; Next = "PVP70RepLeather"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RepLeather"] = { @@ -4240,6 +4246,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "PVP70RepCloth"; Next = "PVP70RepMail"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RepMail"] = { @@ -4270,6 +4277,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "PVP70RepLeather"; Next = "PVP70RepPlate"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RepPlate"] = { @@ -4293,6 +4301,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 21, 35410, "", "=q3=Savage Plate Legguards", "=ds=#f5#, =ec1=#r3#"}; Prev = "PVP70RepMail"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RareCloth_H"] = { @@ -4322,6 +4331,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 28,28819, "", "=q3=High Warlord's Dreadweave Leggings"}; Next = "PVP70RareLeather_H"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RareLeather_H"] = { @@ -4352,6 +4362,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "PVP70RareCloth_H"; Next = "PVP70RareMail_H"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RareMail_H"] = { @@ -4382,6 +4393,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "PVP70RareLeather_H"; Next = "PVP70RarePlate_H"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RarePlate_H"] = { @@ -4411,6 +4423,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 28,28834, "", "=q3=High Warlord's Lamellar Legguards"}; Prev = "PVP70RareMail_H"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RareCloth_A"] = { @@ -4440,6 +4453,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 28,28626, "", "=q3=Grand Marshal's Dreadweave Leggings"}; Next = "PVP70RareLeather_A"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RareLeather_A"] = { @@ -4470,6 +4484,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "PVP70RareCloth_A"; Next = "PVP70RareMail_A"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RareMail_A"] = { @@ -4500,6 +4515,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "PVP70RareLeather_A"; Next = "PVP70RarePlate_A"; Back = "PVP70RepSET"; + Type = "PVP"; }; AtlasLoot_Data["PVP70RarePlate_A"] = { @@ -4529,6 +4545,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 28,28724, "", "=q3=Grand Marshal's Lamellar Legguards"}; Prev = "PVP70RareMail_A"; Back = "PVP70RepSET"; + Type = "PVP"; }; @@ -4565,6 +4582,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 29, 31854, "", "=q1=Major Combat Mana Potion", "=ds=", "200 #faction#"}; Next = "PvP70Accessories2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP70Accessories1_H"] = { @@ -4596,6 +4614,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 29, 31854, "", "=q1=Major Combat Mana Potion", "=ds=", "200 #faction#"}; Next = "PvP70Accessories2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP70Accessories2"] = { @@ -4627,6 +4646,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 30, 33919, "", "=q4=Vindicator's Band of Triumph", "=ds=", "12000 #faction#"}; Prev = "PvP70Accessories1_A"; Back = "PVPMENU"; + Type = "PVP"; }; ------------------------------------ @@ -4657,6 +4677,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 30, 35150, "", "=q4=Guardian's Wyrmhide Boots", "=ds=", "18000 #faction#"}; Next = "PvP70NonSet2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP70NonSet2"] = { @@ -4686,6 +4707,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 30, 35148, "", "=q4=Guardian's Scaled Greaves", "=ds=", "18000 #faction#"}; Prev = "PvP70NonSet1"; Back = "PVPMENU"; + Type = "PVP"; }; -------------------------- @@ -4718,6 +4740,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 34998, "", "=q4=Brutal Gladiator's Dragonhide Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35000, "", "=q4=Brutal Gladiator's Dragonhide Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaDruidBalance"] = { @@ -4746,6 +4769,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35111, "", "=q4=Brutal Gladiator's Wyrmhide Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35113, "", "=q4=Brutal Gladiator's Wyrmhide Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaDruidRestoration"] = { @@ -4774,6 +4798,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35022, "", "=q4=Brutal Gladiator's Kodohide Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35024, "", "=q4=Brutal Gladiator's Kodohide Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaHunter"] = { @@ -4802,6 +4827,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 34991, "", "=q4=Brutal Gladiator's Chain Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 34993, "", "=q4=Brutal Gladiator's Chain Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaMage"] = { @@ -4830,6 +4856,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35098, "", "=q4=Brutal Gladiator's Silk Handguards", "=ds=", "1125 #arena#", ""}; { 28, 35100, "", "=q4=Brutal Gladiator's Silk Trousers", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaPaladinProtection"] = { @@ -4858,6 +4885,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35028, "", "=q4=Brutal Gladiator's Lamellar Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 35030, "", "=q4=Brutal Gladiator's Lamellar Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaPaladinRetribution"] = { @@ -4886,6 +4914,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35089, "", "=q4=Brutal Gladiator's Scaled Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 35091, "", "=q4=Brutal Gladiator's Scaled Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaPaladinHoly"] = { @@ -4914,6 +4943,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35060, "", "=q4=Brutal Gladiator's Ornamented Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35062, "", "=q4=Brutal Gladiator's Ornamented Legplates", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaPriestShadow"] = { @@ -4942,6 +4972,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35083, "", "=q4=Brutal Gladiator's Satin Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35085, "", "=q4=Brutal Gladiator's Satin Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaPriestHoly"] = { @@ -4970,6 +5001,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35053, "", "=q4=Brutal Gladiator's Mooncloth Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35055, "", "=q4=Brutal Gladiator's Mooncloth Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaRogue"] = { @@ -4998,6 +5030,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35032, "", "=q4=Brutal Gladiator's Leather Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35034, "", "=q4=Brutal Gladiator's Leather Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaWarlockDemonology"] = { @@ -5026,6 +5059,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35003, "", "=q4=Brutal Gladiator's Dreadweave Gloves", "=ds=", "1125 #arena#", ""}; { 28, 35005, "", "=q4=Brutal Gladiator's Dreadweave Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaWarlockDestruction"] = { @@ -5054,6 +5088,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35011, "", "=q4=Brutal Gladiator's Felweave Handguards", "=ds=", "1125 #arena#", ""}; { 28, 35013, "", "=q4=Brutal Gladiator's Felweave Trousers", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaShamanEnhancement"] = { @@ -5082,6 +5117,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35043, "", "=q4=Brutal Gladiator's Linked Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 35045, "", "=q4=Brutal Gladiator's Linked Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaShamanElemental"] = { @@ -5110,6 +5146,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35049, "", "=q4=Brutal Gladiator's Mail Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 35051, "", "=q4=Brutal Gladiator's Mail Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaShamanRestoration"] = { @@ -5138,6 +5175,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35078, "", "=q4=Brutal Gladiator's Ringmail Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 35080, "", "=q4=Brutal Gladiator's Ringmail Leggings", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; AtlasLoot_Data["ArenaWarrior"] = { @@ -5166,6 +5204,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35067, "", "=q4=Brutal Gladiator's Plate Gauntlets", "=ds=", "1125 #arena#", ""}; { 28, 35069, "", "=q4=Brutal Gladiator's Plate Legguards", "=ds=", "1875 #arena#", ""}; Back = "ARENASET"; + Type = "PVP"; }; -------------------------------- @@ -5193,6 +5232,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {19, 28933, "", "=q3=High Warlord's Heavy Crossbow"}; {20, 28938, "", "=q3=High Warlord's Battletome"}; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena0Weapons1_A"] = { @@ -5217,6 +5257,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {19, 28960, "", "=q3=Grand Marshal's Heavy Crossbow"}; {20, 28941, "", "=q3=Grand Marshal's Battletome"}; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena1Weapons1"] = { @@ -5245,6 +5286,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {23, 32452, "", "=q4=Gladiator's Reprieve", "=ds=", "1125 #arena#", ""}; Next = "Arena1Weapons2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena1Weapons2"] = { @@ -5259,6 +5301,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {9, 28357, "", "=q4=Gladiator's Totem of the Third Wind", "=ds=", "1000 #arena#", ""}; Prev = "Arena1Weapons1"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena3Weapons1"] = { @@ -5288,6 +5331,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {24, 33766, "", "=q4=Vengeful Gladiator's War Staff", "=ds=", "3000 #arena#", ""}; Next = "Arena3Weapons2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena3Weapons2"] = { @@ -5317,6 +5361,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {24, 33843, "", "=q4=Vengeful Gladiator's Totem of the Third Wind", "=ds=", "800 #arena#", ""}; Prev = "Arena3Weapons1"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena2Weapons1"] = { @@ -5349,6 +5394,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") {27, 32961, "", "=q4=Merciless Gladiator's Reprieve", "=ds=", "9000 #arena#", ""}; Next = "Arena2Weapons2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena2Weapons2"] = { @@ -5394,6 +5440,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 27, 35109, "", "=q4=Brutal Gladiator's War Staff", "=ds=#h2#, #w9#", "3750 #arena#", ""}; Next = "Arena4Weapons2"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["Arena4Weapons2"] = { @@ -5421,6 +5468,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 24, 35106, "", "=q4=Brutal Gladiator's Totem of the Third Wind", "=ds=#w15#", "1000 #arena#", ""}; Prev = "Arena4Weapons1"; Back = "PVPMENU"; + Type = "PVP"; }; -------------------------- diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index ca9f2fd..68d6241 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -5750,6 +5750,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 24, 19318, "", "=q1=Bottled Alterac Spring Water", "=ds=#e4#", "50 #silver#"}; Next = "AVBlue_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["AVBlue_A"] = { @@ -5779,6 +5780,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 27, 19323, "", "=q4=The Unstoppable Force", "=ds=#h2#, #w6#", "5000 #faction#"}; Prev = "AVMisc"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["AVBlue_H"] = { @@ -5808,6 +5810,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 27, 19323, "", "=q4=The Unstoppable Force", "=ds=#h2#, #w6#", "5000 #faction#"}; Prev = "AVMisc"; Back = "PVPMENU2"; + Type = "PVP"; }; -------------------- @@ -5833,6 +5836,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 20, 20069, "", "=q4=Ironbark Staff", "=ds=", "16000 #alliance#", ""}; Next = "AB4049_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["AB4049_A"] = { @@ -5862,6 +5866,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") Prev = "ABMisc_A"; Next = "AB2039_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["AB2039_A"] = { @@ -5889,6 +5894,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 30, 20129, "", "=q3=Highlander's Mail Greaves", "=ds=", "300 #alliance#", ""}; Prev = "AB4049_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["ABMisc_H"] = { @@ -5910,6 +5916,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 26, 20220, "", "=q4=Ironbark Staff", "=ds=", "16000 #horde#", ""}; Next = "AB4049_H"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["AB4049_H"] = { @@ -5939,6 +5946,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") Prev = "ABMisc_H"; Next = "AB2039_H"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["AB2039_H"] = { @@ -5966,6 +5974,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 30, 20210, "", "=q3=Defiler's Mail Greaves", "=ds=", "300 #horde#", ""}; Prev = "AB4049_H"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["ABSets1_A"] = { @@ -5995,6 +6004,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 29, 20048, "", "=q3=Highlander's Plate Greaves", "=ds=", "3000 #alliance#", ""}; Next = "ABSets2_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["ABSets1_H"] = { @@ -6024,6 +6034,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 19, 20208, "", "=q3=Defiler's Plate Greaves", "=ds=", "3000 #horde#", ""}; Next = "ABSets2_H"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["ABSets2_A"] = { @@ -6033,6 +6044,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 4, 20049, "", "=q3=Highlander's Lamellar Greaves", "=ds=", "3000 #alliance#", ""}; Prev = "ABSets1_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["ABSets2_H"] = { @@ -6042,6 +6054,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 4, 20181, "", "=q3=Defiler's Lamellar Greaves", "=ds=", "3000 #horde#", ""}; Prev = "ABSets1_H"; Back = "PVPMENU2"; + Type = "PVP"; }; --------------------- @@ -6065,6 +6078,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 24, 19068, "", "=q1=Warsong Gulch Silk Bandage", "=ds=", "10 #silver#", ""}; Next = "WSGAccessories_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["WSGAccessories_A"] = { @@ -6094,6 +6108,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 29, 21565, "", "=q3=Rune of Perfection", "=ds=", "300 #alliance#", ""}; Next = "WSGWeapons_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["WSGAccessories_H"] = { @@ -6123,6 +6138,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 29, 21565, "", "=q3=Rune of Perfection", "=ds=", "300 #horde#", ""}; Next = "WSGWeapons_H"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["WSGWeapons_A"] = { @@ -6149,6 +6165,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") Prev = "WSGAccessories_A"; Next = "WSGArmor_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["WSGWeapons_H"] = { @@ -6175,6 +6192,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") Prev = "WSGAccessories_H"; Next = "WSGArmor_H"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["WSGArmor_A"] = { @@ -6199,6 +6217,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 25, 22672, "", "=q4=Sentinel's Plate Legguards", "=ds=", "9000 #alliance#", ""}; Prev = "WSGWeapons_A"; Back = "PVPMENU2"; + Type = "PVP"; }; AtlasLoot_Data["WSGArmor_H"] = { @@ -6223,6 +6242,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") { 25, 22651, "", "=q4=Outrider's Plate Legguards", "=ds=", "9000 #horde#", ""}; Prev = "WSGWeapons_H"; Back = "PVPMENU2"; + Type = "PVP"; }; --------------------------------------- @@ -6840,6 +6860,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 21, 23453, "", "=q4=Grand Marshal's Tome of Restoration", "=ds=#s15#", "34100 #alliance#", ""}; Back = "PVPMENU"; Next = "PVPWeapons_H"; + Type = "PVP"; }; AtlasLoot_Data["PVPWeapons_A2"] = { @@ -6867,6 +6888,7 @@ AtlasLoot_Data["PVPWarrior2"] = { Back = "PVPMENU"; Prev = "PVPWeapons_H"; Next = "PVPWeapons_H2"; + Type = "PVP"; }; @@ -6895,6 +6917,7 @@ AtlasLoot_Data["PVPWarrior2"] = { Back = "PVPMENU"; Prev = "PVPWeapons_A"; Next = "PVPWeapons_A2"; + Type = "PVP"; }; AtlasLoot_Data["PVPWeapons_H2"] = { @@ -6921,6 +6944,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 21, 923469, "", "=q3=Champion's Tome of Mending", "=ds=#s15#", "20000 #horde#", ""}; Back = "PVPMENU"; Prev = "PVPWeapons_A2"; + Type = "PVP"; }; -------------------------------- @@ -6948,6 +6972,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 22, 100532, "", "=q4=Combatant's Scroll of Sorcery, =ds=", " #alliance#", ""}; Next = "PvP60Accessories2_A"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP60Accessories1_H"] = { @@ -6972,6 +6997,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 22, 100532, "", "=q4=Combatant's Scroll of Sorcery, =ds=", " #horde#", ""}; Next = "PvP60Accessories2_H"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP60Accessories2_A"] = { @@ -6998,6 +7024,7 @@ AtlasLoot_Data["PVPWarrior2"] = { Next = "PvP60Accessories3_A"; Prev = "PvP60Accessories1_A"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP60Accessories2_H"] = { @@ -7024,6 +7051,7 @@ AtlasLoot_Data["PVPWarrior2"] = { Next = "PvP60Accessories3_H"; Prev = "PvP60Accessories1_H"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP60Accessories3_A"] = { @@ -7045,6 +7073,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 22, 18443, "", "=q3=Master Sergeant's Insignia", "=ds=#s2#", "1600 #alliance#", ""}; Prev = "PvP60Accessories2_A"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP60Accessories3_H"] = { @@ -7066,6 +7095,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 22, 16335, "", "=q3=Senior Sergeant's Insignia", "=ds=#s2#", "1600 #horde#", ""}; Prev = "PvP60Accessories2_H"; Back = "PVPMENU"; + Type = "PVP"; }; AtlasLoot_Data["PvP60Ench"] = { @@ -7091,6 +7121,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 20, 449570, "", "=q3=Lesser Inscription of the Gladiator, =ds=", "40000 #alliance#", ""}; { 21, 449571, "", "=q3=Lesser Inscription of the Battle Mage, =ds=", "40000 #alliance#", ""}; Back = "PVPMENU"; + Type = "PVP"; }; ---------------- --- Factions ---