added saving group and trial to events

René Welbers [02-12-16 - 14:20]
added saving group and trial to events
Filename
PanicModeCombatAnalyzer.lua
PanicModeCombatAnalyzer.txt
diff --git a/PanicModeCombatAnalyzer.lua b/PanicModeCombatAnalyzer.lua
index d4a03fb..0900380 100644
--- a/PanicModeCombatAnalyzer.lua
+++ b/PanicModeCombatAnalyzer.lua
@@ -3,8 +3,8 @@ PanicModeCombatAnalyzer = PanicModeCombatAnalyzer or {}
 base64 = base64 or {}

 PanicModeCombatAnalyzer.name		  = 'PanicModeCombatAnalyzer'
-PanicModeCombatAnalyzer.version	      = '1.0.11'
-PanicModeCombatAnalyzer.versionDB	  = 3
+PanicModeCombatAnalyzer.version	      = '1.0.12'
+PanicModeCombatAnalyzer.versionDB	  = 4
 PanicModeCombatAnalyzer.loaded	      = false
 PanicModeCombatAnalyzer.author        = 'silentgecko, deevilius'
 PanicModeCombatAnalyzer.savedVarsName = 'PMCAVars'
@@ -79,6 +79,9 @@ function PanicModeCombatAnalyzer.OnPlayerCombatState(_, inCombat)
     data[timeStamp]['event'] = data[timeStamp]['event'] or {}
     table.insert(data[timeStamp]['event'], {combat = inCombat})

+    -- add group and trial to event
+    data[timeStamp]['trial'] = self.getTrial()
+    data[timeStamp]['group'] = self.getGroupEnc()
     self.savedVariables.data[timeStamp] = data[timeStamp]
 end

@@ -124,7 +127,7 @@ function PanicModeCombatAnalyzer.addDamage(damage)
             if damage['result'] == ACTION_RESULT_HEAL or damage['result'] == ACTION_RESULT_CRITICAL_HEAL or damage['result'] == ACTION_RESULT_HOT_TICK or damage['result'] == ACTION_RESULT_HOT_TICK_CRITICAL then
                 local currentData = data[lastSaveTS]['healing'][damage['target']] or {}
                 table.insert(currentData, damageData)
-                if next(currentData) ~=nil then
+                if #currentData ~= 0 then
                     data[lastSaveTS]['healing'][damage['target']] = currentData
                 end
             end
@@ -133,14 +136,14 @@ function PanicModeCombatAnalyzer.addDamage(damage)
             if damage['result'] == ACTION_RESULT_DAMAGE or damage['result'] == ACTION_RESULT_CRITICAL_DAMAGE or damage['result'] == ACTION_RESULT_DOT_TICK or damage['result'] == ACTION_RESULT_DOT_TICK_CRITICAL then
                 local currentData = data[lastSaveTS]['damage'][damage['target']] or {}
                 table.insert(currentData, damageData)
-                if next(currentData) ~=nil then
+                if #currentData ~= 0 then
                     data[lastSaveTS]['damage'][damage['target']] = currentData
                 end
             end
         end

         -- only store, when we have damage or healing
-        if next(data[lastSaveTS]['damage']) ~= nil or next(data[lastSaveTS]['healing']) ~= nil then
+        if #data[lastSaveTS]['damage'] ~= 0 or #data[lastSaveTS]['healing'] ~= 0 then
             data[lastSaveTS]['trial'] = self.getTrial()
             data[lastSaveTS]['group'] = self.getGroupEnc()

@@ -162,6 +165,11 @@ function PanicModeCombatAnalyzer.onDeath(event)
         data[timeStamp]['event'] = data[timeStamp]['event'] or {}
         table.insert(data[timeStamp]['event'], {revive = true})
     end
+
+    -- add group and trial to event
+    data[timeStamp]['trial'] = self.getTrial()
+    data[timeStamp]['group'] = self.getGroupEnc()
+
     self.savedVariables.data[timeStamp] = data[timeStamp]
 end

@@ -175,6 +183,10 @@ function PanicModeCombatAnalyzer.onAlive(event)
     data[timeStamp]['event'] = data[timeStamp]['event'] or {}
     table.insert(data[timeStamp]['event'], {alive = true})

+    -- add group and trial to event
+    data[timeStamp]['trial'] = self.getTrial()
+    data[timeStamp]['group'] = self.getGroupEnc()
+
     self.savedVariables.data[timeStamp] = data[timeStamp]
 end

@@ -188,6 +200,11 @@ function PanicModeCombatAnalyzer.onRezz(event, requesterCharacterName, timeLeftT
     data[timeStamp]['event'] = data[timeStamp]['event'] or {}

     table.insert(data[timeStamp]['event'], {rezz = zo_strformat("<<!aC:1>>", requesterCharacterName)})
+
+    -- add group and trial to event
+    data[timeStamp]['trial'] = self.getTrial()
+    data[timeStamp]['group'] = self.getGroupEnc()
+
     self.savedVariables.data[timeStamp] = data[timeStamp]
 end

diff --git a/PanicModeCombatAnalyzer.txt b/PanicModeCombatAnalyzer.txt
index 3c2aa85..e306bad 100644
--- a/PanicModeCombatAnalyzer.txt
+++ b/PanicModeCombatAnalyzer.txt
@@ -1,7 +1,7 @@
 ## Title: |cEFEBBEPanic Mode Combat Analyzer|r
 ## Description: Saves your dps during fight, based on FTC DPS Meter.
 ## Author: |c009ad6silentgecko|r, deevilius
-## Version: 1.0.11
+## Version: 1.0.12
 ## APIVersion: 100014
 ## SavedVariables: PMCAVars
 ## DependsOn: FoundryTacticalCombat