From b616860717ca747f689b275e1121c234057d5520 Mon Sep 17 00:00:00 2001 From: Spit <19otari98@gmail.com> Date: Wed, 5 Feb 2025 07:32:45 +0300 Subject: [PATCH] JC reagents --- Core/AtlasLoot.lua | 4 +-- Core/ButtonRegistry.lua | 21 ++++-------- Core/Spells.lua | 19 ++++++----- Instances/instances.en.lua | 59 ++++++++++----------------------- Locale/locale.en.lua | 2 +- TableRegister/loottables.en.lua | 6 ++-- 6 files changed, 38 insertions(+), 73 deletions(-) diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index 8cb4e8b..e6c13bf 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -2416,7 +2416,7 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Black Bride"], "SWVBlackBride" }, { AL["Damian"], "SWVDamian" }, { AL["Volkan Cruelblade"], "SWVVolkanCruelblade" }, - { AL["Arc'tiras / Vault Armory Equipment"], "SWVVaultArmoryEquipment" }, + { AL["Arc'tiras"], "SWVVaultArmoryEquipment" }, { AL["Trash Mobs"], "SWVTrash" }, }, ["BlackwingLair"] = { @@ -2781,7 +2781,6 @@ AtlasLoot_HewdropDown_SubTables = { ["EmeraldSanctum"] = { { AL["Erennius"], "ESErennius" }, { AL["Solnius the Awakener"], "ESSolnius1" }, - { AL["Solnius the Awakener (Page 2)"], "ESSolnius2" }, { AL["Favor of Erennius (ES Hard Mode)"], "ESHardMode" }, { AL["Trash Mobs"], "ESTrash" }, }, @@ -3298,6 +3297,7 @@ function AtlasLootItem_OnEnter() if ( AtlasLootCharDB.ItemIDs ) then if spellID < 100000 then AtlasLootTooltip:AddLine(AL["SpellID:"].." "..spellID, nil, nil, nil, 1); + -- Mining spells HACK elseif spellID >= 100000 and spellID <= 100005 then AtlasLootTooltip:AddLine(AL["SpellID:"].." 2575", nil, nil, nil, 1); elseif spellID >= 100006 and spellID <= 100007 then diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index 9562bbd..daf3b32 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -750,14 +750,14 @@ AtlasLoot_ButtonRegistry = { ["SWVVolkanCruelblade"] = { Title = AL["Volkan Cruelblade"]; Next_Page = "SWVVaultArmoryEquipment"; - Next_Title = AL["Arc'tiras / Vault Armory Equipment"]; + Next_Title = AL["Arc'tiras"]; Prev_Page = "SWVDamian"; Prev_Title = AL["Damian"]; Back_Page = "DUNGEONSMENU2"; Back_Title = AL["Dungeons & Raids"]; }; ["SWVVaultArmoryEquipment"] = { - Title = AL["Arc'tiras / Vault Armory Equipment"]; + Title = AL["Arc'tiras"]; Prev_Page = "SWVVolkanCruelblade"; Prev_Title = AL["Volkan Cruelblade"]; Next_Page = "SWVTrash"; @@ -768,7 +768,7 @@ AtlasLoot_ButtonRegistry = { ["SWVTrash"] = { Title = AL["Trash Mobs"]; Prev_Page = "SWVVaultArmoryEquipment"; - Prev_Title = AL["Arc'tiras / Vault Armory Equipment"]; + Prev_Title = AL["Arc'tiras"]; Back_Page = "DUNGEONSMENU2"; Back_Title = AL["Dungeons & Raids"]; }; @@ -3337,19 +3337,10 @@ AtlasLoot_ButtonRegistry = { }; ["ESSolnius1"] = { Title = AL["Solnius the Awakener"]; - Next_Page = "ESSolnius2"; - Next_Title = AL["Solnius the Awakener (Page 2)"]; - Prev_Page = "ESErennius"; - Prev_Title = AL["Erennius"]; - Back_Page = "DUNGEONSMENU2"; - Back_Title = AL["Dungeons & Raids"]; - }; - ["ESSolnius2"] = { - Title = AL["Solnius the Awakener (Page 2)"]; Next_Page = "ESHardMode"; Next_Title = AL["Favor of Erennius (ES Hard Mode)"]; - Prev_Page = "ESSolnius1"; - Prev_Title = AL["Solnius the Awakener"]; + Prev_Page = "ESErennius"; + Prev_Title = AL["Erennius"]; Back_Page = "DUNGEONSMENU2"; Back_Title = AL["Dungeons & Raids"]; }; @@ -3357,7 +3348,7 @@ AtlasLoot_ButtonRegistry = { Title = AL["Favor of Erennius (ES Hard Mode)"]; Next_Page = "ESTrash"; Next_Title = AL["Trash Mobs"]; - Prev_Page = "ESSolnius2"; + Prev_Page = "ESSolnius1"; Prev_Title = AL["Solnius the Awakener"]; Back_Page = "DUNGEONSMENU2"; Back_Title = AL["Dungeons & Raids"]; diff --git a/Core/Spells.lua b/Core/Spells.lua index af6e420..3c0d526 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -21163,7 +21163,7 @@ GetSpellInfoAtlasLootDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {2592, 3}, + [1] = {4306, 3}, [2] = {2838, 3}, }, }, @@ -21734,8 +21734,8 @@ GetSpellInfoAtlasLootDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {4306, 4}, - [2] = {7912, 4}, + [1] = {4338, 3}, + [2] = {7912, 3}, }, }, [41233] = { @@ -21749,6 +21749,7 @@ GetSpellInfoAtlasLootDB = { ["craftQuantityMax"] = "", ["reagents"] = { [1] = {7911, 2}, + [2] = {6037 ,2} }, }, [41237] = { @@ -21761,8 +21762,8 @@ GetSpellInfoAtlasLootDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {3858, 4}, - [2] = {55153, 4}, + [1] = {3858, 3}, + [2] = {55153, 3}, }, }, [41601] = { @@ -22283,8 +22284,8 @@ GetSpellInfoAtlasLootDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {10620, 5}, - [2] = {55154, 5}, + [1] = {10620, 3}, + [2] = {55154, 3}, }, }, [41087] = { @@ -22394,8 +22395,8 @@ GetSpellInfoAtlasLootDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {14047, 5}, - [2] = {12365, 5}, + [1] = {14047, 3}, + [2] = {12365, 3}, }, }, [41714] = { diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 067f8ba..0f5d942 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -664,7 +664,6 @@ AtlasLootBossButtons = { ""; "SWVDamian"; "SWVVolkanCruelblade"; - ""; "SWVVaultArmoryEquipment"; "SWVTrash"; }; @@ -961,7 +960,6 @@ AtlasLootBossButtons = { EmeraldSanctum = { "ESErennius"; "ESSolnius1"; - "ESSolnius2"; "ESHardMode"; "ESTrash"; } @@ -4422,8 +4420,6 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "5%" }, }; - SWVArctiras = { - }; SWVVaultArmoryEquipment = { { 40003, "INV_shield_06", "=q3=Vault's Defender", "=ds=#h4#, #w8#", "25%" }, { 60505, "INV_jewelry_ring_27", "=q3=Ring of the Elder Warden", "=ds=#s13#", "25%" }, @@ -8069,60 +8065,39 @@ AtlasLoot_Data["AtlasLootItems"] = { { 61211, "INV_Boots_Fabric_01", "=q4=Sandals of Lucidity", "=ds=#s12#, #a1#", "17%" }, { 61213, "INV_Gauntlets_29", "=q4=Talonwind Gauntlets", "=ds=#s9#, #a3#", "17%" }, { 61239, "INV_Pants_03", "=q4=Ancient Jade Leggings", "=ds=#s11#, #a3#", "17%" }, - { 0, "", "", "" }, + { 61210, "INV_Misc_Cape_01", "=q4=Veil of Nightmare", "=ds=#s4#", "17%" }, + { 61212, "INV_Bracer_09", "=q4=Sanctum Bark Wraps", "=ds=#s8#, #a2#", "17%" }, + { 61207, "INV_Helmet_02", "=q4=Jadestone Helmet", "=ds=#s1#, #a4#", "17%" }, + { 61214, "inv_shoulder_13", "=q4=Mantle of the Wakener", "=ds=#s3#, #a2#", "17%" }, + { 61205, "INV_Jewelry_Ring_37", "=q4=Ring of Nature's Duality", "=ds=#s13#", "17%" }, + { 61209, "INV_Enchant_EssenceMysticalLarge", "=q4=Shard of Nightmare", "=ds=#s14#", "17%" }, { 41076, "INV_Mace_09", "=q4=Aspect of Seradane", "=ds=#h2#, #w6#", "17%" }, { 61237, "INV_Mace_35", "=q4=Mallet of the Awakening", "=ds=#h3#, #w6#", "17%" }, { 61238, "INV_Shield_23", "=q4=Scaleshield of Emerald Flight", "=ds=#w8#", "17%" }, - { 0, "", "", "" }, - { 61205, "INV_Jewelry_Ring_37", "=q4=Ring of Nature's Duality", "=ds=#s13#", "17%" }, - { 61209, "INV_Enchant_EssenceMysticalLarge", "=q4=Shard of Nightmare", "=ds=#s14#", "17%" }, - { 61210, "INV_Misc_Cape_01", "=q4=Veil of Nightmare", "=ds=#s4#", "17%" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 61212, "INV_Bracer_09", "=q4=Sanctum Bark Wraps", "=ds=#s8#, #a2#", "17%" }, - { 61214, "inv_shoulder_13", "=q4=Mantle of the Wakener", "=ds=#s3#, #a2#", "17%" }, - { 61207, "INV_Helmet_02", "=q4=Jadestone Helmet", "=ds=#s1#, #a4#", "17%" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, { 61448, "INV_Weapon_Halberd_05", "=q4=Axe of Dormant Slumber", "=ds=#h1#, #w1#", "17%" }, { 61208, "INV_Staff_49", "=q4=Staff of the Dreamer", "=ds=#h2#, #w9#", "17%" }, - { 0, "", "", "" }, { 61455, "Spell_Nature_NatureTouchDecay", "=q4=Idol of the Emerald Rot", "=ds=#s16#, #e16#", "17%" }, { 61203, "INV_Relics_LibramofGrace", "=q4=Libram of the Dreamguard", "=ds=#s16#, #e18#", "17%" }, { 61204, "Spell_Nature_StoneSkinTotem", "=q4=Totem of the Stonebreaker", "=ds=#s16#, #e17#", "17%" }, - }; - ESSolnius2 = { - { 61215, "inv_misc_head_dragon_green", "=q4=Head of Solnius", "=ds=#m2#", "100%" }, - { 61195, "BTNWoodenRingUPG1", "=q4=Ring of Nordrassil", "=ds=#m4#, #s13#" }, - { 61194, "BTNOrbOfDepths", "=q4=The Heart of Dreams", "=ds=#m4#, #s14#" }, - { 61193, "BTNEnchantedNecklace", "=q4=Verdant Eye Necklace", "=ds=#m4#, #s2#" }, - { 0, "", "", "" }, - { 61196, "INV_Misc_Bag_18", "=q3=Bag of the Vast Conscious", "=ds=#e10#", "15%" }, - { 0, "", "", "" }, + { 61215, "inv_misc_head_dragon_green", "=q4=Head of Solnius", "=ds=#m2#", "100%", "", "", "", "", "", "", "", "", "", "", { + {{61195,"=ds=#m4#, #s13#"},{61194,"=ds=#m4#, #s14#"},{61193,"=ds=#m4#, #s2#"}}, + }, + }, + { 61444, "INV_Stone_05", "=q4=Smoldering Dream Essence", "=ds=#m2#, =q13=#c1#, ", "20%", "", "", "", "", "", "", "", "", "", "", { + {{61445,"=ds=#m4#, =q13=#c1#"}}, + }, + }, + { 51361, "INV_Misc_Note_05", "=q3=Glyph of the Dreamkin", "=ds==q13=#c1#", "14%" }, + { 61196, "INV_Misc_Bag_18", "=q3=Bag of the Vast Conscious", "=ds=#e10#", "15%" }, { 61733, "INV_Misc_Note_01", "=q5=Formula: Eternal Dreamstone Shard", "=ds=#p4# #m14#", "1%" }, { 61217, "INV_Misc_Note_01", "=q3=Formula: Enchant Chest - Mighty Mana", "=ds=#p4# #m14#", "4%" }, { 70000, "INV_Misc_Note_01", "=q3=Formula: Enchant Gloves - Nature Power", "=ds=#p4# #m14#", "4%" }, - { 0, "", "", "" }, { 61218, "INV_Scroll_05", "=q3=Recipe: Elixir of Greater Nature Power", "=ds=#p1# #m14#", "4%" }, - { 0, "", "", "" }, - { 61198, "INV_Stone_03", "=q2=Small Dream Shard", "6-10", "100%" }, - { 20381, "INV_Misc_MonsterScales_11", "=q2=Dreamscale", "", "48%" }, - { 61444, "INV_Stone_05", "=q4=Smoldering Dream Essence", "=ds=#m2#, =q13=#c1#, ", "20%" }, - { 61445, "INV_Enchant_EssenceNetherLarge", "=q4=Purified Emerald Essence", "=ds=#m4#, =q13=#c1#" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 51361, "INV_Misc_Note_05", "=q3=Glyph of the Dreamkin", "=ds==q13=#c1#", "14%" }, - { 0, "", "", "" }, { 61428, "INV_Scroll_05", "=q4=Pattern: Dreamhide Mantle", "=ds=#p7# #m14#", "4%" }, { 61432, "INV_Scroll_05", "=q4=Pattern: Dreamthread Mantle", "=ds=#p7# #m14#", "4%" }, { 61424, "INV_Scroll_05", "=q4=Plans: Dreamsteel Mantle", "=ds=#p2# #m14#", "4%" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, { 17962,"INV_Misc_Bag_10_Blue","=q2=Blue Sack of Gems","=ds=#m23# =q2=#e33#", "100%" }, + }; ESHardMode = { { 61524, "INV_Chest_Plate07", "=q4=Naturecaller's Tunic", "=ds=#s5#, #a2#", "17%" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index 20a910f..c0af020 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -884,7 +884,7 @@ AL:RegisterTranslations("enUS", function() return { ["Black Bride"] = true, ["Damian"] = true, ["Volkan Cruelblade"] = true, - ["Arc'tiras / Vault Armory Equipment"] = true, + ["Arc'tiras"] = true, ["[17-24] The Deadmines"] = "|cffffffff[17-24]|cffffd200 The Deadmines", ["The Deadmines"] = true, ["Pusillin"] = true, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 877eba7..3ba5d94 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -396,7 +396,7 @@ AtlasLoot_TableNames = { ["SWVBlackBride"] = { AL["Stormwind Vault"].." - "..AL["Black Bride"], "AtlasLootItems" }, ["SWVDamian"] = { AL["Stormwind Vault"].." - "..AL["Damian"], "AtlasLootItems" }, ["SWVVolkanCruelblade"] = { AL["Stormwind Vault"].." - "..AL["Volkan Cruelblade"], "AtlasLootItems" }, - ["SWVVaultArmoryEquipment"] = { AL["Stormwind Vault"].." - "..AL["Arc'tiras / Vault Armory Equipment"], "AtlasLootItems" }, + ["SWVVaultArmoryEquipment"] = { AL["Stormwind Vault"].." - "..AL["Arc'tiras"], "AtlasLootItems" }, ["SWVTrash"] = { AL["Stormwind Vault"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --Temple of Ahn'Qiraj ["AQ40Skeram"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["The Prophet Skeram"], "AtlasLootItems" }, @@ -494,7 +494,6 @@ AtlasLoot_TableNames = { --Emerald Sanctum ["ESErennius"] = { AL["Emerald Sanctum"].." - "..AL["Erennius"], "AtlasLootItems" }, ["ESSolnius1"] = { AL["Emerald Sanctum"].." - "..AL["Solnius the Awakener"], "AtlasLootItems" }, - ["ESSolnius2"] = { AL["Emerald Sanctum"].." - "..AL["Solnius the Awakener"], "AtlasLootItems" }, ["ESHardMode"] = { AL["Emerald Sanctum"].." - "..AL["Favor of Erennius"], "AtlasLootItems" }, ["ESTrash"] = { AL["Emerald Sanctum"].." - "..AL["Trash Mobs"], "AtlasLootItems" }, --Lower Karazhan Halls @@ -1200,7 +1199,7 @@ AtlasLoot_TableNamesBoss = { ["SWVBlackBride"] = { AL["Black Bride"], "AtlasLootItems" }, ["SWVDamian"] = { AL["Damian"], "AtlasLootItems" }, ["SWVVolkanCruelblade"] = { AL["Volkan Cruelblade"], "AtlasLootItems" }, - ["SWVVaultArmoryEquipment"] = { AL["Arc'tiras / Vault Armory Equipment"], "AtlasLootItems" }, + ["SWVVaultArmoryEquipment"] = { AL["Arc'tiras"], "AtlasLootItems" }, ["SWVTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, }, ["The Deadmines"] = { @@ -1592,7 +1591,6 @@ AtlasLoot_TableNamesBoss = { ["Emerald Sanctum"] = { ["ESErennius"] = { AL["Erennius"], "AtlasLootItems" }, ["ESSolnius1"] = { AL["Solnius the Awakener"], "AtlasLootItems" }, - ["ESSolnius2"] = { AL["Solnius the Awakener (Page 2)"], "AtlasLootItems" }, ["ESHardMode"] = { AL["Favor of Erennius (ES Hard Mode)"], "AtlasLootItems" }, ["ESTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, },