Fixed issue 59

Author: Prillan

sc2reader/constants.py

@@ -157,8 +157,10 @@
 
 ## Names of the different properties found in the s2gs files lobby part
 LOBBY_PROPERTY_NAMES = {
+    1    : 'unknown1',       #0001/0002
+    2    : 'unknown2',       #0001/0002
     500  : 'Slot type',      #Clsd/Open/Humn/Comp
-    1000 : 'unknown1',       #Dflt
+    1000 : 'unknown3',       #Dflt
     1001 : 'Melee',          #no/yes  no->2000, yes->2001
     2000 : 'Custom mode',    #t2/t3/t4/t5/FFA/Cust  (tX = X teams)
     2001 : 'Melee mode',     #1v1/2v2/3v3/4v4/5v5/6v6/FFA
@@ -177,14 +179,14 @@
     2018 : "'Custom' team",  #(T1/T2/T3/T4/T5/T6)*5
     3000 : 'Game speed',     #Slor/Slow/Norm/Fast/Fasr
     3001 : 'Race',           #Terr/Zerg/Prot/RAND
-    3002 : 'Color',          #tc01/tc02/tc03/tc04/tc05/tc06/tc07/tc08
+    3002 : 'Color',          #tc01/tc02/tc03/tc04/.../tc15
     3003 : 'Handicap',       #50/60/70/80/90/100
     3004 : 'Difficulty',     #VyEy/Easy/Medi/Hard/VyHd/Insa
     3006 : 'Game countdown', #3/5/7/10/15/20/25/30   (countdown timer in lobby (seconds))
     3007 : 'Player mode',    #Part/Watch     (Participating/Watching) Watch->3008
     3008 : 'Spectate mode',  #Obs/Ref
     3009 : 'Lobby type',     #Priv/Pub/Amm
-    3010 : 'unknown3',       #no/yes   (Never required)
+    3010 : 'unknown4',       #no/yes   (Never required)
 }
 
 BUILD_ORDER_UPGRADES = {

sc2reader/resources.py

@@ -801,7 +801,9 @@ def load_player_info(self):
             if not player.teamid in self.teams:
                 self.team[player.teamid] = list()
             self.team[player.teamid].append(player.pid)
-        self.teams = [self.team[tid] for tid in sorted(self.team.keys())]
+        
+        # What does this do?
+        #self.teams = [self.team[tid] for tid in sorted(self.team.keys())]
 
     def load_lobby_properties(self):
         #Monster function used to parse lobby properties in GameSummary
@@ -871,8 +873,11 @@ def load_lobby_properties(self):
         left_lobby = deque([k for k in defs if defs[k]['lobby_prop']])
 
         lobby_props = dict()
+        last_success = 0
+        max = len(left_lobby)
         # We cycle through all property values 'til we're done
-        while len(left_lobby) > 0:
+        while len(left_lobby) > 0 and not (last_success > max+1):
+            last_success += 1
             propid = left_lobby.popleft()
             can_be_parsed = True
             active = True
@@ -889,6 +894,7 @@ def load_lobby_properties(self):
                 # Try parse this later
                 left_lobby.append(propid)
                 continue
+            last_success = 0
             if not active:
                 # Ok, so the reqs weren't fullfilled, don't use this property
                 continue
@@ -930,8 +936,8 @@ def load_lobby_properties(self):
 
             player_props[pid] = player
 
-        self.lobby_props = lobby_props
-        self.player_props = player_props
+        self.lobby_properties = lobby_props
+        self.lobby_player_properties = player_props
 
     def __str__(self):
         return "{} - {} {}".format(time.ctime(self.time),self.game_length,