Added further Effects handling from Showdown parsing and fainting (#596)

hsahovic · Sep 3, 2024 · 70bf850 · 70bf850
1 parent 53fa383
commit 70bf850
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/src/poke_env/environment/abstract_battle.py b/src/poke_env/environment/abstract_battle.py
@@ -32,7 +32,6 @@ class AbstractBattle(ABC):
         "-ohko",
         "-resisted",
         "-singlemove",
-        "-singleturn",
         "-supereffective",
         "-waiting",
         "-zbroken",
@@ -705,6 +704,9 @@ def parse_message(self, split_message: List[str]):
         elif split_message[1] == "-sidestart":
             side, condition = split_message[2:4]
             self._side_start(side, condition)
+        elif split_message[1] in ["-singleturn", "-singlemove"]:
+            pokemon, effect = split_message[2:4]
+            self.get_pokemon(pokemon).start_effect(effect.replace("move: ", ""))
         elif split_message[1] == "-swapboost":
             source, target, stats = split_message[2:5]
             source = self.get_pokemon(source)

diff --git a/src/poke_env/environment/pokemon.py b/src/poke_env/environment/pokemon.py
@@ -225,6 +225,7 @@ def end_turn(self):
     def faint(self):
         self._current_hp = 0
         self._status = Status.FNT
+        self._effects = {}
 
     def forme_change(self, species: str):
         species = species.split(",")[0]

diff --git a/unit_tests/environment/test_battle.py b/unit_tests/environment/test_battle.py
@@ -324,6 +324,11 @@ def test_battle_request_and_interactions(example_request):
     for stat, boost in battle.opponent_active_pokemon.boosts.items():
         assert boost == -boosts_before_invertion[stat]
 
+    battle.parse_message(["", "-singleturn", "p1: Tyranitar", "move: Rage Powder"])
+    assert Effect.RAGE_POWDER in battle.opponent_active_pokemon.effects
+    battle.end_turn(1)
+    assert Effect.RAGE_POWDER not in battle.opponent_active_pokemon.effects
+
     battle.parse_message(
         [
             "",

diff --git a/unit_tests/environment/test_enumerations.py b/unit_tests/environment/test_enumerations.py
@@ -120,6 +120,11 @@ def test_effect_end():
         if effect.is_volatile_status:
             assert effect.ends_on_switch
 
+    furret.switch_in()
+    furret.start_effect("feint")
+    furret.faint()
+    assert furret.effects == {}
+
 
 def test_field_str():
     assert str(Field["ELECTRIC_TERRAIN"])