Skip to content

Commit

Permalink
Version 5.7.1 Hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Shredmaster Reeman committed Nov 13, 2018
1 parent ae60029 commit 73f21b0
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 25 deletions.
6 changes: 3 additions & 3 deletions LuiExtended.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LUIE = {}
LUIE.name = "LuiExtended"
LUIE.author = "ArtOfShred, psypanda & SpellBuilder"
LUIE.version = "5.7"
LUIE.version = "5.7.1"
LUIE.website = "http://www.esoui.com/downloads/info818-LuiExtended.html"
LUIE.github = "https://github.com/ArtOfShred/LuiExtended"

Expand Down Expand Up @@ -567,7 +567,7 @@ local function LUIE_OnAddOnLoaded(eventCode, addonName)
local isPassive = skillData:IsPassive()

local detailedName = (isPassive and skillData:GetNumRanks() > 1) and skillProgressionData:GetFormattedNameWithRank() or skillProgressionData:GetFormattedName()
detailedName = detailedName:gsub("With", "with")
detailedName = detailedName:gsub("With", "with") -- Easiest way to fix the capitalization of the skill "Bond With Nature" (the only skill name we overwrite in the menu) is by using this.
ability.nameLabel:SetText(detailedName)
ability.nameLabel:SetColor(PURCHASED_COLOR:UnpackRGBA())
ability.lock:SetHidden(skillProgressionData:IsUnlocked())
Expand Down Expand Up @@ -910,7 +910,7 @@ local function LUIE_OnAddOnLoaded(eventCode, addonName)
else
detailedName = skillProgressionData:GetFormattedName()
end
detailedName = detailedName:gsub("With", "with")
detailedName = detailedName:gsub("With", "with") -- Easiest way to fix the capitalization of the skill "Bond With Nature" (the only skill name we overwrite in the menu) is by using this.
ability.nameLabel:SetText(detailedName)

if isPurchased then
Expand Down
2 changes: 1 addition & 1 deletion LuiExtended.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Title: |cE12000L|cFFFFB0ui E|rxtended|
## Author: ArtOfShred, psypanda, SpellBuilder
## Version: 5.7
## Version: 5.7.1
## APIVersion: 100025
## Description: Provides UnitFrames, InfoPanel, Combat Text & Info, Buffs & Debuff Tracking, Chat Announcements and Slash Commands.
## OptionalDependsOn: LibStub LibAddonMenu-2.0 LibMediaProvider-1.0 LibMsgWin-1.0
Expand Down
7 changes: 5 additions & 2 deletions LuiExtendedWelcome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ local windowManager = WINDOW_MANAGER

