From 09453c2a14724dc888b8e454cf27fd487643cde1 Mon Sep 17 00:00:00 2001 From: Spit <110714733+Otari98@users.noreply.github.com> Date: Sat, 21 Sep 2024 20:34:56 +0300 Subject: [PATCH] Atlas buttons fix --- Core/AtlasLoot.lua | 5 +- Instances/instances.en.lua | 34 ++++++++----- PvP/Battlegrounds.en.lua | 9 ++-- Sets/sets.lua | 100 ++++++++++++++++++------------------- 4 files changed, 77 insertions(+), 71 deletions(-) diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index 83e04a3..aec63e5 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -197,7 +197,6 @@ AtlasLoot_MenuList = { "CRAFTSET", "COOKINGMENU", "WORLDBOSSMENU" - --"AbyssalCouncil", }; --entrance maps to instance maps NOT NEEDED FOR ATLAS 1.12 @@ -3400,7 +3399,7 @@ function AtlasLootItem_OnEnter() AtlasLootTooltip2:AddLine(GetSpellInfoAtlasLootDB["enchants"][spellID]["extra"], nil, nil, nil, 1); end if ( AtlasLootCharDB.ItemIDs ) then - AtlasLootTooltip2:AddLine(AL["ItemID:"].." "..GetSpellInfoVanillaDB["enchants"][spellID]["item"], nil, nil, nil, 1); + AtlasLootTooltip2:AddLine(AL["ItemID:"].." "..GetSpellInfoAtlasLootDB["enchants"][spellID]["item"], nil, nil, nil, 1); end AtlasLootTooltip2:Show(); end @@ -3460,7 +3459,7 @@ function AtlasLootItem_OnEnter() AtlasLootTooltip2:AddLine(GetSpellInfoAtlasLootDB["craftspells"][spellID]["extra"], nil, nil, nil, 1); end if ( AtlasLootCharDB.ItemIDs ) then - AtlasLootTooltip2:AddLine(AL["ItemID:"].." "..GetSpellInfoVanillaDB["craftspells"][spellID]["craftItem"], nil, nil, nil, 1); + AtlasLootTooltip2:AddLine(AL["ItemID:"].." "..GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"], nil, nil, nil, 1); end AtlasLootTooltip2:Show(); end diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 695befe..4522e1b 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -629,7 +629,6 @@ AtlasLootBossButtons = { "TCGTrash"; }; KarazhanCrypt = { - ""; ""; "KCMarrowspike"; "KCHivaxxis"; @@ -645,33 +644,31 @@ AtlasLootBossButtons = { ""; ""; "COTBMChronar"; - "COTBMHarbingerAphygth"; "COTBMEpidamu"; "COTBMDriftingAvatar"; "COTBMTimeLordEpochronos"; "COTBMMossheart"; - "COTBMRotmaw"; "COTBMAntnormi"; - --"COTBMInfiniteChromie"; + "COTBMRotmaw"; "COTTrash"; }; StormwindVault = { - ""; ""; "SWVAszoshGrimflame"; "SWVThamGrarr"; "SWVBlackBride"; + ""; "SWVDamian"; "SWVVolkanCruelblade"; - "SWVArctiras"; + ""; "SWVVaultArmoryEquipment"; "SWVTrash"; }; HateforgeQuarry = { - ""; ""; "HQHighForemanBargulBlackhammer"; "HQEngineerFiggles"; + ""; "HQCorrosis"; "HQHatereaverAnnihilator"; "HQHargeshDoomcaller"; @@ -832,8 +829,11 @@ AtlasLootBossButtons = { "UldShovelphlange"; }; GilneasCity = { + ""; "GCMatthiasHoltz"; "GCPackmasterRagetooth"; + ""; + ""; "GCJudgeSutherland"; "GCDustivanBlackcowl"; "GCMarshalMagnusGreystone"; @@ -934,11 +934,19 @@ AtlasLootBossButtons = { "ZGEnchants"; }; LowerKara = { + ""; + ""; "LKHRolfen"; + ""; + ""; "LKHBroodQueenAraxxna"; "LKHGrizikil"; + ""; "LKHClawlordHowlfang"; "LKHLordBlackwaldII"; + ""; + ""; + ""; "LKHMoroes"; "LKHTrash"; "LKHEnchants"; @@ -3132,12 +3140,12 @@ AtlasLoot_Data["AtlasLootItems"] = { COTBMRotmaw = { { 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#, 10-15", "100%" }, { 0, "", "", "" }, - { 61023, "inv_chest_leather_08", "=q2=Breastplate of the Wild Hunt", "=ds=#s5#, #a2#", "13%" }, - { 61025, "inv_misc_lantern_01", "=q2=Pyreflame Lantern", "=ds=#s15#", "13%" }, - { 61029, "inv_jewelry_necklace_22", "=q2=Crocolisk Tooth Necklace", "=ds=#s2#", "13%" }, - { 61030, "inv_fishingpole_02", "=q2=The Murkfisher", "=ds=#h2#, #w9#", "13%" }, - { 61034, "inv_jewelry_ring_12", "=q2=Band of the Marsh Bog", "=ds=#s13#", "13%" }, - { 61063, "inv_misc_monsterfang_01", "=q2=Rotmaw's Tooth", "=ds=#h1#, #w4#", "13%" }, + { 61023, "inv_chest_leather_08", "=q3=Breastplate of the Wild Hunt", "=ds=#s5#, #a2#", "13%" }, + { 61025, "inv_misc_lantern_01", "=q3=Pyreflame Lantern", "=ds=#s15#", "13%" }, + { 61029, "inv_jewelry_necklace_22", "=q3=Crocolisk Tooth Necklace", "=ds=#s2#", "13%" }, + { 61030, "inv_fishingpole_02", "=q3=The Murkfisher", "=ds=#h2#, #w9#", "13%" }, + { 61034, "inv_jewelry_ring_12", "=q3=Band of the Marsh Bog", "=ds=#s13#", "13%" }, + { 61063, "inv_misc_monsterfang_01", "=q3=Rotmaw's Tooth", "=ds=#h1#, #w4#", "13%" }, { 61699, "INV_QirajIdol_War", "=q3=Idol of Savagery", "=ds=#s16#, #e16# =q13=#c1#", "13%" }, { 61701, "INV_Helmet_41", "=q3=Wraps of the Transmogrified", "=ds=#s1#, #a1#", "13%" }, }; diff --git a/PvP/Battlegrounds.en.lua b/PvP/Battlegrounds.en.lua index 969972a..c2fe7a9 100644 --- a/PvP/Battlegrounds.en.lua +++ b/PvP/Battlegrounds.en.lua @@ -140,12 +140,12 @@ AtlasLootBattlegrounds = { ""; ""; ""; + ""; + ""; "AVRepFriendly"; "AVRepHonored"; "AVRepRevered"; "AVRepExalted"; - "AVKorrak"; - "AVLokholarIvus"; }; AlteracValleySouth = { "Frostwolf1"; @@ -192,12 +192,11 @@ AtlasLootBattlegrounds = { ""; ""; ""; + ""; "AVRepFriendly"; "AVRepHonored"; "AVRepRevered"; "AVRepExalted"; - "AVKorrak"; - "AVLokholarIvus"; }; ArathiBasin = { ""; @@ -221,7 +220,7 @@ AtlasLootBattlegrounds = { ""; ""; ""; - "WSGRepFriendly4049"; + "WSGRepFriendly"; "WSGRepHonored5059"; "WSGRepRevered5059"; "WSGRepExalted60"; diff --git a/Sets/sets.lua b/Sets/sets.lua index 41186d6..00fabe1 100644 --- a/Sets/sets.lua +++ b/Sets/sets.lua @@ -1345,58 +1345,58 @@ AtlasLoot_Data["AtlasLootSetItems"] = { }; -- Donation Tabards DonationRewards1 = { - { 23705, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Flame", "Donation Reward" }, - { 23709, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Frost", "Donation Reward" }, - { 81085, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Nature", "Donation Reward" }, - { 81082, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Brilliance", "Donation Reward" }, - { 81083, "INV_Shirt_GuildTabard_01", "=q4=Tabard of the Void", "Donation Reward" }, - { 81081, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Fury", "Donation Reward" }, - { 81084, "INV_Shirt_GuildTabard_01", "=q4=Tabard of the Arcane", "Donation Reward" }, - { 81204, "INV_Misc_TabardPVP_02", "=q4=Illidari Tabard", "Donation Reward" }, - { 81088, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Summer Skies", "Donation Reward" }, - { 81087, "INV_Shirt_GuildTabard_01", "=q4=Tabard of Summer Flames", "Donation Reward" }, - { 50092, "INV_Misc_TabardPVP_01", "=q4=Crimson Legion Tabard", "Donation Reward" }, - { 81203, "INV_Misc_TabardPVP_01", "=q4=Violet Eye Tabard", "Donation Reward" }, - { 50086, "INV_Misc_TabardPVP_01", "=q4=Stromgarde Tabard", "Donation Reward" }, - { 50376, "INV_Misc_TabardPVP_01", "=q4=Hillsbrad Tabard", "Donation Reward" }, - { 23710, "INV_Shirt_GuildTabard_01", "=q4=Darkmoon Faire Tabard", "Donation Reward" }, - { 80310, "inv_misc_tournaments_tabard_bloodelf", "=q4=Sin'dorei Tabard", "Donation Reward" }, - { 80314, "inv_misc_tabard_forsaken", "=q4=Undead Scourge Tabard", "Donation Reward" }, - { 50091, "INV_Shirt_GuildTabard_01", "=q4=Black Mageweave Tabard", "Donation Reward" }, - { 50044, "INV_Shirt_GuildTabard_01", "=q4=Gold Mageweave Tabard", "Donation Reward" }, - { 50038, "INV_Shirt_GuildTabard_01", "=q4=Red Mageweave Tabard", "Donation Reward" }, + { 23705, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Flame", "Donation Reward" }, + { 23709, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Frost", "Donation Reward" }, + { 81085, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Nature", "Donation Reward" }, + { 81082, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Brilliance", "Donation Reward" }, + { 81083, "INV_Shirt_GuildTabard_01", "=q1=Tabard of the Void", "Donation Reward" }, + { 81081, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Fury", "Donation Reward" }, + { 81084, "INV_Shirt_GuildTabard_01", "=q1=Tabard of the Arcane", "Donation Reward" }, + { 81204, "INV_Misc_TabardPVP_02", "=q1=Illidari Tabard", "Donation Reward" }, + { 81088, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Summer Skies", "Donation Reward" }, + { 81087, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Summer Flames", "Donation Reward" }, + { 50092, "INV_Misc_TabardPVP_01", "=q1=Crimson Legion Tabard", "Donation Reward" }, + { 81203, "INV_Misc_TabardPVP_01", "=q1=Violet Eye Tabard", "Donation Reward" }, + { 50086, "INV_Misc_TabardPVP_01", "=q1=Stromgarde Tabard", "Donation Reward" }, + { 50376, "INV_Misc_TabardPVP_01", "=q1=Hillsbrad Tabard", "Donation Reward" }, + { 23710, "INV_Shirt_GuildTabard_01", "=q1=Darkmoon Faire Tabard", "Donation Reward" }, + { 80310, "inv_misc_tournaments_tabard_bloodelf", "=q1=Sin'dorei Tabard", "Donation Reward" }, + { 80314, "inv_misc_tabard_forsaken", "=q1=Undead Scourge Tabard", "Donation Reward" }, + { 50091, "INV_Shirt_GuildTabard_01", "=q1=Black Mageweave Tabard", "Donation Reward" }, + { 50044, "INV_Shirt_GuildTabard_01", "=q1=Gold Mageweave Tabard", "Donation Reward" }, + { 50038, "INV_Shirt_GuildTabard_01", "=q1=Red Mageweave Tabard", "Donation Reward" }, }, --Fashion DonationRewards2 = { - { 69146, "INV_Chest_Cloth_41", "=q4=Midnight Star Gown", "Donation Reward" }, - { 69147, "INV_Chest_Cloth_41", "=q4=Evening Star Gown", "Donation Reward" }, - { 69148, "INV_Chest_Cloth_41", "=q4=Twilight Star Gown", "Donation Reward" }, - { 69149, "INV_Chest_Cloth_41", "=q4=Dusk Star Gown", "Donation Reward" }, - { 69150, "INV_Chest_Cloth_41", "=q4=Dawn Star Gown", "Donation Reward" }, - { 69151, "INV_Chest_Cloth_41", "=q4=Morning Star Gown", "Donation Reward" }, - { 69119, "INV_Chest_Cloth_04", "=q4=Stormwind Archmage Robe", "Donation Reward" }, - { 69123, "INV_Chest_Cloth_04", "=q4=Dalaran Archmage Robe", "Donation Reward" }, - { 69120, "INV_Chest_Cloth_04", "=q4=Tirisfal Archmage Robe", "Donation Reward" }, - { 69124, "INV_Chest_Cloth_04", "=q4=Lordaeron Archmage Robe", "Donation Reward" }, - { 69118, "INV_Chest_Cloth_04", "=q4=Gilnean Archmage Robe", "Donation Reward" }, - { 69122, "INV_Chest_Cloth_04", "=q4=Kul Tiras Archmage Robe", "Donation Reward" }, - { 69121, "INV_Chest_Cloth_04", "=q4=Scarlet Archmage Robe", "Donation Reward" }, - { 69125, "INV_Chest_Cloth_04", "=q4=Theramore Archmage Robe", "Donation Reward" }, - { 69117, "INV_Chest_Cloth_04", "=q4=Jaina Proudmoore Robe", "Donation Reward" }, - { 69127, "INV_Chest_Cloth_31", "=q4=Robes of the Lotus Pond", "Donation Reward" }, - { 69131, "INV_Chest_Cloth_31", "=q4=Peach Garden Robes", "Donation Reward" }, - { 69128, "INV_Chest_Cloth_31", "=q4=Robes of Spring", "Donation Reward" }, - { 69129, "INV_Chest_Cloth_31", "=q4=Year of the Dragon Robes", "Donation Reward" }, - { 69130, "INV_Chest_Cloth_31", "=q4=Traditional New Year Robes", "Donation Reward" }, - { 69132, "INV_Chest_Cloth_31", "=q4=Blooming Wisteria Robes", "Donation Reward" }, - { 41091, "INV_Chest_Cloth_07", "=q4=Apparel of the Bells", "Donation Reward" }, - { 41092, "INV_Chest_Cloth_07", "=q4=Jingle Belle Frock", "Donation Reward" }, - { 83479, "INV_Chest_Cloth_09", "=q4=Romantinc Pink Corset Dress", "Donation Reward" }, - { 83478, "INV_Chest_Cloth_09", "=q4=Romantinc Red Corset Dress", "Donation Reward" }, - { 69152, "INV_Boots_Fabric_01", "=q4=Silver Star Sandals", "Donation Reward" }, - { 69101, "Spell_Shadow_Metamorphosis", "=q4=Blood Illidari Tatoos", "Donation Reward" }, - { 69103, "Spell_Shadow_Metamorphosis", "=q4=Nether Illidari Tatoos", "Donation Reward" }, - { 69100, "Spell_Shadow_Metamorphosis", "=q4=Illidari Tatoos", "Donation Reward" }, - { 69102, "Spell_Shadow_Metamorphosis", "=q4=Void Illidari Tatoos", "Donation Reward" }, + { 69146, "INV_Chest_Cloth_41", "=q1=Midnight Star Gown", "Donation Reward" }, + { 69147, "INV_Chest_Cloth_41", "=q1=Evening Star Gown", "Donation Reward" }, + { 69148, "INV_Chest_Cloth_41", "=q1=Twilight Star Gown", "Donation Reward" }, + { 69149, "INV_Chest_Cloth_41", "=q1=Dusk Star Gown", "Donation Reward" }, + { 69150, "INV_Chest_Cloth_41", "=q1=Dawn Star Gown", "Donation Reward" }, + { 69151, "INV_Chest_Cloth_41", "=q1=Morning Star Gown", "Donation Reward" }, + { 69119, "INV_Chest_Cloth_04", "=q1=Stormwind Archmage Robe", "Donation Reward" }, + { 69123, "INV_Chest_Cloth_04", "=q1=Dalaran Archmage Robe", "Donation Reward" }, + { 69120, "INV_Chest_Cloth_04", "=q1=Tirisfal Archmage Robe", "Donation Reward" }, + { 69124, "INV_Chest_Cloth_04", "=q1=Lordaeron Archmage Robe", "Donation Reward" }, + { 69118, "INV_Chest_Cloth_04", "=q1=Gilnean Archmage Robe", "Donation Reward" }, + { 69122, "INV_Chest_Cloth_04", "=q1=Kul Tiras Archmage Robe", "Donation Reward" }, + { 69121, "INV_Chest_Cloth_04", "=q1=Scarlet Archmage Robe", "Donation Reward" }, + { 69125, "INV_Chest_Cloth_04", "=q1=Theramore Archmage Robe", "Donation Reward" }, + { 69117, "INV_Chest_Cloth_04", "=q1=Jaina Proudmoore Robe", "Donation Reward" }, + { 69127, "INV_Chest_Cloth_31", "=q1=Robes of the Lotus Pond", "Donation Reward" }, + { 69131, "INV_Chest_Cloth_31", "=q1=Peach Garden Robes", "Donation Reward" }, + { 69128, "INV_Chest_Cloth_31", "=q1=Robes of Spring", "Donation Reward" }, + { 69129, "INV_Chest_Cloth_31", "=q1=Year of the Dragon Robes", "Donation Reward" }, + { 69130, "INV_Chest_Cloth_31", "=q1=Traditional New Year Robes", "Donation Reward" }, + { 69132, "INV_Chest_Cloth_31", "=q1=Blooming Wisteria Robes", "Donation Reward" }, + { 41091, "INV_Chest_Cloth_07", "=q1=Apparel of the Bells", "Donation Reward" }, + { 41092, "INV_Chest_Cloth_07", "=q1=Jingle Belle Frock", "Donation Reward" }, + { 83479, "INV_Chest_Cloth_09", "=q1=Romantinc Pink Corset Dress", "Donation Reward" }, + { 83478, "INV_Chest_Cloth_09", "=q1=Romantinc Red Corset Dress", "Donation Reward" }, + { 69152, "INV_Boots_Fabric_01", "=q1=Silver Star Sandals", "Donation Reward" }, + { 69101, "Spell_Shadow_Metamorphosis", "=q1=Blood Illidari Tatoos", "Donation Reward" }, + { 69103, "Spell_Shadow_Metamorphosis", "=q1=Nether Illidari Tatoos", "Donation Reward" }, + { 69100, "Spell_Shadow_Metamorphosis", "=q1=Illidari Tatoos", "Donation Reward" }, + { 69102, "Spell_Shadow_Metamorphosis", "=q1=Void Illidari Tatoos", "Donation Reward" }, }, };