From a6747c0e88bf625a91b28340ff4be9bffbe43114 Mon Sep 17 00:00:00 2001
From: F16Gaming <adam.hellberg95@gmail.com>
Date: Sun, 2 Sep 2012 16:22:20 +0200
Subject: [PATCH] Fixed broker plugin code.

---
 .gitignore    |    1 +
 Broker.lua    |   61 +++++++++++++++++++++++++++++++++++++++++++++++----------
 KillTrack.lua |   29 +++++++++++++++++++++------
 icon.tga      |  Bin 1310 -> 2237 bytes
 4 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f5fe64..8c08967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ss_*.png
 /libs/LibStub
 /libs/CallbackHandler-1.0
 /libs/AceGUI-3.0
diff --git a/Broker.lua b/Broker.lua
index 97d8b9d..e9cc639 100644
--- a/Broker.lua
+++ b/Broker.lua
@@ -21,8 +21,8 @@ local KT = KillTrack
 
 KT.Broker = {
 	Text = {
-		Short = "KPM: %f",
-		Long = "Kills Per Minute: %f",
+		Short = "KPM: %.2f",
+		Long = "Kills Per Minute: %.2f"
 	}
 }
 
@@ -33,14 +33,57 @@ local t = 0
 
 local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
 
+local frame = CreateFrame("Frame")
+
 local data = {
 	type = "data source",
-	label = "KillTrack |cff00FF00(" .. KT.Version .. ")|r",
-	icon = "Interface\\AddOns\\KillTrack\\icon.tga"
+	label = KT.Name,
+	icon = "Interface\\AddOns\\KillTrack\\icon.tga",
+	tocname = KT.Name
 }
 
 local obj = ldb:NewDataObject("Broker_KillTrack", data)
 
+function obj.OnTooltipShow(tip)
+	tip:AddLine(("%s |cff00FF00(%s)|r"):format(KT.Name, KT.Version), 1, 1, 1)
+	tip:AddLine(" ")
+	tip:AddLine("Most kills this session:", 1, 1, 0)
+	local added = 0
+	for k,v in pairs(KT.Session.Kills) do
+		tip:AddDoubleLine(k, v)
+		added = added + 1
+	end
+	if added <= 0 then
+		tip:AddLine("No kills this session", 1, 0, 0)
+	end
+	tip:AddLine(" ")
+	tip:AddLine("Most kills total:", 1, 1, 0)
+	local added = 0
+	for _,v in pairs(KT:GetSortedMobTable()) do
+		tip:AddDoubleLine(v.Name, ("%d (%d)"):format(v.cKills, v.gKills))
+		added = added + 1
+		if added >= 3 then break end
+	end
+	if added <= 0 then
+		tip:AddLine("No kills recorded yet", 1, 0, 0)
+	end
+	tip:AddLine(" ")
+	tip:AddDoubleLine("Left Click", "Open mob database", 0, 1, 0, 0, 1, 0)
+	tip:AddDoubleLine("Middle Click", "Toggle short/long text", 0, 1, 0, 0, 1, 0)
+	tip:AddDoubleLine("Right Click", "Reset session statistics", 0, 1, 0, 0, 1, 0)
+	tip:Show()
+end
+
+function obj.OnClick(self, button)
+	if button == "LeftButton" then
+		KT.MobList:ShowGUI()
+	elseif button == "MiddleButton" then
+		KTB:ToggleTextMode()
+	elseif button == "RightButton" then
+		KT:ResetSession()
+	end
+end
+
 function KTB:UpdateText()
 	local text = KT.Global.BROKER.SHORT_TEXT and self.Text.Short or self.Text.Long
 	obj.text = text:format(KT:GetKPM())
@@ -55,13 +98,11 @@ function KTB:OnUpdate(frame, elapsed)
 end
 
 function KTB:ToggleTextMode()
-	if type(KT.Global.BROKER) ~= "table" then KT.Global.BROKER = {} end
 	KT.Global.BROKER.SHORT_TEXT = not KT.Global.BROKER.SHORT_TEXT
 	self:UpdateText()
 end
 
