Finish adding OOD support for all games *

* Besides chaser and plunder, that don't support any of the current holdout types

Author: kcorder

procgen/env.py

@@ -56,10 +56,19 @@
     "bigfish",
     "bossfight",
     "caveflyer",
-    # "chaser",
+    # "chaser",     # not currently supported 
     "climber",
     "coinrun",
     "dodgeball",
+    "fruitbot",
+    "heist",
+    "jumper",
+    "leaper",
+    "maze",
+    "miner",
+    "ninja",
+    # "plunder",    # not currently supported 
+    "starpilot",
     # Add more as they are finished
 ]
 

procgen/src/games/heist.cpp

@@ -117,7 +117,7 @@ class HeistGame : public BasicAbstractGame {
 
         int min_maze_dim = 5;
         int max_diff = (world_dim - min_maze_dim) / 2;
-        int difficulty = rand_gen.randn(max_diff + 1);
+        int difficulty = randn_type_switch(max_diff + 1, "platform"); 
 
         options.center_agent = options.distribution_mode == MemoryMode;
 

procgen/src/games/leaper.cpp

@@ -147,7 +147,7 @@ class LeaperGame : public BasicAbstractGame {
         bottom_road_y = choose_extra_space() + 1;
 
         int max_diff = options.distribution_mode == EasyMode ? 3 : 4;
-        int difficulty = rand_gen.randn(max_diff + 1);
+        int difficulty = randn_type_switch(max_diff + 1, "platform"); 
 
         // half the time we add an extra lane to either roads or water
         int extra_lane_option = options.distribution_mode == EasyMode ? 0 : rand_gen.randn(4);

procgen/src/games/ninja.cpp

@@ -330,7 +330,7 @@ class Ninja : public BasicAbstractGame {
         }
 
         int max_difficulty = 3;
-        int difficulty = rand_gen.randn(max_difficulty) + 1;
+        int difficulty = randn_type_switch(max_difficulty, "platform") + 1;  // 1 to 2 for training; 3 for eval
 
         last_fire_time = 0;
 

procgen/src/games/starpilot.cpp

@@ -250,8 +250,8 @@ class StarPilotGame : public BasicAbstractGame {
             int flyer_theme = 0;
 
             if (type == FLYER || type == FAST_FLYER) {
-                group_size = rand_gen.randint(0, hp_max_group_size) + 1;
-                flyer_theme = rand_gen.randn(NUM_SHIP_THEMES);
+                group_size = rand_gen.randint(0, hp_max_group_size) + 1;  // TODO: switch on "platform" ("difficulty") type ? 
+                flyer_theme = randn_type_switch(NUM_SHIP_THEMES, "enemy");
             }
 
             float y_pos = rand_pos(r, main_height);