Finally straighten out all these player list/dicts

Now as follows:

 * human/humans -> human entities, indexed by uid
 * computer/computers -> computer entities, indexed by pid
 * player/players -> actually playing in the game, indexed by pid
 * observer/observers -> observing the game, indexed by uid
 * entities -> players + observers || humans + computers, indexed by pid
 * client/clients - (deprecated) same as human/humans
 * people/person - (deprecated) same as entity/entities

Author: GraylinKim

sc2reader/engine/plugins/selection.py

@@ -12,7 +12,7 @@ class SelectionTracker(object):
 
         Exposes the following interface, directly integrated into the player:
 
-            for person in replay.people:
+            for person in replay.entities:
                 total_errors = person.selection_errors
 
                 selection = person.selection
@@ -24,7 +24,7 @@ class SelectionTracker(object):
         # TODO: list a few error inducing sitations
     """
     def handleInitGame(self, event, replay):
-        for person in replay.people:
+        for person in replay.entities:
             person.selection = dict()
             for i in range(11):
                 person.selection[i] = list()

sc2reader/factories/plugins/replay.py

@@ -126,7 +126,7 @@ def SelectionTracker(replay):
     debug = replay.opt.debug
     logger = log_utils.get_logger(SelectionTracker)
 
-    for person in replay.people:
+    for person in replay.entities:
         # TODO: A more robust person interface might be nice
         person.selection_errors = 0
         player_selections = GameState(PlayerSelection())

sc2reader/resources.py

@@ -164,6 +164,9 @@ class Replay(Resource):
     #: only the human players from the :attr:`people` list
     humans = list()
 
+    #: A list of :class:`Computer` objects from the game.
+    computers = list()
+
     #: A list of all the chat message events from the game
     messages = list()
 
@@ -211,10 +214,19 @@ def __init__(self, replay_file, filename=None, load_level=4, engine=sc2reader.en
         self.events = list()
         self.events_by_type = defaultdict(list)
         self.teams, self.team = list(), dict()
-        self.players, self.player = list(), utils.PersonDict()
+
+        self.player = utils.PersonDict()
+        self.observer = utils.PersonDict()
+        self.human = utils.PersonDict()
+        self.computer = utils.PersonDict()
+        self.entity = utils.PersonDict()
+
+        self.players = list()
         self.observers = list()  # Unordered list of Observer
-        self.people, self.humans = list(), list()  # Unordered list of Players+Observers
-        self.person = utils.PersonDict()  # Maps pid to Player/Observer
+        self.humans = list()
+        self.computers = list()
+        self.entities = list()
+
         self.attributes = defaultdict(dict)
         self.messages = list()
         self.recorder = None  # Player object
@@ -397,14 +409,19 @@ def get_team(team_id):
                 entity.team.players.append(entity)
                 self.players.append(entity)
                 self.player[entity.pid] = entity
-
             else:
                 self.observers.append(entity)
+                self.observer[entity.uid] = entity
 
             if entity.is_human:
-                self.person[entity.pid] = entity
-                self.client[entity.uid] = entity
-                self.people.append(entity)
+                self.humans.append(entity)
+                self.human[entity.uid] = entity
+            else:
+                self.computers.append(entity)
+                self.computer[entity.pid] = entity
+
+            # Index by pid so that we can match events to players in pre-HotS replays
+            self.entity[entity.pid] = entity
 
         # Pull results up for teams
         for team in self.teams:
@@ -418,7 +435,12 @@ def get_team(team_id):
                 team.result = 'Unknown'
 
         self.teams.sort(key=lambda t: t.number)
-        self.humans = self.clients = self.people
+
+        # These are all deprecated
+        self.clients = self.humans
+        self.people = self.entities
+        self.client = self.human
+        self.person = self.entity
 
         self.real_type = real_type(self.teams)
 

sc2reader/scripts/sc2parse.py

@@ -45,12 +45,12 @@ def main():
                     if not args.one_each or replay.is_ladder:
                         replay = sc2reader.load_replay(path, debug=True)
 
-                        client_pids = set([client.pid for client in replay.clients])
+                        human.pids = set([human.pid for human in replay.humans])
                         event_pids = set([event.player.pid for event in replay.events if getattr(event, 'player', None)])
                         player_pids = set([player.pid for player in replay.players if player.is_human])
                         ability_pids = set([event.player.pid for event in replay.events if 'AbilityEvent' in event.name])
-                        if client_pids != event_pids:
-                            print('Event Pid problem!  pids={pids} but event pids={event_pids}'.format(pids=client_pids, event_pids=event_pids))
+                        if human.pids != event_pids:
+                            print('Event Pid problem!  pids={pids} but event pids={event_pids}'.format(pids=human.pids, event_pids=event_pids))
                             print(' with {path}: {build} - {real_type} on {map_name} - Played {start_time}'.format(path=path, **replay.__dict__))
                         elif player_pids != ability_pids:
                             print('Ability Pid problem!  pids={pids} but event pids={event_pids}'.format(pids=player_pids, event_pids=ability_pids))