- big giant options screen usability cleanup:

- colorized the FAQ and Module Settings description text to be more readable
- removed custom coloring from certain options that didn't match the rest
- hid a few debug-only settings
- consolidated all the 'create custom module' buttons into a drop-down + create button
- clarified description of some options so that their intent/purpose is more clear
- moved around/cleaned up headers for consistency
- doubled the width of long options so that they don't get cut off and ...'d
This commit is contained in:
Parnic
2010-09-12 22:36:02 +00:00
parent cc9dbc283e
commit 1961b66f57
25 changed files with 367 additions and 446 deletions

View File

@ -112,7 +112,7 @@ function IceBarElement.prototype:GetOptions()
opts["side"] = opts["side"] =
{ {
type = 'select', type = 'select',
name = '|c' .. self.configColor .. 'Side|r', name = 'Side|r',
desc = 'Side of the HUD where the bar appears', desc = 'Side of the HUD where the bar appears',
get = function(info) get = function(info)
if (self.moduleSettings.side == IceCore.Side.Right) then if (self.moduleSettings.side == IceCore.Side.Right) then
@ -139,7 +139,7 @@ function IceBarElement.prototype:GetOptions()
opts["offset"] = opts["offset"] =
{ {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Offset|r', name = 'Offset',
desc = 'Offset of the bar', desc = 'Offset of the bar',
min = -10, min = -10,
max = 15, max = 15,
@ -154,13 +154,13 @@ function IceBarElement.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 31 order = 30.01
} }
opts["scale"] = opts["scale"] =
{ {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Scale|r', name = 'Scale',
desc = 'Scale of the bar', desc = 'Scale of the bar',
min = 0.1, min = 0.1,
max = 2, max = 2,
@ -176,7 +176,7 @@ function IceBarElement.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 32 order = 30.02
} }
opts["inverse"] = opts["inverse"] =
@ -195,7 +195,7 @@ function IceBarElement.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 32 order = 30.03
} }
opts["reverse"] = opts["reverse"] =
@ -214,14 +214,9 @@ function IceBarElement.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 32 order = 30.04
} }
opts["headerVisibility"] = {
type = 'header',
name = 'Visibility settings',
order = 27
}
opts["barVisible"] = { opts["barVisible"] = {
type = 'toggle', type = 'toggle',
name = 'Bar visible', name = 'Bar visible',
@ -266,13 +261,13 @@ function IceBarElement.prototype:GetOptions()
if not self.moduleSettings.hideAnimationSettings then if not self.moduleSettings.hideAnimationSettings then
opts["headerAnimation"] = { opts["headerAnimation"] = {
type = 'header', type = 'header',
name = 'Animation settings', name = 'Animation Settings',
order = 110 order = 110
} }
opts["shouldAnimate"] = opts["shouldAnimate"] =
{ {
type = 'toggle', type = 'toggle',
name = '|c' .. self.configColor .. 'Animate amount changes|r', name = 'Animate changes',
desc = 'Whether or not to animate the bar falloffs/gains', desc = 'Whether or not to animate the bar falloffs/gains',
get = function() get = function()
return self.moduleSettings.shouldAnimate return self.moduleSettings.shouldAnimate
@ -290,7 +285,7 @@ if not self.moduleSettings.hideAnimationSettings then
opts["desiredLerpTime"] = opts["desiredLerpTime"] =
{ {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Animation Duration|r', name = 'Animation Duration',
desc = 'How long the animation should take to play', desc = 'How long the animation should take to play',
min = 0, min = 0,
max = 2, max = 2,
@ -311,7 +306,7 @@ end
opts["widthModifier"] = opts["widthModifier"] =
{ {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Bar width modifier|r', name = 'Bar width modifier',
desc = 'Make this bar wider or thinner than others', desc = 'Make this bar wider or thinner than others',
min = -80, min = -80,
max = 80, max = 80,
@ -326,13 +321,13 @@ end
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 33 order = 30.05
} }
opts["barVerticalOffset"] = opts["barVerticalOffset"] =
{ {
type='range', type='range',
name = '|c' .. self.configColor .. 'Bar vertical offset|r', name = 'Bar vertical offset',
desc = 'Adjust the vertical placement of this bar', desc = 'Adjust the vertical placement of this bar',
min = -400, min = -400,
max = 400, max = 400,
@ -347,7 +342,7 @@ end
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 34 order = 30.06
} }
opts["shouldUseOverride"] = opts["shouldUseOverride"] =
@ -366,7 +361,7 @@ end
disabled = function() disabled = function()
return not self:IsEnabled() return not self:IsEnabled()
end, end,
order = 35 order = 30.07
} }
opts["barTextureOverride"] = opts["barTextureOverride"] =
@ -385,13 +380,13 @@ end
return not self:IsEnabled() or not self.moduleSettings.shouldUseOverride return not self:IsEnabled() or not self.moduleSettings.shouldUseOverride
end, end,
values = IceHUD.validBarList, values = IceHUD.validBarList,
order = 36 order = 30.08
} }
opts["textSettings"] = opts["textSettings"] =
{ {
type = 'group', type = 'group',
name = '|c' .. self.configColor .. 'Text Settings|r', name = '|c'..self.configColor..'Text Settings|r',
desc = 'Settings related to texts', desc = 'Settings related to texts',
order = 32, order = 32,
disabled = function() disabled = function()
@ -536,7 +531,7 @@ end
textVerticalOffset = { textVerticalOffset = {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Text Vertical Offset|r', name = 'Text Vertical Offset',
desc = 'Offset of the text from the bar vertically (negative is farther below)', desc = 'Offset of the text from the bar vertically (negative is farther below)',
min = -250, min = -250,
max = 350, max = 350,
@ -555,7 +550,7 @@ end
textHorizontalOffset = { textHorizontalOffset = {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Text Horizontal Offset|r', name = 'Text Horizontal Offset',
desc = 'Offset of the text from the bar horizontally', desc = 'Offset of the text from the bar horizontally',
min = -350, min = -350,
max = 350, max = 350,

View File

@ -197,8 +197,8 @@ function IceCastBar.prototype:GetOptions()
opts["reverseChannel"] = { opts["reverseChannel"] = {
type = 'toggle', type = 'toggle',
name = "Reverse channel direction", name = "Reverse channeling",
desc = "Whether or not to reverse the direction of a channel's castbar", desc = "Whether or not to reverse the direction of the cast bar when a spell is being channeled. For example, if a normal cast causes this bar to fill up, then checking this option will cause a channeled spell to empty the bar instead.",
get = function() get = function()
return self.moduleSettings.reverseChannel return self.moduleSettings.reverseChannel
end, end,

View File

@ -311,7 +311,7 @@ function IceCore.prototype:GetModuleOptions()
options["aaaClickPlus"] = { options["aaaClickPlus"] = {
type = 'description', type = 'description',
fontSize = 'large', fontSize = 'large',
name = 'Click the + next to Module Settings to see the available modules that you can tweak.\n\nAlso notice that some modules have a + next to them. This will open up additional settings such as text tweaks and icon tweaks on that module.', name = 'Click the + next to |cffffdc42Module Settings|r to see the available modules that you can tweak.\n\nAlso notice that some modules have a + next to them. This will open up additional settings such as text tweaks and icon tweaks on that module.',
order = 1 order = 1
} }

View File

@ -119,7 +119,7 @@ function IceElement.prototype:GetOptions()
opts["enabled"] = { opts["enabled"] = {
type = "toggle", type = "toggle",
name = "|c" .. self.configColor .. "Enabled|r", name = "Enabled",
desc = "Enable/disable module", desc = "Enable/disable module",
get = function() get = function()
return self.moduleSettings.enabled return self.moduleSettings.enabled
@ -135,10 +135,16 @@ function IceElement.prototype:GetOptions()
order = 20 order = 20
} }
opts["headerVisibility"] = {
type = 'header',
name = 'Visibility Settings',
order = 27
}
opts["scale"] = opts["scale"] =
{ {
type = 'range', type = 'range',
name = "|c" .. self.configColor .. "Scale|r", name = "Scale",
desc = 'Scale of the element', desc = 'Scale of the element',
min = 0.2, min = 0.2,
max = 2, max = 2,
@ -155,7 +161,7 @@ function IceElement.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 21 order = 27.1
} }
opts["alwaysFullAlpha"] = opts["alwaysFullAlpha"] =
@ -163,6 +169,7 @@ function IceElement.prototype:GetOptions()
type = 'toggle', type = 'toggle',
name = 'Always show at 100% alpha', name = 'Always show at 100% alpha',
desc = 'Whether to always show this module at 100% alpha or not', desc = 'Whether to always show this module at 100% alpha or not',
width = 'double',
get = function() get = function()
return self.moduleSettings.alwaysFullAlpha return self.moduleSettings.alwaysFullAlpha
end, end,

View File

@ -9,6 +9,7 @@ local AceSerializer = LibStub("AceSerializer-3.0", 1)
local pendingModuleLoads = {} local pendingModuleLoads = {}
local bReadyToRegisterModules = false local bReadyToRegisterModules = false
local lastCustomModule = 1
IceHUD.CurrTagVersion = 3 IceHUD.CurrTagVersion = 3
IceHUD.debugging = false IceHUD.debugging = false
@ -16,6 +17,7 @@ IceHUD.debugging = false
IceHUD.WowVer = select(4, GetBuildInfo()) IceHUD.WowVer = select(4, GetBuildInfo())
IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc", "BloodGlaives", "ArcHUD", "FangRune" } IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc", "BloodGlaives", "ArcHUD", "FangRune" }
IceHUD.validCustomModules = {"Buff/Debuff watcher", "Buff/Debuff stack counter", "Ability cooldown bar", "Health bar", "Mana bar"}
local function deepcopy(object) local function deepcopy(object)
local lookup_table = {} local lookup_table = {}
@ -59,41 +61,41 @@ IceHUD.options =
test = { test = {
type = 'description', type = 'description',
fontSize = "medium", fontSize = "medium",
name = [[Thanks for using IceHUD! Below you will find answers to all of the most commonly-asked questions. Be sure to check the addon's page on curse.com and wowinterface.com as well for more discussion and updates! name = [[Thanks for using |cff9999ffIceHUD|r! Below you will find answers to all of the most commonly-asked questions. Be sure to check the addon's page on |cff33ff99curse.com|r and |cff33ff99wowinterface.com|r as well for more discussion and updates! You can also email |cff33ff99icehud@parnic.com|r directly if you prefer.
1. How do I hide the default Blizzard player and target unit frames? |cff9999ff1. How do I hide the default Blizzard player and target unit frames?|r
Expand the "Module Settings" section, click "Player Health" or "Target Health," and check "Hide Blizzard Frame" Expand the "|cffffdc42Module Settings|r" section, click "PlayerHealth" or "TargetHealth," and check "Hide Blizzard Frame"
2. How do I turn off click-targeting and menus on the player bar? |cff9999ff2. How do I turn off click-targeting and menus on the player bar?|r
Expand the "Module Settings" section, click "Player Health," un-check "Allow click-targeting." Note that as of v1.3, there is now an option to allow click-targeting out of combat, but turn it off while in combat. Expand the "|cffffdc42Module Settings|r" section, click "PlayerHealth," un-check "Allow click-targeting." Note that as of v1.3, there is now an option to allow click-targeting out of combat, but turn it off while in combat.
3. How do I hide the HUD or change its transparency based on combat, targeting, etc.? |cff9999ff3. How do I hide the HUD or change its transparency based on combat, targeting, etc.?|r
Check the "Transparency Settings" section. Nearly any combination of states should be available for tweaking. Check the "Transparency Settings" section. Nearly any combination of states should be available for tweaking.
4. Even if the rest of the HUD is transparent, the health percentages seem to show up. Why? |cff9999ff4. Even if the rest of the HUD is transparent, the health percentages seem to show up. Why?|r
Expand the "Module Settings" section, expand "Player Health," click "Text Settings," look for options about keeping the lower/upper text blocks alpha locked. If the text is alpha locked, it will not drop below 100%, otherwise it respects its bar's transparency setting. Player Health/Mana, Target Health/Mana, and pet bars should all have these options. Expand the "|cffffdc42Module Settings|r" section, expand "PlayerHealth," click "Text Settings," look for options about keeping the lower/upper text blocks alpha locked. If the text is alpha locked, it will not drop below 100%, otherwise it respects its bar's transparency setting. PlayerHealth/Mana, TargetHealth/Mana, and pet bars should all have these options.
5. Is there any way to see combo points for Rogues and Druids or sunder applications for Warriors? |cff9999ff5. Is there any way to see combo points for Rogues and Druids or sunder applications for Warriors?|r
Yes, check the "combo points" and "sunder count" modules in the configuration panel. (Note that these modules may not show up if you're not of the appropriate class to see them. They should be present for their respective classes, however.) Yes, check the "ComboPoints" and "SunderCount" modules in the configuration panel. (Note that these modules may not show up if you're not of the appropriate class to see them. They should be present for their respective classes, however.)
6. What's this thing at the top of the player's cast bar? It's darker than the rest of the bar. |cff9999ff6. What's this thing at the top of the player's cast bar? It's darker than the rest of the bar.|r
That's the Cast Lag Indicator that shows you when you can start casting a new spell and still be able to finish the current one (based on your lag to the server). You can disable this in the Player Cast Bar module settings. That's the Cast Lag Indicator that shows you when you can start casting a new spell and still be able to finish the current one (based on your lag to the server). You can disable this in the Player Cast Bar module settings.
7. Is there a bar that shows breath underwater and if so, how can I adjust it? |cff9999ff7. Is there a bar that shows breath underwater, and if so how can I adjust it?|r
Yes, this is called the MirrorBarHandler in the module settings. It's called that because it mirrors casting bar behavior, displays more than just breathing (fatigue is one example), and that's what Blizzard calls it. It can be moved/adjusted/resized/etc. as with any other module. Yes, this is called the MirrorBarHandler in the |cffffdc42Module Settings|r. It's called that because it mirrors casting bar behavior, displays more than just breathing (fatigue is one example), and that's what Blizzard calls it. It can be moved/adjusted/resized/etc. as with any other module.
8. There's a long green bar that sometimes shows up below everything else. What is it? |cff9999ff8. There's a long green bar that sometimes shows up below everything else. What is it?|r
That would be the TargetOfTarget module. That module is available for people who don't want the full ToT health/mana bars, but do want some sort of ToT representation on the screen. That would be the TargetOfTarget module. That module is available for people who don't want the full ToT health/mana bars, but do want some sort of ToT representation on the screen.
9. IceHUD needs a bar or counter for buff/debuff X! |cff9999ff9. IceHUD needs a bar or counter for buff/debuff X!|r
Good news: as of v1.5, you can create as many bars and counters for any buffs or debuffs you want! Click one of the "Create custom ..." buttons above. This will create a module named MyCustomBar# (where # is a number based on how many custom bars you've made so far) or MyCustomCounter#. You can then expand the Module Settings group and modify all sorts of settings on the new custom module. It is highly recommend that you rename the bar as soon as possible to avoid any confusion later. These custom modules are full-featured enough to replace some of the class-specific ones that are already there, but I will leave them so as not to upset people who are already using them. Good news: as of v1.5, you can create as many bars and counters for any buffs or debuffs you want! Click one of the "Create custom ..." buttons above. This will create a module named MyCustomBar# (where # is a number based on how many custom bars you've made so far) or MyCustomCounter#. You can then expand the |cffffdc42Module Settings|r group and modify all sorts of settings on the new custom module. It is highly recommend that you rename the bar as soon as possible to avoid any confusion later. These custom modules are full-featured enough to replace some of the class-specific ones that are already there, but I will leave them so as not to upset people who are already using them.
10. How do I turn off the resting/combat/PvP/etc. icons on the player or target? |cff9999ff10. How do I turn off the resting/combat/PvP/etc. icons on the player or target?|r
Expand Module Settings, expand PlayerHealth (or TargetHealth for targets), click Icon Settings. You can control every aspect of the icons there including location, visibility, draw order, etc. Expand "|cffffdc42Module Settings|r", expand PlayerHealth (or TargetHealth for targets), click Icon Settings. You can control every aspect of the icons there including location, visibility, draw order, etc.
11. How do I turn off buffs/debuffs on the player's or target's bar? |cff9999ff11. How do I turn off buffs/debuffs on the player's or target's bar?|r
Expand Module Settings, expand PlayerInfo (or TargetInfo for targets), and set the number of buffs per row to be 0. These cannot be controlled independently (e.g. you can turn off buffs and debuffs, but not just one or the other).]] Expand "|cffffdc42Module Settings|r", expand PlayerInfo (or TargetInfo for targets), and set the number of buffs per row to be 0. These cannot be controlled independently (e.g. you can turn off buffs and debuffs, but not just one or the other).]]
} }
} }
}, },
@ -529,12 +531,6 @@ Expand Module Settings, expand PlayerInfo (or TargetInfo for targets), and set t
args = {}, args = {},
order = 42 order = 42
}, },
headerOther = {
type = 'header',
name = 'Other',
order = 90
},
--[[ --[[
enabled = { enabled = {
type = "toggle", type = "toggle",
@ -563,94 +559,77 @@ Expand Module Settings, expand PlayerInfo (or TargetInfo for targets), and set t
set = function(info, value) set = function(info, value)
IceHUD.IceCore:SetDebug(value) IceHUD.IceCore:SetDebug(value)
end, end,
hidden =
--[===[@non-debug@
true
--@end-non-debug@]===]
--@debug@
false
--@end-debug@
,
disabled =
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
--[===[@non-debug@
true
--@end-non-debug@]===]
--@debug@
false
--@end-debug@
,
order = 92 order = 92
}, },
reset = { customModuleSelect = {
type = 'execute', type = "select",
name = '|cffff0000Reset|r', name = "Create custom module",
desc = "Resets all IceHUD options - WARNING: Reloads UI", desc = "Select a custom module that you want to create here, then press the 'Create' button.",
func = function() get = function(info)
StaticPopup_Show("ICEHUD_RESET") return lastCustomModule
end, end,
order = 93 set = function(info, v)
lastCustomModule = v
end,
values = IceHUD.validCustomModules,
order = 94.5,
}, },
customBar = { customModuleCreate = {
type = 'execute', type = "execute",
name = 'Create custom bar', name = "Create",
desc = 'Creates a new customized bar. This bar allows you to specify a buff or debuff to track on a variety of targets. Once that buff/debuff is applied, you will be able to watch it count down on the bar. You can create as many of these as you like.', desc = "Creates the selected custom module",
func = function() func = function()
local newMod = IceCustomBar:new() local v = lastCustomModule
local newMod = nil
local popupMsg
if v == 1 then -- custom bar
newMod = IceCustomBar:new()
popupMsg = "ICEHUD_CUSTOM_BAR_CREATED"
elseif v == 2 then -- custom counter
newMod = IceCustomCount:new()
popupMsg = "ICEHUD_CUSTOM_COUNTER_CREATED"
elseif v == 3 then -- cooldown bar
newMod = IceCustomCDBar:new()
popupMsg = "ICEHUD_CUSTOM_CD_CREATED"
elseif v == 4 then -- custom health bar
newMod = IceCustomHealth:new()
popupMsg = "ICEHUD_CUSTOM_HEALTH_CREATED"
elseif v == 5 then -- custom mana bar
newMod = IceCustomMana:new()
popupMsg = "ICEHUD_CUSTOM_MANA_CREATED"
end
if newMod ~= nil then
IceHUD.IceCore:AddNewDynamicModule(newMod) IceHUD.IceCore:AddNewDynamicModule(newMod)
StaticPopup_Show("ICEHUD_CUSTOM_BAR_CREATED")
ConfigDialog:SelectGroup("IceHUD", "modules", newMod.elementName) ConfigDialog:SelectGroup("IceHUD", "modules", newMod.elementName)
StaticPopup_Show(popupMsg)
end
end, end,
order = 94.5 order = 94.6,
},
customCount = {
type = 'execute',
name = 'Create custom counter',
desc = 'Creates a new customized counter. This counter allows you to specify a stacking buff or debuff to track on a variety of targets. A number or graphic (whichever you choose) will count the number of applications of the specified buff/debuff. You can create as many of these as you like.',
func = function()
local newMod = IceCustomCount:new()
IceHUD.IceCore:AddNewDynamicModule(newMod)
StaticPopup_Show("ICEHUD_CUSTOM_COUNTER_CREATED")
ConfigDialog:SelectGroup("IceHUD", "modules", newMod.elementName)
end,
order = 94.6
},
customCD = {
type = 'execute',
name = 'Create cooldown bar',
desc = 'Creates a new customized ability cooldown bar. This bar will monitor the cooldown of the specified skill/spell so you know when it is available to be used again. You can create as many of these as you like.',
func = function()
local newMod = IceCustomCDBar:new()
IceHUD.IceCore:AddNewDynamicModule(newMod)
StaticPopup_Show("ICEHUD_CUSTOM_CD_CREATED")
ConfigDialog:SelectGroup("IceHUD", "modules", newMod.elementName)
end,
order = 94.7
},
customHealth = {
type = 'execute',
name = 'Custom health bar',
desc = 'Creates a new customized health bar. This bar monitors the health of whatever unit you specify. You can create as many of these as you like.',
func = function()
local newMod = IceCustomHealth:new()
IceHUD.IceCore:AddNewDynamicModule(newMod)
StaticPopup_Show("ICEHUD_CUSTOM_HEALTH_CREATED")
ConfigDialog:SelectGroup("IceHUD", "modules", newMod.elementName)
end,
hidden = function()
return IceCustomHealth == nil
end,
order = 94.8
},
customMana = {
type = 'execute',
name = 'Custom mana bar',
desc = 'Creates a new customized mana bar. This bar monitors the mana of whatever unit you specify. You can create as many of these as you like.',
func = function()
local newMod = IceCustomMana:new()
IceHUD.IceCore:AddNewDynamicModule(newMod)
StaticPopup_Show("ICEHUD_CUSTOM_MANA_CREATED")
ConfigDialog:SelectGroup("IceHUD", "modules", newMod.elementName)
end,
hidden = function()
return IceCustomMana == nil
end,
order = 94.8
}, },
configMode = { configMode = {
type = 'toggle', type = 'toggle',
name = '|cffff0000Configuration Mode|r', name = 'Configuration Mode',
desc = 'Puts IceHUD into configuration mode so bars can be placed more easily', desc = "Makes all modules visible so you can see where they're placed and find any that are overlapping.",
get = function() get = function()
return IceHUD.IceCore:IsInConfigMode() return IceHUD.IceCore:IsInConfigMode()
end, end,
@ -663,22 +642,11 @@ Expand Module Settings, expand PlayerInfo (or TargetInfo for targets), and set t
useDogTags = { useDogTags = {
type = 'toggle', type = 'toggle',
name = 'Use Dog Tags', name = 'Use Dog Tags',
desc = 'Whether or not the addon should use the DogTag library (this will increase the CPU usage of the mod)\n\nNOTE: after changing this option, you must reload the UI or else bad things happen', desc = 'Whether or not the addon should use the DogTag library (this will increase the CPU usage of the mod). DogTag controls all text displayed around bars such as health or mana amounts. Type |cffffff78/dog|r to see all DogTag options.\n\nNOTE: after changing this option, you must reload the UI or else bad things happen',
get = function() get = function()
return IceHUD.IceCore:ShouldUseDogTags() return IceHUD.IceCore:ShouldUseDogTags()
end, end,
set = function(info, v) set = function(info, v)
StaticPopupDialogs["ICEHUD_CHANGED_DOGTAG"] = {
text = "This option requires the UI to be reloaded. Do you wish to reload it now?",
button1 = "Yes",
OnAccept = function()
ReloadUI()
end,
button2 = "No",
timeout = 0,
whileDead = 1,
hideOnEscape = 1
};
IceHUD.IceCore:SetShouldUseDogTags(v) IceHUD.IceCore:SetShouldUseDogTags(v)
StaticPopup_Show("ICEHUD_CHANGED_DOGTAG") StaticPopup_Show("ICEHUD_CHANGED_DOGTAG")
end, end,
@ -876,6 +844,23 @@ StaticPopupDialogs["ICEHUD_DELETE_CUSTOM_MODULE"] =
end, end,
} }
StaticPopupDialogs["ICEHUD_CHANGED_DOGTAG"] = {
text = "This option requires the UI to be reloaded. Do you wish to reload it now?",
button1 = "Yes",
OnShow = function(self)
self:SetFrameStrata("TOOLTIP")
end,
OnHide = function(self)
self:SetFrameStrata("DIALOG")
end,
OnAccept = function()
ReloadUI()
end,
button2 = "No",
timeout = 0,
whileDead = 1,
hideOnEscape = 0
}
function IceHUD:OnInitialize() function IceHUD:OnInitialize()
self:SetDebugging(false) self:SetDebugging(false)
@ -956,6 +941,15 @@ function IceHUD:SetupProfileImportButtons()
false false
--@end-debug@ --@end-debug@
, ,
disabled =
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
--[===[@non-debug@
true
--@end-non-debug@]===]
--@debug@
false
--@end-debug@
,
order = 98.1 order = 98.1
} }
@ -994,6 +988,15 @@ function IceHUD:SetupProfileImportButtons()
false false
--@end-debug@ --@end-debug@
, ,
disabled =
-- hello, snooper! this feature doesn't actually work yet, so enabling it won't help you much :)
--[===[@non-debug@
true
--@end-non-debug@]===]
--@debug@
false
--@end-debug@
,
order = 98.2 order = 98.2
} }
end end

View File

@ -72,7 +72,7 @@ function IceUnitBar.prototype:GetOptions()
opts["lowThreshold"] = opts["lowThreshold"] =
{ {
type = 'range', type = 'range',
name = '|cff22bb22Low Threshold|r', name = 'Low Threshold',
desc = 'Threshold of pulsing the bar (0 means never) (for player applies only to mana, not rage/energy/runic power)', desc = 'Threshold of pulsing the bar (0 means never) (for player applies only to mana, not rage/energy/runic power)',
get = function() get = function()
return self.moduleSettings.lowThreshold return self.moduleSettings.lowThreshold
@ -88,12 +88,13 @@ function IceUnitBar.prototype:GetOptions()
max = 1, max = 1,
step = 0.05, step = 0.05,
isPercent = true, isPercent = true,
order = 37 order = 30.091
} }
opts["lowThresholdFlash"] = { opts["lowThresholdFlash"] = {
type = 'toggle', type = 'toggle',
name = 'Flash bar below Low Threshold', name = 'Flash bar below Low Threshold',
desc = 'Flashes the bar when it is below the Low Threshold specified above', desc = 'Flashes the bar when it is below the Low Threshold specified above',
width = 'double',
get = function() get = function()
return self.moduleSettings.lowThresholdFlash return self.moduleSettings.lowThresholdFlash
end, end,
@ -103,7 +104,7 @@ function IceUnitBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 38 order = 30.092
} }
opts["lowThresholdColor"] = { opts["lowThresholdColor"] = {
type = "toggle", type = "toggle",
@ -119,7 +120,7 @@ function IceUnitBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or not (self.moduleSettings.scaleHealthColor and self.moduleSettings.scaleManaColor) return not self.moduleSettings.enabled or not (self.moduleSettings.scaleHealthColor and self.moduleSettings.scaleManaColor)
end, end,
order = 39 order = 30.093
} }
return opts return opts

View File

@ -30,6 +30,7 @@ function CastBar.prototype:GetDefaultSettings()
settings["lagAlpha"] = 0.7 settings["lagAlpha"] = 0.7
settings["showBlizzCast"] = false settings["showBlizzCast"] = false
settings["shouldAnimate"] = false settings["shouldAnimate"] = false
settings["hideAnimationSettings"] = true
settings["usesDogTagStrings"] = false settings["usesDogTagStrings"] = false
settings["rangeColor"] = true settings["rangeColor"] = true
@ -116,31 +117,6 @@ function CastBar.prototype:GetOptions()
order = 43 order = 43
} }
-- Parnic - this exists solely for the console/rock config to work...animating cast bars doesn't make sense
opts["shouldAnimate"] =
{
type = 'toggle',
name = 's',
desc = 's',
set = 's',
get = 's',
hidden = function()
return true
end
}
opts["desiredLerpTime"] =
{
type = 'toggle',
name = 'd',
desc = 'd',
set = 'd',
get = 'd',
hidden = function()
return true
end
}
opts["barVisible"] = { opts["barVisible"] = {
type = 'toggle', type = 'toggle',
name = 'Bar visible', name = 'Bar visible',
@ -256,7 +232,7 @@ function CastBar.prototype:GetOptions()
textVerticalOffset = { textVerticalOffset = {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Text Vertical Offset|r', name = 'Text Vertical Offset',
desc = 'Offset of the text from the bar vertically (negative is farther below)', desc = 'Offset of the text from the bar vertically (negative is farther below)',
min = -250, min = -250,
max = 350, max = 350,
@ -275,7 +251,7 @@ function CastBar.prototype:GetOptions()
textHorizontalOffset = { textHorizontalOffset = {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Text Horizontal Offset|r', name = 'Text Horizontal Offset',
desc = 'Offset of the text from the bar horizontally', desc = 'Offset of the text from the bar horizontally',
min = -350, min = -350,
max = 350, max = 350,

View File

@ -21,6 +21,12 @@ end
function ComboPoints.prototype:GetOptions() function ComboPoints.prototype:GetOptions()
local opts = ComboPoints.super.prototype.GetOptions(self) local opts = ComboPoints.super.prototype.GetOptions(self)
opts["headerLookAndFeel"] = {
type = 'header',
name = 'Look and Feel',
order = 29.9
}
opts["vpos"] = { opts["vpos"] = {
type = "range", type = "range",
name = "Vertical Position", name = "Vertical Position",

View File

@ -141,7 +141,7 @@ function IceCustomBar.prototype:GetOptions()
opts["customHeader"] = { opts["customHeader"] = {
type = 'header', type = 'header',
name = "Custom bar settings", name = "Custom bar settings",
order = 20.1, order = 30.1,
} }
opts["deleteme"] = { opts["deleteme"] = {
@ -154,7 +154,7 @@ function IceCustomBar.prototype:GetOptions()
dialog.data = self dialog.data = self
end end
end, end,
order = 20.2, order = 20.1,
} }
opts["name"] = { opts["name"] = {
@ -173,7 +173,7 @@ function IceCustomBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<a name for this bar>", usage = "<a name for this bar>",
order = 20.3, order = 30.3,
} }
opts["unitToTrack"] = { opts["unitToTrack"] = {
@ -195,7 +195,7 @@ function IceCustomBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.4, order = 30.4,
} }
opts["buffOrDebuff"] = { opts["buffOrDebuff"] = {
@ -214,7 +214,7 @@ function IceCustomBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
order = 20.5, order = 30.5,
} }
opts["buffToTrack"] = { opts["buffToTrack"] = {
@ -236,7 +236,7 @@ function IceCustomBar.prototype:GetOptions()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
usage = "<which buff to track>", usage = "<which buff to track>",
order = 20.6, order = 30.6,
} }
opts["exactMatch"] = { opts["exactMatch"] = {
@ -254,7 +254,7 @@ function IceCustomBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
order = 20.65, order = 30.65,
} }
opts["trackOnlyMine"] = { opts["trackOnlyMine"] = {
@ -272,7 +272,7 @@ function IceCustomBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
order = 20.7, order = 30.7,
} }
opts["barColor"] = { opts["barColor"] = {
@ -291,7 +291,7 @@ function IceCustomBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.8, order = 30.8,
} }
opts["displayWhenEmpty"] = { opts["displayWhenEmpty"] = {
@ -308,7 +308,7 @@ function IceCustomBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.9 order = 30.9
} }
opts["buffTimerDisplay"] = { opts["buffTimerDisplay"] = {
@ -326,7 +326,7 @@ function IceCustomBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
values = validBuffTimers, values = validBuffTimers,
order = 21 order = 31
} }
opts["maxDuration"] = { opts["maxDuration"] = {
@ -347,7 +347,7 @@ function IceCustomBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<the maximum duration for a bar>", usage = "<the maximum duration for a bar>",
order = 21.1, order = 31.1,
} }
opts["headerIcons"] = { opts["headerIcons"] = {

View File

@ -132,7 +132,7 @@ function IceCustomCDBar.prototype:GetOptions()
opts["customHeader"] = { opts["customHeader"] = {
type = 'header', type = 'header',
name = "Custom CD settings", name = "Custom CD settings",
order = 20.1, order = 30.1,
} }
opts["deleteme"] = { opts["deleteme"] = {
@ -145,7 +145,7 @@ function IceCustomCDBar.prototype:GetOptions()
dialog.data = self dialog.data = self
end end
end, end,
order = 20.2, order = 20.1,
} }
opts["name"] = { opts["name"] = {
@ -164,7 +164,7 @@ function IceCustomCDBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<a name for this bar>", usage = "<a name for this bar>",
order = 20.3, order = 30.3,
} }
opts["cooldownToTrack"] = { opts["cooldownToTrack"] = {
@ -187,7 +187,7 @@ function IceCustomCDBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<which spell to track>", usage = "<which spell to track>",
order = 20.6, order = 30.6,
} }
opts["barColor"] = { opts["barColor"] = {
@ -206,7 +206,7 @@ function IceCustomCDBar.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.8, order = 30.8,
} }
opts["displayMode"] = { opts["displayMode"] = {
@ -224,7 +224,7 @@ function IceCustomCDBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
values = validDisplayModes, values = validDisplayModes,
order = 20.9 order = 30.9
} }
opts["cooldownTimerDisplay"] = { opts["cooldownTimerDisplay"] = {
@ -242,7 +242,7 @@ function IceCustomCDBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
values = validBuffTimers, values = validBuffTimers,
order = 21 order = 31
} }
opts["maxDuration"] = { opts["maxDuration"] = {
@ -263,7 +263,7 @@ function IceCustomCDBar.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<the maximum duration for a bar>", usage = "<the maximum duration for a bar>",
order = 21.1, order = 31.1,
} }
opts["headerIcons"] = { opts["headerIcons"] = {

View File

@ -22,7 +22,7 @@ function IceCustomCount.prototype:GetOptions()
opts["customHeader"] = { opts["customHeader"] = {
type = 'header', type = 'header',
name = "Aura settings", name = "Aura settings",
order = 20.1, order = 30.1,
} }
opts["deleteme"] = { opts["deleteme"] = {
@ -35,7 +35,7 @@ function IceCustomCount.prototype:GetOptions()
dialog.data = self dialog.data = self
end end
end, end,
order = 20.2, order = 20.1,
} }
opts["name"] = { opts["name"] = {
@ -54,7 +54,7 @@ function IceCustomCount.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<a name for this bar>", usage = "<a name for this bar>",
order = 20.3, order = 30.3,
} }
opts["auraTarget"] = { opts["auraTarget"] = {
@ -74,7 +74,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.4, order = 30.4,
} }
opts["auraType"] = { opts["auraType"] = {
@ -92,7 +92,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
order = 20.5, order = 30.5,
} }
opts["auraName"] = { opts["auraName"] = {
@ -110,7 +110,7 @@ function IceCustomCount.prototype:GetOptions()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
usage = "<which aura to track>", usage = "<which aura to track>",
order = 20.6, order = 30.6,
} }
opts["trackOnlyMine"] = { opts["trackOnlyMine"] = {
@ -127,7 +127,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon" return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
end, end,
order = 20.7, order = 30.7,
} }
opts["countColor"] = { opts["countColor"] = {
@ -146,7 +146,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.8, order = 30.8,
} }
opts["countMinColor"] = { opts["countMinColor"] = {
@ -165,7 +165,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled or not self.moduleSettings.gradient return not self.moduleSettings.enabled or not self.moduleSettings.gradient
end, end,
order = 20.81, order = 30.81,
} }
opts["maxCount"] = { opts["maxCount"] = {
@ -186,13 +186,13 @@ function IceCustomCount.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<the maximum number of valid applications>", usage = "<the maximum number of valid applications>",
order = 20.9, order = 30.9,
} }
opts["normalHeader"] = { opts["normalHeader"] = {
type = 'header', type = 'header',
name = "Counter look and feel", name = "Counter look and feel",
order = 30, order = 31,
} }
opts["vpos"] = { opts["vpos"] = {
@ -212,7 +212,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 31 order = 31.1
} }
opts["hpos"] = { opts["hpos"] = {
@ -232,7 +232,7 @@ function IceCustomCount.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 31 order = 31.2
} }
opts["CustomFontSize"] = { opts["CustomFontSize"] = {

View File

@ -38,7 +38,7 @@ function IceCustomHealth.prototype:GetOptions()
opts["customHeader"] = { opts["customHeader"] = {
type = 'header', type = 'header',
name = "Custom bar settings", name = "Custom bar settings",
order = 20.1, order = 30.1,
} }
opts["deleteme"] = { opts["deleteme"] = {
@ -51,7 +51,7 @@ function IceCustomHealth.prototype:GetOptions()
dialog.data = self dialog.data = self
end end
end, end,
order = 20.2, order = 20.1,
} }
opts["name"] = { opts["name"] = {
@ -70,7 +70,7 @@ function IceCustomHealth.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<a name for this bar>", usage = "<a name for this bar>",
order = 20.3, order = 30.3,
} }
opts["unitToTrack"] = { opts["unitToTrack"] = {
@ -90,7 +90,7 @@ function IceCustomHealth.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.4, order = 30.4,
} }
return opts return opts

View File

@ -39,7 +39,7 @@ function IceCustomMana.prototype:GetOptions()
opts["customHeader"] = { opts["customHeader"] = {
type = 'header', type = 'header',
name = "Custom bar settings", name = "Custom bar settings",
order = 20.1, order = 30.1,
} }
opts["deleteme"] = { opts["deleteme"] = {
@ -52,7 +52,7 @@ function IceCustomMana.prototype:GetOptions()
dialog.data = self dialog.data = self
end end
end, end,
order = 20.2, order = 20.1,
} }
opts["name"] = { opts["name"] = {
@ -71,7 +71,7 @@ function IceCustomMana.prototype:GetOptions()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
usage = "<a name for this bar>", usage = "<a name for this bar>",
order = 20.3, order = 30.3,
} }
opts["unitToTrack"] = { opts["unitToTrack"] = {
@ -91,7 +91,7 @@ function IceCustomMana.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 20.4, order = 30.4,
} }
return opts return opts

View File

@ -1,6 +1,5 @@
local AceOO = AceLibrary("AceOO-2.0") local AceOO = AceLibrary("AceOO-2.0")
local MobHealth = nil
local FocusHealth = AceOO.Class(IceUnitBar) local FocusHealth = AceOO.Class(IceUnitBar)
FocusHealth.prototype.color = nil FocusHealth.prototype.color = nil
@ -13,8 +12,6 @@ function FocusHealth.prototype:init()
self:SetDefaultColor("FocusHealthHostile", 231, 31, 36) self:SetDefaultColor("FocusHealthHostile", 231, 31, 36)
self:SetDefaultColor("FocusHealthFriendly", 46, 223, 37) self:SetDefaultColor("FocusHealthFriendly", 46, 223, 37)
self:SetDefaultColor("FocusHealthNeutral", 210, 219, 87) self:SetDefaultColor("FocusHealthNeutral", 210, 219, 87)
MobHealth = AceLibrary:HasInstance("LibMobHealth-4.0") and AceLibrary("LibMobHealth-4.0") or nil
end end
@ -25,7 +22,6 @@ function FocusHealth.prototype:GetDefaultSettings()
settings["side"] = IceCore.Side.Right settings["side"] = IceCore.Side.Right
settings["offset"] = -1 settings["offset"] = -1
settings["scale"] = 0.7 settings["scale"] = 0.7
settings["mobhealth"] = (MobHealth3 ~= nil)
settings["classColor"] = false settings["classColor"] = false
settings["hideBlizz"] = false settings["hideBlizz"] = false
settings["upperText"] = "[PercentHP:Round]" settings["upperText"] = "[PercentHP:Round]"
@ -47,23 +43,6 @@ end
function FocusHealth.prototype:GetOptions() function FocusHealth.prototype:GetOptions()
local opts = FocusHealth.super.prototype.GetOptions(self) local opts = FocusHealth.super.prototype.GetOptions(self)
opts["mobhealth"] = {
type = "toggle",
name = "MobHealth3 support",
desc = "Enable/disable MobHealth3 Focus HP data. If this option is gray, you do not have MobHealth3.",
get = function()
return self.moduleSettings.mobhealth
end,
set = function(info, value)
self.moduleSettings.mobhealth = value
self:Update(self.unit)
end,
disabled = function()
return (not self.moduleSettings.enabled) and (MobHealth3 == nil)
end,
order = 40
}
opts["classColor"] = { opts["classColor"] = {
type = "toggle", type = "toggle",
name = "Class color bar", name = "Class color bar",
@ -119,6 +98,12 @@ function FocusHealth.prototype:GetOptions()
order = 43 order = 43
} }
opts["headerIcons"] = {
type = 'header',
name = 'Icons',
order = 50
}
opts["showRaidIcon"] = { opts["showRaidIcon"] = {
type = "toggle", type = "toggle",
name = "Show Raid Icon", name = "Show Raid Icon",
@ -133,7 +118,7 @@ function FocusHealth.prototype:GetOptions()
disabled = function() disabled = function()
return not self.moduleSettings.enabled return not self.moduleSettings.enabled
end, end,
order = 50 order = 50.1
} }
opts["lockIconAlpha"] = { opts["lockIconAlpha"] = {
@ -214,7 +199,7 @@ function FocusHealth.prototype:GetOptions()
opts["shortenHealth"] = { opts["shortenHealth"] = {
type = 'toggle', type = 'toggle',
name = 'Abbreviate estimated health', name = 'Abbreviate health',
desc = 'If this is checked, then a health value of 1100 will display as 1.1k, otherwise it shows the number\n\nNote: this only applies if you are NOT using DogTag', desc = 'If this is checked, then a health value of 1100 will display as 1.1k, otherwise it shows the number\n\nNote: this only applies if you are NOT using DogTag',
get = function() get = function()
return self.moduleSettings.abbreviateHealth return self.moduleSettings.abbreviateHealth
@ -374,17 +359,6 @@ function FocusHealth.prototype:Update(unit)
if not IceHUD.IceCore:ShouldUseDogTags() then if not IceHUD.IceCore:ShouldUseDogTags() then
self:SetBottomText1(math.floor(self.healthPercentage * 100)) self:SetBottomText1(math.floor(self.healthPercentage * 100))
-- first see if we have LibMobHealth that we can piggyback on
if MobHealth then
self.health = MobHealth:GetUnitCurrentHP(self.unit)
self.maxHealth = MobHealth:GetUnitMaxHP(self.unit)
elseif (self.maxHealth == 100 and self.moduleSettings.mobhealth and MobHealth3) then
-- assumption that if a unit's max health is 100, it's not actual amount
-- but rather a percentage - this obviously has one caveat though
self.health, self.maxHealth, _ = MobHealth3:GetUnitHealth(self.unit, self.health, self.maxHealth)
end
if self.moduleSettings.abbreviateHealth then if self.moduleSettings.abbreviateHealth then
self.health = self:Round(self.health) self.health = self:Round(self.health)
self.maxHealth = self:Round(self.maxHealth) self.maxHealth = self:Round(self.maxHealth)

View File

@ -78,6 +78,7 @@ function GlobalCoolDown.prototype:GetDefaultSettings()
settings["side"] = IceCore.Side.Left settings["side"] = IceCore.Side.Left
settings["offset"] = 6 settings["offset"] = 6
settings["shouldAnimate"] = false settings["shouldAnimate"] = false
settings["hideAnimationSettings"] = true
settings["desiredLerpTime"] = nil settings["desiredLerpTime"] = nil
settings["lowThreshold"] = 0 settings["lowThreshold"] = 0
settings["barVisible"]["bg"] = false settings["barVisible"]["bg"] = false
@ -90,8 +91,6 @@ end
function GlobalCoolDown.prototype:GetOptions() function GlobalCoolDown.prototype:GetOptions()
local opts = GlobalCoolDown.super.prototype.GetOptions(self) local opts = GlobalCoolDown.super.prototype.GetOptions(self)
opts["shouldAnimate"] = nil
opts["desiredLerpTime"] = nil
opts["lowThreshold"] = nil opts["lowThreshold"] = nil
opts["textSettings"] = nil opts["textSettings"] = nil

View File

@ -196,10 +196,16 @@ end
function MirrorBarHandler.prototype:GetOptions() function MirrorBarHandler.prototype:GetOptions()
local opts = MirrorBarHandler.super.prototype.GetOptions(self) local opts = MirrorBarHandler.super.prototype.GetOptions(self)
opts["headerLookAndFeel"] = {
type = 'header',
name = 'Look and Feel',
order = 29.9
}
opts["side"] = opts["side"] =
{ {
type = 'select', type = 'select',
name = '|c' .. self.configColor .. 'Side|r', name = 'Side',
desc = 'Side of the HUD where the bar appears', desc = 'Side of the HUD where the bar appears',
get = function(info) get = function(info)
if (self.moduleSettings.side == IceCore.Side.Right) then if (self.moduleSettings.side == IceCore.Side.Right) then
@ -223,7 +229,7 @@ function MirrorBarHandler.prototype:GetOptions()
opts["offset"] = opts["offset"] =
{ {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Offset|r', name = 'Offset',
desc = 'Offset of the bar', desc = 'Offset of the bar',
min = -1, min = -1,
max = 10, max = 10,
@ -275,7 +281,7 @@ function MirrorBarHandler.prototype:GetOptions()
opts["barVerticalOffset"] = opts["barVerticalOffset"] =
{ {
type='range', type='range',
name = '|c' .. self.configColor .. 'Bar vertical offset|r', name = 'Bar vertical offset',
desc = 'Adjust the vertical placement of this bar', desc = 'Adjust the vertical placement of this bar',
min = -400, min = -400,
max = 400, max = 400,
@ -375,7 +381,7 @@ function MirrorBarHandler.prototype:GetOptions()
textVerticalOffset = { textVerticalOffset = {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Text Vertical Offset|r', name = 'Text Vertical Offset',
desc = 'Offset of the text from the bar vertically (negative is farther below)', desc = 'Offset of the text from the bar vertically (negative is farther below)',
min = -250, min = -250,
max = 350, max = 350,
@ -394,7 +400,7 @@ function MirrorBarHandler.prototype:GetOptions()
textHorizontalOffset = { textHorizontalOffset = {
type = 'range', type = 'range',
name = '|c' .. self.configColor .. 'Text Horizontal Offset|r', name = 'Text Horizontal Offset',
desc = 'Offset of the text from the bar horizontally', desc = 'Offset of the text from the bar horizontally',
min = -50, min = -50,
max = 50, max = 50,

View File

@ -196,8 +196,8 @@ function PlayerHealth.prototype:GetOptions()
opts["hideBlizzParty"] = { opts["hideBlizzParty"] = {
type = "toggle", type = "toggle",
name = "Hide Blizzard Party Frame", name = "Hide Blizzard Party",
desc = "Hides Blizzard Party frame and disables all events related to it", desc = "Hides Blizzard's default party frame and disables all events related to them",
get = function() get = function()
return self.moduleSettings.hideBlizzParty return self.moduleSettings.hideBlizzParty
end, end,
@ -253,6 +253,7 @@ function PlayerHealth.prototype:GetOptions()
type = 'toggle', type = 'toggle',
name = 'Allow click-targeting in combat', name = 'Allow click-targeting in combat',
desc = 'Whether or not to allow click targeting/casting and the player drop-down menu for this bar while the player is in combat (Note: does not work properly with HiBar, have to click near the base of the bar)', desc = 'Whether or not to allow click targeting/casting and the player drop-down menu for this bar while the player is in combat (Note: does not work properly with HiBar, have to click near the base of the bar)',
width = 'double',
get = function() get = function()
return self.moduleSettings.allowMouseInteractionCombat return self.moduleSettings.allowMouseInteractionCombat
end, end,

View File

@ -29,8 +29,8 @@ function PlayerInfo.prototype:GetOptions()
opts["hideBlizz"] = { opts["hideBlizz"] = {
type = "toggle", type = "toggle",
name = "Hide Blizzard Buff Frame", name = "Hide Blizzard Buffs",
desc = "Hides Blizzard buffs frame and disables all events related to it", desc = "Hides Blizzard's default buffs frame and disables all events related to it",
get = function() get = function()
return self.moduleSettings.hideBlizz return self.moduleSettings.hideBlizz
end, end,

View File

@ -249,6 +249,7 @@ function TargetCC.prototype:GetDefaultSettings()
settings["enabled"] = false settings["enabled"] = false
settings["shouldAnimate"] = false settings["shouldAnimate"] = false
settings["hideAnimationSettings"] = true
settings["desiredLerpTime"] = nil settings["desiredLerpTime"] = nil
settings["lowThreshold"] = 0 settings["lowThreshold"] = 0
settings["side"] = IceCore.Side.Left settings["side"] = IceCore.Side.Left
@ -263,8 +264,6 @@ end
function TargetCC.prototype:GetOptions() function TargetCC.prototype:GetOptions()
local opts = TargetCC.super.prototype.GetOptions(self) local opts = TargetCC.super.prototype.GetOptions(self)
opts["shouldAnimate"] = nil
opts["desiredLerpTime"] = nil
opts["lowThreshold"] = nil opts["lowThreshold"] = nil
opts["textSettings"].args["upperTextString"] = nil opts["textSettings"].args["upperTextString"] = nil
opts["textSettings"].args["lowerTextString"] = nil opts["textSettings"].args["lowerTextString"] = nil
@ -288,6 +287,7 @@ function TargetCC.prototype:GetOptions()
type = 'toggle', type = 'toggle',
name = 'Only show for my debuffs', name = 'Only show for my debuffs',
desc = 'With this checked, the bar will only activate for your own CC spells and not those of others.', desc = 'With this checked, the bar will only activate for your own CC spells and not those of others.',
width = 'double',
get = function() get = function()
return self.moduleSettings.onlyShowForMyDebuffs return self.moduleSettings.onlyShowForMyDebuffs
end, end,

View File

@ -51,6 +51,7 @@ function TargetCast.prototype:GetDefaultSettings()
settings["flashInstants"] = "Never" settings["flashInstants"] = "Never"
settings["flashFailures"] = "Never" settings["flashFailures"] = "Never"
settings["shouldAnimate"] = false settings["shouldAnimate"] = false
settings["hideAnimationSettings"] = true
settings["usesDogTagStrings"] = false settings["usesDogTagStrings"] = false
settings["displayNonInterruptible"] = true settings["displayNonInterruptible"] = true
@ -88,31 +89,6 @@ end
function TargetCast.prototype:GetOptions() function TargetCast.prototype:GetOptions()
local opts = TargetCast.super.prototype.GetOptions(self) local opts = TargetCast.super.prototype.GetOptions(self)
-- Parnic - this exists solely for the console/rock config to work...animating cast bars doesn't make sense
opts["shouldAnimate"] =
{
type = 'toggle',
name = 's',
desc = 's',
set = 's',
get = 's',
hidden = function()
return true
end
}
opts["desiredLerpTime"] =
{
type = 'toggle',
name = 'd',
desc = 'd',
set = 'd',
get = 'd',
hidden = function()
return true
end
}
opts["barVisible"] = { opts["barVisible"] = {
type = 'toggle', type = 'toggle',
name = 'Bar visible', name = 'Bar visible',

View File

@ -88,7 +88,7 @@ function IceTargetHealth.prototype:GetOptions()
opts["npcHostilityColor"] = { opts["npcHostilityColor"] = {
type = "toggle", type = "toggle",
name = "Color NPC's by hostility", name = "Color NPC by hostility",
desc = "If you are using the 'class color bar' setting above, then enabling this will color NPC's by their hostility toward you since NPC class isn't very helpful or applicable information.", desc = "If you are using the 'class color bar' setting above, then enabling this will color NPC's by their hostility toward you since NPC class isn't very helpful or applicable information.",
get = function() get = function()
return self.moduleSettings.npcHostilityColor return self.moduleSettings.npcHostilityColor

View File

@ -101,6 +101,7 @@ function TargetInvuln.prototype:GetDefaultSettings()
settings["enabled"] = false settings["enabled"] = false
settings["shouldAnimate"] = false settings["shouldAnimate"] = false
settings["hideAnimationSettings"] = true
settings["desiredLerpTime"] = nil settings["desiredLerpTime"] = nil
settings["lowThreshold"] = 0 settings["lowThreshold"] = 0
settings["side"] = IceCore.Side.Left settings["side"] = IceCore.Side.Left
@ -114,8 +115,6 @@ end
function TargetInvuln.prototype:GetOptions() function TargetInvuln.prototype:GetOptions()
local opts = TargetInvuln.super.prototype.GetOptions(self) local opts = TargetInvuln.super.prototype.GetOptions(self)
opts["shouldAnimate"] = nil
opts["desiredLerpTime"] = nil
opts["lowThreshold"] = nil opts["lowThreshold"] = nil
opts["textSettings"].args["upperTextString"] = nil opts["textSettings"].args["upperTextString"] = nil
opts["textSettings"].args["lowerTextString"] = nil opts["textSettings"].args["lowerTextString"] = nil

View File

@ -147,6 +147,7 @@ function IceTargetMana.prototype:GetOptions()
type = 'toggle', type = 'toggle',
name = 'Only show if target uses mana', name = 'Only show if target uses mana',
desc = 'Will only show this bar if the target uses mana (as opposed to rage, energy, runic power, etc.)', desc = 'Will only show this bar if the target uses mana (as opposed to rage, energy, runic power, etc.)',
width = 'double',
get = function() get = function()
return self.moduleSettings.onlyShowMana return self.moduleSettings.onlyShowMana
end, end,

View File

@ -24,6 +24,7 @@ function TargetTargetCast.prototype:GetDefaultSettings()
settings["flashInstants"] = "Never" settings["flashInstants"] = "Never"
settings["flashFailures"] = "Never" settings["flashFailures"] = "Never"
settings["shouldAnimate"] = false settings["shouldAnimate"] = false
settings["hideAnimationSettings"] = true
settings["usesDogTagStrings"] = false settings["usesDogTagStrings"] = false
settings["enabled"] = false settings["enabled"] = false
settings["barVerticalOffset"] = 35 settings["barVerticalOffset"] = 35
@ -77,31 +78,6 @@ end
function TargetTargetCast.prototype:GetOptions() function TargetTargetCast.prototype:GetOptions()
local opts = TargetTargetCast.super.prototype.GetOptions(self) local opts = TargetTargetCast.super.prototype.GetOptions(self)
-- Parnic - this exists solely for the console/rock config to work...animating cast bars doesn't make sense
opts["shouldAnimate"] =
{
type = 'toggle',
name = 's',
desc = 's',
set = 's',
get = 's',
hidden = function()
return true
end
}
opts["desiredLerpTime"] =
{
type = 'toggle',
name = 'd',
desc = 'd',
set = 'd',
get = 'd',
hidden = function()
return true
end
}
opts["barVisible"] = { opts["barVisible"] = {
type = 'toggle', type = 'toggle',
name = 'Bar visible', name = 'Bar visible',

View File

@ -54,7 +54,7 @@ function IceThreat.prototype:GetOptions()
opts["enabled"] = { opts["enabled"] = {
type = "toggle", type = "toggle",
name = "|c" .. self.configColor .. "Enabled|r", name = "Enabled",
desc = "Enable/disable module", desc = "Enable/disable module",
get = function() get = function()
return self.moduleSettings.enabled return self.moduleSettings.enabled
@ -127,8 +127,9 @@ function IceThreat.prototype:GetOptions()
opts["displaySecondPlaceThreat"] = { opts["displaySecondPlaceThreat"] = {
type = 'toggle', type = 'toggle',
name = 'Show second place threat', name = 'Show second highest threat',
desc = 'When tanking, this toggles whether or not the second-highest threat value found in your party or raid is displayed on top of your actual threat value', desc = 'When tanking, this toggles whether or not the second-highest threat value found in your party or raid is displayed on top of your actual threat value',
width = 'double',
get = function() get = function()
return self.moduleSettings.displaySecondPlaceThreat return self.moduleSettings.displaySecondPlaceThreat
end, end,