From 7b0c7439714ce2f17aff5301f04d7ccc542fe1e3 Mon Sep 17 00:00:00 2001 From: Lexie <6937574+Lexiebean@users.noreply.github.com> Date: Sat, 4 Nov 2023 19:25:30 +1100 Subject: [PATCH] Wardens of Time And other faction related fixes --- Core/ButtonRegistry.lua | 15 +- Core/Factions.lua | 252 ++++++++++++++++---------------- Core/Spells.lua | 2 +- Crafting/crafting.en.lua | 4 +- Factions/factions.lua | 51 +++++-- TableRegister/loottables.en.lua | 6 +- 6 files changed, 187 insertions(+), 143 deletions(-) diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index 3938efb..419e915 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -3025,9 +3025,22 @@ AtlasLoot_ButtonRegistry = { Back_Title = AL["Factions"]; }; ["Warderns1"] = { - Title = AL["Wardens of Time"]; + Title = AL["Wardens of Time"] .. ": " .. AL["Friendly"] .. " & " .. AL["Honored"]; Back_Page = "REPMENU"; Back_Title = AL["Factions"]; + Next_Page = "Warderns2"; + Next_Title = AL["Wardens of Time"] .. ": " .. AL["Revered"] .. " & " .. AL["Exalted"]; + Prev_Page = "Warderns2"; + Prev_Title = AL["Wardens of Time"] .. ": " .. AL["Revered"] .. " & " .. AL["Exalted"]; + }; + ["Warderns2"] = { + Title = AL["Wardens of Time"] .. ": " .. AL["Revered"] .. " & " .. AL["Exalted"]; + Back_Page = "REPMENU"; + Back_Title = AL["Factions"]; + Next_Page = "Warderns1"; + Next_Title = AL["Wardens of Time"] .. ": " .. AL["Friendly"] .. " & " .. AL["Honored"]; + Prev_Page = "Warderns1"; + Prev_Title = AL["Wardens of Time"] .. ": " .. AL["Friendly"] .. " & " .. AL["Honored"]; }; ["AQBroodRings"] = { Title = AL["Brood of Nozdormu"]; diff --git a/Core/Factions.lua b/Core/Factions.lua index da5ad54..912597d 100644 --- a/Core/Factions.lua +++ b/Core/Factions.lua @@ -15,162 +15,162 @@ function AtlasLootRepMenu() getglobal("AtlasLootItemsFrame_BACK"):Hide(); getglobal("AtlasLootServerQueryButton"):Hide(); --Argent Dawn - AtlasLootMenuItem_2_Name:SetText(AL["Argent Dawn"]); - AtlasLootMenuItem_2_Extra:SetText(""); - AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Talisman_08"); - AtlasLootMenuItem_2.lootpage="Argent1"; - AtlasLootMenuItem_2:Show(); + AtlasLootMenuItem_1_Name:SetText(AL["Argent Dawn"]); + AtlasLootMenuItem_1_Extra:SetText(""); + AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Talisman_08"); + AtlasLootMenuItem_1.lootpage="Argent1"; + AtlasLootMenuItem_1:Show(); --Bloodsail Pirates - AtlasLootMenuItem_17_Name:SetText(AL["Bloodsail Buccaneers"]); - AtlasLootMenuItem_17_Extra:SetText(""); - AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Helmet_66"); - AtlasLootMenuItem_17.lootpage="Bloodsail1"; - AtlasLootMenuItem_17:Show(); + AtlasLootMenuItem_16_Name:SetText(AL["Bloodsail Buccaneers"]); + AtlasLootMenuItem_16_Extra:SetText(""); + AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\INV_Helmet_66"); + AtlasLootMenuItem_16.lootpage="Bloodsail1"; + AtlasLootMenuItem_16:Show(); --Brood of Nozdormu - AtlasLootMenuItem_3_Name:SetText(AL["Brood of Nozdormu"]); - AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Ring_40"); - AtlasLootMenuItem_3.lootpage="AQBroodRings"; - AtlasLootMenuItem_3:Show(); + AtlasLootMenuItem_2_Name:SetText(AL["Brood of Nozdormu"]); + AtlasLootMenuItem_2_Extra:SetText(""); + AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Ring_40"); + AtlasLootMenuItem_2.lootpage="AQBroodRings"; + AtlasLootMenuItem_2:Show(); --Cenarion Hold - AtlasLootMenuItem_18_Name:SetText(AL["Cenarion Circle"]); - AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Chest_Plate07"); - AtlasLootMenuItem_18.lootpage="Cenarion1"; - AtlasLootMenuItem_18:Show(); + AtlasLootMenuItem_17_Name:SetText(AL["Cenarion Circle"]); + AtlasLootMenuItem_17_Extra:SetText(""); + AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Chest_Plate07"); + AtlasLootMenuItem_17.lootpage="Cenarion1"; + AtlasLootMenuItem_17:Show(); --Darkmoon Faire - AtlasLootMenuItem_4_Name:SetText(AL["Darkmoon Faire"]); - AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Misc_Ticket_Tarot_Maelstrom_01"); - AtlasLootMenuItem_4.lootpage="Darkmoon"; - AtlasLootMenuItem_4:Show(); + AtlasLootMenuItem_3_Name:SetText(AL["Darkmoon Faire"]); + AtlasLootMenuItem_3_Extra:SetText(""); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Misc_Ticket_Tarot_Maelstrom_01"); + AtlasLootMenuItem_3.lootpage="Darkmoon"; + AtlasLootMenuItem_3:Show(); --The Defilers - AtlasLootMenuItem_25_Name:SetText(AL["The Defilers"]); - AtlasLootMenuItem_25_Extra:SetText("|cffFF0000"..AL["Horde"]); - AtlasLootMenuItem_25_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Amulet_07"); - AtlasLootMenuItem_25.lootpage="Defilers"; - AtlasLootMenuItem_25:Show(); + AtlasLootMenuItem_23_Name:SetText(AL["The Defilers"]); + AtlasLootMenuItem_23_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Amulet_07"); + AtlasLootMenuItem_23.lootpage="Defilers"; + AtlasLootMenuItem_23:Show(); --Frostwolf Clan - AtlasLootMenuItem_26_Name:SetText(AL["Frostwolf Clan"]); - AtlasLootMenuItem_26_Extra:SetText("|cffFF0000"..AL["Horde"]); - AtlasLootMenuItem_26_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_FrostwolfTrinket_01"); - AtlasLootMenuItem_26.lootpage="Frostwolf1"; - AtlasLootMenuItem_26:Show(); + AtlasLootMenuItem_24_Name:SetText(AL["Frostwolf Clan"]); + AtlasLootMenuItem_24_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_24_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_FrostwolfTrinket_01"); + AtlasLootMenuItem_24.lootpage="Frostwolf1"; + AtlasLootMenuItem_24:Show(); --Gelkis Clan Centaur - AtlasLootMenuItem_19_Name:SetText(AL["Gelkis Clan Centaur"]); + AtlasLootMenuItem_18_Name:SetText(AL["Gelkis Clan Centaur"]); + AtlasLootMenuItem_18_Extra:SetText(""); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Misc_Head_Centaur_01"); + AtlasLootMenuItem_18.lootpage="GelkisClan1"; + AtlasLootMenuItem_18:Show(); + --Hydraxian Waterlords + AtlasLootMenuItem_4_Name:SetText(AL["Hydraxian Waterlords"]); + AtlasLootMenuItem_4_Extra:SetText(""); + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\Spell_Frost_FrostArmor"); + AtlasLootMenuItem_4.lootpage="WaterLords1"; + AtlasLootMenuItem_4:Show(); + --The League of Arathor + AtlasLootMenuItem_8_Name:SetText(AL["The League of Arathor"]); + AtlasLootMenuItem_8_Extra:SetText("|cff2773ff"..AL["Alliance"]); + AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Amulet_07"); + AtlasLootMenuItem_8.lootpage="LeagueofArathor"; + AtlasLootMenuItem_8:Show(); + --Magram Clan Centaur + AtlasLootMenuItem_19_Name:SetText(AL["Magram Clan Centaur"]); AtlasLootMenuItem_19_Extra:SetText(""); AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Misc_Head_Centaur_01"); - AtlasLootMenuItem_19.lootpage="GelkisClan1"; + AtlasLootMenuItem_19.lootpage="MagramClan1"; AtlasLootMenuItem_19:Show(); - --Hydraxian Waterlords - AtlasLootMenuItem_5_Name:SetText(AL["Hydraxian Waterlords"]); - AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\Spell_Frost_FrostArmor"); - AtlasLootMenuItem_5.lootpage="WaterLords1"; - AtlasLootMenuItem_5:Show(); - --The League of Arathor - AtlasLootMenuItem_10_Name:SetText(AL["The League of Arathor"]); - AtlasLootMenuItem_10_Extra:SetText("|cff2773ff"..AL["Alliance"]); - AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_Amulet_07"); - AtlasLootMenuItem_10.lootpage="LeagueofArathor"; - AtlasLootMenuItem_10:Show(); - --Magram Clan Centaur - AtlasLootMenuItem_20_Name:SetText(AL["Magram Clan Centaur"]); - AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Misc_Head_Centaur_01"); - AtlasLootMenuItem_20.lootpage="MagramClan1"; - AtlasLootMenuItem_20:Show(); --Stormpike Guard - AtlasLootMenuItem_11_Name:SetText(AL["Stormpike Guard"]); - AtlasLootMenuItem_11_Extra:SetText("|cff2773ff"..AL["Alliance"]); - AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_StormPikeTrinket_01"); - AtlasLootMenuItem_11.lootpage="Stormpike1"; - AtlasLootMenuItem_11:Show(); + AtlasLootMenuItem_9_Name:SetText(AL["Stormpike Guard"]); + AtlasLootMenuItem_9_Extra:SetText("|cff2773ff"..AL["Alliance"]); + AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\INV_Jewelry_StormPikeTrinket_01"); + AtlasLootMenuItem_9.lootpage="Stormpike1"; + AtlasLootMenuItem_9:Show(); --Thorium Brotherhood - AtlasLootMenuItem_6_Name:SetText(AL["Thorium Brotherhood"]); - AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\INV_Ingot_Mithril"); - AtlasLootMenuItem_6.lootpage="Thorium1"; - AtlasLootMenuItem_6:Show(); + AtlasLootMenuItem_5_Name:SetText(AL["Thorium Brotherhood"]); + AtlasLootMenuItem_5_Extra:SetText(""); + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\INV_Ingot_Mithril"); + AtlasLootMenuItem_5.lootpage="Thorium1"; + AtlasLootMenuItem_5:Show(); --Timbermaw Hold - AtlasLootMenuItem_21_Name:SetText(AL["Timbermaw Hold"]); - AtlasLootMenuItem_21_Extra:SetText(""); - AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Misc_Horn_01"); - AtlasLootMenuItem_21.lootpage="Timbermaw"; - AtlasLootMenuItem_21:Show(); + AtlasLootMenuItem_20_Name:SetText(AL["Timbermaw Hold"]); + AtlasLootMenuItem_20_Extra:SetText(""); + AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Misc_Horn_01"); + AtlasLootMenuItem_20.lootpage="Timbermaw"; + AtlasLootMenuItem_20:Show(); --The Wintersaber Trainers - AtlasLootMenuItem_7_Name:SetText(AL["Wintersaber Trainers"]); - AtlasLootMenuItem_7_Extra:SetText("|cff2773ff"..AL["Alliance"]); - AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\Ability_Mount_PinkTiger"); - AtlasLootMenuItem_7.lootpage="Wintersaber1"; - AtlasLootMenuItem_7:Show(); + AtlasLootMenuItem_6_Name:SetText(AL["Wintersaber Trainers"]); + AtlasLootMenuItem_6_Extra:SetText("|cff2773ff"..AL["Alliance"]); + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\Ability_Mount_PinkTiger"); + AtlasLootMenuItem_6.lootpage="Wintersaber1"; + AtlasLootMenuItem_6:Show(); --Zandalar Tribe - AtlasLootMenuItem_22_Name:SetText(AL["Zandalar Tribe"]); - AtlasLootMenuItem_22_Extra:SetText(""); - AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\INV_Misc_Coin_08"); - AtlasLootMenuItem_22.lootpage="Zandalar1"; - AtlasLootMenuItem_22:Show(); + AtlasLootMenuItem_23_Name:SetText(AL["Zandalar Tribe"]); + AtlasLootMenuItem_23_Extra:SetText(""); + AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\INV_Misc_Coin_08"); + AtlasLootMenuItem_23.lootpage="Zandalar1"; + AtlasLootMenuItem_23:Show(); --helf - AtlasLootMenuItem_13_Name:SetText(AL["Silvermoon Remnant"]); + AtlasLootMenuItem_11_Name:SetText(AL["Silvermoon Remnant"]); + AtlasLootMenuItem_11_Extra:SetText("|cff2773ff"..AL["Alliance"]); + AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); + AtlasLootMenuItem_11.lootpage="Helf"; + AtlasLootMenuItem_11:Show(); + --raventusk + AtlasLootMenuItem_26_Name:SetText(AL["Revantusk Trolls"]); + AtlasLootMenuItem_26_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_26_Icon:SetTexture("Interface\\Icons\\INV_Misc_Head_Troll_01"); + AtlasLootMenuItem_26.lootpage="Revantusk"; + AtlasLootMenuItem_26:Show(); + --Ironforge + AtlasLootMenuItem_12_Name:SetText(AL["Ironforge"]); + AtlasLootMenuItem_12_Extra:SetText("|cff2773ff"..AL["Alliance"]); + AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); + AtlasLootMenuItem_12.lootpage="Ironforge"; + AtlasLootMenuItem_12:Show(); + --Darnassus + AtlasLootMenuItem_13_Name:SetText(AL["Darnassus"]); AtlasLootMenuItem_13_Extra:SetText("|cff2773ff"..AL["Alliance"]); AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - AtlasLootMenuItem_13.lootpage="Helf"; + AtlasLootMenuItem_13.lootpage="Darnassus"; AtlasLootMenuItem_13:Show(); - --raventusk - AtlasLootMenuItem_28_Name:SetText(AL["Revantusk Trolls"]); - AtlasLootMenuItem_28_Extra:SetText("|cffFF0000"..AL["Horde"]); - AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\INV_Misc_Head_Troll_01"); - AtlasLootMenuItem_28.lootpage="Revantusk"; - AtlasLootMenuItem_28:Show(); - --Ironforge - AtlasLootMenuItem_14_Name:SetText(AL["Ironforge"]); + --Stormwind + AtlasLootMenuItem_14_Name:SetText(AL["Stormwind"]); AtlasLootMenuItem_14_Extra:SetText("|cff2773ff"..AL["Alliance"]); AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - AtlasLootMenuItem_14.lootpage="Ironforge"; + AtlasLootMenuItem_14.lootpage="Stormwind"; AtlasLootMenuItem_14:Show(); - --Darnassus - AtlasLootMenuItem_15_Name:SetText(AL["Darnassus"]); + --Gnomeregan Exiles + AtlasLootMenuItem_15_Name:SetText(AL["Gnomeregan Exiles"]); AtlasLootMenuItem_15_Extra:SetText("|cff2773ff"..AL["Alliance"]); AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - AtlasLootMenuItem_15.lootpage="Darnassus"; + AtlasLootMenuItem_15.lootpage="GnomereganExiles"; AtlasLootMenuItem_15:Show(); - --Stormwind - -- AtlasLootMenuItem_16_Name:SetText(AL["Stormwind"]); - -- AtlasLootMenuItem_16_Extra:SetText("|cff2773ff"..AL["Alliance"]); - -- AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - -- AtlasLootMenuItem_16.lootpage="Stormwind"; - -- AtlasLootMenuItem_16:Show(); - --Gnomeregan Exiles - -- AtlasLootMenuItem_17_Name:SetText(AL["Gnomeregan Exiles"]); - -- AtlasLootMenuItem_17_Extra:SetText("|cff2773ff"..AL["Alliance"]); - -- AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - -- AtlasLootMenuItem_17.lootpage="GnomereganExiles"; - -- AtlasLootMenuItem_17:Show(); --Durotar Labor Union - -- AtlasLootMenuItem_18_Name:SetText(AL["Durotar Labor Union"]); - -- AtlasLootMenuItem_18_Extra:SetText("|cff2773ff"..AL["Horde"]); - -- AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - -- AtlasLootMenuItem_18.lootpage="DurotarLaborUnion"; - -- AtlasLootMenuItem_18:Show(); + AtlasLootMenuItem_27_Name:SetText(AL["Durotar Labor Union"]); + AtlasLootMenuItem_27_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_27_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); + AtlasLootMenuItem_27.lootpage="DurotarLaborUnion"; + AtlasLootMenuItem_27:Show(); --Undercity - -- AtlasLootMenuItem_19_Name:SetText(AL["Undercity"]); - -- AtlasLootMenuItem_19_Extra:SetText("|cff2773ff"..AL["Horde"]); - -- AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - -- AtlasLootMenuItem_19.lootpage="Undercity"; - -- AtlasLootMenuItem_19:Show(); + AtlasLootMenuItem_28_Name:SetText(AL["Undercity"]); + AtlasLootMenuItem_28_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); + AtlasLootMenuItem_28.lootpage="Undercity"; + AtlasLootMenuItem_28:Show(); --Orgrimmar - -- AtlasLootMenuItem_20_Name:SetText(AL["Orgrimmar"]); - -- AtlasLootMenuItem_20_Extra:SetText("|cff2773ff"..AL["Horde"]); - -- AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - -- AtlasLootMenuItem_20.lootpage="Orgrimmar"; - -- AtlasLootMenuItem_20:Show(); + AtlasLootMenuItem_29_Name:SetText(AL["Orgrimmar"]); + AtlasLootMenuItem_29_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_29_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); + AtlasLootMenuItem_29.lootpage="Orgrimmar"; + AtlasLootMenuItem_29:Show(); --Thunder Bluff - -- AtlasLootMenuItem_21_Name:SetText(AL["Thunder Bluff"]); - -- AtlasLootMenuItem_21_Extra:SetText("|cff2773ff"..AL["Horde"]); - -- AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); - -- AtlasLootMenuItem_21.lootpage="ThunderBluff"; - -- AtlasLootMenuItem_21:Show(); + AtlasLootMenuItem_30_Name:SetText(AL["Thunder Bluff"]); + AtlasLootMenuItem_30_Extra:SetText("|cffFF0000"..AL["Horde"]); + AtlasLootMenuItem_30_Icon:SetTexture("Interface\\Icons\\INV_Staff_13"); + AtlasLootMenuItem_30.lootpage="ThunderBluff"; + AtlasLootMenuItem_30:Show(); for i = 1, 30, 1 do getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show(); diff --git a/Core/Spells.lua b/Core/Spells.lua index cb23706..42df9ba 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -798,7 +798,7 @@ GetSpellInfoVanillaDB = { [2] = {3372}, }, }, - [65032] = { + [46068] = { ["name"] = "Survival: Cleaning Cloth", ["requires"] = "", ["tools"] = "", diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index 634028e..74f160d 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -1959,7 +1959,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { 0, "", "", "" }, { "s46075", "inv_misc_lantern_01", "=q2=Iron Lantern", "=ds=#sr# =so1=30 =so2=30 =so3=45 =so4=60" }, { 0, "", "", "" }, - { "s46068", "inv_misc_bandage_07", "=q2=Cleaning Cloth", "=ds=#sr# =so1=50, Requires Rogue Poisons" } + { "s46068", "inv_misc_bandage_07", "=q1=Cleaning Cloth", "=ds=#sr# =so1=50, =q6=Requires Rogue Poisons" }, { "s46072", "Trade_Survival", "=q2=Traveler's Tent", "=ds=#sr# =so1=50 =so2=100 =so3=? =so4=?" }, { 0, "", "", "" }, { "s46074", "trade_herbalism", "=q2=Simple Woodern Planter", "=ds=#sr# =so1=75 =so2=100 =so3=112 =so4=125" }, @@ -2027,7 +2027,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s11343", "ability_poisons", "=q1=Instant Poison VI", "=ds=#lr#=q1= 60 =ds=#sr# =so1=280 =so2=325 =so3=350 =so4=375" }, { "s65032", "spell_nature_nullifypoison", "=q1=Agitating Poison I", "=ds=#lr#=q1= 60 =ds=#sr# =so1=? =so2=? =so3=? =so4=?" }, { 0, "", "", "" }, - { "s46068", "inv_misc_bandage_07", "=q2=Cleaning Cloth", "Requires 50 Survival" } + { "s46068", "inv_misc_bandage_07", "=q1=Cleaning Cloth", "=q6=Requires 50 Survival" }, }; } diff --git a/Factions/factions.lua b/Factions/factions.lua index 12dfbd7..1ecf6b7 100644 --- a/Factions/factions.lua +++ b/Factions/factions.lua @@ -362,6 +362,9 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 0, "", "", "" }, { 0, "Spell_Frost_FrostArmor", "=q6=#r4#", "" }, { 22754, "INV_Potion_83", "=q1=Eternal Quintessence", "=ds=#m33#" }, + { 0, "", "", "" }, + { 0, "Spell_Frost_FrostArmor", "=q6=#r5#", "" }, + { 81254, "Spell_Frost_SummonWaterElemental", "=q1=Water Waveling", "=ds=#e15#" }, }; Bloodsail1 = { { 0, "", "", "" }, @@ -390,27 +393,53 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 0, "inv_misc_head_dragon_01", "=q6=#r2#", "" }, { 61000, "inv_misc_rune_08", "=q1=Time-Worn Rune", "" }, { 0, "", "", "" }, - { 0, "inv_misc_head_dragon_01", "=q6=#r4#", "" }, - { 61001, "inv_sword_34", "=q3=Claw of the Infinite", "=ds=#h1#, #w4#" }, - { 61013, "inv_gauntlets_10", "=q3=Gauntlets of Temporal Guidance", "=ds=#a3#, #s9#" }, - { 61002, "inv_chest_cloth_30", "=q3=Robe of the Custodian", "=ds=#a1#, #s5#" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "inv_misc_head_dragon_01", "=q6=#r3#", "" }, + { 61005, "INV_Boots_08", "=q3=Boots of Flowing Sands", "=ds=#s12#, #a2#" }, + { 84604, "INV_Bracer_14", "=q3=Aurastone Bracers", "=ds=#s8#, #a3#" }, + { 61003, "INV_Helmet_09", "=q3=Timeskipper's Helm of Alacrity", "=ds=#s1#, #a4#" }, { 61004, "inv_jewelry_ring_33", "=q3=Sandswept Ring of Arcanum", "=ds=#s13#" }, - { 61003, "inv_helmet_09", "=q3=Timeskipper's Helm of Alacrity", "=ds=#a4#, #s1#" }, - { 51043, "inv_misc_bag_enchantedrunecloth", "=q2=Void-Linked Satchel", "=ds=#e10#" }, + }; + Warderns2 = { + { 0, "inv_misc_head_dragon_01", "=q6=#r4#", "" }, + { 84601, "INV_Shoulder_13", "=q3=Grass of Eternity", "=ds=#s3#, #a1#" }, + { 61002, "INV_Chest_Cloth_30", "=q3=Robe of the Custodian", "=ds=#s5#, #a1#" }, + { 61013, "INV_Gauntlets_10", "=q3=Gauntlets of Temporal Guidance", "=ds=#s9#, #a3#" }, + { 61001, "INV_Sword_34", "=q3=Claw of the Infinite", "=ds=#h1#, #w4#" }, + { 84602, "INV_Wand_07", "=q3=Consecrated Caduceus", "=ds=#w12#" }, + { 84603, "inv_staff_10", "=q3=Rod of the Churning Hourglass", "=ds=#h2#, #w9#" }, + { 0, "", "", "" }, { 50070, "INV_Misc_Head_Dragon_01", "=q1=Bronze Whelpling", "=ds=#e15#" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, { 0, "inv_misc_head_dragon_01", "=q6=#r5#", "" }, - { 61007, "inv_boots_plate_03", "=q4=Temporal Bronze Boots", "=ds=#a4#, #s12#" }, - { 61009, "inv_shield_10", "=q4=Time-Shifting Wheel", "=ds=#h4#, #w8#" }, - { 61010, "inv_misc_cape_14", "=q4=Wing of the Time-Lord", "=ds=#s4#" }, - { 61006, "inv_sword_22", "=q4=Blade of Infinite Mysteries", "=ds=#w10#, #h3#" }, - { 61011, "INV_Weapon_Rifle_09", "=q4=Flintlocke's Hand Cannon", "=ds=#w5#" }, + { 61007, "INV_Boots_Plate_03", "=q4=Temporal Bronze Boots", "=ds=#s12#, #a4#" }, { 61012, "inv_archaeology_70_highborne_inertleystonecharm", "=q4=Shard of Eternity", "=ds=#s2#" }, + { 61010, "INV_Misc_Cape_14", "=q4=Wing of the Time-Lord", "=ds=#s4#" }, + { 61011, "INV_Weapon_Rifle_09", "=q4=Flintlocke's Hand Cannon", "=ds=#w5#" }, + { 84600, "INV_Mace_01", "=q4=Blackthorn's Blackjack", "=ds=#h1#, #w6#" }, + { 61009, "INV_Shield_10", "=q4=Time-Shifting Wheel", "=ds=#w8#" }, + { 61006, "INV_Sword_22", "=q4=Blade of Infinite Mysteries", "=ds=#h3#, #w10#" }, + { 0, "", "", "" }, + { 51043, "inv_misc_bag_enchantedrunecloth", "=q2=Void-Linked Satchel", "=ds=#e10#" }, { 51252, "inv_misc_head_dragon_01", "=q4=Bronze Drake", "=ds=#e7#" }, { 80300, "inv_shirt_guildtabard_01", "=q1=Time Warden's Tabard", "=ds=#s7#" }, + }; Defilers = { { 0, "", "", "" }, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index abc7472..51d2bc4 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -773,7 +773,8 @@ AtlasLoot_TableNames = { --Timbermaw Hold ["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" }, --Wardens of Time - ["Warderns1"] = { AL["Wardens of Time"], "AtlasLootRepItems" }, + ["Warderns1"] = { AL["Wardens of Time"] .. ": " .. AL["Friendly"] .. " & " .. AL["Honored"], "AtlasLootRepItems" }, + ["Warderns2"] = { AL["Wardens of Time"] .. ": " .. AL["Revered"] .. " & " .. AL["Exalted"], "AtlasLootRepItems" }, --Wintersaber Trainers ["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" }, --Zandalar Tribe @@ -1812,7 +1813,8 @@ AtlasLoot_TableNamesBoss = { --Timbermaw Hold ["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" }, --Wardens of Time - ["Warderns1"] = { AL["Wardens of Time"], "AtlasLootRepItems" }, + ["Warderns1"] = { AL["Wardens of Time"] .. ": " .. AL["Friendly"] .. " & " .. AL["Honored"], "AtlasLootRepItems" }, + ["Warderns2"] = { AL["Wardens of Time"] .. ": " .. AL["Revered"] .. " & " .. AL["Exalted"], "AtlasLootRepItems" }, --Wintersaber Trainers ["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" }, --Zandalar Tribe