local fillMessages = {

"|cFFA5005.7.1|r",
"• Unit Frames - Fixed an issue where the default Player / Target / Group frames would fail to display even when enabled in the menu. This setting has been updated and the Saved Variables have been reset. Default Frames will be disabled by default and can be re-enabled by changing the menu option.",
"|",
"|cFFA5005.7 (Murkmire)|r",
"|cFFFF00General:|r",
"• Did some various minor optimization, removing some old and un-needed functions and adjusting a few functions that were enabled all the time to only be used when relevant options are enabled.",
Expand Down Expand Up @@ -133,8 +136,8 @@ function LUIE_WelcomeScreen(menu)

local buffer = luiChangeLog:GetNamedChild("Buffer")
local slider = luiChangeLog:GetNamedChild("Slider")
buffer:SetScrollPosition(51)
slider:SetValue(buffer:GetNumHistoryLines() - 51)
buffer:SetScrollPosition(54)
slider:SetValue(buffer:GetNumHistoryLines() - 54)

end
-- Set version to current version.
Expand Down
37 changes: 18 additions & 19 deletions modules/UnitFrames.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ UF.D = {
RepositionFrames = true,
DefaultOocTransparency = 85,
DefaultIncTransparency = 85,
DefaultFramesPlayer = false,
DefaultFramesTarget = false,
DefaultFramesGroup = false,
DefaultFramesBoss = nil,
DefaultFramesNewPlayer = 1,
DefaultFramesNewTarget = 1,
DefaultFramesNewGroup = 1,
DefaultFramesNewBoss = 2,
Format = "Current + Shield (Percentage%)",
DefaultFontFace = "Univers 67",
DefaultFontStyle = "soft-shadow-thick",
Expand Down Expand Up @@ -330,22 +330,21 @@ function UF.GetDefaultFramesOptions(frame)
end

function UF.SetDefaultFramesSetting(frame, value)
local key = "DefaultFrames" .. tostring(frame)
local key = "DefaultFramesNew" .. tostring(frame)
if value == g_DefaultFramesOptions[3] then
UF.SV[key] = true
elseif value == g_DefaultFramesOptions[1] then
UF.SV[key] = false
UF.SV[key] = 3
elseif value == g_DefaultFramesOptions[2] then
UF.SV[key] = 2
else
UF.SV[key] = nil
UF.SV[key] = 1
end
end

function UF.GetDefaultFramesSetting(frame, default)
local key = "DefaultFrames" .. tostring(frame)
local key = "DefaultFramesNew" .. tostring(frame)
local from = default and UF.D or UF.SV
local value = from[key]
local out_key = (value == true) and 3 or (value == false) and 1 or 2
return g_DefaultFramesOptions[out_key]
return g_DefaultFramesOptions[value]
end

-- Right Click function for group frames - basically just a copy of the ZOS group frame menu options
Expand Down Expand Up @@ -498,14 +497,14 @@ local function CreateDefaultFrames()
-- Create text overlay for default unit frames for player and reticleover.
local default_controls = {}

if UF.SV.DefaultFramesPlayer then
if UF.SV.DefaultFramesNewPlayer == 3 then
default_controls.player = {
[POWERTYPE_HEALTH] = ZO_PlayerAttributeHealth,
[POWERTYPE_MAGICKA] = ZO_PlayerAttributeMagicka,
[POWERTYPE_STAMINA] = ZO_PlayerAttributeStamina,
}
end
if UF.SV.DefaultFramesTarget then
if UF.SV.DefaultFramesNewTarget == 3 then
default_controls.reticleover = { [POWERTYPE_HEALTH] = ZO_TargetUnitFramereticleover, }
-- g_DefaultFrames.reticleover should be always present to hold target classIcon and friendIcon
else
Expand Down Expand Up @@ -537,15 +536,15 @@ local function CreateDefaultFrames()
tableinsert( g_targetUnitFrame.fadeComponents, g_DefaultFrames.reticleover.friendIcon )

-- When default Group frame in use, then create dummy boolean field, so this setting remain constant between /reloadui calls
if UF.SV.DefaultFramesGroup then
if UF.SV.DefaultFramesNewGroup == 3 then
g_DefaultFrames.SmallGroup = true
end

-- Apply fonts
UF.DefaultFramesApplyFont()

-- Instead of using Default Unit Frames Extender, the player could wish simply to disable and hide default UI frames
if UF.SV.DefaultFramesPlayer == false then
if UF.SV.DefaultFramesNewPlayer == 1 then
local frames = { "Health" , "Stamina" , "Magicka" , "MountStamina" , "Werewolf", "SiegeHealth" }
for i = 1 , #frames do
local frame = _G["ZO_PlayerAttribute"..frames[i]]
Expand Down Expand Up @@ -1371,7 +1370,7 @@ function UF.Initialize( enabled )
end
self.healthText:SetText(ZO_FormatResourceBarCurrentAndMax(totalHealth, totalMaxHealth))

if UF.SV.DefaultFramesBoss == nil then
if UF.SV.DefaultFramesNewBoss == 2 then
COMPASS_FRAME:SetBossBarActive(totalHealth > 0)
end
end
Expand Down Expand Up @@ -1951,7 +1950,7 @@ function UF.OnReticleTargetChanged(eventCode)
end

-- Finally if user does not want to have default target frame we have to hide it here all the time
if not g_DefaultFrames.reticleover[POWERTYPE_HEALTH] and UF.SV.DefaultFramesTarget == false then
if not g_DefaultFrames.reticleover[POWERTYPE_HEALTH] and UF.SV.DefaultFramesNewTarget == 1 then
ZO_TargetUnitFramereticleover:SetHidden( true )
end
end
Expand Down Expand Up @@ -3132,7 +3131,7 @@ function UF.OnBossesChanged( eventCode )
end

function LUIE.UnitFrames.ResetCompassBarMenu()
if UF.SV.DefaultFramesBoss == nil then
if UF.SV.DefaultFramesNewBoss == 2 then
for i = 1, 6 do
local unitTag = "boss" .. i
if DoesUnitExist(unitTag) then
Expand Down

0 comments on commit 73f21b0

Please sign in to comment.