Merge branch 'master' of github.com:cameronangliss/poke-env into allow-no-status-overwrite

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

@@ -238,12 +238,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]
@@ -373,9 +368,7 @@ def _end_illusion_on(
             return illusionist_mon
 
         illusionist_mon.switch_in(details=details)
-        illusionist_mon.status = (  # type: ignore
-            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)
@@ -699,7 +692,7 @@ def parse_message(self, split_message: List[str]):
                 self.get_pokemon(pokemon).ability = cause
         elif split_message[1] == "-start":
             pokemon, effect = event[2:4]
-            pokemon = self.get_pokemon(pokemon)  # type: ignore
+            mon = self.get_pokemon(pokemon)
 
             if effect == "typechange":
                 if len(event) > 5 and event[5].startswith("[of] "):
@@ -708,16 +701,16 @@ def parse_message(self, split_message: List[str]):
                     )
                 else:
                     types = event[4]
-                pokemon.start_effect(effect, details=types)  # type: ignore
+                mon.start_effect(effect, details=types)
             else:
-                pokemon.start_effect(effect)  # type: ignore
+                mon.start_effect(effect)
 
-            if pokemon.is_dynamaxed:  # type: ignore
-                if pokemon in self.team.values() and self._dynamax_turn is None:
+            if mon.is_dynamaxed:
+                if mon in self.team.values() and self._dynamax_turn is None:
                     self._dynamax_turn = self.turn
                     self._used_dynamax = True
                 elif (
-                    pokemon in self.opponent_team.values()
+                    mon in self.opponent_team.values()
                     and self._opponent_dynamax_turn is None
                 ):
                     self._opponent_dynamax_turn = self.turn
@@ -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  # type: ignore
+            self.get_pokemon(pokemon).status = status
         elif event[1] == "rule":
             self.rules.append(event[2])
 
@@ -906,7 +899,6 @@ def parse_message(self, split_message: List[str]):
             else:
                 self._opponent_used_z_move = True
             pokemon = event[2]
-            self.get_pokemon(pokemon).used_z_move()
         elif event[1] == "clearpoke":
             self.in_team_preview = True
             for mon in self.team.values():
@@ -989,7 +981,7 @@ def parse_message(self, split_message: List[str]):
             self.in_team_preview = False
         elif event[1] == "swap":
             pokemon, position = event[2:4]
-            self._swap(pokemon, position)  # type: ignore
+            self._swap(pokemon, position)
         elif event[1] == "teamsize":
             player, number = event[2:4]
             self._team_size[player] = int(number)
@@ -998,11 +990,11 @@ def parse_message(self, split_message: List[str]):
                 self.logger.info("Received message: %s", event[2])
         elif event[1] == "-immune":
             if len(event) == 4:
-                mon, cause = event[2:]  # type: ignore
+                pokemon, cause = event[2:]
 
                 if cause.startswith("[from] ability:"):
                     cause = cause.replace("[from] ability:", "")
-                    self.get_pokemon(mon).ability = to_id_str(cause)  # type: ignore
+                    self.get_pokemon(pokemon).ability = to_id_str(cause)
         elif event[1] == "-swapsideconditions":
             self._side_conditions, self._opponent_side_conditions = (
                 self._opponent_side_conditions,
@@ -1013,10 +1005,10 @@ def parse_message(self, split_message: List[str]):
             self.players = player_1, player_2
         elif event[1] == "-terastallize":
             pokemon, type_ = event[2:]
-            pokemon = self.get_pokemon(pokemon)  # type: ignore
-            pokemon.terastallize(type_)  # type: ignore
+            mon = self.get_pokemon(pokemon)
+            mon.terastallize(type_)
 
-            if pokemon.is_terastallized:  # type: ignore
+            if mon.is_terastallized:
                 if pokemon in self.team.values():
                     self._used_tera = True
                 elif pokemon in self.opponent_team.values():

src/poke_env/battle/effect.py

@@ -108,6 +108,7 @@ class Effect(Enum):
     LEPPA_BERRY = auto()
     LIGHTNING_ROD = auto()
     LIMBER = auto()
+    LINGERING_AROMA = auto()
     LIQUID_OOZE = auto()
     LOCKED_MOVE = auto()
     LOCK_ON = auto()
@@ -402,6 +403,7 @@ def is_from_move(self) -> bool:
     Effect.IRON_BARBS,
     Effect.LIGHTNING_ROD,
     Effect.LIMBER,
+    Effect.LINGERING_AROMA,
     Effect.LIQUID_OOZE,
     Effect.MIMICRY,
     Effect.MUMMY,
@@ -871,6 +873,7 @@ def is_from_move(self) -> bool:
     "LEPPABERRY": Effect.LEPPA_BERRY,
     "LIGHTNINGROD": Effect.LIGHTNING_ROD,
     "LIMBER": Effect.LIMBER,
+    "LINGERINGAROMA": Effect.LINGERING_AROMA,
     "LIQUIDOOZE": Effect.LIQUID_OOZE,
     "LOCKEDMOVE": Effect.LOCKED_MOVE,
     "LOCKON": Effect.LOCK_ON,

src/poke_env/battle/pokemon.py

@@ -275,6 +275,11 @@ def forme_change(self, species: str):
         species = species.split(",")[0]
         self._update_from_pokedex(species, store_species=False)
 
+    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()}
 
@@ -666,9 +671,6 @@ def _update_from_teambuilder(self, tb: TeambuilderPokemon):
             for stat, val in zip(["hp", "atk", "def", "spa", "spd", "spe"], stats):
                 self._stats[stat] = val
 
-    def used_z_move(self):
-        self._item = None
-
     def was_illusioned(self, fields: Dict[Field, int]):
         self._current_hp = None
         self._max_hp = None
@@ -1096,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:
         """
@@ -1104,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

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

unit_tests/environment/test_battle.py

@@ -413,7 +413,6 @@ def test_battle_request_and_interactions(example_request):
 
     battle.opponent_active_pokemon.item = "grassiumz"
     battle.parse_message(["", "-zpower", "p1: Sunflora"])
-    assert battle.opponent_active_pokemon.item is None
 
     sunflora = battle.opponent_active_pokemon
     assert sunflora.fainted is False