-local frame = CreateFrame("Frame")
-
-frame:SetScript("OnUpdate", function(self, elapsed) KTB:OnUpdate(self, elapsed) end)
-
-KTB:UpdateText()
+function KTB:OnLoad()
+	frame:SetScript("OnUpdate", function(self, elapsed) KTB:OnUpdate(self, elapsed) end)
+	self:UpdateText()
+end
diff --git a/KillTrack.lua b/KillTrack.lua
index c9fda7e..4fe1ce8 100644
--- a/KillTrack.lua
+++ b/KillTrack.lua
@@ -79,12 +79,19 @@ function KT.Events.ADDON_LOADED(self, ...)
 	if type(_G["KILLTRACK_CHAR"]) ~= "table" then
 		_G["KILLTRACK_CHAR"] = {}
 	end
+	if type(KT.Global.BROKER) ~= "table" then
+		KT.Global.BROKER = {}
+	end
+	if type(KT.Global.BROKER.SHORT_TEXT) ~= "boolean" then
+		KT.Global.BROKER.SHORT_TEXT = false
+	end
 	self.CharGlobal = _G["KILLTRACK_CHAR"]
 	if type(self.CharGlobal.MOBS) ~= "table" then
 		self.CharGlobal.MOBS = {}
 	end
 	self:Msg("AddOn Loaded!")
-	self.Session.Start = time()
+	self.Session.Start = time() / 60
+	self.Broker:OnLoad()
 end
 
 function KT.Events.COMBAT_LOG_EVENT_UNFILTERED(self, ...)
@@ -177,7 +184,7 @@ function KT:AddKill(id, name)
 	if self.Global.PRINTKILLS then
 		self:Msg(("Updated %q, new kill count: %d. Kill count on this character: %d"):format(name, self.Global.MOBS[id].Kills, self.CharGlobal.MOBS[id].Kills))
 	end
-	self:AddSessionKill(name, self.Global.MOBS[id].Kills)
+	self:AddSessionKill(name)
 	if type(self.Global.MOBS[id].AchievCount) ~= "number" then
 		self.Global.MOBS[id].AchievCount = floor(self.Global.MOBS[id].Kills / self.Global.ACHIEV_THRESHOLD)
 		if self.Global.MOBS[id].AchievCount >= 1 then
@@ -192,8 +199,12 @@ function KT:AddKill(id, name)
 	end
 end
 
-function KT:AddSessionKill(name, kills)
-	self.Session.Kills[name] = kills
+function KT:AddSessionKill(name)
+	if self.Session.Kills[name] then
+		self.Session.Kills[name] = self.Session.Kills[name] + 1
+	else
+		self.Session.Kills[name] = 1
+	end
 	table.sort(self.Session.Kills, function(a, b) return a > b end)
 	-- Trim table to only contain 3 entries
 	local trimmed = {}
@@ -207,6 +218,12 @@ function KT:AddSessionKill(name, kills)
 	self.Session.Count = self.Session.Count + 1
 end
 
+function KT:ResetSession()
+	wipe(self.Session.Kills)
+	self.Session.Count = 0
+	self.Session.Start = time() / 60
+end
+
 function KT:GetKills(id)
 	local gKills, cKills = 0, 0
 	for k,v in pairs(self.Global.MOBS) do
@@ -220,9 +237,9 @@ function KT:GetKills(id)
 	return gKills, cKills
 end
 
-function GetKPM()
+function KT:GetKPM()
 	if not self.Session.Start then return 0 end
-	return self.Session.Count / (time() - self.Session.Start)
+	return self.Session.Count / (time() / 60 - self.Session.Start)
 end
 
 function KT:PrintKills(identifier)
