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

Author: cameronangliss

docs/source/examples/rl_with_gymnasium_wrapper.rst

@@ -122,7 +122,7 @@ Now that our custom class is defined, we can instantiate our RL player and test
 
     opponent = RandomPlayer(battle_format="gen8randombattle")
     test_env = SimpleRLPlayer(
-        battle_format="gen8randombattle", opponent=opponent, start_challenging=True
+        battle_format="gen8randombattle", opponent=opponent
     )
     check_env(test_env)
     test_env.close()
@@ -135,8 +135,6 @@ Instantiating train environment and evaluation environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Normally, to ensure isolation between training and testing, two different environments are created.
-If you don't want the player to start challenging the opponent you can set ``start_challenging=False`` when creating it.
-In this case, we want them to start challenging right away:
 
 .. code-block:: python
 
@@ -145,11 +143,11 @@ In this case, we want them to start challenging right away:
 
     opponent = RandomPlayer(battle_format="gen8randombattle")
     train_env = SimpleRLPlayer(
-        battle_format="gen8randombattle", opponent=opponent, start_challenging=True
+        battle_format="gen8randombattle", opponent=opponent
     )
     opponent = RandomPlayer(battle_format="gen8randombattle")
     eval_env = SimpleRLPlayer(
-        battle_format="gen8randombattle", opponent=opponent, start_challenging=True
+        battle_format="gen8randombattle", opponent=opponent
     )
     ...
 

examples/env_example.py

@@ -36,7 +36,6 @@ def embed_battle(self, battle: AbstractBattle):
 if __name__ == "__main__":
     gymnasium_env = TestEnv(
         battle_format="gen8randombattle",
-        start_challenging=True,
     )
     parallel_api_test(gymnasium_env)
     gymnasium_env.close()

examples/requirements.txt

@@ -1,2 +1,2 @@
-tensorflow<2.19
+tensorflow<2.20
 keras-rl2

examples/rl_with_gymnasium_wrapper.py

@@ -78,21 +78,15 @@ async def main():
     # First test the environment to ensure the class is consistent
     # with the Gymnasium API
     opponent = RandomPlayer(battle_format="gen8randombattle")
-    test_env = SimpleRLPlayer(
-        battle_format="gen8randombattle", start_challenging=True, opponent=opponent
-    )
+    test_env = SimpleRLPlayer(battle_format="gen8randombattle", opponent=opponent)
     check_env(test_env)
     test_env.close()
 
     # Create one environment for training and one for evaluation
     opponent = RandomPlayer(battle_format="gen8randombattle")
-    train_env = SimpleRLPlayer(
-        battle_format="gen8randombattle", opponent=opponent, start_challenging=True
-    )
+    train_env = SimpleRLPlayer(battle_format="gen8randombattle", opponent=opponent)
     opponent = RandomPlayer(battle_format="gen8randombattle")
-    eval_env = SimpleRLPlayer(
-        battle_format="gen8randombattle", opponent=opponent, start_challenging=True
-    )
+    eval_env = SimpleRLPlayer(battle_format="gen8randombattle", opponent=opponent)
 
     # Compute dimensions
     n_action = train_env.action_space.n

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"
         }
     ],
-    "gen9vgc2025regg": [
+    "gen9vgc2025regi": [
         {
             "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"

integration_tests/test_env.py

@@ -53,10 +53,8 @@ def test_env_run():
         env = SinglesTestEnv(
             battle_format=f"gen{gen}randombattle",
             log_level=25,
-            start_challenging=False,
             strict=False,
         )
-        env.start_challenging(10)
         play_function(env, 10)
         env.close()
     for gen in range(8, 10):
@@ -87,11 +85,9 @@ def test_single_agent_env_run():
         env = SinglesTestEnv(
             battle_format=f"gen{gen}randombattle",
             log_level=25,
-            start_challenging=False,
             strict=False,
         )
         env = SingleAgentWrapper(env, RandomPlayer())
-        env.env.start_challenging(10)
         single_agent_play_function(env, 10)
         env.close()
     for gen in range(8, 10):
@@ -112,23 +108,17 @@ def test_repeated_runs():
     env = SinglesTestEnv(
         battle_format="gen8randombattle",
         log_level=25,
-        start_challenging=False,
         strict=False,
     )
-    env.start_challenging(2)
     play_function(env, 2)
-    env.start_challenging(2)
     play_function(env, 2)
     env.close()
     env = SinglesTestEnv(
         battle_format="gen9randombattle",
         log_level=25,
-        start_challenging=False,
         strict=False,
     )
-    env.start_challenging(2)
     play_function(env, 2)
-    env.start_challenging(2)
     play_function(env, 2)
     env.close()
 
@@ -139,7 +129,6 @@ def test_env_api():
         env = SinglesTestEnv(
             battle_format=f"gen{gen}randombattle",
             log_level=25,
-            start_challenging=True,
             strict=False,
         )
         parallel_api_test(env)
@@ -161,7 +150,6 @@ def test_single_agent_env_api():
         env = SinglesTestEnv(
             battle_format=f"gen{gen}randombattle",
             log_level=25,
-            start_challenging=True,
             strict=False,
         )
         env = SingleAgentWrapper(env, RandomPlayer())

out.json

@@ -3652,7 +3652,7 @@
   "pp": 15,
   "priority": 0,
   "flags": { "protect": 1, "mirror": 1, "sound": 1, "bypasssub": 1, "metronome": 1 },
-  "onTry": "onTry",
+  "onTryMove": "onTryMove",
   "condition": {
    "duration": 2,
    "onFieldStart": "onFieldStart",
@@ -13878,7 +13878,6 @@
   "priority": 0,
   "flags": { "protect": 1, "mirror": 1, "sound": 1, "bypasssub": 1, "metronome": 1 },
   "secondary": {
-   "dustproof": true,
    "chance": 100,
    "volatileStatus": "sparklingaria"
   },

src/poke_env/__init__.py

@@ -2,6 +2,7 @@
 
 import logging
 
+import poke_env.calc as calc
 import poke_env.environment as environment
 import poke_env.exceptions as exceptions
 import poke_env.player as player
@@ -42,6 +43,7 @@
     "ShowdownException",
     "ShowdownServerConfiguration",
     "SimpleHeuristicsPlayer",
+    "calc",
     "compute_raw_stats",
     "cross_evaluate",
     "environment",

src/poke_env/calc/__init__.py

@@ -0,0 +1,8 @@
+from poke_env.calc import damage_calc_gen9
+from poke_env.calc.damage_calc_gen9 import calculate_base_power, calculate_damage
+
+__all__ = [
+    "damage_calc_gen9",
+    "calculate_damage",
+    "calculate_base_power",
+]