From 82fc7a582d0837900adbec06b5794516affd1083 Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Fri, 17 Oct 2025 09:37:41 -0700 Subject: [PATCH] remove awesomewotlk ref --- APIDocumentation/APIDocumentation.toc | 1 - .../Blizzard_APIDocumentation.lua | 4 +- .../Awesome_WotLKDocumentation.lua | 444 ------------------ README.md | 5 - WeakAuras/BuffTrigger2.lua | 12 +- WeakAuras/GenericTrigger.lua | 16 +- WeakAuras/Init.lua | 8 +- WeakAuras/Modernize.lua | 12 +- WeakAuras/Types.lua | 55 +-- WeakAuras/WeakAuras.lua | 30 +- WeakAuras/WeakAuras.toc | 3 +- WeakAurasOptions/ActionOptions.lua | 12 +- WeakAurasOptions/ConditionOptions.lua | 2 +- .../OptionsFrames/OptionsFrame.lua | 8 - .../RegionOptions/DynamicGroup.lua | 6 +- 15 files changed, 63 insertions(+), 555 deletions(-) delete mode 100644 APIDocumentation/Documentation/Awesome_WotLKDocumentation.lua diff --git a/APIDocumentation/APIDocumentation.toc b/APIDocumentation/APIDocumentation.toc index 59cbf88..7d20008 100644 --- a/APIDocumentation/APIDocumentation.toc +++ b/APIDocumentation/APIDocumentation.toc @@ -31,7 +31,6 @@ Documentation\ActionDocumentation.lua Documentation\AddonRelatedDocumentation.lua Documentation\ArenaDocumentation.lua Documentation\AuctionDocumentation.lua -Documentation\Awesome_WotLKDocumentation.lua Documentation\BankDocumentation.lua Documentation\BarbershopDocumentation.lua Documentation\BattlefieldDocumentation.lua diff --git a/APIDocumentation/Blizzard_APIDocumentation.lua b/APIDocumentation/Blizzard_APIDocumentation.lua index e745143..3a1cc07 100644 --- a/APIDocumentation/Blizzard_APIDocumentation.lua +++ b/APIDocumentation/Blizzard_APIDocumentation.lua @@ -61,8 +61,8 @@ end function APIDocumentationMixin:HandleCopyAPI(apiInfo) local clipboardString = apiInfo:GetClipboardString(); - if CopyToClipboard then - CopyToClipboard(clipboardString); + if Internal_CopyToClipboard then + Internal_CopyToClipboard(clipboardString); end self:WriteLineF("Copied to clipboard: %s", clipboardString); end diff --git a/APIDocumentation/Documentation/Awesome_WotLKDocumentation.lua b/APIDocumentation/Documentation/Awesome_WotLKDocumentation.lua deleted file mode 100644 index d027dfa..0000000 --- a/APIDocumentation/Documentation/Awesome_WotLKDocumentation.lua +++ /dev/null @@ -1,444 +0,0 @@ -local Awesome_WotLK = -{ - Name = "Awesome WotLK", - Type = "System", - Namespace = "Awesome WotLK", - - Functions = - { - { - Name = "C_NamePlate.GetNamePlateForUnit", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - - Returns = - { - { Name = "namePlate", Type = "frame", Nilable = false }, - }, - }, - { - Name = "C_NamePlate.GetNamePlates", - Type = "Function", - - Returns = - { - { Name = "namePlateList", Type = "table", Nilable = false }, - }, - }, - { - Name = "C_NamePlate.GetNamePlateByGUID", - Type = "Function", - - Arguments = - { - { Name = "GUID", Type = "WOWGUID", Nilable = false }, - }, - - Returns = - { - { Name = "namePlateList", Type = "frame", Nilable = false }, - }, - }, - { - Name = "C_NamePlate.GetNamePlateTokenByGUID", - Type = "Function", - - Arguments = - { - { Name = "GUID", Type = "WOWGUID", Nilable = false }, - }, - - Returns = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - }, - { - Name = "C_VoiceChat.GetTtsVoices", - Type = "Function", - - Returns = - { - { Name = "voiceList", Type = "table", Nilable = false }, - }, - }, - { - Name = "C_VoiceChat.GetRemoteTtsVoices", - Type = "Function", - - Returns = - { - { Name = "voiceList", Type = "table", Nilable = false }, - }, - }, - { - Name = "C_VoiceChat.SpeakText", - Type = "Function", - - Arguments = - { - { Name = "voiceID", Type = "number", Nilable = false }, - { Name = "text", Type = "string", Nilable = false }, - { Name = "destination", Type = "number", Nilable = true }, - { Name = "rate", Type = "number", Nilable = true }, - { Name = "volume", Type = "number", Nilable = true }, - }, - - Returns = - { - { Name = "utteranceID", Type = "number", Nilable = false }, - }, - }, - { - Name = "C_VoiceChat.StopSpeakingText", - Type = "Function", - - }, - { - Name = "C_TTSSettings.GetSpeechRate", - Type = "Function", - - Returns = - { - { Name = "rate", Type = "number", Nilable = false }, - }, - }, - { - Name = "C_TTSSettings.GetSpeechVolume", - Type = "Function", - - Returns = - { - { Name = "volume", Type = "number", Nilable = false }, - }, - }, - { - Name = "C_TTSSettings.GetSpeechVoiceID", - Type = "Function", - - Returns = - { - { Name = "voiceID", Type = "number", Nilable = false }, - }, - }, - { - Name = "C_TTSSettings.GetVoiceOptionName", - Type = "Function", - - Returns = - { - { Name = "voiceName", Type = "string", Nilable = false }, - }, - }, - { - Name = "C_TTSSettings.SetDefaultSettings", - Type = "Function", - - }, - { - Name = "C_TTSSettings.SetSpeechRate", - Type = "Function", - - Arguments = - { - { Name = "rate", Type = "number", Nilable = false }, - }, - - }, - { - Name = "C_TTSSettings.SetSpeechVolume", - Type = "Function", - - Arguments = - { - { Name = "volume", Type = "number", Nilable = false }, - }, - - }, - { - Name = "C_TTSSettings.SetVoiceOption", - Type = "Function", - - Arguments = - { - { Name = "voiceID", Type = "number", Nilable = false }, - }, - - }, - { - Name = "C_TTSSettings.SetVoiceOptionByName", - Type = "Function", - - Arguments = - { - { Name = "voiceName", Type = "string", Nilable = false }, - }, - - }, - { - Name = "C_TTSSettings.RefreshVoices", - Type = "Function", - - }, - { - Name = "UnitIsControlled", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - - Returns = - { - { Name = "isControlled", Type = "bool", Nilable = false }, - }, - }, - { - Name = "UnitIsDisarmed", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - - Returns = - { - { Name = "isDisarmed", Type = "bool", Nilable = false }, - }, - }, - { - Name = "UnitIsSilenced", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - - Returns = - { - { Name = "isSilenced", Type = "bool", Nilable = false }, - }, - }, - { - Name = "UnitOccupations", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - - Returns = - { - { Name = "npcFlags", Type = "number", Nilable = false }, - }, - }, - { - Name = "UnitOwner", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - - Returns = - { - { Name = "ownerName", Type = "string", Nilable = false }, - { Name = "ownerGuid", Type = "WOWGUID", Nilable = false }, - }, - }, - { - Name = "UnitTokenFromGUID", - Type = "Function", - - Arguments = - { - { Name = "GUID", Type = "WOWGUID", Nilable = false }, - }, - - Returns = - { - { Name = "UnitToken", Type = "UnitToken", Nilable = false }, - }, - }, - { - Name = "GetInventoryItemTransmog", - Type = "Function", - - Arguments = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - { Name = "slot", Type = "number", Nilable = false }, - }, - - Returns = - { - { Name = "itemId", Type = "number", Nilable = false }, - { Name = "enchantId", Type = "number", Nilable = false }, - }, - }, - { - Name = "GetSpellBaseCooldown", - Type = "Function", - - Arguments = - { - { Name = "spellId", Type = "string", Nilable = false }, - }, - - Returns = - { - { Name = "cdMs", Type = "number", Nilable = false }, - { Name = "gcdMs", Type = "number", Nilable = false }, - }, - }, - { - Name = "GetItemInfoInstant", - Type = "Function", - - Arguments = - { - { Name = "itemId/itemName/itemHyperlink", Type = "string", Nilable = false }, - }, - - Returns = - { - { Name = "itemID", Type = "number", Nilable = false }, - { Name = "itemType", Type = "string", Nilable = false }, - { Name = "itemSubType", Type = "string", Nilable = false }, - { Name = "itemEquipLoc", Type = "string", Nilable = false }, - { Name = "icon", Type = "string", Nilable = false }, - { Name = "classID", Type = "number", Nilable = false }, - { Name = "subclassID", Type = "number", Nilable = false }, - }, - }, - { - Name = "FlashWindow", - Type = "Function", - - }, - { - Name = "IsWindowFocused", - Type = "Function", - - }, - { - Name = "FocusWindow", - Type = "Function", - - }, - { - Name = "CopyToClipboard", - Type = "Function", - - Arguments = - { - { Name = "text", Type = "string", Nilable = false }, - }, - - }, - }, - - Events = - { - { - Name = "NamePlateCreated", - Type = "Event", - LiteralName = "NAME_PLATE_CREATED", - Payload = - { - { Name = "namePlateBase", Type = "frame", Nilable = false }, - }, - }, - { - Name = "NamePlateUnitAdded", - Type = "Event", - LiteralName = "NAME_PLATE_UNIT_ADDED", - Payload = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - }, - { - Name = "NamePlateUnitRemoved", - Type = "Event", - LiteralName = "NAME_PLATE_UNIT_REMOVED", - Payload = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - }, - { - Name = "NamePlateOwnerChanged", - Type = "Event", - LiteralName = "NAME_PLATE_OWNER_CHANGED", - Payload = - { - { Name = "unitId", Type = "UnitToken", Nilable = false }, - }, - }, - { - Name = "VoiceChatTtsPlaybackStarted", - Type = "Event", - LiteralName = "VOICE_CHAT_TTS_PLAYBACK_STARTED", - Payload = - { - { Name = "numConsumers", Type = "number", Nilable = false }, - { Name = "utteranceID", Type = "number", Nilable = false }, - { Name = "durationMS", Type = "time_t", Nilable = false }, - { Name = "destination", Type = "number", Nilable = false }, - }, - }, - { - Name = "VoiceChatTtsPlaybackFinished", - Type = "Event", - LiteralName = "VOICE_CHAT_TTS_PLAYBACK_FINISHED", - Payload = - { - { Name = "numConsumers", Type = "number", Nilable = false }, - { Name = "utteranceID", Type = "number", Nilable = false }, - { Name = "destination", Type = "number", Nilable = false }, - }, - }, - { - Name = "VoiceChatTtsPlaybackFailed", - Type = "Event", - LiteralName = "VOICE_CHAT_TTS_PLAYBACK_FAILED", - Payload = - { - { Name = "status", Type = "string", Nilable = false }, - { Name = "utteranceID", Type = "number", Nilable = false }, - { Name = "destination", Type = "number", Nilable = false }, - }, - }, - { - Name = "VoiceChatTtsSpeakTextUpdate", - Type = "Event", - LiteralName = "VOICE_CHAT_TTS_SPEAK_TEXT_UPDATE", - Payload = - { - { Name = "status", Type = "string", Nilable = false }, - { Name = "utteranceID", Type = "number", Nilable = false }, - }, - }, - { - Name = "VoiceChatTtsVoicesUpdate", - Type = "Event", - LiteralName = "VOICE_CHAT_TTS_VOICES_UPDATE", - }, - }, - - Tables = - { - }, -}; - -APIDocumentation:AddDocumentationTable(Awesome_WotLK); diff --git a/README.md b/README.md index d4f4aa4..3d6d4e8 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,6 @@ To open the options window, type `/wa` or `/weakauras` into your chat and hit en 1. [Download the package](https://github.com/NoM0Re/WeakAuras-WotLK/archive/refs/heads/master.zip). 2. Open the archive, then open folder `WeakAuras-WotLK-master`, extract all folders to `Interface\AddOns`. -## Client Extensions - -* [Large Address Aware](https://github.com/NoM0Re/WeakAuras-WotLK/wiki/Large-Address-Aware): Enables the WoW client to use up to 4GB of RAM instead of the default 2GB, improving stability and performance on modern systems. This patch is highly recommended for WotLK 3.3.5a users. -* [Awesome WotLK](https://github.com/NoM0Re/WeakAuras-WotLK/wiki/awesome_wotlk): Adds modern retail-style nameplate search functions, unit tracking, and events. Additionally adds the modern Text-to-Speech functions to the client. This adds a lot of additional functionality to WeakAuras, that are not enabled without it. - ## Extensions * [WeakAuras Companion](https://weakauras.wtf): This application adds the missing link between Wago.io and the World of Warcraft addon, enabling you to update your auras in a convenient fashion. Read about how to use it [here](https://github.com/NoM0Re/WeakAuras-WotLK/wiki/WeakAuras-Companion). diff --git a/WeakAuras/BuffTrigger2.lua b/WeakAuras/BuffTrigger2.lua index 49d73f9..faf1353 100644 --- a/WeakAuras/BuffTrigger2.lua +++ b/WeakAuras/BuffTrigger2.lua @@ -1992,10 +1992,8 @@ Buff2Frame:RegisterEvent("PLAYER_TARGET_CHANGED") Buff2Frame:RegisterEvent("PARTY_MEMBERS_CHANGED") Buff2Frame:RegisterEvent("RAID_ROSTER_UPDATE") Buff2Frame:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT") -if WeakAuras.IsAwesomeEnabled() then - Buff2Frame:RegisterEvent("NAME_PLATE_UNIT_ADDED") - Buff2Frame:RegisterEvent("NAME_PLATE_UNIT_REMOVED") -end +Buff2Frame:RegisterEvent("NAME_PLATE_UNIT_ADDED") +Buff2Frame:RegisterEvent("NAME_PLATE_UNIT_REMOVED") Buff2Frame:RegisterEvent("PLAYER_ENTERING_WORLD") Buff2Frame:SetScript("OnEvent", EventHandler) @@ -3642,10 +3640,8 @@ function BuffTrigger.InitMultiAura() multiAuraFrame:RegisterEvent("UNIT_AURA") multiAuraFrame:RegisterEvent("PLAYER_TARGET_CHANGED") multiAuraFrame:RegisterEvent("PLAYER_FOCUS_CHANGED") - if WeakAuras.IsAwesomeEnabled() then - multiAuraFrame:RegisterEvent("NAME_PLATE_UNIT_ADDED") - multiAuraFrame:RegisterEvent("NAME_PLATE_UNIT_REMOVED") - end + multiAuraFrame:RegisterEvent("NAME_PLATE_UNIT_ADDED") + multiAuraFrame:RegisterEvent("NAME_PLATE_UNIT_REMOVED") multiAuraFrame:RegisterEvent("PLAYER_LEAVING_WORLD") multiAuraFrame:SetScript("OnEvent", BuffTrigger.HandleMultiEvent) Private.frames["Multi-target 2 Aura Trigger Handler"] = multiAuraFrame diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua index f0cc7a0..2bd4520 100644 --- a/WeakAuras/GenericTrigger.lua +++ b/WeakAuras/GenericTrigger.lua @@ -1274,13 +1274,11 @@ local frame = CreateFrame("Frame"); frame.unitFrames = {}; Private.frames["WeakAuras Generic Trigger Frame"] = frame; frame:RegisterEvent("PLAYER_ENTERING_WORLD"); -if WeakAuras.IsAwesomeEnabled() then - frame:RegisterEvent("NAME_PLATE_UNIT_ADDED") - frame:RegisterEvent("NAME_PLATE_UNIT_REMOVED") - genericTriggerRegisteredEvents["NAME_PLATE_UNIT_ADDED"] = true; - genericTriggerRegisteredEvents["NAME_PLATE_UNIT_REMOVED"] = true; -end +frame:RegisterEvent("NAME_PLATE_UNIT_ADDED") +frame:RegisterEvent("NAME_PLATE_UNIT_REMOVED") genericTriggerRegisteredEvents["PLAYER_ENTERING_WORLD"] = true; +genericTriggerRegisteredEvents["NAME_PLATE_UNIT_ADDED"] = true; +genericTriggerRegisteredEvents["NAME_PLATE_UNIT_REMOVED"] = true; frame:SetScript("OnEvent", HandleEvent); function GenericTrigger.Delete(id) @@ -3157,10 +3155,8 @@ function WeakAuras.WatchUnitChange(unit) watchUnitChange:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT"); watchUnitChange:RegisterEvent("PARTY_MEMBERS_CHANGED") watchUnitChange:RegisterEvent("RAID_ROSTER_UPDATE") - if WeakAuras.IsAwesomeEnabled() then - watchUnitChange:RegisterEvent("NAME_PLATE_UNIT_ADDED") - watchUnitChange:RegisterEvent("NAME_PLATE_UNIT_REMOVED") - end + watchUnitChange:RegisterEvent("NAME_PLATE_UNIT_ADDED") + watchUnitChange:RegisterEvent("NAME_PLATE_UNIT_REMOVED") watchUnitChange:RegisterEvent("UNIT_FACTION") watchUnitChange:RegisterEvent("PLAYER_ENTERING_WORLD") watchUnitChange:RegisterEvent("UNIT_PET") diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua index 07e6839..203605d 100644 --- a/WeakAuras/Init.lua +++ b/WeakAuras/Init.lua @@ -12,9 +12,7 @@ local versionStringFromToc = GetAddOnMetadata("WeakAuras", "Version") local versionString = "5.20.5 Beta" -- Year, Month, Day, Hour, Minute, Seconds local buildTime = "2025".."09".."14".."20".."43".."00" -local isAwesomeEnabled = C_VoiceChat and C_VoiceChat.SpeakText and 2 -- TTS available - or C_NamePlate and C_NamePlate.GetNamePlateForUnit and 1 -- Nameplates available - or false +local isTTSEnabled = C_VoiceChat and C_VoiceChat.SpeakText and true or false local isDBMRegistered = (DBM and type(DBM.Revision) == "number" and DBM.Revision >= 20250929200404) and true or false local flavor @@ -31,8 +29,8 @@ WeakAuras.buildTime = buildTime WeakAuras.newFeatureString = "|TInterface\\OptionsFrame\\UI-OptionsFrame-NewFeatureIcon:0|t" WeakAuras.BuildInfo = select(4, GetBuildInfo()) -function WeakAuras.IsAwesomeEnabled() - return isAwesomeEnabled +function WeakAuras.IsTTSEnabled() + return isTTSEnabled end function WeakAuras.IsDBMRegistered() diff --git a/WeakAuras/Modernize.lua b/WeakAuras/Modernize.lua index e41d52f..3291093 100644 --- a/WeakAuras/Modernize.lua +++ b/WeakAuras/Modernize.lua @@ -293,13 +293,11 @@ function Private.Modernize(data, oldSnapshot) -- Version 18 was a migration for stance/form trigger, but deleted later because of migration issue -- Version 19 were introduced in July 2019 in BfA - if WeakAuras.IsAwesomeEnabled() then - if data.internalVersion < 19 then - if data.triggers then - for triggerId, triggerData in ipairs(data.triggers) do - if triggerData.trigger.type == "status" and triggerData.trigger.event == "Cast" and triggerData.trigger.unit == "multi" then - triggerData.trigger.unit = "nameplate" - end + if data.internalVersion < 19 then + if data.triggers then + for triggerId, triggerData in ipairs(data.triggers) do + if triggerData.trigger.type == "status" and triggerData.trigger.event == "Cast" and triggerData.trigger.unit == "multi" then + triggerData.trigger.unit = "nameplate" end end end diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua index 0c95bf2..4fdb6dc 100644 --- a/WeakAuras/Types.lua +++ b/WeakAuras/Types.lua @@ -28,11 +28,9 @@ Private.glow_action_types = { Private.glow_frame_types = { UNITFRAME = L["Unit Frame"], FRAMESELECTOR = L["Frame Selector"], - PARENTFRAME = L["Parent Frame"] + PARENTFRAME = L["Parent Frame"], + NAMEPLATE = L["Nameplate"], } -if WeakAuras.IsAwesomeEnabled() then - Private.glow_frame_types.NAMEPLATE = L["Nameplate"] -end Private.circular_group_constant_factor_types = { ANGLE = L["Angle and Radius"], @@ -1136,11 +1134,9 @@ Private.unit_types_bufftrigger_2 = WeakAuras.Mixin({ arena = L["Arena"], pet = L["Pet"], member = L["Specific Unit"], - multi = L["Multi-target"] + multi = L["Multi-target"], + nameplate = L["Nameplate"] }, target_unit_types) -if WeakAuras.IsAwesomeEnabled() then - Private.unit_types_bufftrigger_2.nameplate = L["Nameplate"] -end Private.actual_unit_types = WeakAuras.Mixin({ player = L["Player"], @@ -1162,21 +1158,17 @@ Private.actual_unit_types_cast = WeakAuras.Mixin({ arena = L["Arena"], pet = L["Pet"], member = L["Specific Unit"], + nameplate = L["Nameplate"], }, target_unit_types) -if WeakAuras.IsAwesomeEnabled() then - Private.actual_unit_types_cast.nameplate = L["Nameplate"] -end Private.actual_unit_types_cast_tooltip = L["• |cff00ff00Player|r, |cff00ff00Target|r, |cff00ff00Focus|r, and |cff00ff00Pet|r correspond directly to those individual unitIDs.\n• |cff00ff00Specific Unit|r lets you provide a specific valid unitID to watch.\n|cffff0000Note|r: The game will not fire events for all valid unitIDs, making some untrackable by this trigger.\n• |cffffff00Party|r, |cffffff00Raid|r, |cffffff00Boss|r, |cffffff00Arena|r, and |cffffff00Nameplate|r can match multiple corresponding unitIDs.\n• |cffffff00Smart Group|r adjusts to your current group type, matching just the \"player\" when solo, \"party\" units (including \"player\") in a party or \"raid\" units in a raid.\n\n|cffffff00*|r Yellow Unit settings will create clones for each matching unit while this trigger is providing Dynamic Info to the Aura."] Private.threat_unit_types = WeakAuras.Mixin({ boss = L["Boss"], member = L["Specific Unit"], - none = L["At Least One Enemy"] + none = L["At Least One Enemy"], + nameplate = L["Nameplate"] }, target_unit_types) -if WeakAuras.IsAwesomeEnabled() then - Private.threat_unit_types.nameplate = L["Nameplate"] -end Private.unit_types_range_check = WeakAuras.Mixin({ pet = L["Pet"], @@ -1315,11 +1307,9 @@ Private.anchor_frame_types = { MOUSE = L["Mouse Cursor"], SELECTFRAME = L["Select Frame"], UNITFRAME = L["Unit Frames"], - CUSTOM = L["Custom"] + NAMEPLATE = L["Nameplates"], + CUSTOM = L["Custom"], } -if WeakAuras.IsAwesomeEnabled() then - Private.anchor_frame_types.NAMEPLATE = L["Nameplates"] -end Private.anchor_frame_types_group = { SCREEN = L["Screen/Parent Group"], @@ -2597,11 +2587,9 @@ Private.classification_types = { elite = L["Elite"], rare = L["Rare"], normal = L["Normal"], - trivial = L["Trivial (Low Level)"] + trivial = L["Trivial (Low Level)"], + minus = L["Minus (Small Nameplate)"] } -if WeakAuras.IsAwesomeEnabled() then - Private.classification_types.minus = L["Minus (Small Nameplate)"] -end Private.creature_type_types = { [1] = L["Beast"], @@ -2817,7 +2805,7 @@ Private.send_chat_message_types = { PRINT = L["Chat Frame"], ERROR = L["Error Frame"] } -if WeakAuras.IsAwesomeEnabled() == 2 then +if WeakAuras.IsTTSEnabled() then Private.send_chat_message_types.TTS = L["Text-to-speech"] end @@ -3520,21 +3508,17 @@ Private.multiUnitId = { ["partypets"] = true, ["partypetsonly"] = true, ["raid"] = true, + ["nameplate"] = true, } -if WeakAuras.IsAwesomeEnabled() then - Private.multiUnitId["nameplate"] = true -end Private.multiUnitUnits = { ["boss"] = {}, ["arena"] = {}, ["group"] = {}, ["party"] = {}, - ["raid"] = {} + ["raid"] = {}, + ["nameplate"] = {}, } -if WeakAuras.IsAwesomeEnabled() then - Private.multiUnitUnits["nameplate"] = {} -end Private.multiUnitUnits.group["player"] = true Private.multiUnitUnits.party["player"] = true @@ -3568,11 +3552,10 @@ for i = 1, 40 do Private.multiUnitUnits.group["raidpet"..i] = true Private.multiUnitUnits.raid["raidpet"..i] = true end -if WeakAuras.IsAwesomeEnabled() then - for i = 1, 100 do - Private.baseUnitId["nameplate"..i] = true - Private.multiUnitUnits.nameplate["nameplate"..i] = true - end + +for i = 1, 100 do + Private.baseUnitId["nameplate"..i] = true + Private.multiUnitUnits.nameplate["nameplate"..i] = true end Private.dbm_types = { diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua index ecc2a2f..7ea652d 100644 --- a/WeakAuras/WeakAuras.lua +++ b/WeakAuras/WeakAuras.lua @@ -2853,19 +2853,20 @@ function Private.UpdateSoundIcon(data) end -- tts - if WeakAuras.IsAwesomeEnabled() ~= 2 then return end - if (data.actions.start.do_message and data.actions.start.message_type == "TTS") - or (data.actions.finish.do_message and data.actions.finish.message_type == "TTS") - then - Private.AuraWarnings.UpdateWarning(data.uid, "tts_action", "tts", L["This aura plays a Text To Speech via an action."]) - else - Private.AuraWarnings.UpdateWarning(data.uid, "tts_action") - end + if WeakAuras.IsTTSEnabled() then + if (data.actions.start.do_message and data.actions.start.message_type == "TTS") + or (data.actions.finish.do_message and data.actions.finish.message_type == "TTS") + then + Private.AuraWarnings.UpdateWarning(data.uid, "tts_action", "tts", L["This aura plays a Text To Speech via an action."]) + else + Private.AuraWarnings.UpdateWarning(data.uid, "tts_action") + end - if ttsCondition then - Private.AuraWarnings.UpdateWarning(data.uid, "tts_condition", "tts", L["This aura plays a Text To Speech via a condition."]) - else - Private.AuraWarnings.UpdateWarning(data.uid, "tts_condition") + if ttsCondition then + Private.AuraWarnings.UpdateWarning(data.uid, "tts_condition", "tts", L["This aura plays a Text To Speech via a condition."]) + else + Private.AuraWarnings.UpdateWarning(data.uid, "tts_condition") + end end end @@ -2955,9 +2956,6 @@ function WeakAuras.PreAdd(data, snapshot) end end validateUserConfig(data, data.authorOptions, data.config) - if not(WeakAuras.IsAwesomeEnabled()) then - removeNameplateUnitsAndAnchors(data) - end data.init_started = nil data.init_completed = nil data.expanded = nil @@ -3365,7 +3363,7 @@ function Private.HandleChatAction(message_type, message, message_dest, message_d if(message_type == "PRINT") then DEFAULT_CHAT_FRAME:AddMessage(message, r or 1, g or 1, b or 1); elseif message_type == "TTS" then - if WeakAuras.IsAwesomeEnabled() == 2 then + if WeakAuras.IsTTSEnabled() then if not Private.SquelchingActions() then pcall(function() local voice = C_TTSSettings and C_TTSSettings.GetSpeechVoiceID() diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc index d8b40a8..22cf0ac 100644 --- a/WeakAuras/WeakAuras.toc +++ b/WeakAuras/WeakAuras.toc @@ -19,10 +19,9 @@ ## DefaultState: Enabled ## LoadOnDemand: 0 ## SavedVariables: WeakAurasSaved -## OptionalDeps: Ace3, LibCompress, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, Masque, GTFO, LibButtonGlow-1.0, LibSpellRange-1.0, LibRangeCheck-2.0, LibDBIcon-1.0, LibGetFrame-1.0, LibGroupTalents, !!AddonLocale, CustomNames, BigWigs, DBM-Core, AwesomeCVar +## OptionalDeps: Ace3, LibCompress, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, Masque, GTFO, LibButtonGlow-1.0, LibSpellRange-1.0, LibRangeCheck-2.0, LibDBIcon-1.0, LibGetFrame-1.0, LibGroupTalents, !!AddonLocale, CustomNames, BigWigs, DBM-Core Compatibility.lua -Pools.lua # External code + initialization embeds.xml diff --git a/WeakAurasOptions/ActionOptions.lua b/WeakAurasOptions/ActionOptions.lua index d07a07c..1cdfe96 100644 --- a/WeakAurasOptions/ActionOptions.lua +++ b/WeakAurasOptions/ActionOptions.lua @@ -214,7 +214,7 @@ function OptionsPrivate.GetActionOptions(data) name = "", order = 3.19, image = function() return "", 0, 0 end, - hidden = function() return WeakAuras.IsAwesomeEnabled() ~= 2 or data.actions.start.message_type ~= "TTS" end, + hidden = function() return not WeakAuras.IsTTSEnabled() or data.actions.start.message_type ~= "TTS" end, }, start_message_tts_settings = { type = "execute", @@ -228,8 +228,8 @@ function OptionsPrivate.GetActionOptions(data) or L["Install AwesomeCVar to open the Voice Chat settings."], name = L["Voice Settings"], order = 3.2, - disabled = function() return WeakAuras.IsAwesomeEnabled() ~= 2 or not data.actions.start.do_message end, - hidden = function() return WeakAuras.IsAwesomeEnabled() ~= 2 or data.actions.start.message_type ~= "TTS" end, + disabled = function() return not WeakAuras.IsTTSEnabled() or not data.actions.start.do_message end, + hidden = function() return not WeakAuras.IsTTSEnabled() or data.actions.start.message_type ~= "TTS" end, }, start_message = { type = "input", @@ -742,7 +742,7 @@ function OptionsPrivate.GetActionOptions(data) name = "", order = 23.19, image = function() return "", 0, 0 end, - hidden = function() return WeakAuras.IsAwesomeEnabled() ~= 2 or data.actions.finish.message_type ~= "TTS" end, + hidden = function() return not WeakAuras.IsTTSEnabled() or data.actions.finish.message_type ~= "TTS" end, }, finish_message_tts_settings = { type = "execute", @@ -756,8 +756,8 @@ function OptionsPrivate.GetActionOptions(data) or L["Install AwesomeCVar to open the Voice Chat settings."], name = L["Voice Settings"], order = 23.2, - disabled = function() return WeakAuras.IsAwesomeEnabled() ~= 2 or not data.actions.finish.do_message end, - hidden = function() return WeakAuras.IsAwesomeEnabled() ~= 2 or data.actions.finish.message_type ~= "TTS" end, + disabled = function() return not WeakAuras.IsTTSEnabled() or not data.actions.finish.do_message end, + hidden = function() return not WeakAuras.IsTTSEnabled() or data.actions.finish.message_type ~= "TTS" end, }, finish_message = { type = "input", diff --git a/WeakAurasOptions/ConditionOptions.lua b/WeakAurasOptions/ConditionOptions.lua index 442fba0..7845b6c 100644 --- a/WeakAurasOptions/ConditionOptions.lua +++ b/WeakAurasOptions/ConditionOptions.lua @@ -1016,7 +1016,7 @@ local function addControlsForChange(args, order, data, conditionVariable, totalA } order = order + 1; - if WeakAuras.IsAwesomeEnabled() == 2 then + if WeakAuras.IsTTSEnabled() then args["condition" .. i .. "value" .. j .. "message voice"] = { type = "execute", name = L["Voice Settings"], diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua index ce68404..13119ee 100644 --- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua +++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua @@ -520,14 +520,6 @@ function OptionsPrivate.CreateFrame() changelogButton:SetPoint("LEFT", thanksButton, "RIGHT", footerSpacing, 0) end - local awesomeWotlkButton - if not WeakAuras.IsAwesomeEnabled() then - awesomeWotlkButton = addFooter("Awesome WotLK", [[Interface\AddOns\WeakAuras\Media\Textures\GitHub.tga]], "https://github.com/someweirdhuman/awesome_wotlk", - L["Unlock nameplate anchoring & units and Text-to-speech in WeakAuras with the Awesome WotLK client patch."]) - awesomeWotlkButton:SetParent(tipFrame) - awesomeWotlkButton:SetPoint("LEFT", changelogButton or thanksButton, "RIGHT", footerSpacing, 0) - end - local reportbugButton = addFooter(L["Found a Bug?"], [[Interface\AddOns\WeakAuras\Media\Textures\bug_report.tga]], "https://github.com/NoM0Re/WeakAuras-WotLK/issues", L["Report bugs on our issue tracker."], nil, nil, true) reportbugButton:SetParent(tipFrame) diff --git a/WeakAurasOptions/RegionOptions/DynamicGroup.lua b/WeakAurasOptions/RegionOptions/DynamicGroup.lua index b0dd42b..bc440ba 100644 --- a/WeakAurasOptions/RegionOptions/DynamicGroup.lua +++ b/WeakAurasOptions/RegionOptions/DynamicGroup.lua @@ -173,11 +173,9 @@ local function createOptions(id, data) values = function() local v = { ["UNITFRAME"] = L["Unit Frames"], - ["CUSTOM"] = L["Custom Frames"] + ["CUSTOM"] = L["Custom Frames"], + ["NAMEPLATE"] = L["Nameplates"] } - if WeakAuras.IsAwesomeEnabled() then - v["NAMEPLATE"] = L["Nameplates"] - end return v end, hidden = function() return data.grow == "CUSTOM" end,