Added lobby property names to constants.py

Author: Prillan

sc2reader/constants.py

@@ -155,6 +155,38 @@
     'E55BB0': 'Pink'
 }
 
+## Names of the different properties found in the s2gs files lobby part
+LOBBY_PROPERTY_NAMES = {
+    500  : 'Slot type',      #Clsd/Open/Humn/Comp
+    1000 : 'unknown1',       #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
+    2002 : '1v1 Team',       #T1/T2
+    2003 : '2v2 Team',       #T1/T2/T1/T2
+    2004 : '3v3 Team',       #T1/T2/T1/T2/T1/T2
+    2005 : '4v4 Team',       #T1/T2/T1/T2/T1/T2/T1/T2
+    2006 : 'FFA Team',       #T1/T2/T3/T4/T5/T6
+    2007 : '5v5 Team',       #T1/T2/T1/T2/T1/T2/T1/T2/T1/T2
+    2008 : '6v6 Team',       #T1/T2/T1/T2/T1/T2/T1/T2/T1/T2/T1/T2
+    2011 : "'2 Teams' team", #(T1/T2)*6
+    2012 : "'3 Teams' team", #(T1/T2/T3)*6
+    2013 : "'4 Teams' team", #(T1/T2/T3/T4)*6
+    2014 : "'5 Teams' team", #(T1/T2/T3/T4/T5)*6
+    2017 : "FFA Team",       #T1/T2/T3/T4/T5/T6
+    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
+    3003 : 'Handicap',       #50/60/70/80/90/100
+    3004 : 'Difficulty',     #VyEy/Easy/Medi/Hard/VyHd/Insa
+    3006 : 'unknown2',       #3/5/7/10/15/20/25/30   (stalemate timer?)
+    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)
+}
+
 BUILD_ORDER_UPGRADES = {
     # Protoss
 

sc2reader/utils.py

@@ -874,8 +874,10 @@ def get_lobby_properties(data):
             }
 
     lobby_ids = [k for k in defs if defs[k]['lobby_prop']]
+    lobby_ids.sort()
     player_ids = [k for k in defs if not defs[k]['lobby_prop']]
-    
+    player_ids.sort()
+
     left_lobby = deque([k for k in defs if defs[k]['lobby_prop']])
 
     lobby_props = dict()
@@ -906,8 +908,7 @@ def get_lobby_properties(data):
     player_props = [dict() for pid in range(16)]
     # Parse each player separately (this is required :( )
     for pid in range(16):
-        # The most required value, 500, is in the back, change this
-        left_players = deque(reversed([a for a in player_ids]))
+        left_players = deque([a for a in player_ids])
         player = dict()
 
         # Use this to avoid an infinite loop