This commit is contained in:
Crum
2018-01-18 17:14:26 -06:00
parent c1828828df
commit e03c4b9eb3
9 changed files with 205 additions and 209 deletions
+1 -1
View File
@@ -723,7 +723,7 @@ function B:VendorGrays(delete, _, getValue)
for s = 1, GetContainerNumSlots(b) do
local l = GetContainerItemLink(b, s)
if l and find(l,"ff9d9d9d") then
local p = LIP:GetSellValue(l) * select(2, GetContainerItemInfo(b, s))
-- local p = LIP:GetSellValue(l) * select(2, GetContainerItemInfo(b, s))
if delete then
if find(l,"ff9d9d9d") then
+3 -3
View File
@@ -694,7 +694,7 @@ end
local hyperLinkEntered
function CH:OnHyperlinkEnter()
local linkToken = match(arg1, "(%a+):(%d+)")
local linkToken = match(arg1, "([^:]+)")
if hyperlinkTypes[linkToken] then
ShowUIPanel(GameTooltip)
GameTooltip:SetOwner(this, "ANCHOR_CURSOR")
@@ -705,7 +705,7 @@ function CH:OnHyperlinkEnter()
end
function CH:OnHyperlinkLeave()
local linkToken = match(arg1, "(%a+):(%d+)")
local linkToken = match(arg1, "([^:]+)")
if hyperlinkTypes[linkToken] then
HideUIPanel(GameTooltip)
hyperLinkEntered = nil
@@ -1708,7 +1708,7 @@ function CH:Initialize()
end
local S = E:GetModule("Skins")
--S:HandleNextPrevButton(CombatLogQuickButtonFrame_CustomAdditionalFilterButton, true)
local frame = CreateFrame("Frame", "CopyChatFrame", E.UIParent)
tinsert(UISpecialFrames, "CopyChatFrame")
E:SetTemplate(frame, "Transparent")
+1 -6
View File
@@ -6,10 +6,8 @@ E.Misc = M
--Lua functions
local format, gsub = string.format, string.gsub
--WoW API / Variables
local CanGuildBankRepair = CanGuildBankRepair
local CanMerchantRepair = CanMerchantRepair
local GetFriendInfo = GetFriendInfo
local GetGuildBankWithdrawMoney = GetGuildBankWithdrawMoney
local GetGuildRosterInfo = GetGuildRosterInfo
local GetNumFriends = GetNumFriends
local GetNumGuildMembers = GetNumGuildMembers
@@ -18,7 +16,6 @@ local GetNumRaidMembers = GetNumRaidMembers
local GetPartyMember = GetPartyMember
local GetRepairAllCost = GetRepairAllCost
local GuildRoster = GuildRoster
local InCombatLockdown = InCombatLockdown
local IsInGuild = IsInGuild
local IsInInstance = IsInInstance
local IsShiftKeyDown = IsShiftKeyDown
@@ -97,8 +94,6 @@ function M:MERCHANT_SHOW()
end
function M:DisbandRaidGroup()
if InCombatLockdown() then return end -- Prevent user error in combat
if UnitInRaid("player") then
for i = 1, GetNumRaidMembers() do
local name, _, _, _, _, _, _, online = GetRaidRosterInfo(i)
@@ -182,7 +177,7 @@ function M:Initialize()
self:RegisterEvent("MERCHANT_SHOW")
self:RegisterEvent("PLAYER_REGEN_DISABLED", "ErrorFrameToggle")
self:RegisterEvent("PLAYER_REGEN_ENABLED", "ErrorFrameToggle")
self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
-- self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
self:RegisterEvent("CHAT_MSG_BG_SYSTEM_HORDE", "PVPMessageEnhancement")
self:RegisterEvent("CHAT_MSG_BG_SYSTEM_ALLIANCE", "PVPMessageEnhancement")
self:RegisterEvent("CHAT_MSG_BG_SYSTEM_NEUTRAL", "PVPMessageEnhancement")
@@ -5,7 +5,7 @@ local mod = E:NewModule("NamePlates", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3
local _G = _G
local pairs, tonumber = pairs, tonumber
local select = select
local gsub, split = string.gsub, string.split
local gsub, match, split = string.gsub, string.match, string.split
local twipe = table.wipe
local CreateFrame = CreateFrame
@@ -82,7 +82,7 @@ function mod:CheckBGHealers()
for i = 1, GetNumBattlefieldScores() do
name, _, _, _, _, _, _, _, _, class, damageDone, healingDone = GetBattlefieldScore(i)
if name and class and healClasses[class] then
name = name:match("(.+)%-.+") or name
name = match(name, "(.+)%-.+") or name
if name and healingDone > (damageDone * 2) then
self.Healers[name] = true
elseif name and self.Healers[name] then
@@ -712,7 +712,7 @@ end
if queryList[name] then
local frame = queryList[name]
if frame.UnitType then
if frame.UnitType then
if frame.UnitType == "ENEMY_NPC" then
frame.UnitType = "ENEMY_PLAYER"
end
@@ -223,7 +223,7 @@ local function LoadSkin()
end
E:StripTextures(button)
E:StyleButton(button, false ,true)
E:StyleButton(button, false, true)
_G["BrowseButton"..i.."Highlight"] = button:GetHighlightTexture()
button:GetHighlightTexture():ClearAllPoints()
button:GetHighlightTexture():SetPoint("TOPLEFT", icon, "TOPRIGHT", 2, 0)