Added better actual_race handling, should support RU, KR and possible CH now

Author: alexhanh

sc2reader/data.py

@@ -310,7 +310,7 @@
     0x022b01: 'Rich Mineral Field',
 }
 
-# These are found in fileset.{locale}#Mods#Core.SC2Mod#{locale}.SC2Data/LocalizedData/Editor/EditorCategoryStrings.txt
+# These are found in Repack-MPQ/fileset.{locale}#Mods#Core.SC2Mod#{locale}.SC2Data/LocalizedData/Editor/EditorCategoryStrings.txt
 # EDSTR_CATEGORY_Race
 # EDSTR_PLAYERPROPS_RACE
 # question mark means not confirmed data
@@ -323,12 +323,21 @@
     # itIT
 
     # koKR
-    '프로토스': 'Protoss', #?
-    '테란': 'Terran' #?
+    '프로토스': 'Protoss',
+    '테란': 'Terran',
+    '저그': 'Zerg',
 
     # plPL
     # ptBR
     # ruRU
+    'Протосс': 'Protoss',
+    'Терран': 'Terran',
+    'Зерг': 'Zerg',
     # zhCN
     # zhTW
+    
+    # Uncategorized
+    '神族': 'Protoss',
+    '蟲族': 'Zerg',
+    '人類': 'Terran'
 }

sc2reader/objects.py

@@ -187,6 +187,16 @@ def __init__(self, pid, data, realm="us"):
         self.actual_race = data[2].decode("hex")
 
         # Actual race seems to be localized, so try to convert to english if possible
+        
+        # Some European language, like DE will have races written slightly differently (ie. Terraner).
+        # To avoid these differences, only examine the first letter, which seem to be consistent across languages.
+        if self.actual_race[0] == 'T':
+            self.actual_race = "Terran"
+        if self.actual_race[0] == 'P':
+            self.actual_race = "Protoss"
+        if self.actual_race[0] == 'Z':
+            self.actual_race = "Zerg"
+            
         if self.actual_race in races:
             self.actual_race = races[self.actual_race]
 

test_replays/test_all.py

@@ -192,4 +192,127 @@ def test_datetimes():
 
     # Played at 25 Feb 2011 16:36:28 UTC+2
     replay = Replay("test_replays/build17811/3.SC2Replay")
-    assert replay.utc_date == datetime.datetime(2011, 2, 25, 14, 36, 26)
+    assert replay.utc_date == datetime.datetime(2011, 2, 25, 14, 36, 26)
+    
+def test_15():
+    replay = Replay("test_replays/build17811/15.SC2Replay")
+    
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    assert 1==0
+
+def test_16():
+    replay = Replay("test_replays/build17811/16.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    assert 1==0
+    
+def test_17():
+    replay = Replay("test_replays/build17811/17.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+
+def test_18():
+    replay = Replay("test_replays/build17811/18.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_19():
+    replay = Replay("test_replays/build17811/19.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_20():
+    replay = Replay("test_replays/build17811/20.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_21():
+    replay = Replay("test_replays/build17811/21.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_22():
+    replay = Replay("test_replays/build17811/22.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_23():
+    replay = Replay("test_replays/build17811/23.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_24():
+    replay = Replay("test_replays/build17811/24.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0
+    
+def test_25():
+    replay = Replay("test_replays/build17811/25.SC2Replay")
+    print replay.realm
+    print len(replay.players)
+    print replay.players[0].actual_race
+    print replay.players[1].actual_race
+    print replay.players[0].choosen_race
+    print replay.players[1].choosen_race
+    print replay.players[0].name
+    print replay.players[1].name
+    assert 1==0