Added average match apm for players and some helper results for events

Author: alexhanh

sc2reader/objects.py

@@ -97,25 +97,37 @@ def __str__(self):
 class Event(object):
     def __init__(self, elapsed_time, event_type, event_code, global_flag, player_id, 
                     location=None, bytes=""):
-        self.time, seconds = (elapsed_time, elapsed_time/16)
-        self.timestr = "%s:%s" % (seconds/60, str(seconds%60).rjust(2, "0"))
+        self.time, self.seconds = (elapsed_time, elapsed_time/16)
+        self.timestr = "%s:%s" % (self.seconds/60, str(self.seconds%60).rjust(2, "0"))
         self.type = event_type
         self.code = event_code
         self.local = (global_flag == 0x0)
         self.player = player_id
         self.location = location
         self.bytes = bytes
-        self.abilitystr = ""
+
+        # Added for convenience
+        self.is_init = (event_type == 0x00)
+        self.is_player_action = (event_type == 0x01)
+        self.is_camera_movement = (event_type == 0x03)
+        self.is_unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
 
     def __call__(self, elapsed_time, event_type, global_flag, player_id, event_code, bytes):
-        self.time, seconds = (elapsed_time, elapsed_time/16)
-        self.timestr = "%s:%s" % (seconds/60, str(seconds%60).rjust(2, "0"))
+        self.time, self.seconds = (elapsed_time, elapsed_time/16)
+        self.timestr = "%s:%s" % (self.seconds/60, str(self.seconds%60).rjust(2, "0"))
         self.type = event_type
         self.code = event_code
         self.local = (global_flag == 0x0)
         self.player = player_id
         self.bytes = ""
         self.abilitystr = ""
+        
+        # Added for convenience
+        self.is_init = (event_type == 0x00)
+        self.is_player_action = (event_type == 0x01)
+        self.is_camera_movement = (event_type == 0x03)
+        self.is_unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
+        
         self.parse(bytes)
         return self
 
@@ -166,6 +178,7 @@ def __init__(self, pid, data, realm="us"):
         self.team = None # A number to be supplied later
         self.type = "" # Human or Computer
         self.events = list()
+        self.avg_apm = 0
 
     def __str__(self):
         return "Player %s - %s (%s)" % (self.pid, self.name, self.actual_race)

sc2reader/replay.py

@@ -148,7 +148,19 @@ def _parse_events(self):
         self.events_by_type = defaultdict(list)
         for event in self.events:
             self.events_by_type[event.name].append(event)
-            # self.player[event.player_id].events.append(event)
+            
+            if event.local:
+                player = self.player[event.player]
+                player.events.append(event)
+                
+                if event.is_player_action:
+                    player.avg_apm += 1
+                else:
+                    print event.name
+
+        # Average the APM
+        for player in self.players:
+            player.avg_apm /= player.events[-1].seconds/60
 
         self._process_results()
 

shell.py

@@ -2,3 +2,7 @@
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 from sc2reader import Replay
 from mpyq import MPQArchive
+
+replay = Replay("1.sc2replay")
+
+print replay.player["dblrainbow"].avg_apm

test_replays/test_all.py

@@ -83,18 +83,9 @@ def test_standard_1v1():
     assert replay.messages[10].player.name == "Emperor"
     assert replay.messages[11].text == "huh?"
     assert replay.messages[11].player.name == "Boom"
-    
+
     for msg in replay.messages:
         assert msg.sent_to_all == True
-    
-    try:
-        for event in replay.events:
-            if (event.player_id != 1 and event.player_id != 2):
-                print event    
-    except AttributeError:
-        print event
-    
-    assert True == False
 
 def test_private_category():
     replay = Replay("test_replays/build17811/2.SC2Replay")