Commit fc40bc41 authored by Merathilis's avatar Merathilis

Merge branch 'development'

parents 28bfeaeb e50882f3
[b][color=orange]v3.07[/color], 31.08.2017[/b][list]
[*]Update install with new filterPriority.
[*]Add the possibility to change the duration text on the Nameplate auras.
[*]Fix errors with PlaySound API.
[*]Increase the size of the Orderhall Commandbar.[/list]
[b][color=orange]v3.06[/color], 29.08.2017[/b][list]
[*]Implement OzCooldowns - Credits Infinitron
[*]Add a new Logo. Thx RZ_Digital
......
**v3.06[/color], 29.08.2017**
** v3.07[/color], 31.08.2017**
* Update install with new filterPriority.
* Add the possibility to change the duration text on the Nameplate auras.
* Fix errors with PlaySound API.
* Increase the size of the Orderhall Commandbar.
** v3.06, 29.08.2017**
* Implement OzCooldowns - Credits Infinitron
* Add a new Logo. Thx RZ_Digital
* Some layout adjustments.
......
## Interface: 70300
## Author: Merathilis
## Credits: Benik, Darth Predator, Blazeflack, Azilroka, Infinitron, fgprodigal, Elv & all AddOn Authors who inspired me
## Version: 3.06
## Version: 3.07
## Title: |cff1784d1ElvUI|r |cffff7d0aMerathilisUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -12,8 +12,8 @@
## SavedVariables: MERData
## SavedVariablesPerCharacter: MERDataPerChar
## OptionalDeps: SharedMedia, XIV_Databar, BigWigs
## X-ElvVersion: 10.60
## X-Curse-Packaged-Version: 3.06
## X-ElvVersion: 10.62
## X-Curse-Packaged-Version: 3.07
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -16,12 +16,10 @@ local SOUNDKIT = SOUNDKIT
local ChangeLogData = {
"Changes:",
"• Implement OzCooldowns - Credits Infinitron.",
"• Add a new Logo. Thx RZ_Digital.",
"• Some layout adjustments.",
"• Add Namplateaura Filter - Credits Infinitron.",
"• Fix a error in AFK screen.",
"• Works with Patch 7.2.5 & 7.3.",
"• Update install with new filterPriority.",
"• Add the possibility to change the duration text on the Nameplate auras.",
"• Fix errors with PlaySound API.",
"• Increase the size of the Orderhall Commandbar.",
-- "• ",
" ",
"Notes:",
......@@ -128,11 +126,7 @@ function MER:ToggleChangeLog()
if not MerathilisUIChangeLog then
self:CreateChangelog()
end
if E.wowbuild < 24896 then --7.2.5
PlaySound("igMainMenuOptionCheckBoxOff")
else --7.3
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF)
end
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF or 857)
local fadeInfo = {}
fadeInfo.mode = "IN"
......
......@@ -1070,7 +1070,7 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["raid"]["buffs"]["enable"] = true
E.db["unitframe"]["units"]["raid"]["buffs"]["yOffset"] = 5
E.db["unitframe"]["units"]["raid"]["buffs"]["anchorPoint"] = "CENTER"
E.db["unitframe"]["units"]["raid"]["buffs"]["clickTrough"] = false
E.db["unitframe"]["units"]["raid"]["buffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["raid"]["buffs"]["useBlacklist"] = false
E.db["unitframe"]["units"]["raid"]["buffs"]["useWhitelist"] = true
E.db["unitframe"]["units"]["raid"]["buffs"]["noDuration"] = false
......@@ -1240,7 +1240,7 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["party"]["buffs"]["yOffset"] = 0
E.db["unitframe"]["units"]["party"]["buffs"]["xOffset"] = 0
E.db["unitframe"]["units"]["party"]["buffs"]["anchorPoint"] = "CENTER"
E.db["unitframe"]["units"]["party"]["buffs"]["clickTrough"] = false
E.db["unitframe"]["units"]["party"]["buffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["party"]["buffs"]["useFilter"] = "MER_RaidCDs"
E.db["unitframe"]["units"]["party"]["buffs"]["perrow"] = 1
E.db["unitframe"]["units"]["party"]["buffs"]["enable"] = true
......@@ -1516,7 +1516,7 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["target"]["debuffs"]["anchorPoint"] = "TOPRIGHT"
E.db["unitframe"]["units"]["target"]["debuffs"]["perrow"] = 4
E.db["unitframe"]["units"]["target"]["debuffs"]["attachTo"] = "BUFFS"
E.db["unitframe"]["units"]["target"]["debuffs"]["priority"] = "Personal,Boss,Whitelist,Blacklist,RaidDebuffs,blockNoDuration"
E.db["unitframe"]["units"]["target"]["buffs"]["priority"] = "Personal,Boss,Whitelist,Blacklist,PlayerBuffs,nonPersonal"
E.db["unitframe"]["units"]["target"]["smartAuraPosition"] = "DISABLED"
E.db["unitframe"]["units"]["target"]["aurabar"]["enable"] = false
E.db["unitframe"]["units"]["target"]["aurabar"]["attachTo"] = "BUFFS"
......@@ -1678,10 +1678,12 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["raid"]["verticalSpacing"] = 2
E.db["unitframe"]["units"]["raid"]["debuffs"]["countFontSize"] = 12
E.db["unitframe"]["units"]["raid"]["debuffs"]["enable"] = true
E.db["unitframe"]["units"]["raid"]["debuffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["raid"]["debuffs"]["xOffset"] = 0
E.db["unitframe"]["units"]["raid"]["debuffs"]["yOffset"] = -8
E.db["unitframe"]["units"]["raid"]["debuffs"]["anchorPoint"] = "TOPRIGHT"
E.db["unitframe"]["units"]["raid"]["debuffs"]["sizeOverride"] = 15
E.db["unitframe"]["units"]["raid"]["debuffs"]["priority"] = "Boss,Whitelist,Blacklist,RaidDebuffs,nonPersonal,CastByUnit,Dispellable"
E.db["unitframe"]["units"]["raid"]["rdebuffs"]["enable"] = false
E.db["unitframe"]["units"]["raid"]["rdebuffs"]["font"] = "Merathilis Prototype"
E.db["unitframe"]["units"]["raid"]["rdebuffs"]["fontSize"] = 10
......@@ -1707,7 +1709,7 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["raid"]["buffs"]["enable"] = true
E.db["unitframe"]["units"]["raid"]["buffs"]["yOffset"] = 5
E.db["unitframe"]["units"]["raid"]["buffs"]["anchorPoint"] = "CENTER"
E.db["unitframe"]["units"]["raid"]["buffs"]["clickTrough"] = false
E.db["unitframe"]["units"]["raid"]["buffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["raid"]["buffs"]["useBlacklist"] = false
E.db["unitframe"]["units"]["raid"]["buffs"]["useWhitelist"] = true
E.db["unitframe"]["units"]["raid"]["buffs"]["noDuration"] = false
......@@ -1719,6 +1721,8 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["raid"]["buffs"]["xOffset"] = 0
E.db["unitframe"]["units"]["raid"]["buffs"]["yOffset"] = 0
E.db["unitframe"]["units"]["raid"]["buffs"]["countFontSize"] = 12
E.db["unitframe"]["units"]["raid"]["buffs"]["useFilter"] = "MER_RaidCDs"
E.db["unitframe"]["units"]["raid"]["buffs"]["priority"] = "MER_RaidCDs"
E.db["unitframe"]["units"]["raid"]["raidicon"]["attachTo"] = "CENTER"
E.db["unitframe"]["units"]["raid"]["raidicon"]["xOffset"] = 0
E.db["unitframe"]["units"]["raid"]["raidicon"]["yOffset"] = 5
......@@ -1832,9 +1836,12 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["party"]["debuffs"]["sizeOverride"] = 15
E.db["unitframe"]["units"]["party"]["debuffs"]["position"] = "RIGHT"
E.db["unitframe"]["units"]["party"]["debuffs"]["countFontSize"] = 12
E.db["unitframe"]["units"]["party"]["debuffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["party"]["debuffs"]["perrow"] = 3
E.db["unitframe"]["units"]["party"]["debuffs"]["yOffset"] = 0
E.db["unitframe"]["units"]["party"]["debuffs"]["xOffset"] = 0
E.db["unitframe"]["units"]["party"]["debuffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["party"]["debuffs"]["priority"] = "Boss,Whitelist,Blacklist,RaidDebuffs,blockNoDuration,nonPersonal"
E.db["unitframe"]["units"]["party"]["rdebuffs"]["font"] = "Merathilis Prototype"
E.db["unitframe"]["units"]["party"]["rdebuffs"]["fontOutline"] = "OUTLINE"
E.db["unitframe"]["units"]["party"]["rdebuffs"]["size"] = 20
......@@ -1877,7 +1884,8 @@ function MER:SetupUnitframes(layout)
E.db["unitframe"]["units"]["party"]["buffs"]["yOffset"] = 0
E.db["unitframe"]["units"]["party"]["buffs"]["xOffset"] = 0
E.db["unitframe"]["units"]["party"]["buffs"]["anchorPoint"] = "CENTER"
E.db["unitframe"]["units"]["party"]["buffs"]["clickTrough"] = false
E.db["unitframe"]["units"]["party"]["buffs"]["clickTrough"] = true
E.db["unitframe"]["units"]["party"]["buffs"]["priority"] = "MER_RaidCDs"
E.db["unitframe"]["units"]["party"]["buffs"]["useFilter"] = "MER_RaidCDs"
E.db["unitframe"]["units"]["party"]["buffs"]["perrow"] = 1
E.db["unitframe"]["units"]["party"]["buffs"]["enable"] = true
......
......@@ -374,8 +374,10 @@ L["Icon Height"] = "Symbol Höhe"
L["Set the height of this spells icon."] = "Setzt die Höhe von einem Zaubersymbol."
L["Lock Aspect Ratio"] = "Seitenverhältnis sperren"
L["Set if height and width are locked to the same value."] = "Behält das Seitenverhältnis bei."
L["Stack Size"] = "Stappel Größe"
L["Text Size"] = "Text Größe"
L["Size of the stack text."] = "Größe des Stack Texts."
L["Size of the cooldown text."] = "Größe des Cooldown Texts."
L["Specific Auras"] = "Spezifische Auren"
L["Always"] = "Immer"
L["Never"] = "Niemals"
......
......@@ -373,8 +373,10 @@ L["Icon Height"] = true
L["Set the height of this spells icon."] = true
L["Lock Aspect Ratio"] = true
L["Set if height and width are locked to the same value."] = true
L["Stack Size"] = true
L["Text Size"] = true
L["Size of the stack text."] = true
L["Size of the cooldown text."] = true
L["Specific Auras"] = true
L["Always"] = true
L["Never"] = true
......
......@@ -362,8 +362,10 @@ L["Icon Height"] = true
L["Set the height of this spells icon."] = true
L["Lock Aspect Ratio"] = true
L["Set if height and width are locked to the same value."] = true
L["Stack Size"] = true
L["Text Size"] = true
L["Size of the stack text."] = true
L["Size of the cooldown text."] = true
L["Specific Auras"] = true
L["Always"] = true
L["Never"] = true
......
......@@ -362,8 +362,10 @@ L["Icon Height"] = true
L["Set the height of this spells icon."] = true
L["Lock Aspect Ratio"] = true
L["Set if height and width are locked to the same value."] = true
L["Stack Size"] = true
L["Text Size"] = true
L["Size of the stack text."] = true
L["Size of the cooldown text."] = true
L["Specific Auras"] = true
L["Always"] = true
L["Never"] = true
......
......@@ -362,8 +362,10 @@ L["Icon Height"] = true
L["Set the height of this spells icon."] = true
L["Lock Aspect Ratio"] = true
L["Set if height and width are locked to the same value."] = true
L["Stack Size"] = true
L["Text Size"] = true
L["Size of the stack text."] = true
L["Size of the cooldown text."] = true
L["Specific Auras"] = true
L["Always"] = true
L["Never"] = true
......
......@@ -362,8 +362,10 @@ L["Icon Height"] = true
L["Set the height of this spells icon."] = true
L["Lock Aspect Ratio"] = true
L["Set if height and width are locked to the same value."] = true
L["Stack Size"] = true
L["Text Size"] = true
L["Size of the stack text."] = true
L["Size of the cooldown text."] = true
L["Specific Auras"] = true
L["Always"] = true
L["Never"] = true
......
......@@ -362,8 +362,10 @@ L["Icon Height"] = true
L["Set the height of this spells icon."] = true
L["Lock Aspect Ratio"] = true
L["Set if height and width are locked to the same value."] = true
L["Stack Size"] = true
L["Text Size"] = true
L["Size of the stack text."] = true
L["Size of the cooldown text."] = true
L["Specific Auras"] = true
L["Always"] = true
L["Never"] = true
......
......@@ -96,7 +96,7 @@ LP.PortItems = {
{129276}, --Beginner's Guide to Dimensional Rifting
{140493}, --Adept's Guide to Dimensional Rifting
{142542, nil, true}, --Tome of Town Portal (Diablo Event)
-- {152964}, --Krokul Flute (Argus 7.3)
{152964}, --Krokul Flute (Argus 7.3)
}
LP.Spells = {
......
......@@ -25,11 +25,7 @@ function MI:LoadMisc()
-- Force readycheck warning
local ShowReadyCheckHook = function(_, initiator)
if initiator ~= "player" then
if E.wowbuild < 24896 then --7.2.5
PlaySound("ReadyCheck", "Master")
else -- 7.3
PlaySound(SOUNDKIT.READY_CHECK)
end
PlaySound(SOUNDKIT.READY_CHECK or 8960)
end
end
hooksecurefunc("ShowReadyCheck", ShowReadyCheckHook)
......@@ -44,27 +40,15 @@ function MI:LoadMisc()
for i = 1, GetMaxBattlefieldID() do
local status = GetBattlefieldStatus(i)
if status == "confirm" then
if E.wowbuild < 24896 then --7.2.5
PlaySound("PVPTHROUGHQUEUE", "Master")
else -- 7.3
PlaySound(SOUNDKIT.UI_PET_BATTLES_PVP_THROUGH_QUEUE)
end
PlaySound(SOUNDKIT.UI_PET_BATTLES_PVP_THROUGH_QUEUE or 36609)
break
end
i = i + 1
end
elseif event == "PET_BATTLE_QUEUE_PROPOSE_MATCH" then
if E.wowbuild < 24896 then --7.2.5
PlaySound("PVPTHROUGHQUEUE", "Master")
else -- 7.3
PlaySound(SOUNDKIT.UI_PET_BATTLES_PVP_THROUGH_QUEUE)
end
PlaySound(SOUNDKIT.UI_PET_BATTLES_PVP_THROUGH_QUEUE or 36609)
elseif event == "LFG_PROPOSAL_SHOW" then
if E.wowbuild < 24896 then --7.2.5
PlaySound("ReadyCheck", "Master")
else -- 7.3
PlaySound(SOUNDKIT.READY_CHECK)
end
PlaySound(SOUNDKIT.READY_CHECK or 8960)
end
end)
......
......@@ -49,20 +49,35 @@ function NA:SetAura(aura, index, name, icon, count, duration, expirationTime, sp
aura:SetHeight(height)
-- Stacks
local textSize = 7
local stackSize = 7
if spell and spell['text'] then
textSize = spell['text']
elseif E.global['nameplate']['spellListDefault']['text'] then
textSize = E.global['nameplate']['spellListDefault']['text']
if spell and spell['stackSize'] then
stackSize = spell['stackSize']
elseif E.global['nameplate']['spellListDefault']['stackSize'] then
stackSize = E.global['nameplate']['spellListDefault']['stackSize']
end
aura.count:FontTemplate(nil, textSize, 'OUTLINE')
aura.count:FontTemplate(nil, stackSize, 'OUTLINE')
if count > 1 then
aura.count:SetText(count)
else
aura.count:SetText("")
end
-- Text
local textSize = 9
if spell and spell['text'] then
textSize = spell['textSize']
elseif E.global['nameplate']['spellListDefault']['text'] then
textSize = E.global['nameplate']['spellListDefault']['text']
end
if aura.cooldown.timer then
aura.cooldown.timer.text:FontTemplate(nil, textSize, 'OUTLINE')
aura.cooldown.timer.text:Point('TOPLEFT', 1, 1)
end
NA:SortAuras(aura:GetParent());
end
end
......
......@@ -100,11 +100,26 @@ local function UpdateSpellGroup()
end
end,
},
stackSize = {
type = "range",
order = 7,
name = L["Stack Size"],
desc = L["Size of the stack text."],
min = 6,
max = 24,
step = 1,
get = function(info)
return E.global['nameplate']['spellListDefault']["stackSize"]
end,
set = function(info, value)
E.global['nameplate']['spellListDefault']["stackSize"] = value
end,
},
text = {
type = 'range',
order = 7,
name = L['Text Size'],
desc = L['Size of the stack text.'],
desc = L['Size of the cooldown text.'],
min = 6,
max = 24,
step = 1,
......@@ -176,6 +191,7 @@ local function NameplateAurasTable()
['width'] = E.global['nameplate']['spellListDefault']['width'],
['height'] = E.global['nameplate']['spellListDefault']['height'],
['lockAspect'] = E.global['nameplate']['spellListDefault']['lockAspect'],
['stackSize'] = E.global['nameplate']['spellListDefault']['stackSize'],
['text'] = E.global['nameplate']['spellListDefault']['text'],
['flashTime'] = E.global['nameplate']['spellListDefault']['flashTime'],
}
......@@ -192,9 +208,9 @@ local function NameplateAurasTable()
type = "select",
name = L["Spell List"],
get = function(info) return selectedSpellID end,
set = function(info, value) selectedSpellID = value; UpdateSpellGroup() end,
set = function(info, value) selectedSpellID = tonumber(value:match("%[(%d+)]$")); UpdateSpellGroup() end,
values = function()
spellLists = {}
local spellLists = {}
for spell in pairs(E.global['nameplate']['spellList']) do
local spellName = select(1, GetSpellInfo(spell));
local color = "|cffff0000"
......@@ -204,7 +220,7 @@ local function NameplateAurasTable()
elseif visibility == 3 then
color = "|cff00ffff"
end
spellLists[spell] = color..spellName.."|r"
spellLists[format("%s [%i]", spellName, spell)] = color..spellName.."|r"
end
return spellLists
end,
......@@ -296,14 +312,29 @@ local function NameplateAurasTable()
end
end,
},
text = {
stackSize = {
type = "range",
order = 7,
name = L["Text Size"],
name = L["Stack Size"],
desc = L["Size of the stack text."],
min = 6,
max = 24,
step = 1,
get = function(info)
return E.global['nameplate']['spellListDefault']["stackSize"]
end,
set = function(info, value)
E.global['nameplate']['spellListDefault']["stackSize"] = value
end,
},
text = {
type = "range",
order = 8,
name = L["Text Size"],
desc = L["Size of the cooldown text."],
min = 6,
max = 24,
step = 1,
get = function(info)
return E.global['nameplate']['spellListDefault']["text"]
end,
......
......@@ -34,7 +34,6 @@ local PlaySoundFile = PlaySoundFile
local PlaySound = PlaySound
local C_Timer = C_Timer
local GetGameTime = GetGameTime
local PlaySoundKitID = PlaySoundKitID
local CreateAnimationGroup = CreateAnimationGroup
local CalendarGetAbsMonth = CalendarGetAbsMonth
......@@ -91,7 +90,7 @@ function NF:SpawnToast(toast)
toast.AnimOut.AnimMove:SetOffset(0, -YOffset)
toast.AnimIn:Play()
toast.AnimOut:Play()
PlaySoundKitID(18019, "master", true)
PlaySound(18019, "master", true)
end
function NF:RefreshToasts()
......@@ -456,11 +455,7 @@ function NF:VIGNETTE_ADDED(event, id)
end
function NF:RESURRECT_REQUEST(name)
if E.wowbuild < 24896 then --7.2.5
PlaySound("LEVELUPSOUND", "master")
else -- 7.3
PlaySound(SOUNDKIT.UI_GARRISON_COMMAND_TABLE_FOLLOWER_LEVEL_UP)
end
PlaySound(46893, "master", true)
end
function NF:Initialize()
......
......@@ -25,7 +25,7 @@ local function styleOrderhall()
MERS:CreateStripes(b)
end
b:SetWidth(b.AreaName:GetStringWidth() + 500)
b:SetWidth(b.AreaName:GetStringWidth() + 610)
b.Background:SetAtlas(nil)
b.Currency:Hide()
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment