Merge pull request #157 from ArtOfShred/develop

6.0.6

Changelog.lua

@@ -6,58 +6,33 @@
 local zo_strformat = zo_strformat
 
 local changelogMessages = {
-    "|cFFA500LuiExtended Version 6.0.5|r",
+    "|cFFA500LuiExtended Version 6.0.6|r",
     "",
     "|cFFFF00General:|r",
-    "[*] Updated icons, tooltips, alerts, and cc tracker for several dungeons (EH I & EH II, COA I & COA II, and Tempest Island) as well as a multitude of monster attacks.",
+    "[*] Updated the icons for Flying Immunites, Boss Immunites, Major Vulnerability Immunity, Off-Balance Immunity, Minor Toughness, as well as the icons for Major and Minor Aegis, Slayer, and Courage.",
+    "[*] Added an option to the base LuiExtended menu to unlock several default UI elements - Quest Tracker, Battleground Score, Loot History, and Equipment Status.",
     "",
     "|cFFFF00Buffs & Debuffs:|r",
-    "[*] Fixed an issue where the default tooltips for abilities weren't displaying in the Active Effects Window on both the keyboard and gamepad UI.",
+    "[*] Housing Target dummies will now display a \"Boss Immunities\" buff.",
+    "[*] Added a \"Custom Icon & Normalization Options\" menu to Buffs & Debuffs. Added 3 individual options in this menu that allow you to toggle the custom icons for potion/poison/status effects that have a major/minor effect with the major/minor effect icon. The option for poisons is enabled by default.",
     "",
     "|cFFFF00Chat Announcements:|r",
-    "[*] Added a workaround for duplicate Quest Accepted messages displayed in chat if enabled when using Dolgubon's Lazy Writ Crafter.",
+    "[*] Added an option to display \"Container\" loot messages in Chat Announcements when you empty a container item in your inventory and it is removed.",
+    "[*] Fixed some minor timing issues with the Chat Printer (the chat printer operates on a 50ms throttle to allow any event messages to be properly ordered - some events don't properly line up so they now delay the printer slightly so all queued messages display simultaneously.",
+    "[*] The throttle settings for Tel Var Stones no longer apply to stones when looting them from a chest/container.",
+    "[*] Achievement Tracking Categories are now hardcoded into the menu so I don't have to update the categories with each game update. This will cause these settings to reset for anyone who modified them.",
+    "[*] Added an option to always show the Center Screen Announcement for Achievement Completion even if you have the category filtered out. This is how Achievement Tracking worked before this option was implemented - so it is enabled by default.",
     "",
     "|cFFFF00Slash Commands:|r",
-    "[*] Updated the /cake command to summon the 2020 anniversary cake and updated the icon. Too little too late at this point.",
-    "[*] Slash Commands are no longer set to nil when disabled in the options menu, this means you will need to reload the UI when disabling slash commands you don't want to use. This is to stop LUIE from removing commands if another addon also adds the same slash command with similar functionality.",
+    "[*] Using the /friend Slash Command now displays a prompt confirming the name entry & allows you to type a note to that person.",
     "",
-    "|cFFA500LuiExtended Version 6.0.4|r",
-    "",
-    "|cFFFF00General:|r",
-    "[*] Updated icons, tooltips, alerts, and cc tracker for Crypt of Hearts I.",
-    "[*] Updated and added a good chunk of improved custom icons.",
-    "",
-    "|cFFFF00Chat Announcements:|r",
-    "[*] Fixed an issue where Friend logon/logoff messages would duplicate when using pChat, now my tatsumaki is more powerful.",
-    "[*] Fixed an issue where the Center Screen Announcement for completing a lore collection for a zone that resulted in Mages Guild reputation gain would throw a UI error & fixed an issue where the Chat Announcement for this event had an icon that was colored by the default system text color.",
-    "",
-    "|cFFFF00Combat Info:|r",
-    "[*] Fixed an issue where the fallback font variable was misnamed. This could cause the addon to fail to load if for some reason the selected font wasn't found.",
-    "[*] Removed a debug line from Ability Alerts that could display when enemies used abilities.",
-    "",
-    "|cFFA500LuiExtended Version 6.0.3|r",
-    "",
-    "|cFFFF00Slash Commands:|r",
-    "[*] Fixed an issue where using the /fence Slash Command or Keybinding would throw an error.",
-    "[*] When summoning a banker, fence, or merchant with the keybinding, your Chat Announcement setting will now determine if a feedback chat message is displayed. Note that using the slash command will still always return feedback into chat.",
-    "",
-    "|cFFA500LuiExtended Version 6.0.2|r",
-    "",
-    "|cFFFF00General:|r",
-    "[*] Added a keybinding option for \"Leave Group.\"",
-    "",
-    "|cFFFF00Chat Announcements:|r",
-    "[*] Restored the ability to print chat messages to specific chat tabs.",
-    "[*] Removed the \"Enable pChat Message Saving\" setting and replaced it with an \"Allow Addons to Modify LUIE Messages.\" It has the same functionality but is disabled by default. This setting can always be enabled now instead of toggling off when selecting the option to print to specific chat tabs (it still won't effect messages printed to specific tabs but will handle system messages if you choose to print those in all tabs).",
-    "[*] Fixed an issue where having LibChatMessage enabled would bypass some Chat Announcements toggle settings, the most common being friends logging on & off. Now if you choose to disable these messages, they will cease to display properly.",
-    "[*] Fixed an issue where promoting a player to group leader or being promoted to group leader sometimes wouldn't properly show the promotion chat message/alert.",
-    "",
-    "|cFFA500LuiExtended Version 6.0.1|r",
-    "",
-    "|cFFFF00General:|r",
-    "[*] Fixed an issue with the Crowd Control Tracker where \"Player Set AOE\" was using the setting for \"Player Ultimate AOE.\"",
-    "[*] Fixed an issue where the keybinding options for Summon Banker/Merchant were reversed (Banker key summoned Merchant and vice versa).",
-    "[*] Fixed a few strings missing from the German translation.",
+    "|cFFFF00Unit Frames:|r",
+    "[*] Unit Frame names will no longer abbreviate to \"...\" when cut off and will now truncate instead. This allows for better use of the frame space.",
+    "[*] Added resurrection monitoring status to Group & Raid Unit Frames - now you will be able to see when a target is being resurrected, has a pending resurrection, or is self-reviving. This label updates dynamically and replaces the \"Dead\" label when one of these conditions is met.",
+    "[*] Updated the right click handler for custom Group Unit Frames to allow you to request to add the player as a friend.",
+    "[*] Increased the default Raid Frame width by 20 units. This won't modify your current settings.",
+    "[*] Added Unit Frames for pets - with a new color option for the pet bar and the option to color the bar by your Class color.",
+    "[*] Added a name blacklist for the new pet frames. Entering a pet name (not case-sensitive) will hide it from displaying on your UI.",
     "",
     "|cFFA500LuiExtended Version 6.0.0|r",
     "",

Hooks.lua

@@ -484,6 +484,16 @@ function LUIE.InitializeHooks()
                         end
                     end
 
+                    -- TODO: Implement this functionality but it needs to have a filter for ONLY specific ids.
+                    --[[
+                    -- Display Default Description if no internal effect description is present
+                    if tooltipText == "" or tooltipText == nil then
+                        if GetAbilityDescription(abilityId) ~= "" then
+                            tooltipText = GetAbilityDescription(abilityId)
+                        end
+                    end
+                    ]]--
+
                     -- Override custom tooltip with default tooltip if this ability is flagged to do so (scaling buffs like Mundus Stones)
                     if LUIE.Data.Effects.TooltipUseDefault[abilityId] then
                         if GetAbilityEffectDescription(buffSlot) ~= "" then

Initialize.lua

@@ -79,6 +79,8 @@ local function OnAddonOnLoaded(eventCode, addonName)
 
     -- Initialize Hooks
     LUIE.InitializeHooks()
+    -- Set Positions for moved Default UI elements
+    LUIE.SetElementPosition()
 
     LUIE.PlayerNameRaw = GetRawUnitName("player")
     LUIE.PlayerNameFormatted = zo_strformat(SI_UNIT_NAME, GetUnitName("player"))

LuiExtended.lua

@@ -8,7 +8,7 @@ if LUIE == nil then LUIE = {} end
 
 LUIE.tag         = "LUIE"
 LUIE.name        = "LuiExtended"
-LUIE.version     = "6.0.5"
+LUIE.version     = "6.0.6"
 LUIE.author      = "ArtOfShred, psypanda & SpellBuilder"
 LUIE.website     = "https://www.esoui.com/downloads/info818-LuiExtended.html"
 LUIE.github      = "https://github.com/ArtOfShred/LuiExtended"

LuiExtended.txt

@@ -1,8 +1,8 @@
 ## Title: |cE12000L|cFFFFB0ui E|rxtended|
 ## Author: ArtOfShred, psypanda, SpellBuilder
-## Version: 6.0.5
+## Version: 6.0.6
 ## APIVersion: 100030 100031
-## AddOnVersion: 605
+## AddOnVersion: 606
 ## Description: Provides UnitFrames, InfoPanel, Combat Text & Info, Buffs & Debuff Tracking, Chat Announcements and Slash Commands.
 ## DependsOn: LibAddonMenu-2.0 LibMediaProvider-1.0
 ## OptionalDependsOn: LibStub LibChatMessage pChat
@@ -60,6 +60,8 @@ i18n/settings/Settings_$(language).lua
 i18n/skills/Skills_en.lua
 i18n/skills/Skills_$(language).lua
 
+Unlock.lua
+
 data/Globals.lua
 data/AbilityTables.lua
 data/Tooltips.lua

Unlock.lua

@@ -0,0 +1,85 @@
+--[[
+    LuiExtended
+    License: The MIT License (MIT)
+--]]
+
+local UI = LUIE.UI
+
+local WM = GetWindowManager()
+
+local firstRun = true
+local savedHiddenStates = { }
+
+-- Table of UI elements to unlock for moving.
+-- Constraints for some of these elements need to be adjusted - using values from Azurah.
+local defaultPanels = {
+    --[ZO_HUDInfamyMeter]	= { "Infamy Meter" },
+    --[ZO_HUDTelvarMeter]	= { "Tel Var Meter" },
+    --[ZO_HUDDaedricEnergyMeter] = { "Volendrung Meter" },
+    [ZO_HUDEquipmentStatus]	= { GetString(SI_LUIE_DEFAULT_FRAME_EQUIPMENT_STATUS) },
+    [ZO_FocusedQuestTrackerPanel] = { GetString(SI_LUIE_DEFAULT_FRAME_QUEST_LOG), nil, 200 },
+    [ZO_LootHistoryControl_Keyboard] = { GetString(SI_LUIE_DEFAULT_FRAME_LOOT_HISTORY), 280, 400 },
+    [ZO_BattlegroundHUDFragmentTopLevel] = { GetString(SI_LUIE_DEFAULT_FRAME_BATTLEGROUND_SCORE) },
+}
+
+function LUIE.SetElementPosition()
+    for k,v in pairs(defaultPanels) do
+        local frameName = k:GetName()
+        if LUIE.SV[frameName] then
+            local x = LUIE.SV[frameName][1]
+            local y = LUIE.SV[frameName][2]
+            if x ~= nil and y ~= nil then
+                k:ClearAnchors()
+                k:SetAnchor(TOPLEFT, GuiRoot, TOPLEFT, x, y)
+            end
+        end
+    end
+end
+
+function LUIE.SetupElementMover(state)
+    for k,v in pairs(defaultPanels) do
+        if firstRun then
+            -- Clamp these elements to screen so we can't drag them off
+            k:SetClampedToScreen ( true )
+            -- Adjust constraints so we can move elements.
+            if v[2] then
+				k:SetWidth(v[2])
+            end
+            if v[3] then
+                k:SetHeight(v[3])
+            end
+            k.customPositionAttr = k:GetName()
+            k.preview = UI.Backdrop( k, "fill", nil, nil, nil, false )
+            k.preview:SetDrawLayer(DL_OVERLAY)
+            k.preview:SetDrawLevel(3)
+            k.preview:SetDrawTier(DT_HIGH)
+            k.previewLabel = UI.Label( k.preview, {CENTER,CENTER}, nil, nil, "ZoFontGameMedium", v[1], false )
+            k.previewLabel:SetDrawLayer(DL_OVERLAY)
+            k.previewLabel:SetDrawLevel(4)
+            k.previewLabel:SetDrawTier(DT_HIGH)
+            k:SetHandler( "OnMoveStop", function(self)
+                LUIE.SV[self.customPositionAttr] = { self:GetLeft(), self:GetTop() }
+            end)
+        end
+        k:SetMouseEnabled ( state )
+        k:SetMovable ( state )
+        k.preview:SetHidden( not state )
+        if state == false then
+            if savedHiddenStates[k.customPositionAttr] then
+                k:SetHidden ( savedHiddenStates[k.customPositionAttr] )
+            end
+        else
+            savedHiddenStates[k.customPositionAttr] = k:IsHidden()
+            k:SetHidden ( false )
+        end
+    end
+    firstRun = false
+end
+
+-- Reset position of windows. Called from Settings Menu.
+function LUIE.ResetElementPosition()
+    for k,v in pairs(defaultPanels) do
+        LUIE.SV[k.customPositionAttr] = nil
+    end
+    ReloadUI()
+end

data/AbilityTables.lua

@@ -910,7 +910,6 @@ local AbilityTables = {
     Skill_Razor_Armor                 = 36304,
 
     Skill_Pariahs_Resolve             = 116095,
-    Skill_Ruinous_Cyclone             = 116096,
     Skill_Consume_Lifeforce           = GetString(SI_LUIE_SKILL_CONSUME_LIFEFORCE),
 
     -- ---------------------------------------------------

data/AlertTable.lua

@@ -341,7 +341,7 @@ LUIE.Data.AlertTable = {
     [5262] = { avoid = true, interrupt = true, priority = 3, auradetect = true, duration = 4000 }, -- Burning Ground (Shalk)
 
     [8429] = { interrupt = true, priority = 3, refire = 750, result = ACTION_RESULT_BEGIN, duration = 4600 }, -- Zap (Thunderbug)
-    [26412] = { avoid = true, interrupt = true, priority = 3, result = ACTION_RESULT_BEGIN, duration = 1500 }, -- Thunderstrikes (Thunderbug)
+    [26412] = { avoid = true, interrupt = true, priority = 3, result = ACTION_RESULT_BEGIN, duration = 1500, postCast = 1800 }, -- Thunderstrikes (Thunderbug)
 
     [73172] = { dodge = true, interrupt = true, priority = 3, result = ACTION_RESULT_BEGIN, duration = 3667, cc = LUIE_CC_TYPE_SNARE }, -- Swarm (Kotu Gava Broodmother)
     [73199] = { avoid = true, priority = 3, eventdetect = true, result = ACTION_RESULT_EFFECT_GAINED, cc = LUIE_CC_TYPE_SNARE }, -- Swarmburst (Kotu Gava Broodmother)

data/DebugTable.lua

@@ -891,6 +891,7 @@ LUIE.DebugAuras = {
     [46733] = true, -- Reduce Stamina Cost (Glyph of Reduce Feat Cost)
     [26750] = true, -- Reduce Magicka Cost (Glyph of Reduce Spell Cost)
     [46739] = true, -- Reduce Block and Bash Cost (Glyph of Shielding)
+    [140300] = true, -- Prismatic Reduced Cost (Glyph of Reduced Skill Cost)
 
     -- Weapon Enchants
     [28919] = true, -- Life Drain (Glyph of Absorb Health)
@@ -2492,6 +2493,7 @@ LUIE.DebugAuras = {
     [61426] = true, -- Shadowstrike (The Shadow 120 - Shadowstrike)
     [64244] = true, -- Shadowstrike (The Shadow 120 - Shadowstrike)
     [64245] = true, -- Shadowstrike (The Shadow 120 - Shadowstrike)
+    [140520] = true, -- Shadowstrike (The Shadow 120 - Shadowstrike)
     [77773] = true, -- Clairvoyance Fx (The Shadow 120 - Shadowstrike)
 
     -- The Apprentice
@@ -5269,6 +5271,7 @@ LUIE.DebugAuras = {
     [126537] = true, -- Minor Endurance (Rally)
     [60894] = true, -- Heal Buffer (Rally)
     [60895] = true, -- Heal Buff (Rally)
+    [60996] = true, -- Buff Remover (Rally)
     [38805] = true, -- Rally (Rally)
 
     [83216] = true, -- Berserker Strike (Berserker Strike)
@@ -5852,7 +5855,8 @@ LUIE.DebugAuras = {
     -------------------------------------
 
     [16145] = true, -- Light Attack
-    [16212] = true, -- Heavy Attack
+    [16212] = true, -- Restoration Staff Channel
+    [67022] = true, -- Restoration Staff Heavy Attack
     [32760] = true, -- Heavy Attack (Restoration)
     [67106] = true, -- Partial Heavy Attack (Resto)
 
@@ -10406,6 +10410,18 @@ LUIE.DebugAuras = {
     [83886] = true, -- Shadow Flare (Magdelena)
     [83883] = true, -- Shadow Flare (Magdelena)
 
+    -------------------------------------
+    -- QUESTS - SHARED ------------------
+    -------------------------------------
+
+    [55831] = true, -- Found Recommended Ore (Blacksmith Certification)
+	[56061]	= true, -- Found Recommended Jute (Clothier Certification)
+	[55965]	= true, -- Found Recommended Maple (Woodworker Certification)
+	[56266]	= true, -- Found Recommended Solvent and (Alchemist Certification)
+	[56256]	= true, -- Found Recommended Runestones (Enchanter Certification)
+	[55983]	= true, -- Found Recommended Ingredients (Provisioner Certification)
+	[103376] = true, -- Found Recommended Dust (Jewelry Crafting Certification)
+
     -------------------------------------
     -- MAIN QUEST -----------------------
     -------------------------------------
@@ -15398,8 +15414,9 @@ LUIE.DebugAuras = {
     [116366] = true, -- Pariah's Resolve (Pariah's Resolve)
 
     [116096] = true, -- Ruinous Cyclone (Ruinous Cyclone)
-    [116669] = true, -- Ebony Cyclone (Ruinous Cyclone)
-    [116680] = true, -- Ebony Cyclone (Ruinous Cyclone)
+    [116669] = true, -- Ruinous Cyclone (Ruinous Cyclone)
+    [116680] = true, -- Ruinous Cyclone (Ruinous Cyclone)
+    [116678] = true, -- Ruinous Cyclone (Ruinous Cyclone)
 
     -- Siege Warfare
     [35106] = true, -- Fire (Firepot Trebuchet)