From 011a288a0d9c1a460d6295723e0fc79e5f148760 Mon Sep 17 00:00:00 2001 From: Spit <19otari98@gmail.com> Date: Sun, 21 Sep 2025 14:42:26 +0300 Subject: [PATCH] alchemy --- Core/ButtonRegistry.lua | 22 +++++++++--- Core/Crafting.lua | 6 ++-- Core/Spells.lua | 74 ++++++++++++++++++++++++++++++++++++++ Database/Crafting.lua | 22 +++++++++++- Database/TableRegister.lua | 12 ++++--- Locale/locale.en.lua | 4 +-- 6 files changed, 125 insertions(+), 15 deletions(-) diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index cda5b96..d3970e1 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -3968,13 +3968,19 @@ AtlasLoot_ButtonRegistry = { Title = AL["Alchemy"] .. ": " .. AL["Artisan"]; Back_Page = "ALCHEMYMENU"; Prev_Page = "AlchemyArtisan1"; + Next_Page = "AlchemyArtisan3"; + }; + ["AlchemyArtisan3"] = { + Title = AL["Alchemy"] .. ": " .. AL["Artisan"]; + Back_Page = "ALCHEMYMENU"; + Prev_Page = "AlchemyArtisan2"; Next_Page = "AlchemyFlasks1"; }; ["AlchemyFlasks1"] = { Title = AL["Flasks"]; Back_Page = "ALCHEMYMENU"; Next_Page = "AlchemyProtectionPots1"; - Prev_Page = "AlchemyArtisan2"; + Prev_Page = "AlchemyArtisan3"; }, ["AlchemyProtectionPots1"] = { Title = AL["Protection Potions"]; @@ -3983,7 +3989,7 @@ AtlasLoot_ButtonRegistry = { Prev_Page = "AlchemyFlasks1"; }, ["AlchemyHealingAndMana1"] = { - Title = AL["Healing and Mana Potions"]; + Title = AL["Health and Mana Potions"]; Back_Page = "ALCHEMYMENU"; Next_Page = "AlchemyTransmutes1"; Prev_Page = "AlchemyProtectionPots1"; @@ -4003,14 +4009,20 @@ AtlasLoot_ButtonRegistry = { ["AlchemyOffensive1"] = { Title = AL["Offensive Potions and Elixirs"]; Back_Page = "ALCHEMYMENU"; - Next_Page = "AlchemyOther1"; + Next_Page = "AlchemyOffensive2"; Prev_Page = "AlchemyDefensive1"; }, - ["AlchemyOther1"] = { - Title = AL["Other"]; + ["AlchemyOffensive2"] = { + Title = AL["Offensive Potions and Elixirs"]; Back_Page = "ALCHEMYMENU"; + Next_Page = "AlchemyMisc1"; Prev_Page = "AlchemyOffensive1"; }, + ["AlchemyMisc1"] = { + Title = AL["Miscellaneous"]; + Back_Page = "ALCHEMYMENU"; + Prev_Page = "AlchemyOffensive2"; + }, ["SmithingApprentice1"] = { Title = AL["Blacksmithing"] .. ": " .. AL["Apprentice"]; Back_Page = "SMITHINGMENU"; diff --git a/Core/Crafting.lua b/Core/Crafting.lua index 5711269..8639ff2 100644 --- a/Core/Crafting.lua +++ b/Core/Crafting.lua @@ -312,7 +312,7 @@ function AtlasLoot_AlchemyMenu() AtlasLootMenuItem_8.lootpage="AlchemyProtectionPots1"; AtlasLootMenuItem_8:Show(); --Healing and Mana - AtlasLootMenuItem_9_Name:SetText(AL["Healing and Mana Potions"]); + AtlasLootMenuItem_9_Name:SetText(AL["Health and Mana Potions"]); AtlasLootMenuItem_9_Extra:SetText(""); AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\Trade_Alchemy"); AtlasLootMenuItem_9.lootpage="AlchemyHealingAndMana1"; @@ -336,10 +336,10 @@ function AtlasLoot_AlchemyMenu() AtlasLootMenuItem_12.lootpage="AlchemyOffensive1"; AtlasLootMenuItem_12:Show(); --Other - AtlasLootMenuItem_13_Name:SetText(AL["Other"]); + AtlasLootMenuItem_13_Name:SetText(AL["Miscellaneous"]); AtlasLootMenuItem_13_Extra:SetText(""); AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\Trade_Alchemy"); - AtlasLootMenuItem_13.lootpage="AlchemyOther1"; + AtlasLootMenuItem_13.lootpage="AlchemyMisc1"; AtlasLootMenuItem_13:Show(); end diff --git a/Core/Spells.lua b/Core/Spells.lua index 7558b49..559b319 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -4561,6 +4561,80 @@ GetSpellInfoAtlasLootDB = { [1] = {7075}, }, }, + [36903] = { + ["name"] = "Alchemy: Elixir of Greater Arcane Power", + ["craftItem"] = 55048, + ["reagents"] = { + [1] = {8831, 3}, + [2] = {8925}, + }, + }, + [36901] = { + ["name"] = "Alchemy: Elixir of Greater Frost Power", + ["craftItem"] = 55046, + ["reagents"] = { + [1] = {13467, 3}, + [2] = {8925}, + }, + }, + [36935] = { + ["name"] = "Alchemy: Concoction of the Dreamwater", + ["craftItem"] = 47414, + ["reagents"] = { + [1] = {12820}, + [2] = {61423}, + [3] = {18256}, + }, + }, + [36929] = { + ["name"] = "Alchemy: Concoction of the Emerald Mongoose", + ["craftItem"] = 47410, + ["reagents"] = { + [1] = {13452}, + [2] = {61224}, + [3] = {18256}, + }, + }, + [36932] = { + ["name"] = "Alchemy: Concoction of the Arcane Giant", + ["craftItem"] = 47412, + ["reagents"] = { + [1] = {9206}, + [2] = {13454}, + [3] = {18256}, + }, + }, + [17632] = { + ["name"] = "Alchemy: Alchemist's Stone", + ["craftItem"] = 13503, + ["reagents"] = { + [1] = {7078, 8}, + [2] = {7076, 8}, + [3] = {7082, 8}, + [4] = {7080, 8}, + [5] = {12803, 8}, + [6] = {9262, 2}, + [7] = {13468, 4}, + }, + }, + [115] = { + ["name"] = "Alchemy: Elixir of Rapid Growth", + ["craftItem"] = 56113, + ["reagents"] = { + [1] = {4625}, + [2] = {7068}, + [3] = {3372}, + }, + }, + [17579] = { + ["name"] = "Alchemy: Greater Holy Protection Potion", + ["craftItem"] = 13460, + ["reagents"] = { + [1] = {7069}, + [2] = {13464}, + [3] = {8925}, + }, + }, [2329] = { ["name"] = "Alchemy: Elixir of Lion's Strength", ["craftItem"] = 2454, diff --git a/Database/Crafting.lua b/Database/Crafting.lua index 86fffd3..dd6abd8 100644 --- a/Database/Crafting.lua +++ b/Database/Crafting.lua @@ -332,6 +332,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s12609", "inv_potion_36", "=q1=Catseye Elixir", "=ds=#sr# =so1=200 =so2=220 =so3=240 =so4=260" }, { "s3454", "inv_potion_20", "=q1=Frost Oil", "=ds=#sr# =so1=200 =so2=220 =so3=240 =so4=260" }, { "s11459", "inv_misc_orb_01", "=q1=Philosopher's Stone", "=ds=#sr# =so1=200 =so2=240 =so3=260 =so4=280" }, + { "s115", "inv_elixir_of_rapid_growth_1", "=q1=Elixir of Rapid Growth", "=ds=#sr# =so1=200 =so2=200 =so3=212 =so4=225" }, { "s11448", "inv_potion_73", "=q1=Greater Mana Potion", "=ds=#sr# =so1=205 =so2=220 =so3=240 =so4=260" }, { "s11451", "inv_potion_11", "=q1=Oil of Immolation", "=ds=#sr# =so1=205 =so2=220 =so3=240 =so4=260" }, { "s11456", "inv_cask_02", "=q1=Goblin Rocket Fuel", "=ds=#sr# =so1=210 =so2=225 =so3=245 =so4=265" }, @@ -392,6 +393,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s17575", "inv_potion_20", "=q1=Greater Frost Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, { "s17576", "inv_potion_22", "=q1=Greater Nature Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, { "s17578", "inv_potion_23", "=q1=Greater Shadow Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, + { "s17579", "inv_potion_09", "=q1=Greater Holy Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, { "s24368", "inv_potion_80", "=q1=Major Troll's Blood Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, { "s17580", "inv_potion_76", "=q1=Major Mana Potion", "=ds=#sr# =so1=295 =so2=310 =so3=330 =so4=350" }, { "s25146", "spell_fire_fire", "=q1=Transmute: Elemental Fire", "=ds=#sr# =so1=300 =so2=301 =so3=305 =so4=310" }, @@ -409,6 +411,14 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s45989", "inv_potion_22", "=q1=Elixir of Greater Nature Power", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, { "s57111", "inv_potion_08", "=q1=Potion of Quickness", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, }; + AlchemyArtisan3 = { + { "s36903", "INV_Potion_81", "=q1=Elixir of Greater Arcane Power", "=ds=#sr# =so1=300 =so2=300 =so3=315 =so4=330" }, + { "s36901", "INV_Potion_13", "=q1=Elixir of Greater Frost Power", "=ds=#sr# =so1=300 =so2=300 =so3=315 =so4=330" }, + { "s36932", "inv_yellow_purple_elixir_2", "=q1=Concoction of the Arcane Giant", "=ds=#sr# =so1=300 =so2=310 =so3=330 =so4=350" }, + { "s36929", "inv_blue_gold_elixir_2", "=q1=Concoction of the Emerald Mongoose", "=ds=#sr# =so1=300 =so2=310 =so3=330 =so4=350" }, + { "s36935", "inv_green_pink_elixir_1", "=q1=Concoction of the Dreamwater", "=ds=#sr# =so1=300 =so2=310 =so3=330 =so4=350" }, + { "s17632", "INV_Misc_Orb_02", "=q4=Alchemist's Stone", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, + }, AlchemyFlasks1 = { { "s17638", "inv_potion_48", "=q1=Flask of Chromatic Resistance", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, { "s17634", "inv_potion_26", "=q1=Flask of Petrification", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, @@ -429,6 +439,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s17575", "inv_potion_20", "=q1=Greater Frost Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, { "s17576", "inv_potion_22", "=q1=Greater Nature Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, { "s17578", "inv_potion_23", "=q1=Greater Shadow Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" }, + { "s17579", "inv_potion_09", "=q1=Greater Holy Protection Potion", "=ds=#sr# =so1=290 =so2=305 =so3=325 =so4=345" } }; AlchemyHealingAndMana1 = { { "s2330", "inv_potion_49", "=q1=Minor Healing Potion", "=ds=#sr# =so1=1 =so2=55 =so3=75 =so4=95" }, @@ -524,16 +535,24 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s11476", "inv_potion_46", "=q1=Elixir of Shadow Power", "=ds=#sr# =so1=250 =so2=265 =so3=285 =so4=305" }, { "s17573", "inv_potion_25", "=q1=Greater Arcane Elixir", "=ds=#sr# =so1=285 =so2=300 =so3=320 =so4=340" }, { "s45989", "inv_potion_22", "=q1=Elixir of Greater Nature Power", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, + { "s36903", "INV_Potion_81", "=q1=Elixir of Greater Arcane Power", "=ds=#sr# =so1=300 =so2=300 =so3=315 =so4=330" }, + { "s36901", "INV_Potion_13", "=q1=Elixir of Greater Frost Power", "=ds=#sr# =so1=300 =so2=300 =so3=315 =so4=330" }, { "s57131", "INV_Potion_12", "=q1=Dreamshard Elixir", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, { "", "", "", "" }, + { "s36932", "inv_yellow_purple_elixir_2", "=q1=Concoction of the Arcane Giant", "=ds=#sr# =so1=300 =so2=310 =so3=330 =so4=350" }, + { "s36929", "inv_blue_gold_elixir_2", "=q1=Concoction of the Emerald Mongoose", "=ds=#sr# =so1=300 =so2=310 =so3=330 =so4=350" }, + { "s36935", "inv_green_pink_elixir_1", "=q1=Concoction of the Dreamwater", "=ds=#sr# =so1=300 =so2=310 =so3=330 =so4=350" }, + }; + AlchemyOffensive2 = { { "s3171", "inv_potion_06", "=q1=Elixir of Wisdom", "=ds=#sr# =so1=90 =so2=120 =so3=140 =so4=160" }, { "s11465", "inv_potion_10", "=q1=Elixir of Greater Intellect", "=ds=#sr# =so1=235 =so2=250 =so3=270 =so4=290" }, { "s17555", "inv_potion_29", "=q1=Elixir of the Sages", "=ds=#sr# =so1=265 =so2=280 =so3=300 =so4=320" }, { "", "", "", "" }, { "s11477", "inv_potion_27", "=q1=Elixir of Demonslaying", "=ds=#sr# =so1=250 =so2=265 =so3=285 =so4=305" }, { "s57111", "inv_potion_08", "=q1=Potion of Quickness", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, + { "s115", "inv_elixir_of_rapid_growth_1", "=q1=Elixir of Rapid Growth", "=ds=#sr# =so1=200 =so2=200 =so3=212 =so4=225" }, }; - AlchemyOther1 = { + AlchemyMisc1 = { { "s7836", "inv_drink_12", "=q1=Blackmouth Oil", "=ds=#sr# =so1=80 =so2=80 =so3=90 =so4=100" }, { "s7837", "inv_potion_38", "=q1=Fire Oil", "=ds=#sr# =so1=130 =so2=150 =so3=160 =so4=170" }, { "s17551", "inv_potion_68", "=q1=Stonescale Oil", "=ds=#sr# =so1=250 =so2=250 =so3=255 =so4=260" }, @@ -563,6 +582,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s11456", "inv_cask_02", "=q1=Goblin Rocket Fuel", "=ds=#sr# =so1=210 =so2=225 =so3=245 =so4=265" }, { "s11473", "inv_poison_mindnumbing", "=q1=Ghost Dye", "=ds=#sr# =so1=245 =so2=260 =so3=280 =so4=300" }, { "s24266", "inv_poison_mindnumbing", "=q3=Gurubashi Mojo Madness", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" }, + { "s17632", "INV_Misc_Orb_02", "=q4=Alchemist's Stone", "=ds=#sr# =so1=300 =so2=315 =so3=322 =so4=330" } }, ---------------- diff --git a/Database/TableRegister.lua b/Database/TableRegister.lua index 8670241..445f9eb 100644 --- a/Database/TableRegister.lua +++ b/Database/TableRegister.lua @@ -833,13 +833,15 @@ AtlasLoot_TableNames = { ["AlchemyExpert1"] = { AL["Alchemy"]--[[ .. ": " .. AL["Expert"]], "AtlasLootCrafting" }, ["AlchemyArtisan1"] = { AL["Alchemy"]--[[ .. ": " .. AL["Artisan"]], "AtlasLootCrafting" }, ["AlchemyArtisan2"] = { AL["Alchemy"]--[[ .. ": " .. AL["Artisan"]], "AtlasLootCrafting" }, + ["AlchemyArtisan3"] = { AL["Alchemy"]--[[ .. ": " .. AL["Artisan"]], "AtlasLootCrafting" }, ["AlchemyFlasks1"] = { AL["Alchemy"] .. ": " .. AL["Flasks"], "AtlasLootCrafting" }, ["AlchemyProtectionPots1"] = { AL["Alchemy"] .. ": " .. AL["Protection Potions"], "AtlasLootCrafting" }, - ["AlchemyHealingAndMana1"] = { AL["Alchemy"] .. ": " .. AL["Healing and Mana Potions"], "AtlasLootCrafting" }, + ["AlchemyHealingAndMana1"] = { AL["Alchemy"] .. ": " .. AL["Health and Mana Potions"], "AtlasLootCrafting" }, ["AlchemyTransmutes1"] = { AL["Alchemy"] .. ": " .. AL["Transmutes"], "AtlasLootCrafting" }, ["AlchemyDefensive1"] = { AL["Alchemy"] .. ": " .. AL["Defensive Potions and Elixirs"], "AtlasLootCrafting" }, ["AlchemyOffensive1"] = { AL["Alchemy"] .. ": " .. AL["Offensive Potions and Elixirs"], "AtlasLootCrafting" }, - ["AlchemyOther1"] = { AL["Alchemy"] .. ": " .. AL["Other"], "AtlasLootCrafting" }, + ["AlchemyOffensive2"] = { AL["Alchemy"] .. ": " .. AL["Offensive Potions and Elixirs"], "AtlasLootCrafting" }, + ["AlchemyMisc1"] = { AL["Alchemy"] .. ": " .. AL["Miscellaneous"], "AtlasLootCrafting" }, --BlackSmithing ["SmithingApprentice1"] = { AL["Blacksmithing"]--[[ .. ": " .. AL["Apprentice"]], "AtlasLootCrafting" }, ["SmithingJourneyman1"] = { AL["Blacksmithing"]--[[ .. ": " .. AL["Journeyman"]], "AtlasLootCrafting" }, @@ -2018,13 +2020,15 @@ AtlasLoot_TableNamesBoss = { ["AlchemyExpert1"] = { AL["Alchemy"]--[[ .. ": " .. AL["Expert"]], "AtlasLootCrafting" }, ["AlchemyArtisan1"] = { AL["Alchemy"]--[[ .. ": " .. AL["Artisan"]], "AtlasLootCrafting" }, ["AlchemyArtisan2"] = { AL["Alchemy"]--[[ .. ": " .. AL["Artisan"]], "AtlasLootCrafting" }, + ["AlchemyArtisan3"] = { AL["Alchemy"]--[[ .. ": " .. AL["Artisan"]], "AtlasLootCrafting" }, ["AlchemyFlasks1"] = { AL["Flasks"], "AtlasLootCrafting" }, ["AlchemyProtectionPots1"] = { AL["Protection Potions"], "AtlasLootCrafting" }, - ["AlchemyHealingAndMana1"] = { AL["Healing and Mana Potions"], "AtlasLootCrafting" }, + ["AlchemyHealingAndMana1"] = { AL["Health and Mana Potions"], "AtlasLootCrafting" }, ["AlchemyTransmutes1"] = { AL["Transmutes"], "AtlasLootCrafting" }, ["AlchemyDefensive1"] = { AL["Defensive Potions and Elixirs"], "AtlasLootCrafting" }, ["AlchemyOffensive1"] = { AL["Offensive Potions and Elixirs"], "AtlasLootCrafting" }, - ["AlchemyOther1"] = { AL["Other"], "AtlasLootCrafting" }, + ["AlchemyOffensive2"] = { AL["Offensive Potions and Elixirs"], "AtlasLootCrafting" }, + ["AlchemyMisc1"] = { AL["Miscellaneous"], "AtlasLootCrafting" }, --BlackSmithing ["SmithingApprentice1"] = { AL["Blacksmithing"]--[[ .. ": " .. AL["Apprentice"]], "AtlasLootCrafting" }, ["SmithingJourneyman1"] = { AL["Blacksmithing"]--[[ .. ": " .. AL["Journeyman"]], "AtlasLootCrafting" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index ad552bd..d4dde8c 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -699,7 +699,7 @@ AL:RegisterTranslations("enUS", function() return { ["Hazzas"] = true, ["Head"] = true, ["Headless Horseman"] = true, - ["Healing and Mana Potions"] = true, + ["Health and Mana Potions"] = true, ["Hearthsinger Forresten"] = true, ["Hedrum the Creeper"] = true, ["Heigan"] = true, @@ -956,6 +956,7 @@ AL:RegisterTranslations("enUS", function() return { ["Minimap button has been reset!"] = true, ["Mining"] = true, ["Misc"] = true, + ["Miscellaneous"] = true, ["Misc. Rewards"] = true, ["Moam"] = true, ["Molten Core"] = true, @@ -1027,7 +1028,6 @@ AL:RegisterTranslations("enUS", function() return { ["Oronok Torn-Heart"] = true, ["Ossirian the Unscarred"] = true, ["Ostarius"] = true, - ["Other"] = true, ["Ouro"] = true, ["Ouro's Intact Hide"] = true, ["Outland"] = true,