Grouped player's color related thing with a prefix color_ for consistency

Author: alexhanh

sc2reader/objects.py

@@ -168,13 +168,14 @@ def __init__(self, pid, data, realm="us"):
         self.url = self.url_template % (self.realm, self.uid, self.subregion, self.name)
         self.actual_race = data[2].decode("hex")
         self.choosen_race = "" # Populated from the replay.attribute.events file
-        self.rgba = dict([
+        self.color_rgba = dict([
                 ['r', data[3][1]], 
                 ['g', data[3][2]], 
                 ['b', data[3][3]], 
                 ['a', data[3][0]], 
             ])
-        self.hex_color = "%02X%02X%02X" % (data[3][1], data[3][2], data[3][3])
+        self.color_hex = "%02X%02X%02X" % (data[3][1], data[3][2], data[3][3])
+        self.color_text = "" # The text of the player color (Red, Blue, etc) to be supplied later
         self.recorder = True # Actual recorder will be determined using the replay.message.events file
         self.handicap = data[6]
         self.team = None # A number to be supplied later

sc2reader/parsers.py

@@ -111,7 +111,7 @@ def load(self, replay, filecontents):
         for pid, attributes in data.iteritems():
             if pid == 16: continue
             player = replay.player[pid]
-            player.color = attributes['Color']
+            player.color_text = attributes['Color']
             player.team = attributes['Teams'+replay.type]
             player.choosen_race = attributes['Race']
             player.difficulty = attributes['Difficulty']

shell.py

@@ -10,4 +10,4 @@
 # print replay.players[0].rgba
 # print "%02X%02X%02X" % (replay.players[0].rgba['r'], replay.players[0].rgba['g'], replay.players[0].rgba['b'])
 
-replay = Replay("94.sc2replay")
+replay = Replay("1.sc2replay")