Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 08:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Crum
2018-11-15 23:48:59 -06:00
parent 2dc704179d
commit 15e589e1cf
7 changed files with 336 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Core/core.lua
+1 -1
View File
@@ -141,7 +141,7 @@ function E:ColorizedName(name, arg2)
end
function E:Print(msg)
print(self:ColorizedName("ElvUI", true), msg)
(_G[self.db.general.messageRedirect] or DEFAULT_CHAT_FRAME):AddMessage(strjoin("", self:ColorizedName("ElvUI", true), msg)) -- I put DEFAULT_CHAT_FRAME as a fail safe.
end
E.PriestColors = {
ElvUI/Modules/Bags/Bags.lua
+38 -4
View File
@@ -56,7 +56,7 @@ B.ProfessionColors = {
[1] = {225/255, 175/255, 105/255}, -- Quiver
[2] = {225/255, 175/255, 105/255}, -- Ammo Pouch
[4] = {225/255, 175/255, 105/255}, -- Soul Bag
[8] = {18/255, 181/255, 32/255}, -- Herbs
[8] = {18/255, 181/255, 32/255}, -- Herbalism
[16] = {160/255, 3/255, 168/255}, -- Enchanting
}
@@ -246,6 +246,15 @@ function B:UpdateBagTypes(isBank)
end
end
function B:UpdateAllBagSlots()
if E.private.bags.enable ~= true then return end
for _, bagFrame in pairs(self.BagFrames) do
if bagFrame.UpdateAllSlots then
bagFrame:UpdateAllSlots()
end
end
end
function B:UpdateSlot(bagID, slotID)
if (self.Bags[bagID] and self.Bags[bagID].numSlots ~= GetContainerNumSlots(bagID)) or not self.Bags[bagID] or not self.Bags[bagID][slotID] then return end
@@ -277,7 +286,11 @@ function B:UpdateSlot(bagID, slotID)
if iLvl and B.db.itemLevel and (itemEquipLoc ~= nil and itemEquipLoc ~= "" and itemEquipLoc ~= "INVTYPE_AMMO" and itemEquipLoc ~= "INVTYPE_BAG" and itemEquipLoc ~= "INVTYPE_QUIVER" and itemEquipLoc ~= "INVTYPE_TABARD") and (slot.rarity and slot.rarity > 1) then
if iLvl >= E.db.bags.itemLevelThreshold then
slot.itemLevel:SetText(iLvl)
slot.itemLevel:SetTextColor(r, g, b)
if B.db.itemLevelCustomColorEnable then
slot.itemLevel:SetTextColor(B.db.itemLevelCustomColor.r, B.db.itemLevelCustomColor.g, B.db.itemLevelCustomColor.b)
else
slot.itemLevel:SetTextColor(r, g, b)
end
end
end
@@ -914,9 +927,11 @@ function B:VendorGrayCheck()
end
function B:ContructContainerFrame(name, isBank)
local strata = E.db.bags.strata or "HIGH"
local f = CreateFrame("Button", name, E.UIParent)
E:SetTemplate(f, "Transparent")
f:SetFrameStrata("DIALOG")
f:SetFrameStrata(strata)
f.UpdateSlot = B.UpdateSlot
f.UpdateAllSlots = B.UpdateAllSlots
f.UpdateBagSlots = B.UpdateBagSlots
@@ -962,7 +977,7 @@ function B:ContructContainerFrame(name, isBank)
f:SetScript("OnLeave", function() GameTooltip:Hide() end)
f.closeButton = CreateFrame("Button", name.."CloseButton", f, "UIPanelCloseButton")
E:Point(f.closeButton, "TOPRIGHT", -4, -4)
E:Point(f.closeButton, "TOPRIGHT", 2, 2)
E:GetModule("Skins"):HandleCloseButton(f.closeButton)
@@ -1531,6 +1546,17 @@ end
B.SellFrame:Hide()
end
B.BagIndice = {
quiver = 1,
ammoPouch = 2,
soulBag = 4,
herbs = 8,
enchanting = 16,
}
function B:UpdateBagColors(table, indice, r, g, b)
self[table][B.BagIndice[indice]] = {r, g, b}
end
function B:Initialize()
self:LoadBagBar()
@@ -1559,6 +1585,14 @@ function B:Initialize()
self.db = E.db.bags
self.BagFrames = {}
self.ProfessionColors = {
[1] = {self.db.colors.profession.quiver.r, self.db.colors.profession.quiver.g, self.db.colors.profession.quiver.b},
[2] = {self.db.colors.profession.ammoPouch.r, self.db.colors.profession.ammoPouch.g, self.db.colors.profession.ammoPouch.b},
[4] = {self.db.colors.profession.soulBag.r, self.db.colors.profession.soulBag.g, self.db.colors.profession.soulBag.b},
[8] = {self.db.colors.profession.herbs.r, self.db.colors.profession.herbs.g, self.db.colors.profession.herbs.b},
[16] = {self.db.colors.profession.enchanting.r, self.db.colors.profession.enchanting.g, self.db.colors.profession.enchanting.b},
}
--Bag Mover: Set default anchor point and create mover
E:Point(BagFrameHolder, "BOTTOMRIGHT", RightChatPanel, "BOTTOMRIGHT", 0, 22 + E.Border*4 - E.Spacing*2)
E:CreateMover(BagFrameHolder, "ElvUIBagMover", L["Bag Mover (Grow Up)"], nil, nil, B.PostBagMove)
ElvUI/Modules/Skins/Blizzard/Craft.lua
+1 -1
View File
@@ -89,7 +89,7 @@ local function LoadSkin()
CraftRequirements:SetTextColor(1, 0.80, 0.10)
S:HandleCloseButton(CraftFrameCloseButton)
S:HandleCloseButton(CraftFrameCloseButton, CraftFrame.backdrop)
E:StripTextures(CraftExpandButtonFrame)
ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
+1 -1
View File
@@ -110,7 +110,7 @@ local function LoadSkin()
TradeSkillRequirementLabel:SetTextColor(1, 0.80, 0.10)
S:HandleCloseButton(TradeSkillFrameCloseButton)
S:HandleCloseButton(TradeSkillFrameCloseButton, TradeSkillFrame.backdrop)
E:StripTextures(TradeSkillExpandButtonFrame)
ElvUI/Settings/Profile.lua
+96 -54
View File
@@ -5,6 +5,7 @@ P.farmSize = 340
--Core
P["general"] = {
["messageRedirect"] = DEFAULT_CHAT_FRAME:GetName(),
["stickyFrames"] = true,
["loginmessage"] = true,
["autoRepair"] = "NONE",
@@ -96,6 +97,101 @@ P["databars"] = {
},
}
--Bags
P["bags"] = {
["sortInverted"] = true,
["bagSize"] = 34,
["bankSize"] = 34,
["bagWidth"] = 406,
["bankWidth"] = 406,
["moneyFormat"] = "SMART",
["moneyCoins"] = true,
["ignoredItems"] = {},
["itemLevel"] = true,
["itemLevelThreshold"] = 1,
["itemLevelFont"] = "Homespun",
["itemLevelFontSize"] = 10,
["itemLevelFontOutline"] = "MONOCHROMEOUTLINE",
["itemLevelCustomColorEnable"] = false,
["itemLevelCustomColor"] = {r = 1, g = 1, b = 1},
["countFont"] = "Homespun",
["countFontSize"] = 10,
["countFontOutline"] = "MONOCHROMEOUTLINE",
["countFontColor"] = {r = 1, g = 1, b = 1},
["reverseSlots"] = false,
["clearSearchOnClose"] = false,
["disableBagSort"] = false,
["disableBankSort"] = false,
["strata"] = "DIALOG",
["colors"] = {
["profession"] = {
["quiver"] = {r = 1, g = 0.56, b = 0.73},
["ammoPouch"] = {r = 1, g = 0.56, b = 0.73},
["soulBag"] = {r = 0.47, g = 0.26, b = 1},
["leatherworking"] = {r = 0.88, g = 0.73, b = 0.29},
["herbs"] = {r = 0.07, g = 0.71, b = 0.13},
["enchanting"] = {r = 0.76, g = 0.02, b = 0.8},
["engineering"] = {r = 0.91, g = 0.46, b = 0.18},
["gems"] = {r = 0.03, g = 0.71, b = 0.81},
["mining"] = {r = 0.54, g = 0.40, b = 0.04}
}
},
["vendorGrays"] = {
["enable"] = false,
["interval"] = 0.2,
["details"] = false
},
["split"] = {
["bagSpacing"] = 5,
["player"] = false,
["bank"] = false,
["bag1"] = false,
["bag2"] = false,
["bag3"] = false,
["bag4"] = false,
["bag5"] = false,
["bag6"] = false,
["bag7"] = false,
["bag8"] = false,
["bag9"] = false,
["bag10"] = false,
["bag11"] = false,
},
["cooldown"] = {
["threshold"] = 4,
["override"] = false,
["reverse"] = false,
["expiringColor"] = {r = 1, g = 0, b = 0},
["secondsColor"] = {r = 1, g = 1, b = 1},
["minutesColor"] = {r = 1, g = 1, b = 1},
["hoursColor"] = {r = 1, g = 1, b = 1},
["daysColor"] = {r = 1, g = 1, b = 1},
["checkSeconds"] = false,
["hhmmColor"] = {r = 1, g = 1, b = 1},
["mmssColor"] = {r = 1, g = 1, b = 1},
["hhmmThreshold"] = -1,
["mmssThreshold"] = -1,
["fonts"] = {
["enable"] = false,
["font"] = "PT Sans Narrow",
["fontOutline"] = "OUTLINE",
["fontSize"] = 18
}
},
["bagBar"] = {
["growthDirection"] = "VERTICAL",
["sortDirection"] = "ASCENDING",
["size"] = 30,
["spacing"] = 4,
["backdropSpacing"] = 4,
["showBackdrop"] = false,
["mouseover"] = false,
["visibility"] = "",
}
}
P["nameplates"] = {
["statusbar"] = "ElvUI Norm",
["font"] = "PT Sans Narrow",
@@ -545,60 +641,6 @@ P["tooltip"] = {
}
}
P["bags"] = {
["sortInverted"] = true,
["bagSize"] = 34,
["bankSize"] = 34,
["bagWidth"] = 406,
["bankWidth"] = 406,
["moneyFormat"] = "SMART",
["moneyCoins"] = true,
["ignoredItems"] = {},
["itemLevel"] = true,
["itemLevelThreshold"] = 1,
["itemLevelFont"] = "Homespun",
["itemLevelFontSize"] = 10,
["itemLevelFontOutline"] = "MONOCHROMEOUTLINE",
["countFont"] = "Homespun",
["countFontSize"] = 10,
["countFontOutline"] = "MONOCHROMEOUTLINE",
["countFontColor"] = {r = 1, g = 1, b = 1},
["reverseSlots"] = false,
["clearSearchOnClose"] = false,
["disableBagSort"] = false,
["disableBankSort"] = false,
["vendorGrays"] = {
["enable"] = false,
["interval"] = 0.2,
["details"] = false
},
["split"] = {
["bagSpacing"] = 5,
["player"] = false,
["bank"] = false,
["bag1"] = false,
["bag2"] = false,
["bag3"] = false,
["bag4"] = false,
["bag5"] = false,
["bag6"] = false,
["bag7"] = false,
["bag8"] = false,
["bag9"] = false,
["bag10"] = false,
["bag11"] = false,
},
["bagBar"] = {
["growthDirection"] = "VERTICAL",
["sortDirection"] = "ASCENDING",
["size"] = 30,
["spacing"] = 4,
["backdropSpacing"] = 4,
["showBackdrop"] = false,
["mouseover"] = false
}
}
--UnitFrame
P["unitframe"] = {
["smoothbars"] = false,