From c355c24fcc95ea2996b55ec5273bad8ce6c1984f Mon Sep 17 00:00:00 2001 From: benellis3 Date: Fri, 23 Sep 2022 11:27:59 +0100 Subject: [PATCH] Add ranges --- install_dependencies.sh | 2 +- src/config/envs/sc2_gen_protoss.yaml | 4 +++- src/config/envs/sc2_gen_terran.yaml | 4 +++- src/config/envs/sc2_gen_zerg.yaml | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/install_dependencies.sh b/install_dependencies.sh index 20fc6bc4..b5670739 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -7,4 +7,4 @@ pip install --upgrade pip pip install --ignore-installed six pip install sacred numpy scipy gym==0.10.8 matplotlib seaborn pyyaml pygame pytest probscale imageio snakeviz tensorboard-logger wandb -pip install -U git+https://github.com/benellis3/smac.git@smac-v2 +pip install -U git+https://github.com/oxwhirl/smacv2.git@ranges diff --git a/src/config/envs/sc2_gen_protoss.yaml b/src/config/envs/sc2_gen_protoss.yaml index a7e2c1fe..68606cc3 100644 --- a/src/config/envs/sc2_gen_protoss.yaml +++ b/src/config/envs/sc2_gen_protoss.yaml @@ -23,7 +23,9 @@ env_args: reward_win: 200 replay_dir: "" replay_prefix: "" - conic_fov: True + conic_fov: False + use_unit_ranges: True + min_attack_range: 2 num_fov_actions: 12 obs_own_pos: True capability_config: diff --git a/src/config/envs/sc2_gen_terran.yaml b/src/config/envs/sc2_gen_terran.yaml index ec320c1d..692f8319 100644 --- a/src/config/envs/sc2_gen_terran.yaml +++ b/src/config/envs/sc2_gen_terran.yaml @@ -23,7 +23,9 @@ env_args: reward_win: 200 replay_dir: "" replay_prefix: "" - conic_fov: True + conic_fov: False + use_unit_ranges: True + min_attack_range: 2 num_fov_actions: 12 obs_own_pos: True capability_config: diff --git a/src/config/envs/sc2_gen_zerg.yaml b/src/config/envs/sc2_gen_zerg.yaml index ac634be9..1aa1b43e 100644 --- a/src/config/envs/sc2_gen_zerg.yaml +++ b/src/config/envs/sc2_gen_zerg.yaml @@ -23,7 +23,9 @@ env_args: reward_win: 200 replay_dir: "" replay_prefix: "" - conic_fov: True + conic_fov: False + use_unit_ranges: True + min_attack_range: 2 num_fov_actions: 12 obs_own_pos: True capability_config: