Fix move tracking

fixture_data/teams.json

@@ -83,7 +83,7 @@
             "packed-format": "zuzu|azumarill|aguavberry|hugepower|aquajet,bellydrum,return,playrough|Adamant|44,252,18,4,18,172|F||S|67|211]metal bird|celesteela|leftovers|beastboost|protect,rockslide,heavyslam,leechseed|Impish|252,,72,,184,||,,,0,9,20|||144]Garchomp||choiceband|roughskin|rockslide,earthpower,outrage,aquatail|Jolly|8,252,,,,248|||S||]Greninja||choicespecs|protean|scald,icebeam,darkpulse,extrasensory|Timid|4,,,252,,252|M|29,0,3,6,21,23|||]Heatran||assaultvest|flashfire|overheat,flamethrower,flashcannon,earthpower|Modest|252,,,252,,4||,0,,,26,|||,Ice,]kaaaaaaa|kartana|focussash|beastboost|leafblade,sacredsword,swordsdance,xscissor|Jolly|4,252,,,,252||||62|200"
         }
     ],
-    "gen9vgc2025regi": [
+    "gen9vgc2024regg": [
         {
             "showdown-file": "beastcoasttt-413XPlayz.showdown",
             "packed-format": "Iron Hands||assaultvest|quarkdrive|fakeout,drainpunch,wildcharge,heavyslam|Adamant|4,156,4,,252,92||||50|,,,,,Water]Flutter Mane||boosterenergy|protosynthesis|moonblast,shadowball,icywind,protect|Timid|4,,196,148,4,156||,0,,,,||50|,,,,,Fairy]Landorus-Therian||choicescarf|intimidate|stompingtantrum,terablast,rockslide,uturn|Adamant|132,116,4,,4,252||||50|,,,,,Flying]Ogerpon-Wellspring||wellspringmask|waterabsorb|spikyshield,ivycudgel,hornleech,followme|Adamant|252,76,100,,12,68|F|||50|,,,,,Water]Chi-Yu||choicespecs|beadsofruin|heatwave,darkpulse,snarl,overheat|Timid|132,,4,108,12,252||,0,,,,||50|,,,,,Ghost]Sinistcha||rockyhelmet|hospitality|matchagotcha,ragepowder,trickroom,strengthsap|Bold|252,,252,4,,||,0,,,,||50|,,,,,Fairy"

src/poke_env/battle/__init__.py

@@ -3,7 +3,7 @@
 from poke_env.battle.double_battle import DoubleBattle
 from poke_env.battle.effect import Effect
 from poke_env.battle.field import Field
-from poke_env.battle.move import SPECIAL_MOVES, EmptyMove, Move
+from poke_env.battle.move import SPECIAL_MOVES, Move
 from poke_env.battle.move_category import MoveCategory
 from poke_env.battle.observation import Observation
 from poke_env.battle.observed_pokemon import ObservedPokemon
@@ -21,7 +21,6 @@
     "Battle",
     "DoubleBattle",
     "Effect",
-    "EmptyMove",
     "Field",
     "Move",
     "MoveCategory",

src/poke_env/battle/abstract_battle.py

@@ -6,6 +6,7 @@
 
 from poke_env.battle.effect import Effect
 from poke_env.battle.field import Field
+from poke_env.battle.move import Move
 from poke_env.battle.observation import Observation
 from poke_env.battle.observed_pokemon import ObservedPokemon
 from poke_env.battle.pokemon import Pokemon
@@ -479,9 +480,10 @@ def parse_message(self, split_message: List[str]):
             self._check_damage_message_for_item(event)
             self._check_damage_message_for_ability(event)
         elif event[1] == "move":
+            use = True
             failed = False
-            override_move = None
-            reveal_other_move = False
+            reveal = True
+            overridden_move = None
 
             for move_failed_suffix in ["[miss]", "[still]", "[notarget]"]:
                 if event[-1] == move_failed_suffix:
@@ -491,37 +493,40 @@ def parse_message(self, split_message: List[str]):
             if event[-1] == "[notarget]":
                 event = event[:-1]
 
-            if event[-1].startswith("[spread]"):
+            while event[-1].startswith("[spread]"):
                 event = event[:-1]
 
-            if event[-1] in {
-                "[from] lockedmove",
-                "[from] Pursuit",
-                "[from]lockedmove",
-                "[from] Sky Attack",
-                "[from]Pursuit",
-                "[zeffect]",
-            }:
+            if event[-1] in {"[from] lockedmove", "[from]lockedmove"}:
+                use = False
+                reveal = False
+                event = event[:-1]
+
+            if event[-1] in {"[from] Pursuit", "[from]Pursuit", "[zeffect]"}:
                 event = event[:-1]
 
             if event[-1].startswith("[anim]"):
                 event = event[:-1]
 
             if event[-1].startswith(("[from] move: ", "[from]move: ")):
-                override_move = event.pop().split(": ")[-1]
+                overridden_move = event.pop().split(": ")[-1]
 
-                if override_move == "Sleep Talk":
-                    # Sleep talk was used, but also reveals another move
-                    reveal_other_move = True
-                elif override_move in {"Copycat", "Metronome", "Nature Power", "Round"}:
+                if overridden_move == "Sleep Talk":
                     pass
-                elif override_move in {"Grass Pledge", "Water Pledge", "Fire Pledge"}:
-                    override_move = None
+                elif overridden_move in {
+                    "Copycat",
+                    "Metronome",
+                    "Nature Power",
+                    "Round",
+                }:
+                    # triggers moves not owned by actor, so no reveal
+                    reveal = False
+                elif overridden_move in {"Grass Pledge", "Water Pledge", "Fire Pledge"}:
+                    overridden_move = None
                 elif self.logger is not None:
                     self.logger.warning(
                         "Unmanaged [from] move message received - move %s in cleaned up "
                         "message %s in battle %s turn %d",
-                        override_move,
+                        overridden_move,
                         event,
                         self.battle_tag,
                         self.turn,
@@ -537,7 +542,8 @@ def parse_message(self, split_message: List[str]):
                 self.get_pokemon(pokemon).ability = revealed_ability
 
                 if revealed_ability == "Magic Bounce":
-                    return
+                    use = False
+                    reveal = False
                 elif revealed_ability == "Dancer":
                     return
                 elif self.logger is not None:
@@ -558,6 +564,7 @@ def parse_message(self, split_message: List[str]):
             if event[-1] == "":
                 event = event[:-1]
 
+            presumed_target = None
             if len(event) == 4:
                 pokemon, move = event[2:4]
             elif len(event) == 5:
@@ -600,16 +607,35 @@ def parse_message(self, split_message: List[str]):
                 temp_pokemon = self.get_pokemon(pokemon)
                 temp_pokemon.start_effect("MINIMIZE")
 
-            if override_move:
+            pressure = self._pressure_on(pokemon, move, presumed_target)
+            mon = self.get_pokemon(pokemon)
+            if overridden_move:
                 # Moves that can trigger this branch results in two `move` messages being sent.
                 # We're setting use=False in the one (with the override) in order to prevent two pps from being used
                 # incorrectly.
-                self.get_pokemon(pokemon).moved(override_move, failed=failed, use=False)
-            if override_move is None or reveal_other_move:
-                self.get_pokemon(pokemon).moved(move, failed=failed, use=False)
+                mon.moved(move, failed=failed, use=False, reveal=reveal)
+                overriden = mon.moves[Move.retrieve_id(overridden_move)]
+                overriden.use(pressure)
+            else:
+                if not failed and move in {
+                    "Sleep Talk",
+                    "Copycat",
+                    "Metronome",
+                    "Nature Power",
+                }:
+                    # wait until override move to decide how much pp to deduct
+                    # since override determines pressure interaction
+                    use = False
+                mon.moved(
+                    move, failed=failed, use=use, reveal=reveal, pressure=pressure
+                )
         elif event[1] == "cant":
-            pokemon, _ = event[2:4]
-            self.get_pokemon(pokemon).cant_move()
+            if len(event) == 4:
+                pokemon, _ = event[2:4]
+                self.get_pokemon(pokemon).cant_move()
+            elif len(event) == 5:
+                pokemon, _, move = event[2:5]
+                self.get_pokemon(pokemon).cant_move(move)
         elif event[1] == "turn":
             # Saving the beginning-of-turn battle state and events as we go into the turn
             self.observations[self.turn] = self._current_observation
@@ -747,6 +773,9 @@ def parse_message(self, split_message: List[str]):
                     "[item] ", ""
                 )
                 self.get_pokemon(target).item = None
+            elif effect == "item: Leppa Berry":
+                move = to_id_str(event[4])
+                self.get_pokemon(target).moves[move].current_pp += 10
             elif target != "":  # ['', '-activate', '', 'move: Splash']
                 self.get_pokemon(target).start_effect(effect)
         elif event[1] == "-status":
@@ -1040,6 +1069,10 @@ def parse_request(
     ):
         pass
 
+    @abstractmethod
+    def _pressure_on(self, pokemon: str, move: str, target_str: Optional[str]) -> bool:
+        pass
+
     def _register_teampreview_pokemon(self, player: str, details: str):
         if player != self._player_role:
             mon = Pokemon(details=details, gen=self._data.gen)

src/poke_env/battle/battle.py

@@ -96,6 +96,14 @@ def parse_request(
                 self._trapped = True
 
             if self.active_pokemon is not None:
+                if (
+                    strict_battle_tracking
+                    and self.gen not in [7, 8]
+                    and "illusion" not in [p.ability for p in self.team.values()]
+                    and "illusion"
+                    not in [p.ability for p in self.opponent_team.values()]
+                ):
+                    self.active_pokemon.check_move_consistency(active_request)
                 # TODO: the illusion handling here works around Zoroark's
                 # difficulties. This should be properly handled at some point.
                 try:
@@ -125,6 +133,37 @@ def parse_request(
                 if not pokemon.active and self.reviving == pokemon.fainted:
                     self._available_switches.append(pokemon)
 
+    def _pressure_on(self, pokemon: str, move: str, target_str: Optional[str]) -> bool:
+        if self.gen == 7:
+            return False
+        move_data = self._data.moves[Move.retrieve_id(move)]
+        if move_data["target"] == "all" or target_str is None:
+            target = (
+                self.opponent_active_pokemon
+                if self.player_role == pokemon[:2]
+                else self.active_pokemon
+            )
+            assert target is not None
+        else:
+            target = self.get_pokemon(target_str)
+        return (
+            target.ability == "pressure"
+            and not target.fainted
+            and (
+                move_data["target"]
+                in [
+                    "all",
+                    "allAdjacent",
+                    "allAdjacentFoes",
+                    "any",
+                    "normal",
+                    "randomNormal",
+                    "scripted",
+                ]
+                or "mustpressure" in move_data["flags"]
+            )
+        )
+
     def switch(self, pokemon_str: str, details: str, hp_status: str):
         identifier = pokemon_str.split(":")[0][:2]
 

src/poke_env/battle/double_battle.py

@@ -140,6 +140,14 @@ def parse_request(
                     force_self_team=True,
                     details=pokemon_dict["details"],
                 )
+                if (
+                    strict_battle_tracking
+                    and self.gen not in [7, 8]
+                    and "illusion" not in [p.ability for p in self.team.values()]
+                    and "illusion"
+                    not in [p.ability for p in self.opponent_team.values()]
+                ):
+                    active_pokemon.check_move_consistency(active_request)
                 if self.player_role is not None:
                     if (
                         active_pokemon_number == 0
@@ -210,6 +218,38 @@ def parse_request(
                     if not pokemon.active and self.reviving == pokemon.fainted:
                         self._available_switches[i].append(pokemon)
 
+    def _pressure_on(self, pokemon: str, move: str, target_str: Optional[str]) -> bool:
+        move_data = self._data.moves[Move.retrieve_id(move)]
+        if move_data["target"] == "all" or target_str is None:
+            targets = (
+                self.opponent_active_pokemon
+                if self.player_role == pokemon[:2]
+                else self.active_pokemon
+            )
+            cleaned_targets = [t for t in targets if t is not None]
+            target = cleaned_targets[0]
+            for t in cleaned_targets:
+                if target.ability != "pressure":
+                    target = t
+            assert target is not None
+        else:
+            target = self.get_pokemon(target_str)
+        return (
+            target.ability == "pressure"
+            and not target.fainted
+            and self._data.moves[Move.retrieve_id(move)]["target"]
+            in [
+                "all",
+                "allAdjacent",
+                "allAdjacentFoes",
+                "any",
+                "normal",
+                "randomNormal",
+                "scripted",
+            ]
+            or "mustpressure" in move_data["flags"]
+        )
+
     def switch(self, pokemon_str: str, details: str, hp_status: str):
         pokemon_identifier = pokemon_str.split(":")[0][:3]
         player_identifier = pokemon_identifier[:2]

src/poke_env/battle/move.py

@@ -1,4 +1,3 @@
-import copy
 from functools import lru_cache
 from typing import Any, Dict, List, Optional, Set, Tuple, Union
 
@@ -13,7 +12,6 @@
 from poke_env.data import GenData, to_id_str
 
 SPECIAL_MOVES: Set[str] = {"struggle", "recharge"}
-
 _PROTECT_MOVES = {
     "protect",
     "detect",
@@ -80,7 +78,6 @@ class Move:
         "_current_pp",
         "_dynamaxed_move",
         "_gen",
-        "_is_empty",
         "_moves_dict",
         "_request_target",
     )
@@ -102,16 +99,18 @@ def __init__(self, move_id: str, gen: int, raw_id: Optional[str] = None):
                     pass
 
         self._current_pp = self.max_pp
-        self._is_empty: bool = False
 
         self._dynamaxed_move = None
         self._request_target = None
 
     def __repr__(self) -> str:
         return f"{self._id} (Move object)"
 
-    def use(self):
-        self._current_pp -= 1
+    def use(self, pressure: bool = False):
+        if pressure:
+            self.current_pp -= 2
+        else:
+            self.current_pp -= 1
 
     @staticmethod
     def is_id_z(id_: str, gen: int) -> bool:
@@ -219,6 +218,14 @@ def current_pp(self) -> int:
         """
         return self._current_pp
 
+    @current_pp.setter
+    def current_pp(self, pp: int):
+        """
+        :param pp: New PP value.
+        :type pp: int
+        """
+        self._current_pp = min(max(0, pp), self.max_pp)
+
     @property
     def damage(self) -> Union[int, str]:
         """
@@ -402,14 +409,6 @@ def ignore_immunity(self) -> Union[bool, Set[PokemonType]]:
                 }
         return False
 
-    @property
-    def is_empty(self) -> bool:
-        """
-        :return: Whether the move is an empty move.
-        :rtype: bool
-        """
-        return self._is_empty
-
     @property
     def is_protect_counter(self) -> bool:
         """
@@ -768,21 +767,6 @@ def z_move_power(self) -> int:
         return 200
 
 
-class EmptyMove(Move):
-    def __init__(self, move_id: str):
-        self._id = move_id
-        self._is_empty: bool = True
-
-    def __getattribute__(self, name: str):
-        try:
-            return super(Move, self).__getattribute__(name)
-        except (AttributeError, TypeError, ValueError):
-            return 0
-
-    def __deepcopy__(self, memodict: Optional[Dict[int, Any]] = {}):
-        return EmptyMove(copy.deepcopy(self._id, memodict))
-
-
 class DynamaxMove(Move):
     BOOSTS_MAP = {
         PokemonType.BUG: {"spa": -1},