diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index a295209..7489b91 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -2920,6 +2920,8 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Bloodsoul Embrace"], "BloodsoulEmbrace" }, }, ["CraftSetLeatherwork"] = { + { AL["Grifter's Armor"], "GriftersArmor" }, + { AL["Primalist's Trappings"], "PrimalistsTrappings" }, { AL["Volcanic Armor"], "VolcanicArmor" }, { AL["Ironfeather Armor"], "IronfeatherArmor" }, { AL["Stormshroud Armor"], "StormshroudArmor" }, diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index 1cea350..42b9b4d 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -943,6 +943,16 @@ AtlasLoot_ButtonRegistry = { Title = AL["Bloodvine Garb"]; Back_Page = "CRAFTSET"; Back_Title = AL["Crafted Sets"]; + }; + ["GriftersArmor"] = { + Title = AL["Grifter's Armor"]; + Back_Page = "CRAFTSET"; + Back_Title = AL["Crafted Sets"]; + }; + ["PrimalistsTrappings"] = { + Title = AL["Primalist's Trappings"]; + Back_Page = "CRAFTSET"; + Back_Title = AL["Crafted Sets"]; }; ["VolcanicArmor"] = { Title = AL["Volcanic Armor"]; diff --git a/Core/Crafting.lua b/Core/Crafting.lua index b5cde25..e2b97ce 100644 --- a/Core/Crafting.lua +++ b/Core/Crafting.lua @@ -150,102 +150,114 @@ function AtlasLootCraftedSetMenu() AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\INV_Pants_Cloth_14"); AtlasLootMenuItem_6.lootpage="BloodvineG"; AtlasLootMenuItem_6:Show(); - --Leatherworking Leather Header - AtlasLootMenuItem_8_Name:SetText(RED..AL["Leatherworking"]); - AtlasLootMenuItem_8_Extra:SetText(WHITE..AL["Leather"]); - AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_04"); + --Mail Blacksmithing Header + AtlasLootMenuItem_8_Name:SetText(RED..AL["Blacksmithing"]); + AtlasLootMenuItem_8_Extra:SetText(WHITE..AL["Mail"]); + AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_04"); AtlasLootMenuItem_8.isheader = true; AtlasLootMenuItem_8:Show(); - --Volcanic Armor - AtlasLootMenuItem_9_Name:SetText(AL["Volcanic Armor"]); - AtlasLootMenuItem_9_Extra:SetText(ORANGE..AL["Fire Resistance Gear"]); - AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\INV_Pants_06"); - AtlasLootMenuItem_9.lootpage="VolcanicArmor"; + --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:Show(); - --Ironfeather Armor - AtlasLootMenuItem_10_Name:SetText(AL["Ironfeather Armor"]); - AtlasLootMenuItem_10_Extra:SetText(""); - AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_06"); - AtlasLootMenuItem_10.lootpage="IronfeatherArmor"; - AtlasLootMenuItem_10:Show(); - --Stormshroud Armor - AtlasLootMenuItem_11_Name:SetText(AL["Stormshroud Armor"]); - AtlasLootMenuItem_11_Extra:SetText(""); - AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_08"); - AtlasLootMenuItem_11.lootpage="StormshroudArmor"; + --Plate Blacksmithing header + AtlasLootMenuItem_11_Name:SetText(RED..AL["Blacksmithing"]); + AtlasLootMenuItem_11_Extra:SetText(WHITE..AL["Plate"]); + AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Chest_Plate10"); + AtlasLootMenuItem_11.isheader = true; AtlasLootMenuItem_11:Show(); - --Devilsaur Armor - AtlasLootMenuItem_12_Name:SetText(AL["Devilsaur Armor"]); + --Imperial Plate + AtlasLootMenuItem_12_Name:SetText(AL["Imperial Plate"]); AtlasLootMenuItem_12_Extra:SetText(""); - AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Pants_Wolf"); - AtlasLootMenuItem_12.lootpage="DevilsaurArmor"; + AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Belt_01"); + AtlasLootMenuItem_12.lootpage="ImperialPlate"; AtlasLootMenuItem_12:Show(); - --Blood Tiger Harness - AtlasLootMenuItem_13_Name:SetText(AL["Blood Tiger Harness"]); + --The Darksoul + AtlasLootMenuItem_13_Name:SetText(AL["The Darksoul"]); AtlasLootMenuItem_13_Extra:SetText(""); - AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_23"); - AtlasLootMenuItem_13.lootpage="BloodTigerH"; + AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_01"); + AtlasLootMenuItem_13.lootpage="TheDarksoul"; AtlasLootMenuItem_13:Show(); - --Primal Batskin - AtlasLootMenuItem_14_Name:SetText(AL["Primal Batskin"]); - AtlasLootMenuItem_14_Extra:SetText(""); - AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_03"); - AtlasLootMenuItem_14.lootpage="PrimalBatskin"; - AtlasLootMenuItem_14:Show(); - --Mail Blacksmithing Header - AtlasLootMenuItem_16_Name:SetText(RED..AL["Blacksmithing"]); - AtlasLootMenuItem_16_Extra:SetText(WHITE..AL["Mail"]); - AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_04"); + --Leatherworking Leather Header + AtlasLootMenuItem_16_Name:SetText(RED..AL["Leatherworking"]); + AtlasLootMenuItem_16_Extra:SetText(WHITE..AL["Leather"]); + AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_04"); AtlasLootMenuItem_16.isheader = true; AtlasLootMenuItem_16:Show(); - --Bloodsoul Embrace - AtlasLootMenuItem_17_Name:SetText(AL["Bloodsoul Embrace"]); + --Grifter's Armor + AtlasLootMenuItem_17_Name:SetText(AL["Grifter's Armor"]); AtlasLootMenuItem_17_Extra:SetText(""); - AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_15"); - AtlasLootMenuItem_17.lootpage="BloodsoulEmbrace"; + AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Helmet_33"); + AtlasLootMenuItem_17.lootpage="GriftersArmor"; AtlasLootMenuItem_17:Show(); - --Plate Blacksmithing header - AtlasLootMenuItem_19_Name:SetText(RED..AL["Blacksmithing"]); - AtlasLootMenuItem_19_Extra:SetText(WHITE..AL["Plate"]); - AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Chest_Plate10"); - AtlasLootMenuItem_19.isheader = true; + --Primalist's Trappings + AtlasLootMenuItem_18_Name:SetText(AL["Primalist's Trappings"]); + AtlasLootMenuItem_18_Extra:SetText(""); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Helmet_04"); + AtlasLootMenuItem_18.lootpage="PrimalistsTrappings"; + AtlasLootMenuItem_18:Show(); + --Volcanic Armor + AtlasLootMenuItem_19_Name:SetText(AL["Volcanic Armor"]); + AtlasLootMenuItem_19_Extra:SetText(ORANGE..AL["Fire Resistance Gear"]); + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Pants_06"); + AtlasLootMenuItem_19.lootpage="VolcanicArmor"; AtlasLootMenuItem_19:Show(); - --Imperial Plate - AtlasLootMenuItem_20_Name:SetText(AL["Imperial Plate"]); + --Ironfeather Armor + AtlasLootMenuItem_20_Name:SetText(AL["Ironfeather Armor"]); AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Belt_01"); - AtlasLootMenuItem_20.lootpage="ImperialPlate"; + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_06"); + AtlasLootMenuItem_20.lootpage="IronfeatherArmor"; AtlasLootMenuItem_20:Show(); - --The Darksoul - AtlasLootMenuItem_21_Name:SetText(AL["The Darksoul"]); + --Stormshroud Armor + AtlasLootMenuItem_21_Name:SetText(AL["Stormshroud Armor"]); AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_01"); - AtlasLootMenuItem_21.lootpage="TheDarksoul"; + AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_08"); + AtlasLootMenuItem_21.lootpage="StormshroudArmor"; AtlasLootMenuItem_21:Show(); - --Leatherworking Mail Header - AtlasLootMenuItem_23_Name:SetText(RED..AL["Leatherworking"]); - AtlasLootMenuItem_23_Extra:SetText(WHITE..AL["Mail"]); - AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_12"); - AtlasLootMenuItem_23.isheader = true; + --Devilsaur Armor + AtlasLootMenuItem_22_Name:SetText(AL["Devilsaur Armor"]); + AtlasLootMenuItem_22_Extra:SetText(""); + AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\INV_Pants_Wolf"); + AtlasLootMenuItem_22.lootpage="DevilsaurArmor"; + AtlasLootMenuItem_22:Show(); + --Blood Tiger Harness + AtlasLootMenuItem_23_Name:SetText(AL["Blood Tiger Harness"]); + AtlasLootMenuItem_23_Extra:SetText(""); + AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_23"); + AtlasLootMenuItem_23.lootpage="BloodTigerH"; AtlasLootMenuItem_23:Show(); - --Green Dragon Mail - AtlasLootMenuItem_24_Name:SetText(AL["Green Dragon Mail"]); - AtlasLootMenuItem_24_Extra:SetText(ORANGE..AL["Nature Resistance Gear"]); - AtlasLootMenuItem_24_Icon:SetTexture("Interface\\Icons\\INV_Pants_05"); - AtlasLootMenuItem_24.lootpage="GreenDragonM"; + --Primal Batskin + AtlasLootMenuItem_24_Name:SetText(AL["Primal Batskin"]); + AtlasLootMenuItem_24_Extra:SetText(""); + AtlasLootMenuItem_24_Icon:SetTexture("Interface\\Icons\\INV_Chest_Leather_03"); + AtlasLootMenuItem_24.lootpage="PrimalBatskin"; AtlasLootMenuItem_24:Show(); - --Blue Dragon Mail - AtlasLootMenuItem_25_Name:SetText(AL["Blue Dragon Mail"]); - AtlasLootMenuItem_25_Extra:SetText(ORANGE..AL["Arcane Resistance Gear"]); - AtlasLootMenuItem_25_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_04"); - AtlasLootMenuItem_25.lootpage="BlueDragonM"; - AtlasLootMenuItem_25:Show(); - --Black Dragon Mail - AtlasLootMenuItem_26_Name:SetText(AL["Black Dragon Mail"]); - AtlasLootMenuItem_26_Extra:SetText(ORANGE..AL["Fire Resistance Gear"]); - AtlasLootMenuItem_26_Icon:SetTexture("Interface\\Icons\\INV_Pants_03"); - AtlasLootMenuItem_26.lootpage="BlackDragonM"; + --Leatherworking Mail Header + AtlasLootMenuItem_26_Name:SetText(RED..AL["Leatherworking"]); + AtlasLootMenuItem_26_Extra:SetText(WHITE..AL["Mail"]); + AtlasLootMenuItem_26_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_12"); + AtlasLootMenuItem_26.isheader = true; AtlasLootMenuItem_26:Show(); + --Green Dragon Mail + AtlasLootMenuItem_27_Name:SetText(AL["Green Dragon Mail"]); + AtlasLootMenuItem_27_Extra:SetText(ORANGE..AL["Nature Resistance Gear"]); + AtlasLootMenuItem_27_Icon:SetTexture("Interface\\Icons\\INV_Pants_05"); + AtlasLootMenuItem_27.lootpage="GreenDragonM"; + AtlasLootMenuItem_27:Show(); + --Blue Dragon Mail + AtlasLootMenuItem_28_Name:SetText(AL["Blue Dragon Mail"]); + AtlasLootMenuItem_28_Extra:SetText(ORANGE..AL["Arcane Resistance Gear"]); + AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_04"); + AtlasLootMenuItem_28.lootpage="BlueDragonM"; + AtlasLootMenuItem_28:Show(); + --Black Dragon Mail + AtlasLootMenuItem_29_Name:SetText(AL["Black Dragon Mail"]); + AtlasLootMenuItem_29_Extra:SetText(ORANGE..AL["Fire Resistance Gear"]); + AtlasLootMenuItem_29_Icon:SetTexture("Interface\\Icons\\INV_Pants_03"); + AtlasLootMenuItem_29.lootpage="BlackDragonM"; + AtlasLootMenuItem_29:Show(); for i = 1, 30, 1 do getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show(); end diff --git a/Core/Spells.lua b/Core/Spells.lua index 857ae9a..1793e0d 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -15818,6 +15818,97 @@ GetSpellInfoVanillaDB = { [6] = {7071}, }, }, + [46620] = { + ["name"] = "Leatherworking: Grifter's Boots", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 83405, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4304, 7}, + [2] = {4291, 3}, + }, + }, + [46621] = { + ["name"] = "Leatherworking: Grifter's Gauntlets", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 83404, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4304, 6}, + [2] = {4291, 2}, + }, + }, + [46622] = { + ["name"] = "Leatherworking: Grifter's Belt", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 83403, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4234, 10}, + [2] = {4291}, + [3] = {4236}, + }, + }, + [46623] = { + ["name"] = "Leatherworking: Grifter's Leggings", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 83402, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4304, 10}, + [2] = {4234, 2}, + [3] = {4291, 4}, + [4] = {2605}, + }, + }, + [46624] = { + ["name"] = "Leatherworking: Grifter's Tunic", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 83401, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4304, 12}, + [2] = {3575, 2}, + [3] = {4291, 4}, + [4] = {2605, 2}, + }, + }, + [46625] = { + ["name"] = "Leatherworking: Grifter's Cover", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 83400, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4304, 8}, + [2] = {4338, 4}, + [3] = {4291, 2}, + [4] = {2605}, + }, + }, [10490] = { ["name"] = "Leatherworking: Comfortable Leather Hat", ["requires"] = "", @@ -15833,6 +15924,98 @@ GetSpellInfoVanillaDB = { [3] = {4291, 2}, }, }, + [47015] = { + ["name"] = "Leatherworking: Primalist's Gloves", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 81061, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {8170, 6}, + [2] = {14047, 4}, + [3] = {14341}, + }, + }, + [47016] = { + ["name"] = "Leatherworking: Primalist's Shoulders", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 81062, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {8170, 12}, + [2] = {12803}, + [3] = {14341}, + }, + }, + [47017] = { + ["name"] = "Leatherworking: Primalist's Headdress", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 81063, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {8170, 10}, + [2] = {7080}, + [3] = {12803}, + [4] = {14341}, + }, + }, + [47018] = { + ["name"] = "Leatherworking: Primalist's Pants", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 81064, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {8170, 12}, + [2] = {8343, 2}, + [3] = {14341}, + }, + }, + [47019] = { + ["name"] = "Leatherworking: Primalist's Vest", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 81066, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {8170, 24}, + [2] = {12803, 4}, + [3] = {15407}, + [4] = {14341}, + }, + }, + [47020] = { + ["name"] = "Leatherworking: Primalist's Boots", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 81065, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {8170, 8}, + [2] = {14047, 4}, + [3] = {14341}, + }, + }, [9207] = { ["name"] = "Leatherworking: Dusky Boots", ["requires"] = "", diff --git a/Core/TextParsing.lua b/Core/TextParsing.lua index feb2d5d..4762056 100644 --- a/Core/TextParsing.lua +++ b/Core/TextParsing.lua @@ -286,6 +286,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#x93#", AL["Avalanchion"]); text = gsub(text, "#x94#", AL["Princess Tempestria"]); text = gsub(text, "#x95#", AL["The Windreaver"]); + text = gsub(text, "#x96#", AL["Mr. Smite"]); -- Misc text = gsub(text, "#j1#", AL["Dungeon 1 Set"]); @@ -320,6 +321,8 @@ function AtlasLoot_FixText(text) text = gsub(text, "#craftt5#", AL["Bloodvine Garb"]); -- Leatherworking Crafted Sets + text = gsub(text, "#craftlwl7#", AL["Grifter's Armor"]); + text = gsub(text, "#craftlwl8#", AL["Primalist's Trappings"]); text = gsub(text, "#craftlwl1#", AL["Volcanic Armor"]); text = gsub(text, "#craftlwl2#", AL["Ironfeather Armor"]); text = gsub(text, "#craftlwl3#", AL["Stormshroud Armor"]); diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index f763f6d..5607946 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -131,6 +131,30 @@ AtlasLoot_Data["AtlasLootCrafting"] = { --- Leatherworking Leather Sets --- ----------------------------------- + GriftersArmor = { + { 0, "", "", "" }, + { 0, "INV_Box_01", "=q6=#craftlwl7#", "" }, + { 0, "", "", "" }, + { "83400", "inv_helmet_33", "=q2=Grifter's Cover", "=ds=#s1#, #a2#" }, + { "83401", "inv_chest_leather_08", "=q2=Grifter's Tunic", "=ds=#s5#, #a2#" }, + { "83402", "inv_pants_12", "=q2=Grifter's Leggings", "=ds=#s11#, #a2#" }, + { "83404", "inv_gauntlets_15", "=q2=Grifter's Gauntlets", "=ds=#s9#, #a2#" }, + { "83403", "inv_belt_04", "=q2=Grifter's Belt", "=ds=#s10#, #a2#" }, + { "83405", "inv_boots_05", "=q2=Grifter's Boots", "=ds=#s12#, #a2#" }, + }; + + PrimalistsTrappings = { + { 0, "", "", "" }, + { 0, "INV_Box_01", "=q6=#craftlwl8#", "" }, + { 0, "", "", "" }, + { "81063", "inv_helmet_04", "=q2=Primalist's Headdress", "=ds=#s1#, #a2#" }, + { "81062", "inv_shoulder_09", "=q2=Primalist's Shoulders", "=ds=#s10#, #a2#" }, + { "81066", "inv_chest_plate08", "=q3=Primalist's Vest", "=ds=#s5#, #a2#" }, + { "81064", "inv_pants_04", "=q2=Primalist's Pants", "=ds=#s11#, #a2#" }, + { "81061", "inv_gauntlets_09", "=q2=Primalist's Gloves", "=ds=#s9#, #a2#" }, + { "81065", "inv_boots_plate_05", "=q2=Primalist's Boots", "=ds=#s12#, #a2#" }, + }; + VolcanicArmor = { { 0, "", "", "" }, { 0, "INV_Box_01", "=q6=#craftlwl1#", "=q1=#j6#" }, @@ -921,13 +945,19 @@ AtlasLoot_Data["AtlasLootCrafting"] = { }; LeatherExpert2 = { + { "s46620", "inv_boots_05", "=q2=Grifter's Boots", "=ds=#sr# =so1=200 =so2=215 =so3=220 =so4=225" }, + { "s46621", "inv_gauntlets_15", "=q2=Grifter's Gauntlets", "=ds=#sr# =so1=200 =so2=215 =so3=220 =so4=225" }, + { "s46622", "inv_belt_04", "=q2=Grifter's Belt", "=ds=#sr# =so1=200 =so2=215 =so3=220 =so4=225" }, { "s3779", "inv_belt_09", "=q2=Barbaric Belt", "=ds=#sr# =so1=200 =so2=220 =so3=230 =so4=240" }, { "s10490", "inv_helmet_15", "=q2=Comfortable Leather Hat", "=ds=#sr# =so1=200 =so2=220 =so3=230 =so4=240" }, { "s9207", "inv_boots_07", "=q2=Dusky Boots", "=ds=#sr# =so1=200 =so2=220 =so3=230 =so4=240" }, { "s9208", "inv_boots_08", "=q2=Swift Boots", "=ds=#sr# =so1=200 =so2=220 =so3=230 =so4=240" }, + { "s46623", "inv_pants_12", "=q2=Grifter's Leggings", "=ds=#sr# =so1=205 =so2=225 =so3=230 =so4=235" }, { "s10507", "inv_belt_24", "=q2=Nightscape Headband", "=ds=#sr# =so1=205 =so2=225 =so3=235 =so4=245" }, { "s10499", "inv_chest_leather_03", "=q2=Nightscape Tunic", "=ds=#sr# =so1=205 =so2=225 =so3=235 =so4=245" }, { "s10509", "inv_gauntlets_05", "=q2=Turtle Scale Gloves", "=ds=#sr# =so1=205 =so2=225 =so3=235 =so4=245" }, + { "s46625", "inv_helmet_33", "=q2=Grifter's Cover", "=ds=#sr# =so1=210 =so2=225 =so3=230 =so4=235" }, + { "s46624", "inv_chest_leather_08", "=q2=Grifter's Tunic", "=ds=#sr# =so1=210 =so2=235 =so3=240 =so4=245" }, { "s10516", "inv_shoulder_07", "=q2=Nightscape Shoulders", "=ds=#sr# =so1=210 =so2=230 =so3=240 =so4=250" }, { "s10518", "inv_bracer_06", "=q2=Turtle Scale Bracers", "=ds=#sr# =so1=210 =so2=230 =so3=240 =so4=250" }, { "s10511", "inv_chest_chain_12", "=q2=Turtle Scale Breastplate", "=ds=#sr# =so1=210 =so2=230 =so3=240 =so4=250" }, @@ -957,6 +987,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s22331", "inv_misc_leatherscrap_02", "=q1=Rugged Leather", "=ds=#sr# =so1=250 =so2=250 =so3=250 =so4=250" }, { "s19047", "inv_misc_pelt_bear_03", "=q1=Cured Rugged Hide", "=ds=#sr# =so1=250 =so2=250 =so3=255 =so4=260" }, { "s19058", "inv_misc_armorkit_09", "=q1=Rugged Armor Kit", "=ds=#sr# =so1=250 =so2=255 =so3=265 =so4=275" }, + { "s10647", "inv_chest_leather_06", "=q3=Feathered Breastplate", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, { "s10570", "inv_helmet_20", "=q2=Tough Scorpid Helm", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, { "s10574", "inv_misc_cape_03", "=q2=Wild Leather Cloak", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, { "s10572", "inv_pants_14", "=q2=Wild Leather Leggings", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, @@ -965,18 +996,25 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s19051", "inv_chest_chain_15", "=q2=Heavy Scorpid Vest", "=ds=#sr# =so1=265 =so2=285 =so3=295 =so4=305" }, { "s19052", "inv_bracer_07", "=q2=Wicked Leather Bracers", "=ds=#sr# =so1=265 =so2=285 =so3=295 =so4=305" }, { "s19055", "inv_gauntlets_31", "=q2=Runic Leather Gauntlets", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, + { "s19055", "inv_gauntlets_31", "=q2=Runic Leather Gauntlets", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, + { "s47020", "inv_boots_plate_05", "=q2=Primalist's Boots", "=ds=#sr# =so1=270 =so2=290 =so3=291 =so4=295" }, + { "s47015", "inv_gauntlets_09", "=q2=Primalist's Gloves ", "=ds=#sr# =so1=270 =so2=285 =so3=290 =so4=295" }, + { "s47017", "inv_helmet_04", "=q2=Primalist's Headdress", "=ds=#sr# =so1=270 =so2=290 =so3=291 =so4=295" }, { "s22815", "inv_chest_chain_14", "=q2=Gordok Ogre Suit", "=ds=#sr# =so1=275 =so2=285 =so3=290 =so4=295" }, { "s19064", "inv_gauntlets_24", "=q2=Heavy Scorpid Gauntlets", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, { "s19065", "inv_bracer_11", "=q2=Runic Leather Bracers", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, + { "s47018", "inv_pants_04", "=q2=Primalist's Pants", "=ds=#sr# =so1=280 =so2=290 =so3=291 =so4=295" }, + { "s47016", "inv_shoulder_09", "=q2=Primalist's Shoulders", "=ds=#sr# =so1=280 =so2=285 =so3=290 =so4=295" }, { "s19070", "inv_belt_03", "=q2=Heavy Scorpid Belt", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, - { "s19072", "inv_belt_03", "=q2=Runic Leather Belt", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, - { "s19071", "inv_misc_bandage_13", "=q2=Wicked Leather Headband", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, - { "s19075", "inv_pants_12", "=q2=Heavy Scorpid Leggings", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, - { "s19082", "inv_misc_bandage_11", "=q2=Runic Leather Headband", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, - { "s19083", "inv_pants_12", "=q2=Wicked Leather Pants", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, }; LeatherArtisan2 = { + { "s19072", "inv_belt_03", "=q2=Runic Leather Belt", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, + { "s19071", "inv_misc_bandage_13", "=q2=Wicked Leather Headband", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, + { "s47019", "inv_chest_plate08", "=q3=Primalist's Vest", "=ds=#sr# =so1=285 =so2=290 =so3=291 =so4=295" }, + { "s19075", "inv_pants_12", "=q2=Heavy Scorpid Leggings", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, + { "s19082", "inv_misc_bandage_11", "=q2=Runic Leather Headband", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, + { "s19083", "inv_pants_12", "=q2=Wicked Leather Pants", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s23705", "inv_boots_cloth_08", "=q3=Dawn Treaders", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s23703", "inv_belt_09", "=q3=Might of the Timbermaw", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s19088", "inv_helmet_20", "=q2=Heavy Scorpid Helm", "=ds=#sr# =so1=295 =so2=315 =so3=325 =so4=335" }, @@ -1000,16 +1038,16 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s24122", "inv_gauntlets_31", "=q3=Primal Batskin Gloves", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24121", "inv_chest_leather_03", "=q3=Primal Batskin Jerkin", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24849", "inv_bracer_12", "=q3=Sandstalker Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, - { "s24851", "inv_chest_plate07", "=q3=Sandstalker Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s24851", "inv_chest_plate07", "=q3=Sandstalker Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + }; + + LeatherArtisan3 = { { "s24850", "inv_gauntlets_11", "=q3=Sandstalker Gauntlets", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24846", "inv_bracer_05", "=q3=Spitfire Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24848", "inv_chest_leather_02", "=q3=Spitfire Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24847", "inv_gauntlets_11", "=q3=Spitfire Gauntlets", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s22923", "inv_bracer_05", "=q3=Swift Flight Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s23704", "inv_gauntlets_26", "=q3=Timbermaw Brawlers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, - }; - - LeatherArtisan3 = { { "s28224", "inv_bracer_07", "=q4=Icy Scale Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s28222", "inv_chest_plate09", "=q4=Icy Scale Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s28223", "inv_gauntlets_28", "=q4=Icy Scale Gauntlets", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, @@ -1063,7 +1101,6 @@ AtlasLoot_Data["AtlasLootCrafting"] = { Tribal1 = { { "s10621", "inv_helmet_04", "=q3=Wolfshead Helm", "=ds=#sr# =so1=225 =so2=245 =so3=255 =so4=265" }, - { "s10647", "inv_chest_leather_06", "=q3=Feathered Breastplate", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, { "s19053", "inv_gauntlets_23", "=q2=Chimeric Gloves", "=ds=#sr# =so1=265 =so2=270 =so3=280 =so4=290" }, { "s19062", "inv_shoulder_06", "=q3=Ironfeather Shoulders", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, { "s19063", "inv_boots_07", "=q2=Chimeric Boots", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index 003e510..3ce892b 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -313,6 +313,8 @@ AL:RegisterTranslations("enUS", function() return { ["Primal Mooncloth"] = true, ["Shadow's Embrace"] = true, ["Wrath of Spellfire"] = true, + ["Grifter's Armor"] = true, + ["Primalist's Trappings"] = true, ["Volcanic Armor"] = true, ["Ironfeather Armor"] = true, ["Stormshroud Armor"] = true, diff --git a/Sets/sets.lua b/Sets/sets.lua index 81efa0a..30711d8 100644 --- a/Sets/sets.lua +++ b/Sets/sets.lua @@ -4,10 +4,11 @@ AtlasLoot_Data["AtlasLootSetItems"] = { { 0, "", "", "" }, { 0,"INV_Box_01","=q6=#pre60s1#","" }, { 0, "", "", "" }, - { 10399, "INV_Chest_Leather_08", "=q3=Blackened Defias Armor", "=ds=#s5#, #a2# =q7=#x6#", "14.77%" }, - { 10401, "INV_Gauntlets_18", "=q2=Blackened Defias Gloves", "=ds=#s9#, #a2# =q7=#x9#", "1.76%" }, - { 10403, "INV_Belt_26", "=q2=Blackened Defias Belt", "=ds=#s10#, #a2# =q7=#x8#", "23.26%" }, - { 10400, "INV_Pants_12", "=q2=Blackened Defias Leggings", "=ds=#s11#, #a2# =q7=#x9#", "1.64%" }, + { 81007, "INV_Misc_Bandana_03", "=q3=Blackened Defias Mask", "=ds=#s1#, #a2# =q7=#x96#", "20%" }, + { 10399, "INV_Chest_Leather_08", "=q3=Blackened Defias Armor", "=ds=#s5#, #a2# =q7=#x6#", "20%" }, + { 10401, "INV_Gauntlets_18", "=q2=Blackened Defias Gloves", "=ds=#s9#, #a2# =q7=#x9#", "1.75%" }, + { 10403, "INV_Belt_26", "=q2=Blackened Defias Belt", "=ds=#s10#, #a2# =q7=#x7#", "30%" }, + { 10400, "INV_Pants_12", "=q2=Blackened Defias Leggings", "=ds=#s11#, #a2# =q7=#x9#", "1.75%" }, { 10402, "INV_Boots_05", "=q2=Blackened Defias Boots", "=ds=#s12#, #a2# =q7=#x8#", "1.23%" }, }; WAILING = { diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 3f5c93d..9e28e64 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -513,6 +513,8 @@ AtlasLoot_TableNames = { ["PillagersGarb"] = { AL["Pillager's Garb"], "AtlasLootCrafting" }, ["BloodvineG"] = { AL["Bloodvine Garb"], "AtlasLootCrafting" }, --Crafted Sets - Leatherworking + ["GriftersArmor"] = { AL["Grifter's Armor"], "AtlasLootCrafting" }, + ["PrimalistsTrappings"] = { AL["Primalist's Trappings"], "AtlasLootCrafting" }, ["VolcanicArmor"] = { AL["Volcanic Armor"], "AtlasLootCrafting" }, ["IronfeatherArmor"] = { AL["Ironfeather Armor"], "AtlasLootCrafting" }, ["StormshroudArmor"] = { AL["Stormshroud Armor"], "AtlasLootCrafting" },