diff --git a/icon.tga b/icon.tga
index 8e43c714ce1996de48d833e84051876fce6c11f7..d9ccafdcac8392debdd42784718e8c3b991432ae 100644
GIT binary patch
literal 2237
zcma);QEn445Qe>*q@+A>2Gn<W$rVzhNC+e#h!gY*efA~|0U^X|u8=F_3b{hAkSmz|
zKF8Y)GzeGS_1ZJv{4@4?6T<UQ+RM=Xjn_OrwEyWBy{}xV_CFmChZIxWYI@u4Hr?Of
zr^wV#jI<o^xZm%!#(0ULMn5oGaS_M(3PRXyHYs*y-#fDxZO<5RFruy3YuVV-hd{jk
zGk)JX3<+vhOv)YCJ`Q{&x4O*WX+4zvj7R35(t=BzPN&J_Zf<UJtt!UPF&gZ4yR=~L
zdOn{go=AcLTyfw|`x{WpYjdY5H~@&`62V1$T?slD0L1G65x{`LU=4#*8r)5)jTn*(
z%+3fZz#2$Hr=l+S=7lsS2&IT<K<K>$LCeNgn~<sjR+n0s5hLTiEL6cRGPy&O`v-hb
zj4<c|1i>(e^oURbm@-av32_NM!~pYx2C+oCg#>(ecb6uUNv@$wQ!$LgqP+w!baExG
zC?ZrwxYLTjhE4=ODta*i&mGB;c;X)E*RXKKfIBf5qoEj>Xech%h+zU1x595O@k^1p
z!z-JiFEsB2A`d89;aeX30`N#^Ul4}aGPy<$DG)%#Br)7<HBZceb(f78=?CB$yl))P
zjFzuEL!G<J2Ojyjx_{MwMI46zmp+6{9dRsCvh3sWD29~t-YCoAD%U0YQx$@Eo`w~|
zWq~x$>4siD8XRM`A)gv#sYx#R8L+o45gDjO!+r@os?Gz$H^0Ue<rG-_C1Q<Y2((B?
zs6C--6*}gK?SqS20{u&C1-nBx^!!{=0M0n+`HKUpx9QHPo+5+3UPw#eH9aZ<vhm=x
zuqgH&ZM{zWONtAF&kFCVc)K`O(cO?wBpBx>ga@WX%cKI2d<$my1>rsXwR7=wGcqcd
z1l7x^J<+G6PiLoJxg5+5bMCh2a(xVD9KQ>ZtRHm4PEk22CM5ew_62?1Liuxn3;}*@
g{h<If`C9-%v`-)Ax1VPpXYb#=`toM>_V#u74JThw_5c6?

literal 1310
zcmX}s-;EP75XbS^oPgtvbb#`B61+?cIi!;iNWda0m=^Nv<aA04(?VKE3vMAT<SDuR
zla<YP7KvCND?3@+zqMD9=DmnCAL--+?OrM$he0tHa;+H-gF+BDW;hHAK@84t7!-n-
zFvDR`2x5^8he08rIya{`C<GBE!(mVeB4CEYpb$jp42MA>hzH4V7!-ndxD1CuAz%Sk
z_qiFpLJ*sf;V>u!u`wAAgF+CSmEkZb1hIh`4ue7vo0{P;C<IJIo=9SIQ+h#ceul%K
z5X6CGI1CCw98!kEpb*5tWjG89K^$g=!=Ml_fIP7)kwoVv^l|7J4ue7vFG7aHpb*5%
zk>M~X1o6UTI1CB_9eJq3pb+o_dE$g(S0ahbjho3s9R`Jf3CKeo28Do0$wM6mg@A>~
zLmdW%fW=vYIt&VtGfp_-fIT*7vBnC^DrfFJ;fMqF*r3H4D=ej+ne&7r4%lOZ7Hh1q
z#QA)#r_-q(kH>mA9O{0*uba)LwryM2>vdhNR&}{#UG9y4fn9wrFLhf}*$&(C%(u5?
z=%b~w<4Q^zn(>xOGtAfbrN8#$R3@$xqnfeX4r$sJF6v$Bs1Guw8{;UvD`UC!w`oYX
zW}GXjEXIN9?xubmQXxd$m8QF;NxC$$R-uy0o9n~n;kDb1i=i+Nvt1T)xu)(-KaBrN
zN#vSd8Aw?97xt2_3kIe>0>oq8U9JzWspI+TbA2IoJav42{b(P5KmC0A{_WGBFHc_|
GKg(ZWfDGyY

-- 
1.7.9.5