* Moved ReplayBuffer up for future debugging options

 * Moved raw reading from player constructor to reader
 * Removed unneeded replaybuffer.py
 * Moved processor-specific variables to processors

Author: bpeschier

sc2reader/__init__.py

@@ -48,7 +48,7 @@ def read_file(filename,config=DefaultConfig()):
         for file,readers in config.readers.iteritems():
             for reader in readers:
                 if reader.reads(replay.build):
-                    reader.read(archive.read_file(file),replay)
+                    reader.read(ReplayBuffer(archive.read_file(file)),replay)
                     break
             else:
                 raise NotYetImplementedError("No parser was found that accepted the replay file;check configuration")

sc2reader/constants.py

@@ -4,7 +4,7 @@
 # EDSTR_CATEGORY_Race
 # EDSTR_PLAYERPROPS_RACE
 # question mark means not confirmed data
-races = {
+LOCALIZED_RACES = {
 
     # deDE
     # enUS
@@ -33,7 +33,11 @@
     '人類': 'Terran'
 }
 
-RACES = {
+#
+# Codes as found in bytestream
+#
+
+RACE_CODES = {
     'rreT': 'Terran',
     'greZ': 'Zerg',
     'torP': 'Protoss',
@@ -45,8 +49,7 @@
     '128': 'Header',
     '125': 'Ping',
 }
-
-TEAM_COLORS = {
+TEAM_COLOR_CODES = {
     '10ct': "Red",
     '20ct': "Blue",
     '30ct': "Teal",
@@ -64,53 +67,47 @@
     '51ct': "??",
     '61ct': "??",
 }
-DIFFICULTIES = {
+DIFFICULTY_CODES = {
     'yEyV': 'Very easy',
     'ysaE': 'Easy',
     'ideM': 'Medium',
     'draH': 'Hard',
     'dHyV': 'Very hard',
     'asnI': 'Insane',
 }
-
-GAME_TYPES = {
+GAME_TYPE_CODES = {
     'virP': 'Private',
     'buP': 'Public',
     'mmA': 'Ladder',
     '': 'Single Player',
 }
-
 # (name, key for team ids)
-GAME_FORMATS = {
-    '1v1': ('1v1', 0x07d2,),
-    '2v2': ('2v2', 0x07d3,),
-    '3v3': ('3v3', 0x07d4,),
-    '4v4': ('4v4', 0x07d5,),
-    'AFF': ('FFA', 0x07d6,),
+GAME_FORMAT_CODES = {
+    '1v1': '1v1',
+    '2v2': '2v2',
+    '3v3': '3v3',
+    '4v4': '4v4',
+    'AFF': 'FFA',
 }
-
-GAME_SPEEDS = {
+GAME_SPEED_CODES = {
     'rolS': 'Slower',
     'wolS': 'Slow',
     'mroN': 'Normal',
     'tsaF': 'Fast',
     'rsaF': 'Faster',
 }
-
-PLAYER_TYPES = {
+PLAYER_TYPE_CODES = {
     'nmuH': 'Human',
     'pmoC': 'Computer',
 }
-
-GATEWAYS = {
+GATEWAY_CODES = {
     'US': 'Americas',
     'KR': 'Asia',
     'EU': 'Europe',
     'SG': 'South East Asia',
     'XX': 'Public Test',
 }
-
-COLOURS = {
+COLOR_CODES = {
     'B4141E': 'Red',
     '0042FF': 'Blue',
     '1CA7EA': 'Teal',

sc2reader/data.py

@@ -154,7 +154,7 @@ def visit(self, timestamp, player, object_type=None):
             # TODO siege tanks should not auto-assign
             self.morph_to(object_type, timestamp)
 
-        if not player.is_obs and not self.player:
+        if not player.is_observer and not self.player:
             self.player = player
 
     def morph_to(self, cls, timestamp):