Merge branch 'master' of github.com:cameronangliss/poke-env into open…

…-sheets-fill-battle-obj

src/poke_env/environment/abstract_battle.py

@@ -225,8 +225,11 @@
 
         player_role = identifier[:2]
         name = identifier[3:].strip()
-        is_mine = player_role == self._player_role
-        team = self._team if is_mine or force_self_team else self._opponent_team
+        team = (
+            self._team
+            if player_role == self._player_role or force_self_team
+            else self._opponent_team
+        )
 
         # if the pokemon has a nickname, this ensures we recognize it
         split_details = [
@@ -241,17 +244,21 @@
         ]
         assert len(matches) < 2
         if identifier not in team and matches:
             i = matches[0]
             items = list(team.items())
             items[i] = (identifier, items[i][1])
             items[i][1]._name = identifier[4:]
-            if is_mine or force_self_team:
+            if player_role == self._player_role or force_self_team:
                 self._team = dict(items)
             else:
                 self._opponent_team = dict(items)
-        team = self._team if is_mine or force_self_team else self._opponent_team
+        team = (
+            self._team
+            if player_role == self._player_role or force_self_team
+            else self._opponent_team
+        )
         if identifier in team:
             return team[identifier]
 
         if self._team_size and len(team) >= self._team_size[player_role]:
             raise ValueError(
@@ -1004,40 +1011,40 @@
     def _update_team_from_open_sheets(
         self, message_dict: Dict[str, List[str]], role: str
     ):
         teampreview_team = (
             self.teampreview_team
             if role == self.player_role
             else self.teampreview_opponent_team
         )
         team = self._team if role == self.player_role else self._opponent_team
         for mon in teampreview_team:
             identifier = f"{role}: {mon.base_species.capitalize()}"
             if identifier not in team:
                 team[identifier] = Pokemon(
                     mon._data.gen,
                     species=mon.species,
                     name=mon._data.pokedex[mon.species]["name"],
                     details=mon._last_details,
                 )
             pokemon = team[identifier]
             pokemon_msg = [
                 msg
                 for name, msg in message_dict.items()
                 if mon.base_species in to_id_str(name)
             ][0]
             pokemon._item = to_id_str(pokemon_msg[1])
             pokemon._ability = to_id_str(pokemon_msg[2])
             pokemon._moves = {
                 to_id_str(name): Move(to_id_str(name), self.gen)
                 for name in pokemon_msg[3].split(",")
             }
             pokemon._gender = (
                 PokemonGender.from_request_details(pokemon_msg[6])
                 if pokemon_msg[6]
                 else PokemonGender.NEUTRAL
             )
             pokemon._level = int(pokemon_msg[9])
             pokemon._terastallized_type = PokemonType.from_name(
                 pokemon_msg[10].split(",")[-1]
             )