From 7eddf36e1690318994659669207b925df3b4a647 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Tue, 5 Apr 2016 18:40:35 -0400
Subject: [PATCH] cleanup some unused keys

---
 .../src/vwowrla/core/encounters/analysis.clj  | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/vwowrla.core/src/vwowrla/core/encounters/analysis.clj b/vwowrla.core/src/vwowrla/core/encounters/analysis.clj
index e91aafb..418fde6 100644
--- a/vwowrla.core/src/vwowrla/core/encounters/analysis.clj
+++ b/vwowrla.core/src/vwowrla/core/encounters/analysis.clj
@@ -23,25 +23,17 @@
    timestamp   :- Date]
   (if-not (get-in encounter [:entities entity-name])
     (assoc-in encounter [:entities entity-name]
-              {:name                 entity-name
-               :added-at             timestamp
-               :last-activity-at     timestamp
-               :damage-out-total     0
-               :damage-out-totals    {}
-               :damage-in-total      0
-               :damage-in-totals     {}
-               :alive-dps            0
-               :encounter-dps        0
-               :damage-out           {}
-               :damage-out-by-entity {}
-               :damage-in            {}
-               :damage-in-by-entity  {}
-               :casts                {}
-               :other-powers         {}
-               :auras                {}
-               :deaths               []
-               :resurrections        []
-               :alive-duration       0})
+              {:name             entity-name
+               :added-at         timestamp
+               :last-activity-at timestamp
+               :damage           {:in  {}
+                                  :out {}}
+               :skill-uses       {}
+               :alive-dps        0
+               :encounter-dps    0
+               :deaths           []
+               :resurrections    []
+               :alive-duration   0})
     (assoc-in encounter [:entities entity-name :last-activity-at] timestamp)))
 
 (s/defn get-entity-last-activity :- (s/maybe Date)
@@ -305,7 +297,8 @@
                :started-at       timestamp
                :entities         {}
                :skills           {}
-               :damage           {}
+               :damage           {:in {}
+                                  :out {}}
                :healing          {}
                :trigger-entities (get-in defined-encounters [encounter-name :entities])}))