From 5ed19a3d418ff0d04fa6f861c6caaa1a994c7a91 Mon Sep 17 00:00:00 2001 From: Lexie <6937574+Lexiebean@users.noreply.github.com> Date: Sat, 3 Aug 2024 08:05:59 +1000 Subject: [PATCH] Bug Fixes --- Core/AtlasLoot.lua | 15 +++++++++++++++ Core/ButtonRegistry.lua | 6 +++--- Core/Crafting.lua | 4 ++-- Core/TextParsing.lua | 2 +- Factions/factions.lua | 6 +++--- Locale/locale.en.lua | 2 +- TableRegister/loottables.en.lua | 5 +++-- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index 94208c1..6679a0f 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -3846,6 +3846,10 @@ AtlasLoot_updater:RegisterEvent("CHAT_MSG_ADDON") AtlasLoot_updater:RegisterEvent("CHAT_MSG_CHANNEL") AtlasLoot_updater:RegisterEvent("PLAYER_ENTERING_WORLD") AtlasLoot_updater:RegisterEvent("PARTY_MEMBERS_CHANGED") +AtlasLoot_updater:RegisterEvent("CHAT_MSG_CHANNEL_JOIN") + +AtlasLootUserCounter = {} +PlayerCounter = {} AtlasLoot_updater:SetScript("OnEvent", function() if event == "CHAT_MSG_ADDON" and arg1 == "AtlasLoot" then @@ -3864,6 +3868,13 @@ AtlasLoot_updater:SetScript("OnEvent", function() end end + if event == "CHAT_MSG_CHANNEL_JOIN" then + local name = arg2 + if not PlayerCounter[name] then + PlayerCounter[name] = 1 + end + end + if event == "CHAT_MSG_CHANNEL" then local _,_,source = string.find(arg4,"(%d+)%.") if source then @@ -3885,6 +3896,10 @@ AtlasLoot_updater:SetScript("OnEvent", function() end end end + local name = arg2 + if not AtlasLootUserCounter[name] then + AtlasLootUserCounter[name] = 1 + end end end end diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index 590cfa5..c512533 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -4877,12 +4877,12 @@ AtlasLoot_ButtonRegistry = { Back_Page = "SURVIVALMENU"; Back_Title = AL["Survival"]; Prev_Page = "Survival2"; - Prev_Title = AL["Garderning"]; + Prev_Title = AL["Gardening"]; Next_Page = "Survival2"; - Next_Title = AL["Garderning"]; + Next_Title = AL["Gardening"]; }; ["Survival2"] = { - Title = AL["Garderning"]; + Title = AL["Gardening"]; Back_Page = "SURVIVALMENU"; Back_Title = AL["Survival"]; Prev_Page = "Survival1"; diff --git a/Core/Crafting.lua b/Core/Crafting.lua index eba35e5..a2f658d 100644 --- a/Core/Crafting.lua +++ b/Core/Crafting.lua @@ -704,9 +704,9 @@ function AtlasLoot_SurvivalMenu() AtlasLootMenuItem_2.lootpage = "Survival1"; AtlasLootMenuItem_2:Show(); --Journeyman - AtlasLootMenuItem_3_Name:SetText(AL["Garderning"]); + AtlasLootMenuItem_3_Name:SetText(AL["Gardening"]); AtlasLootMenuItem_3_Extra:SetText(""); AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\trade_herbalism"); AtlasLootMenuItem_3.lootpage = "Survival2"; AtlasLootMenuItem_3:Show(); -end \ No newline at end of file +end diff --git a/Core/TextParsing.lua b/Core/TextParsing.lua index 548daa2..3cf1afc 100644 --- a/Core/TextParsing.lua +++ b/Core/TextParsing.lua @@ -118,7 +118,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#p14#", AL["Gnomish Engineering"]); text = gsub(text, "#p15#", AL["Goblin Engineering"]); text = gsub(text, "#p16#", AL["Survival"]); - text = gsub(text, "#p17#", AL["Garderning"]); + text = gsub(text, "#p17#", AL["Gardening"]); --Reputation text = gsub(text, "#r1#", AL["Neutral"]); diff --git a/Factions/factions.lua b/Factions/factions.lua index da80184..4614a4e 100644 --- a/Factions/factions.lua +++ b/Factions/factions.lua @@ -586,10 +586,10 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 80542, "INV_Staff_39", "=q3=Quel'dorei Cleric's Staff", "=ds=#h2#, #w9#" }, { 80545, "INV_WAND_07", "=q2=Quel'dorei Cleric's Wand", "=ds=#w12#" }, { 0, "", "", "" }, + { 80528, "inv_weapon_shortblade_07", "=q3=Quel'dorei Assassin's Kris", "=ds=#w4#" }, { 0, "", "", "" }, { 80546, "INV_Weapon_Bow_17", "=q3=Quel'dorei Ranger's Longbow", "=ds=#w2#" }, { 0, "", "", "" }, - { 0, "", "", "" }, { 80530, "INV_Hammer_02", "=q3=Quel'dorei Guardian's Mace", "=ds=#h1#, #w6#" }, { 80531, "INV_Mace_30", "=q3=Quel'dorei Guardian's Warhammer", "=ds=#h2#, #w6#" }, { 0, "", "", "" }, @@ -678,10 +678,10 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 80645, "INV_Wand_01", "=q3=Revantusk Mender's Wand", "=ds=#w12#" }, { 0, "", "", "" }, { 0, "", "", "" }, + { 80628, "inv_misc_monsterfang_01", "=q3=Revantusk Stalker's Kris", "=ds=#w4#" }, + { 0, "", "", "" }, { 80646, "INV_Weapon_Bow_08", "=q3=Revantusk Shadow Hunter's Longbow", "=ds=#w2#" }, { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, { 80630, "INV_Mace_01", "=q3=Revantusk Watcher's Mace", "=ds=#h1#, #w6#" }, { 80631, "INV_Hammer_09", "=q3=Revantusk Watcher's Maul", "=ds=#h2#, #w6#" }, { 0, "", "", "" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index 8c9aec0..c7ed299 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -1442,7 +1442,7 @@ AL:RegisterTranslations("enUS", function() return { ["Cooking"] = true, ["First Aid"] = true, ["Survival"] = true, - ["Garderning"] = true, + ["Gardening"] = true, ["Alterac Valley"] = true, ["Arathi Basin"] = true, ["Warsong Gulch"] = true, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index ebf1e9e..12008c1 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -889,7 +889,7 @@ AtlasLoot_TableNames = { ["FirstAid1"] = { AL["First Aid"], "AtlasLootCrafting" }, --Survival ["Survival1"] = { AL["Survival"], "AtlasLootCrafting" }, - ["Survival2"] = { AL["Garderning"], "AtlasLootCrafting" }, + ["Survival2"] = { AL["Gardening"], "AtlasLootCrafting" }, --Poisons ["Poisons1"] = { AL["Rogue"] .. ": " .. AL["Poisons"], "AtlasLootCrafting" }, @@ -1849,6 +1849,7 @@ AtlasLoot_TableNamesBoss = { ["Undercity"] = { AL["Undercity"], "AtlasLootRepItems" }, ["Orgrimmar"] = { AL["Orgrimmar"], "AtlasLootRepItems" }, ["ThunderBluff"] = { AL["Thunder Bluff"], "AtlasLootRepItems" }, + ["Dalaran"] = { AL["Dalaran"], "AtlasLootRepItems" }, ["Wildhammer"] = { AL["Wildhammer Clan"], "AtlasLootRepItems" }, }, @@ -1936,7 +1937,7 @@ AtlasLoot_TableNamesBoss = { ["FirstAid1"] = { AL["First Aid"], "AtlasLootCrafting" }, --Survival ["Survival1"] = { AL["Survival"], "AtlasLootCrafting" }, - ["Survival2"] = { AL["Garderning"], "AtlasLootCrafting" }, + ["Survival2"] = { AL["Gardening"], "AtlasLootCrafting" }, --Poisons ["Poisons1"] = { AL["Rogue"] .. ": " .. AL["Poisons"], "AtlasLootCrafting" }, },