Exiles/coa-atlasloot
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

added tbc highrisk items fixed system to work with it removed difficulty.duplicate as its now obsolete

Browse Source
This commit is contained in:
Anch
2022-06-29 20:31:27 +12:00
parent 8f0bb145cd
commit f3ef9ca5ee
8 changed files with 664 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AtlasLoot/Core/AtlasDifficulty.lua
+15
View File
@@ -199,6 +199,21 @@ AtlasLoot_Difficulty = {
},
};
["CraftingExtTBC"] = {
[1] = {
{"Crafting Patterns Rare", "", [4] = "Submenu" },
},
[2] = {
{"Crafting Patterns Epic", "Epic", [4] = "Submenu" },
},
[3] = {
{"Item Rare", "=s=", [4] = "Submenu" },
},
[4] = {
{"Item Epic", "=s=Epic", [4] = "Submenu" }
},
};
["Expansion"] = {
[1] = {
{"Classic", "=ex=CLASSIC", [4] = "Submenu"}
AtlasLoot/Core/AtlasLoot.lua
+9 -11
View File
@@ -630,11 +630,17 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
end
if isTablereference and not notPattern then -- if the itemID is the item rather from a crafting pattern rather then the pattern itself
dataID = dataID .. tableReference;
local dataClean = dataID
dataID = AtlasLoot_CleandataID(dataID, 1);
dataClean = gsub(dataClean, dataID, "")
dataID = dataID .. tableReference .. dataClean;
DewDrop2Enable = true;
lastReference = tableReference;
elseif isTablereference and notPattern then -- if the itemID is a new table reference rather then and itemID reference
dataID = dataID .. tableReference;
local dataClean = dataID
dataID = AtlasLoot_CleandataID(dataID, 1);
dataClean = gsub(dataClean, dataID, "")
dataID = dataID .. tableReference .. dataClean;
DewDrop2Enable = true;
lastReference = tableReference;
elseif isTableExpansion then
@@ -651,6 +657,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
else
DewDrop2Enable = false;
end
--Turns on the submenu to change expansion
if dataID == "SearchResult" or dataID == "WishList" then
elseif AtlasLoot_Data[dataID].Submenu == "Expansion" then
@@ -725,20 +732,11 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
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(dataSource[dataID][i][2], ItemindexID) or dataSource[dataID][i][2];
if ((dataID == "SearchResult") or (dataID == "WishList")) then
IDfound = AL_FindId(dataSource[dataID][i][2], 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(dataSource[dataID][i][2], ItemindexID) or dataSource[dataID][i][2];
if ((dataID == "SearchResult") or (dataID == "WishList")) then
IDfound = AL_FindId(dataSource[dataID][i][2], 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);
AtlasLoot/Menus/CraftingMenus.lua
+8 -7
View File
@@ -19,7 +19,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 20, "COOKINGDAILYMENU", "INV_Misc_Food_15", AL["Cooking Daily"], ""};
{ 21, "FISHINGDAILYMENU", "inv_fishingpole_03", AL["Fishing Daily"], ""};
{ 22, "JEWELCRAFTINGDAILYMENU", "INV_Misc_Gem_01", AL["Jewelcrafting Daily"], ""};
{ 27, "CookingHighRisk", "INV_Misc_Food_15", "=ds=Cooking High Risk", ""};
{ 27, "CookingHighRisk"..AtlasLoot_Expac, "INV_Misc_Food_15", "=ds=Cooking High Risk", ""};
Submenu = "Disable";
};
@@ -27,7 +27,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 2, "AlchemyBattleElixir"..AtlasLoot_Expac, "INV_Potion_23", "=ds="..AL["Battle Elixirs"], "" };
{ 3, "AlchemyPotion"..AtlasLoot_Expac, "INV_Potion_23", "=ds="..AL["Potions"], "" };
{ 4, "AlchemyTransmute"..AtlasLoot_Expac, "INV_Potion_23", "=ds="..AL["Transmutes"], "" };
{ 6, "AlchemyHighRisk", "INV_Potion_23", "=ds=High Risk", "" };
{ 6, "AlchemyHighRisk"..AtlasLoot_Expac, "INV_Potion_23", "=ds=High Risk", "" };
{ 17, "AlchemyGuardianElixir"..AtlasLoot_Expac, "INV_Potion_23", "=ds="..AL["Guardian Elixirs"], "" };
{ 18, "AlchemyFlask"..AtlasLoot_Expac, "INV_Potion_23", "=ds="..AL["Flasks"], "" };
{ 19, "AlchemyMisc"..AtlasLoot_Expac, "INV_Potion_23", "=ds="..AL["Miscellaneous"], "" };
@@ -41,7 +41,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 6, "Armorsmith1", "Trade_BlackSmithing", "=ds="..GetSpellInfo(9788), "" };
{ 7, "Axesmith1", "Trade_BlackSmithing", "=ds="..GetSpellInfo(17041), "" };
{ 8, "Swordsmith1", "Trade_BlackSmithing", "=ds="..GetSpellInfo(17039), "" };
{ 10, "SmithingHighRisk", "Trade_BlackSmithing", "=ds=High Risk", "" };
{ 10, "SmithingHighRisk"..AtlasLoot_Expac, "Trade_BlackSmithing", "=ds=High Risk", "" };
{ 17, "SmithingWeapon"..AtlasLoot_Expac, "Trade_BlackSmithing", "=ds="..BabbleInventory["Weapon"], "" };
{ 19, "SmithingMisc1", "Trade_BlackSmithing", "=ds="..AL["Miscellaneous"], "" };
{ 21, "Weaponsmith1", "Trade_BlackSmithing", "=ds="..GetSpellInfo(9787), "" };
@@ -57,7 +57,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 5, "EnchantingShield"..AtlasLoot_Expac, "Trade_Engraving", "=ds="..AL["Enchant Shield"], "" };
{ 6, "EnchantingTwoHWeapon"..AtlasLoot_Expac, "Trade_Engraving", "=ds="..AL["Enchant 2H Weapon"], "" };
{ 7, "EnchantingMisc"..AtlasLoot_Expac, "Trade_Engraving", "=ds="..AL["Miscellaneous"], "" };
{ 9, "EnchantingHighRisk", "Trade_Engraving", "=ds=High Risk", "" };
{ 9, "EnchantingHighRisk"..AtlasLoot_Expac, "Trade_Engraving", "=ds=High Risk", "" };
{ 17, "EnchantingBracer"..AtlasLoot_Expac, "Trade_Engraving", "=ds="..AL["Enchant Bracer"], "" };
{ 18, "EnchantingCloak"..AtlasLoot_Expac, "Trade_Engraving", "=ds="..AL["Enchant Cloak"], "" };
{ 19, "EnchantingRing1", "Trade_Engraving", "=ds="..AL["Enchant Ring"], "" };
@@ -73,7 +73,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 4, "EngineeringMisc1", "Trade_Engineering", "=ds="..AL["Miscellaneous"], "" };
{ 5, "EngineeringWeapon1", "Trade_Engineering", "=ds="..BabbleInventory["Weapon"], "" };
{ 7, "Gnomish1", "Trade_Engineering", "=ds="..GetSpellInfo(20220), "" };
{ 9, "EngineerHighRisk", "Trade_Engineering", "=ds=High Risk", "" };
{ 9, "EngineerHighRisk"..AtlasLoot_Expac, "Trade_Engineering", "=ds=High Risk", "" };
{ 17, "EngineeringArmor1", "Trade_Engineering", "=ds="..BabbleInventory["Armor"], "" };
{ 18, "EngineeringItemEnhancements1", "Trade_Engineering", "=ds="..AL["Item Enhancements"], "" };
{ 19, "EngineeringReagents1", "Trade_Engineering", "=ds="..AL["Reagents"], "" };
@@ -121,6 +121,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 7, "JewelMeta"..AtlasLoot_Expac, "INV_Misc_Gem_01", "=ds="..BabbleInventory["Meta"].." "..BabbleInventory["Gem"], "" };
{ 8, "JewelPrismatic1", "INV_Misc_Gem_01", "=ds="..BabbleInventory["Prismatic"].." "..BabbleInventory["Gem"], "" };
{ 9, "JewelDragonsEye1", "INV_Misc_Gem_01", "=ds="..AL["Dragon's Eye"], "" };
{ 11, "JewlHighRisk"..AtlasLoot_Expac, "INV_Misc_Gem_01", "=ds=High Risk", "" };
{ 16, "JewelNeck1", "INV_Misc_Gem_01", "=ds="..BabbleInventory["Neck"], "" };
{ 17, "JewelTrinket1", "INV_Misc_Gem_01", "=ds="..BabbleInventory["Trinket"], "" };
{ 18, "JewelRing1", "INV_Misc_Gem_01", "=ds="..BabbleInventory["Ring"], "" };
@@ -136,7 +137,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 6, "LeatherLeather1", "INV_Misc_ArmorKit_17", "=ds="..BabbleInventory["Leather"], "" };
{ 8, "Dragonscale1", "INV_Misc_ArmorKit_17", "=ds="..GetSpellInfo(10656), "" };
{ 9, "Tribal1", "INV_Misc_ArmorKit_17", "=ds="..GetSpellInfo(10660), "" };
{ 11, "LeatherHighRisk", "INV_Misc_ArmorKit_17", "=ds=High Risk", "" };
{ 11, "LeatherHighRisk"..AtlasLoot_Expac, "INV_Misc_ArmorKit_17", "=ds=High Risk", "" };
{ 17, "LeatherMailArmor"..AtlasLoot_Expac, "INV_Misc_ArmorKit_17", "=ds="..AL["Mail Armor"],"" };
{ 19, "LeatherItemEnhancement1", "INV_Misc_ArmorKit_17", "=ds="..AL["Item Enhancements"], "" };
{ 20, "LeatherDrumsBagsMisc1", "INV_Misc_ArmorKit_17", "=ds="..AL["Drums, Bags and Misc."], "" };
@@ -150,7 +151,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0")
{ 4, "Mooncloth1", "Trade_Tailoring", "=ds="..GetSpellInfo(26798), "" };
{ 5, "Shadoweave1", "Trade_Tailoring", "=ds="..GetSpellInfo(26801), "" };
{ 6, "Spellfire1", "Trade_Tailoring", "=ds="..GetSpellInfo(26797), "" };
{ 8, "TailorHighRisk", "Trade_Tailoring", "=ds=High Risk", "" };
{ 8, "TailorHighRisk"..AtlasLoot_Expac, "Trade_Tailoring", "=ds=High Risk", "" };
{ 17, "TailoringBags1", "Trade_Tailoring", "=ds="..AL["Bags"], "" };
{ 18, "TailoringMisc1", "Trade_Tailoring", "=ds="..AL["Miscellaneous"], "" };
{ 19, "TailoringShirts1", "Trade_Tailoring", "=ds="..AL["Shirts"], "" };
AtlasLoot/TableRegister/loottables.en.lua
+42 -24
View File
@@ -1862,30 +1862,48 @@ end
AtlasLoot_TableNames["JewelcraftingDaily5"] = { AL["Jewelcrafting Daily"], "AtlasLootCrafting" };
AtlasLoot_TableNames["JewelcraftingDaily6"] = { AL["Jewelcrafting Daily"], "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRisk"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskRare"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskEpic"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRisk"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskRare"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskEpic"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRisk"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskRare"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskEpic"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRisk"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskRare"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskEpic"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRisk"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskRare"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskEpic"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRisk"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskRare"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskEpic"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRisk"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwo"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskRare"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoRare"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskEpic"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoEpic"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskCLASSIC"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskRareCLASSIC"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskEpicCLASSIC"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskCLASSIC"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskRareCLASSIC"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskEpicCLASSIC"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskCLASSIC"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskRareCLASSIC"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskEpicCLASSIC"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskCLASSIC"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskRareCLASSIC"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskEpicCLASSIC"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskCLASSIC"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskRareCLASSIC"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskEpicCLASSIC"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskCLASSIC"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskRareCLASSIC"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskEpicCLASSIC"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskCLASSIC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoCLASSIC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskRareCLASSIC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoRareCLASSIC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskEpicCLASSIC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoEpicCLASSIC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskTBC"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["AlchemyHighRiskEpicTBC"] = { ALCHEMY, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskTBC"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["SmithingHighRiskEpicTBC"] = { BLACKSMITHING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskTBC"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EnchantingHighRiskEpicTBC"] = { ENCHANTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskTBC"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["EngineerHighRiskEpicTBC"] = { ENGINEERING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskTBC"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["LeatherHighRiskEpicTBC"] = { LEATHERWORKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskTBC"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["TailorHighRiskEpicTBC"] = { TAILORING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTBC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoTBC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskEpicTBC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["CookingHighRiskTwoEpicTBC"] = { COOKING, "AtlasLootCrafting" };
AtlasLoot_TableNames["JewlHighRiskTBC"] = { JEWELCRAFTING, "AtlasLootCrafting" };
AtlasLoot_TableNames["JewlHighRiskEpicTBC"] = { JEWELCRAFTING, "AtlasLootCrafting" };
-----------
--- PvP ---