Removed unnecessary comments, cleaned up comments, initial work for player.events started

Author: alexhanh

sc2reader/eventparsers.py

@@ -56,7 +56,7 @@ def load(self, event, bytes):
             event.abilitystr = abilities[event.ability]
         else: 
             event.abilitystr = "0x"+str(hex(event.ability))[2:].rjust(6, "0")
-        
+                
         if atype == 0x20 or atype == 0x22:
             event.name = 'unitability'
             #print "Time %s - Player %s orders (%s) %s " % (self.timestr, self.player, hex(atype), event.abilitystr)

sc2reader/objects.py

@@ -105,7 +105,8 @@ def __init__(self, elapsed_time, event_type, event_code, global_flag, player_id,
         self.player = player_id
         self.location = location
         self.bytes = bytes
-		
+        self.abilitystr = ""
+        		
     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"))
@@ -114,11 +115,12 @@ def __call__(self, elapsed_time, event_type, global_flag, player_id, event_code,
         self.local = (global_flag == 0x0)
         self.player = player_id
         self.bytes = ""
+        self.abilitystr = ""
         self.parse(bytes)
         return self
 
     def __str__(self):
-        return "%s - %s" % (self.timestr, self.name)
+        return "%s - %s - %s" % (self.timestr, self.name, self.abilitystr)
 
     def __repr__(self):
         return str(self)

sc2reader/parsers.py

@@ -231,7 +231,7 @@ class EventParser(object):
     }
 
     def load(self, replay, filecontents):
-        #set up an event list,  start the timer,  and process the file contents
+        #set up an event list, start the timer, and process the file contents
         replay.events, elapsed_time, bytes = list(), 0, ByteStream(filecontents)
 
         while bytes.remaining > 0:
@@ -243,7 +243,7 @@ def load(self, replay, filecontents):
 
             event_bytes += bytes.peek(2)
             #Next is a compound byte where the first 3 bits XXX00000 mark the
-            #event_type,  the 4th bit 000X0000 marks the eventObjectas local or global, 
+            #event_type, the 4th bit 000X0000 marks the eventObjectas local or global,
             #and the remaining bits 0000XXXX mark the player id number.
             #The following byte completes the unique eventObjectidentifier
             first, event_code = bytes.get_big_8(), bytes.get_big_8()

sc2reader/replay.py

@@ -148,6 +148,7 @@ 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)
 
         self._process_results()
 

test_replays/test_all.py

@@ -86,6 +86,15 @@ def test_standard_1v1():
 
     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")
@@ -112,15 +121,9 @@ def test_ffa():
     replay = Replay("test_replays/build17811/8.SC2Replay")
     assert replay.type == "FFA"
 
-    # TODO: Remove me when done!
-    for player in replay.players:
-        print player.name + " " + player.result
-    
     # Player 'Boom' won because the last building of the last player was destroyed,
     # but the winner cannot be parsed because "Player has left" event isn't generated.
     # Unknown result is the best we can do.
-    print replay.length
-    print replay.events[-2]
     assert replay.winner_known == False
 
 def test_unknown_winner():