return winner when running a match

2 files changed, 19 insertions, 5 deletions

diff --git a/planetwars-matchrunner/src/lib.rs b/planetwars-matchrunner/src/lib.rs
index b7a9e53..1f1a4c7 100644
--- a/planetwars-matchrunner/src/lib.rs
+++ b/planetwars-matchrunner/src/lib.rs
@@ -52,7 +52,11 @@ pub trait BotSpec: Send + Sync {
     ) -> Box<dyn PlayerHandle>;
 }
 
-pub async fn run_match(config: MatchConfig) {
+pub struct MatchOutcome {
+    pub winner: Option<usize>,
+}
+
+pub async fn run_match(config: MatchConfig) -> MatchOutcome {
     let pw_config = PwConfig {
         map_file: config.map_path,
         max_turns: 100,
@@ -103,8 +107,18 @@ pub async fn run_match(config: MatchConfig) {
     // )
     // .unwrap();
 
-    let match_state = pw_match::PwMatch::create(match_ctx, pw_config);
+    let mut match_state = pw_match::PwMatch::create(match_ctx, pw_config);
     match_state.run().await;
+
+    let final_state = match_state.match_state.state();
+    let survivors = final_state.living_players();
+    let winner = if survivors.len() == 1 {
+        Some(survivors[0])
+    } else {
+        None
+    };
+
+    MatchOutcome { winner }
 }
 
 // writing this as a closure causes lifetime inference errors
diff --git a/planetwars-matchrunner/src/pw_match.rs b/planetwars-matchrunner/src/pw_match.rs
index c9a7f7b..f5b803c 100644
--- a/planetwars-matchrunner/src/pw_match.rs
+++ b/planetwars-matchrunner/src/pw_match.rs
@@ -24,8 +24,8 @@ pub struct MatchConfig {
 }
 
 pub struct PwMatch {
-    match_ctx: MatchCtx,
-    match_state: PlanetWars,
+    pub match_ctx: MatchCtx,
+    pub match_state: PlanetWars,
 }
 
 impl PwMatch {
@@ -39,7 +39,7 @@ impl PwMatch {
         }
     }
 
-    pub async fn run(mut self) {
+    pub async fn run(&mut self) {
         while !self.match_state.is_finished() {
             let player_messages = self.prompt_players().await;