TM 3.7.5 and 4.1.2 now build with old build tool, wait for free slot …

…after starting StarCraft for clients

bots/template/bot.toml

@@ -2,6 +2,7 @@
 #race="Terran"
 #race="Protoss"
 #race="Zerg"
+#race="Random"
 
 # Path of bot executable (if not automatically detected)
 #executable='bwapi-data\AI\ExampleAIModule.dll'

src/bwapi.rs

@@ -72,17 +72,27 @@ impl GameTableAccess {
             .map(|shmem| unsafe { *(shmem.as_ptr() as *const GameTable) })
     }
 
-    pub fn get_connected_client_count(&mut self) -> usize {
+    pub fn all_slots_filled(&mut self) -> bool {
         self.get_game_table()
             .map(|table| {
                 // eprintln!("{:#?}", table);
+                !table
+                    .game_instances
+                    .iter()
+                    .any(|it| it.server_process_id != 0 && !it.is_connected)
+            })
+            .unwrap_or(false)
+    }
+
+    pub fn has_free_slot(&mut self) -> bool {
+        self.get_game_table()
+            .map(|table| {
                 table
                     .game_instances
                     .iter()
-                    .filter(|it| it.is_connected)
-                    .count()
+                    .any(|it| it.server_process_id != 0 && !it.is_connected)
             })
-            .unwrap_or(0)
+            .unwrap_or(false)
     }
 }
 

src/main.rs

@@ -531,12 +531,6 @@ fn main() -> anyhow::Result<()> {
                 );
                 host = false;
 
-                let old_connected_client_count =
-                    if matches!(bot.binary, Binary::Exe(_) | Binary::Dll(_)) {
-                        game_table_access.get_connected_client_count()
-                    } else {
-                        0
-                    };
                 let mut cmd = bwapi_launcher.build_command(&game_config)?;
                 cmd.stdout(File::create(bot.log_dir.join("game_out.log"))?)
                     .stderr(File::create(bot.log_dir.join("game_err.log"))?);
@@ -564,6 +558,15 @@ fn main() -> anyhow::Result<()> {
                     Binary::Exe(exe) => Some(sandbox.wrap_executable(exe)),
                 }
                 .map(|ref mut cmd| -> anyhow::Result<Child> {
+                    // Wait for server to be ready to accept connections
+                    retry(Fixed::from_millis(100).take(100), || {
+                        if game_table_access.has_free_slot() {
+                            OperationResult::Ok(())
+                        } else {
+                            OperationResult::Retry("Server process not ready")
+                        }
+                    }).map_err(|e| anyhow!(e))?;
+
                     cmd.current_dir(bot.working_dir);
                     cmd.stdout(bot_out_log);
                     cmd.stderr(bot_err_log);
@@ -572,13 +575,12 @@ fn main() -> anyhow::Result<()> {
 
                     // Wait up to 10 seconds before bailing
                     retry(Fixed::from_millis(100).take(100), || {
-                        let found = game_table_access.get_connected_client_count()
-                            > old_connected_client_count;
+                        let slots_filled = game_table_access.all_slots_filled();
                         if !matches!(bwapi_child.try_wait(), Ok(None)) {
                             OperationResult::Err("BWAPI process died")
                         } else if !matches!(child.try_wait(), Ok(None)) {
                             OperationResult::Err("Bot process died")
-                        } else if found {
+                        } else if slots_filled {
                             OperationResult::Ok(())
                         } else {
                             OperationResult::Retry(

tm/Custom Tournament Modules

@@ -0,0 +1,2 @@
+Just compile for each BWAPI version you like to support and add them here.
+Be sure to name them <prefix>_<bwapiversion>.dll and use the prefix in the 'bot.toml' files

tm/Where are these from

@@ -0,0 +1 @@
+All TMs here are from https://github.com/basil-ladder/sc-tm - and are build by AppVeyor.