Skip to content

Commit 37ae400

Browse files
authored
Merge pull request #150 from yogesh1801/project-pikachu-yogesh
fix: ensure Gen 8 Random Battles run correctly instead of Gen 9
2 parents 1f47a4e + bc8e0c5 commit 37ae400

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/envs/pokemon_env/server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ COPY src/envs/pokemon_env/ /app/src/envs/pokemon_env/
4646
COPY src/envs/pokemon_env/README.md /app/README.md
4747

4848
# Pokemon environment variables
49-
ENV POKEMON_BATTLE_FORMAT=gen9randombattle
49+
ENV POKEMON_BATTLE_FORMAT=gen8randombattle
5050
ENV POKEMON_PLAYER_USERNAME=player
5151
ENV POKEMON_REWARD_MODE=sparse
5252
ENV POKEMON_MAX_TURNS=1000

src/envs/pokemon_env/server/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
python -m envs.pokemon_env.server.app
1717
1818
Environment variables:
19-
POKEMON_BATTLE_FORMAT: Battle format (default: "gen9randombattle")
19+
POKEMON_BATTLE_FORMAT: Battle format (default: "gen8randombattle")
2020
POKEMON_PLAYER_USERNAME: Player username (default: "player")
2121
POKEMON_REWARD_MODE: Reward mode - "sparse" or "dense" (default: "sparse")
2222
POKEMON_MAX_TURNS: Maximum turns per battle (default: "1000")
@@ -37,7 +37,7 @@
3737
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
3838
)
3939

40-
battle_format = os.getenv("POKEMON_BATTLE_FORMAT", "gen9randombattle")
40+
battle_format = os.getenv("POKEMON_BATTLE_FORMAT", "gen8randombattle")
4141
player_username = os.getenv("POKEMON_PLAYER_USERNAME", "player")
4242
reward_mode = os.getenv("POKEMON_REWARD_MODE", "sparse")
4343
max_turns = int(os.getenv("POKEMON_MAX_TURNS", "1000"))

src/envs/pokemon_env/server/pokemon_environment.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class PokemonEnvironment(Environment):
234234

235235
def __init__(
236236
self,
237-
battle_format: str = "gen9randombattle",
237+
battle_format: str = "gen8randombattle",
238238
player_username: Optional[str] = None,
239239
opponent: Optional[Player] = None,
240240
reward_mode: str = "sparse",
@@ -254,7 +254,7 @@ def __init__(
254254
self.player = OpenEnvPokemonPlayer(
255255
account_configuration=AccountConfiguration(self.player_username, None),
256256
server_configuration=LocalhostServerConfiguration,
257-
battle_format=battle_format,
257+
battle_format=self.battle_format,
258258
max_concurrent_battles=1, # One battle at a time
259259
)
260260

@@ -265,7 +265,7 @@ def __init__(
265265
self.opponent = RandomPlayer(
266266
account_configuration=AccountConfiguration(opponent_username, None),
267267
server_configuration=LocalhostServerConfiguration,
268-
battle_format=battle_format,
268+
battle_format=self.battle_format,
269269
max_concurrent_battles=1,
270270
)
271271
else:
@@ -537,6 +537,7 @@ def reset(self) -> Observation:
537537
# Start battle on POKE_LOOP
538538
async def start_battle():
539539
"""Start a single battle and return when it's initialized."""
540+
logger.info(self.battle_format)
540541
logger.info("Starting battle...")
541542

542543
# Use battle_against which returns when battle is complete

0 commit comments

Comments
 (0)