Add full color support for summary players.

Author: GraylinKim

sc2reader/constants.py

@@ -155,6 +155,8 @@
     'E55BB0': 'Pink'
 }
 
+COLOR_CODES_INV = dict(zip(COLOR_CODES.values(),COLOR_CODES.keys()))
+
 ## Names of the different properties found in the s2gs files lobby part
 LOBBY_PROPERTY_NAMES = {
     1    : 'unknown1',       #0001/0002

sc2reader/resources.py

@@ -16,6 +16,7 @@
 from sc2reader.exceptions import SC2ReaderLocalizationError
 from sc2reader.objects import Player, Observer, Team, PlayerSummary, Graph, DepotFile
 from sc2reader.constants import REGIONS, LOCALIZED_RACES, GAME_SPEED_FACTOR, GAME_SPEED_CODES, RACE_CODES, PLAYER_TYPE_CODES, TEAM_COLOR_CODES, GAME_FORMAT_CODES, GAME_TYPE_CODES, DIFFICULTY_CODES
+from sc2reader.utils import Color
 
 
 def real_type(teams):
@@ -988,7 +989,7 @@ def load_players(self):
 
             # We can just copy these settings right over
             # TODO: Get the hex from the color string?
-            player.color = settings.get('Color', None)
+            player.color = Color(name=settings.get('Color', None))
             player.pick_race = settings.get('Race', None)
             player.handicap = settings.get('Handicap', None)
 

sc2reader/utils.py

@@ -14,7 +14,7 @@
 from collections import deque
 
 from sc2reader import exceptions
-from sc2reader.constants import COLOR_CODES, BUILD_ORDER_UPGRADES
+from sc2reader.constants import COLOR_CODES, COLOR_CODES_INV, BUILD_ORDER_UPGRADES
 from sc2reader.data import build22612 as Data
 
 LITTLE_ENDIAN,BIG_ENDIAN = '<','>'
@@ -416,12 +416,21 @@ class Color(AttributeDict):
     @property
     def rgba(self):
         """Tuple containing the (r,g,b,a) representation of the color"""
+        if 'r' not in self or 'g' not in self or 'b' not in self:
+            hexstr = self.hex
+            self.r = int(hexstr[0:2],16)
+            self.g = int(hexstr[2:4],16)
+            self.b = int(hexstr[4:6],16)
+            self.a = 255
         return (self.r,self.g,self.b,self.a)
 
     @property
     def hex(self):
         """The hexadecimal representation of the color"""
-        return "{0.r:02X}{0.g:02X}{0.b:02X}".format(self)
+        if 'name' in self:
+            return COLOR_CODES_INV.get(self.name)
+        else:
+            return "{0.r:02X}{0.g:02X}{0.b:02X}".format(self)
 
     def __str__(self):
         if not hasattr(self,'name'):