diff --git a/Core/AtlasLoot.xml b/Core/AtlasLoot.xml index d3ed887..a7e4309 100644 --- a/Core/AtlasLoot.xml +++ b/Core/AtlasLoot.xml @@ -20,7 +20,7 @@ - + diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index b802c90..c077f9a 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -4791,6 +4791,11 @@ AtlasLoot_ButtonRegistry = { Back_Page = "CRAFTSET"; Back_Title = AL["Crafted Sets"]; }; + ["MoonclothSet"] = { + Title = AL["Mooncloth Regalia"]; + Back_Page = "CRAFTSET"; + Back_Title = AL["Crafted Sets"]; + }; ["GriftersArmor"] = { Title = AL["Grifter's Armor"]; Back_Page = "CRAFTSET"; diff --git a/Core/Crafting.lua b/Core/Crafting.lua index c5ed26a..b063d27 100644 --- a/Core/Crafting.lua +++ b/Core/Crafting.lua @@ -164,43 +164,49 @@ function AtlasLootCraftedSetMenu() AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\INV_Pants_Cloth_14"); AtlasLootMenuItem_6.lootpage="BloodvineG"; AtlasLootMenuItem_6:Show(); + --Mooncloth Regalia + AtlasLootMenuItem_7_Name:SetText(AL["Mooncloth Regalia"]); + AtlasLootMenuItem_7_Extra:SetText(""); + AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\inv_chest_cloth_08"); + AtlasLootMenuItem_7.lootpage="MoonclothSet"; + AtlasLootMenuItem_7:Show(); --Mail Blacksmithing Header - AtlasLootMenuItem_8_Name:SetText(RED..AL["Blacksmithing"]); - AtlasLootMenuItem_8_Extra:SetText(WHITE..AL["Mail"]); - AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\Trade_BlackSmithing"); - AtlasLootMenuItem_8.isheader = true; - AtlasLootMenuItem_8:Show(); - --Bloodsoul Embrace - AtlasLootMenuItem_9_Name:SetText(AL["Bloodsoul Embrace"]); - AtlasLootMenuItem_9_Extra:SetText(""); - AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_15"); - AtlasLootMenuItem_9.lootpage="BloodsoulEmbrace"; + AtlasLootMenuItem_9_Name:SetText(RED..AL["Blacksmithing"]); + AtlasLootMenuItem_9_Extra:SetText(WHITE..AL["Mail"]); + AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\Trade_BlackSmithing"); + AtlasLootMenuItem_9.isheader = true; AtlasLootMenuItem_9:Show(); + --Bloodsoul Embrace + AtlasLootMenuItem_10_Name:SetText(AL["Bloodsoul Embrace"]); + AtlasLootMenuItem_10_Extra:SetText(""); + AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_15"); + AtlasLootMenuItem_10.lootpage="BloodsoulEmbrace"; + AtlasLootMenuItem_10:Show(); --Plate Blacksmithing header - AtlasLootMenuItem_11_Name:SetText(RED..AL["Blacksmithing"]); - AtlasLootMenuItem_11_Extra:SetText(WHITE..AL["Plate"]); - AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\Trade_BlackSmithing"); - AtlasLootMenuItem_11.isheader = true; - AtlasLootMenuItem_11:Show(); - --Steel Plate - AtlasLootMenuItem_12_Name:SetText(AL["Steel Plate"]); - AtlasLootMenuItem_12_Extra:SetText(""); - AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Helmet_25"); - AtlasLootMenuItem_12.lootpage="SteelPlate"; + AtlasLootMenuItem_12_Name:SetText(RED..AL["Blacksmithing"]); + AtlasLootMenuItem_12_Extra:SetText(WHITE..AL["Plate"]); + AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\Trade_BlackSmithing"); + AtlasLootMenuItem_12.isheader = true; AtlasLootMenuItem_12:Show(); - --Imperial Plate - AtlasLootMenuItem_13_Name:SetText(AL["Imperial Plate"]); + --Steel Plate + AtlasLootMenuItem_13_Name:SetText(AL["Steel Plate"]); AtlasLootMenuItem_13_Extra:SetText(""); - AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Belt_01"); - AtlasLootMenuItem_13.lootpage="ImperialPlate"; + AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Helmet_25"); + AtlasLootMenuItem_13.lootpage="SteelPlate"; AtlasLootMenuItem_13:Show(); - --The Darksoul - AtlasLootMenuItem_14_Name:SetText(AL["The Darksoul"]); + --Imperial Plate + AtlasLootMenuItem_14_Name:SetText(AL["Imperial Plate"]); AtlasLootMenuItem_14_Extra:SetText(""); - AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_01"); - AtlasLootMenuItem_14.lootpage="TheDarksoul"; - AtlasLootMenuItem_14:Show(); + AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Belt_01"); + AtlasLootMenuItem_14.lootpage="ImperialPlate"; AtlasLootMenuItem_14:Show(); + --The Darksoul + AtlasLootMenuItem_15_Name:SetText(AL["The Darksoul"]); + AtlasLootMenuItem_15_Extra:SetText(""); + AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_01"); + AtlasLootMenuItem_15.lootpage="TheDarksoul"; + AtlasLootMenuItem_15:Show(); + AtlasLootMenuItem_15:Show(); --Leatherworking Leather Header AtlasLootMenuItem_16_Name:SetText(RED..AL["Leatherworking"]); AtlasLootMenuItem_16_Extra:SetText(WHITE..AL["Leather"]); diff --git a/Core/TextParsing.lua b/Core/TextParsing.lua index 3cf1afc..9a54edf 100644 --- a/Core/TextParsing.lua +++ b/Core/TextParsing.lua @@ -325,6 +325,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#craftt3#", AL["Diviner's Garments"]); text = gsub(text, "#craftt4#", AL["Pillager's Garb"]); text = gsub(text, "#craftt5#", AL["Bloodvine Garb"]); + text = gsub(text, "#craftt6#", AL["Mooncloth Regalia"]); -- Leatherworking Crafted Sets text = gsub(text, "#craftlwl7#", AL["Grifter's Armor"]); diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index 019958c..ac65ff1 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -138,6 +138,19 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { 19683, "INV_Pants_Cloth_14", "=q3=Bloodvine Leggings", "=ds=#s11#, #a1#" }, { 19684, "INV_Boots_Cloth_02","=q3=Bloodvine Boots", "=ds=#s12#, #a1#" }, }; + + MoonclothSet = { + { 0, "", "", "" }, + { 0, "INV_Box_01", "=q6=#craftt6#", "" }, + { 0, "", "", "" }, + { 14140, "inv_misc_bandana_01", "=q3=Mooncloth Circlet", "=ds=#s1#, #a1#" }, + { 14139, "inv_shoulder_02", "=q3=Mooncloth Shoulders", "=ds=#s3#, #a1#" }, + { 14138, "inv_chest_cloth_08", "=q3=Mooncloth Vest", "=ds=#s5#, #a1#" }, + { 18486, "inv_chest_cloth_04", "=q3=Mooncloth Robe", "=ds=#s5#, #a1#" }, + { 18409, "inv_gauntlets_17", "=q3=Mooncloth Gloves", "=ds=#s9#, #a1#" }, + { 14137, "inv_pants_13", "=q3=Mooncloth Leggings", "=ds=#s11#, #a1#" }, + { 15802, "inv_boots_05", "=q3=Mooncloth Boots", "=ds=#s12#, #a1#" }, + }; ----------------------------------- --- Leatherworking Leather Sets --- @@ -2510,7 +2523,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s45459", "inv_pants_14", "=q4=Dreamthread Kilt", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, { "s45461", "inv_bracer_06", "=q4=Dreamthread Bracers", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, { "s45463", "inv_gauntlets_23", "=q4=Dreamthread Gloves", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, - { "s45457", "INV_Shoulder_05", "=q4=Dreamthread Gloves", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, + { "s45457", "INV_Shoulder_05", "=q4=Dreamthread Mantle", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, }; TailoringHelm1 = { { "s8760", "inv_helmet_29", "=q2=Azure Silk Hood", "=ds=#sr# =so1=145 =so2=155 =so3=160 =so4=165" }, @@ -2545,7 +2558,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s18448", "inv_shoulder_02", "=q3=Mooncloth Shoulders", "=ds=#sr# =so1=300 =so2=315 =so3=330 =so4=345" }, { "s28482", "inv_shoulder_18", "=q3=Sylvan Shoulders", "=ds=#sr# =so1=300 =so2=315 =so3=330 =so4=345" }, { "s20848", "inv_shoulder_23", "=q4=Flarecore Mantle", "=ds=#sr# =so1=300 =so2=315 =so3=330 =so4=345" }, - { "s45457", "INV_Shoulder_05", "=q4=Dreamthread Gloves", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, + { "s45457", "INV_Shoulder_05", "=q4=Dreamthread Mantle", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, }, TailoringCloak1 = { { "s2387", "inv_misc_cape_14", "=q1=Linen Cloak", "=ds=#sr# =so1=1 =so2=35 =so3=47 =so4=60" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index 8face5e..c8266f9 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -1544,5 +1544,6 @@ AL:RegisterTranslations("enUS", function() return { ["Caverns of Time"] = true, ["Hyjal"] = true, ["Dustwallow Marsh"] = true, + ["Mooncloth Regalia"] = true, } end) diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index be61a67..53ace44 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -553,6 +553,7 @@ AtlasLoot_TableNames = { ["DivinersGarments"] = { AL["Diviner's Garments"], "AtlasLootCrafting" }, ["PillagersGarb"] = { AL["Pillager's Garb"], "AtlasLootCrafting" }, ["BloodvineG"] = { AL["Bloodvine Garb"], "AtlasLootCrafting" }, + ["MoonclothSet"] = { AL["Mooncloth Regalia"], "AtlasLootCrafting"}, --Crafted Sets - Leatherworking ["GriftersArmor"] = { AL["Grifter's Armor"], "AtlasLootCrafting" }, ["PrimalistsTrappings"] = { AL["Primalist's Trappings"], "AtlasLootCrafting" }, @@ -1676,6 +1677,7 @@ AtlasLoot_TableNamesBoss = { ["DivinersGarments"] = { AL["Diviner's Garments"], "AtlasLootCrafting" }, ["PillagersGarb"] = { AL["Pillager's Garb"], "AtlasLootCrafting" }, ["BloodvineG"] = { AL["Bloodvine Garb"], "AtlasLootCrafting" }, + ["MoonclothSet"] = { AL["Mooncloth Regalia"], "AtlasLootCrafting"}, }, --Crafted Sets - Leatherworking ["Crafted Sets - Leatherworking"] = {