diff --git a/environment.yml b/environment.yml index bbe9b655..13f2cb08 100644 --- a/environment.yml +++ b/environment.yml @@ -1,15 +1,17 @@ +name: procgen channels: - conda-forge - + - nodefaults dependencies: - - python=3.7.3 + - python # https://www.anaconda.com/utilizing-the-new-compilers-in-anaconda-distribution-5/ - - c-compiler=1.3.0 + - c-compiler - cmake=3.21.3 - - qt=5.12.5 # conda-forge does not have 5.13.2 available + - qt=5.15.8 + - filelock + - numpy + - gym + - glfw - pip - pip: - gym3==0.3.3 - - numpy==1.17.2 - - gym==0.15.3 - - filelock==3.0.10 diff --git a/procgen/CMakeLists.txt b/procgen/CMakeLists.txt index 31084aa5..a2b1b233 100644 --- a/procgen/CMakeLists.txt +++ b/procgen/CMakeLists.txt @@ -75,4 +75,4 @@ add_library(env # find libenv.h header target_include_directories(env PUBLIC ${LIBENV_DIR}) -target_link_libraries(env Qt5::Gui) \ No newline at end of file +target_link_libraries(env Qt5::Gui) diff --git a/procgen/src/games/chaser.cpp b/procgen/src/games/chaser.cpp index a6ec0c8d..15f94d01 100644 --- a/procgen/src/games/chaser.cpp +++ b/procgen/src/games/chaser.cpp @@ -293,7 +293,6 @@ class ChaserGame : public BasicAbstractGame { void game_step() override { BasicAbstractGame::game_step(); - int num_orbs = 0; int num_enemies = 0; float default_enemy_speed = .5; @@ -303,7 +302,6 @@ class ChaserGame : public BasicAbstractGame { auto ent = entities[j]; if (ent->type == ORB) { - num_orbs++; } else if (ent->type == ENEMY_EGG) { num_enemies++; ent->health -= 1; diff --git a/procgen/src/games/starpilot.cpp b/procgen/src/games/starpilot.cpp index 9ea93e03..7ab579ec 100644 --- a/procgen/src/games/starpilot.cpp +++ b/procgen/src/games/starpilot.cpp @@ -228,7 +228,7 @@ class StarPilotGame : public BasicAbstractGame { bool can_spawn_left = options.distribution_mode != EasyMode; - for (int i = 0; t <= SHOOTER_WIN_TIME; i++) { + while (t <= SHOOTER_WIN_TIME) { int group_size = 1; float start_weight = rand_gen.rand01() * total_prob_weight; float curr_weight = start_weight;