Merge branch 'master' of github.com:cameronangliss/poke-env into add-last-used-move-field

Author: cameronangliss

.github/workflows/update-data.yml

@@ -17,7 +17,7 @@ jobs:
           ./scripts/update_all_data.sh
           chmod -x ./scripts/update_all_data.sh
       - name: Create or update pull request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           commit-message: JSON data update from smogon
           branch: create-pull-request/update-data

src/poke_env/battle/abstract_battle.py

@@ -239,12 +239,7 @@ def get_pokemon(
 
         # if the pokemon has a nickname, this ensures we recognize it
         name_det = details.split(", ")[0]
-        matches = [
-            i
-            for i, p in enumerate(team.values())
-            if p.base_species == to_id_str(name_det)
-            or p.base_species in [to_id_str(det) for det in name_det.split("-")]
-        ]
+        matches = [i for i, p in enumerate(team.values()) if p.identifies_as(name_det)]
         assert len(matches) < 2
         if identifier not in team and matches:
             i = matches[0]
@@ -374,9 +369,7 @@ def _end_illusion_on(
             return illusionist_mon
 
         illusionist_mon.switch_in(details=details)
-        illusionist_mon._status = (
-            illusioned.status if illusioned.status is not None else None
-        )
+        illusionist_mon.status = illusioned.status
         illusionist_mon.set_hp(f"{illusioned.current_hp}/{illusioned.max_hp}")
 
         illusioned.was_illusioned(self.fields)
@@ -740,7 +733,7 @@ def parse_message(self, split_message: List[str]):
                 self.get_pokemon(target).start_effect(effect)
         elif event[1] == "-status":
             pokemon, status = event[2:4]
-            self.get_pokemon(pokemon)._status = Status[status.upper()]
+            self.get_pokemon(pokemon).status = status
         elif event[1] == "rule":
             self.rules.append(event[2])
 
@@ -1002,7 +995,7 @@ def parse_message(self, split_message: List[str]):
 
                 if cause.startswith("[from] ability:"):
                     cause = cause.replace("[from] ability:", "")
-                    self.get_pokemon(pokemon).ability = cause
+                    self.get_pokemon(pokemon).ability = to_id_str(cause)
         elif event[1] == "-swapsideconditions":
             self._side_conditions, self._opponent_side_conditions = (
                 self._opponent_side_conditions,

src/poke_env/battle/pokemon.py

@@ -277,6 +277,11 @@ def forme_change(self, species: str):
     def heal(self, hp_status: str):
         self.set_hp_status(hp_status)
 
+    def identifies_as(self, ident: str) -> bool:
+        return self.base_species in to_id_str(ident) or self.base_species in [
+            to_id_str(substr) for substr in ident.split("-")
+        ]
+
     def invert_boosts(self):
         self._boosts = {k: -v for k, v in self._boosts.items()}
 
@@ -1093,6 +1098,10 @@ def status(self) -> Optional[Status]:
         """
         return self._status
 
+    @status.setter
+    def status(self, status: Optional[Union[Status, str]]):
+        self._status = Status[status.upper()] if isinstance(status, str) else status
+
     @property
     def status_counter(self) -> int:
         """
@@ -1101,10 +1110,6 @@ def status_counter(self) -> int:
         """
         return self._status_counter
 
-    @status.setter  # type: ignore
-    def status(self, status: Optional[Union[Status, str]]):
-        self._status = Status[status.upper()] if isinstance(status, str) else status
-
     @property
     def stab_multiplier(self) -> float:
         """

src/poke_env/player/player.py

@@ -304,9 +304,7 @@ async def _handle_battle_message(self, split_messages: List[List[str]]):
                         m
                         for m in teambuilder_team
                         if m.nickname is not None
-                        if preview_mon.base_species == to_id_str(m.nickname)
-                        or preview_mon.base_species
-                        in [to_id_str(substr) for substr in m.nickname.split("-")]
+                        and preview_mon.identifies_as(m.nickname)
                     ][0]
                     mon = battle.get_pokemon(
                         f"{role}: {teambuilder_mon.nickname}",