cleanup: remove arena & boss

This commit is contained in:
Crum
2018-06-11 22:50:02 -05:00
parent eb5a0582df
commit bec12d0f0d
13 changed files with 25 additions and 94 deletions
+1 -1
View File
@@ -245,7 +245,7 @@ function CC:PLAYER_ENTERING_WORLD()
local inInstance, instanceType = IsInInstance()
self.inInstance = inInstance
if instanceType == "arena" or instanceType == "pvp" then
if instanceType == "pvp" then
self.inBattleground = true
else
self.inBattleground = false
+1 -1
View File
@@ -760,7 +760,7 @@ end
function E:SendMessage()
local numParty, numRaid = GetNumPartyMembers(), GetNumRaidMembers()
local inInstance, instanceType = IsInInstance()
if inInstance and (instanceType == "pvp" or instanceType == "arena") then
if inInstance and (instanceType == "pvp") then
SendAddonMessage("ELVUI_VERSIONCHK", E.version, "BATTLEGROUND")
else
if numRaid > 0 then
+1 -1
View File
@@ -58,7 +58,7 @@ function E:UpdateBlizzardFonts()
SetFont(GameFontNormalSmall, NORMAL, self.db.general.fontSize);
SetFont(GameFontNormalLarge, NORMAL, self.db.general.fontSize);
SetFont(GameFontNormalHuge, NORMAL, 25, MONOCHROME .. "OUTLINE");
SetFont(BossEmoteNormalHuge, NORMAL, 25, MONOCHROME .. "OUTLINE");
-- SetFont(BossEmoteNormalHuge, NORMAL, 25, MONOCHROME .. "OUTLINE");
SetFont(GameFontBlack, NORMAL, self.db.general.fontSize);
SetFont(NumberFontNormal, NUMBER, self.db.general.fontSize, MONOCHROME .. "OUTLINE");
SetFont(NumberFontNormalSmall, NUMBER, self.db.general.fontSize);
-6
View File
@@ -322,9 +322,6 @@ function E:SetupResolution(noDataReset)
E.db.unitframe.units.targettarget.power.enable = false
E.db.unitframe.units.targettarget.width = 200
E.db.unitframe.units.targettarget.height = 26
E.db.unitframe.units.arena.width = 200
E.db.unitframe.units.arena.castbar.width = 200
end
local isPixel = E.private.general.pixelPerfect
@@ -553,9 +550,6 @@ function E:SetupLayout(layout, noDataReset)
E.db.unitframe.units.targettarget.power.enable = false
E.db.unitframe.units.targettarget.width = 200
E.db.unitframe.units.targettarget.height = 26
E.db.unitframe.units.arena.width = 200
E.db.unitframe.units.arena.castbar.width = 200
end
if layout == "dpsCaster" or layout == "healer" or (layout == "dpsMelee" and E.myclass == "HUNTER") then
@@ -45,9 +45,10 @@ local function SetAnchors(self)
for index = 1, getn(bars) do
local frame = bars[index]
local anchor = frame.anchor
frame:Height(self.auraBarHeight or 20)
frame.statusBar.iconHolder:Size(frame:GetHeight())
frame:Width((self.auraBarWidth or self:GetWidth()) - (frame:GetHeight() + (self.gap or 0)))
frame:SetHeight(self.auraBarHeight or 20)
frame.statusBar.iconHolder:SetWidth(frame:GetHeight())
frame.statusBar.iconHolder:SetHeight(frame:GetHeight())
frame:SetWidth((self.auraBarWidth or self:GetWidth()) - (frame:GetHeight() + (self.gap or 0)))
frame:ClearAllPoints()
if self.down == true then
if self == anchor then -- Root frame so indent for icon
+1 -6
View File
@@ -10,7 +10,6 @@ local strsub = strsub
local CreateFrame = CreateFrame
local ToggleCharacter = ToggleCharacter
local ToggleFrame = ToggleFrame
local ToggleAchievementFrame = ToggleAchievementFrame
local ToggleFriendsFrame = ToggleFriendsFrame
local IsAddOnLoaded = IsAddOnLoaded
local ToggleHelpFrame = ToggleHelpFrame
@@ -48,11 +47,7 @@ end
function M:GetLocTextColor()
local pvpType = GetZonePVPInfo()
if pvpType == "sanctuary" then
return 0.035, 0.58, 0.84
elseif pvpType == "arena" then
return 0.84, 0.03, 0.03
elseif pvpType == "friendly" then
if pvpType == "friendly" then
return 0.05, 0.85, 0.03
elseif pvpType == "hostile" then
return 0.84, 0.03, 0.03
+1 -1
View File
@@ -116,7 +116,7 @@ end
function M:PVPMessageEnhancement(_, msg)
if not E.db.general.enhancedPvpMessages then return end
local _, instanceType = IsInInstance()
if instanceType == "pvp" or instanceType == "arena" then
if instanceType == "pvp" then
RaidNotice_AddMessage(RaidBossEmoteFrame, msg, ChatTypeInfo["RAID_BOSS_EMOTE"])
end
end
-26
View File
@@ -265,32 +265,6 @@ local function LoadSkin()
E:Point(StackSplitFrame.bg1, "BOTTOMRIGHT", -10, 55)
StackSplitFrame.bg1:SetFrameLevel(StackSplitFrame.bg1:GetFrameLevel() - 1)
-- Declension frame
if GetLocale() == "ruRU" then
DeclensionFrame:SetTemplate("Transparent")
S:HandleNextPrevButton(DeclensionFrameSetPrev)
S:HandleNextPrevButton(DeclensionFrameSetNext)
S:HandleButton(DeclensionFrameOkayButton)
S:HandleButton(DeclensionFrameCancelButton)
for i = 1, RUSSIAN_DECLENSION_PATTERNS do
local editBox = _G["DeclensionFrameDeclension"..i.."Edit"]
if editBox then
E:StripTextures(editBox)
S:HandleEditBox(editBox)
end
end
end
if GetLocale() == "koKR" then
S:HandleButton(GameMenuButtonRatings)
RatingMenuFrame:SetTemplate("Transparent")
RatingMenuFrameHeader:Kill()
S:HandleButton(RatingMenuButtonOkay)
end
E:StripTextures(OpacityFrame)
E:SetTemplate(OpacityFrame, "Transparent")
+1 -1
View File
@@ -46,7 +46,7 @@ function UF:Update_PartyHeader(header)
header:ClearAllPoints()
header:SetPoint("BOTTOMLEFT", E.UIParent, "BOTTOMLEFT", 4, 195)
E:CreateMover(header, header:GetName().."Mover", L["Party Frames"], nil, nil, nil, "ALL,PARTY,ARENA")
E:CreateMover(header, header:GetName().."Mover", L["Party Frames"], nil, nil, nil, "ALL,PARTY")
header.positioned = true
end
end
-1
View File
@@ -21,7 +21,6 @@ local GetInstanceInfo = GetInstanceInfo
local UnregisterStateDriver = UnregisterStateDriver
local RegisterStateDriver = RegisterStateDriver
local MAX_RAID_MEMBERS = MAX_RAID_MEMBERS
local MAX_BOSS_FRAMES = MAX_BOSS_FRAMES
local ns = oUF
ElvUF = ns.oUF
-3
View File
@@ -103,9 +103,6 @@ V["unitframe"] = {
["disabledBlizzardFrames"] = {
["player"] = true,
["target"] = true,
["focus"] = true,
["boss"] = true,
["arena"] = true,
["party"] = true,
},
}