From 45f480ceb994404bc32d7c4395c455d3c0ee9791 Mon Sep 17 00:00:00 2001 From: Albea Date: Sun, 19 Mar 2017 17:52:33 +0100 Subject: [PATCH] Fixed lua error and nostalkgeek special syntax --- DPSMate/DPSMate.lua | 2 +- DPSMate_!frFR/DPSMate_ParserFRFR.lua | 2 ++ DPSMate_Deaths/DPSMate_Details_DeathsTotal.lua | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/DPSMate/DPSMate.lua b/DPSMate/DPSMate.lua index c66d9c6..c957782 100644 --- a/DPSMate/DPSMate.lua +++ b/DPSMate/DPSMate.lua @@ -1,6 +1,6 @@ -- Global Variables DPSMate = {} -DPSMate.VERSION = 105 +DPSMate.VERSION = 106 DPSMate.LOCALE = GetLocale() DPSMate.SYNCVERSION = DPSMate.VERSION..DPSMate.LOCALE DPSMate.Parser = CreateFrame("Frame", nil, UIParent) diff --git a/DPSMate_!frFR/DPSMate_ParserFRFR.lua b/DPSMate_!frFR/DPSMate_ParserFRFR.lua index a3a4454..0b8bcab 100644 --- a/DPSMate_!frFR/DPSMate_ParserFRFR.lua +++ b/DPSMate_!frFR/DPSMate_ParserFRFR.lua @@ -1246,4 +1246,6 @@ if (GetLocale() == "frFR") then return end end + local gsub = string.gsub + DPSMate.Parser:SetScript("OnEvent", function() this[event](gsub(arg1, "DE", "de")) end) end diff --git a/DPSMate_Deaths/DPSMate_Details_DeathsTotal.lua b/DPSMate_Deaths/DPSMate_Details_DeathsTotal.lua index 1f60ad2..64ff037 100644 --- a/DPSMate_Deaths/DPSMate_Details_DeathsTotal.lua +++ b/DPSMate_Deaths/DPSMate_Details_DeathsTotal.lua @@ -44,8 +44,16 @@ function DPSMate.Modules.DetailsDeathsTotal:UpdateRow(row, a, b, c, d, e, f, g, else _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_CombatTime"):SetText("") end - _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Victim"):SetText("|cFF"..hexClassColor[DPSMateUser[c][2] or "warrior"]..c.."|r") - _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Cause"):SetText("|cFF"..hexClassColor[DPSMateUser[h][2] or "warrior"]..h.."|r") + if c=="" then + _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Victim"):SetText("|cFF"..hexClassColor["warrior"]..c.."|r") + else + _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Victim"):SetText("|cFF"..hexClassColor[DPSMateUser[c][2] or "warrior"]..c.."|r") + end + if h=="" then + _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Cause"):SetText("|cFF"..hexClassColor["warrior"]..h.."|r") + else + _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Cause"):SetText("|cFF"..hexClassColor[DPSMateUser[h][2] or "warrior"]..h.."|r") + end _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Over"):SetText(strformat("%.2f", d).."s") _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_Ability"):SetText(e) _G("DPSMate_Details_Deaths_Total_LogDetails_Row"..row.."_HealIn"):SetText("+"..f)