aboutsummaryrefslogtreecommitdiff
path: root/planetwars-matchrunner/src/pw_match.rs
diff options
context:
space:
mode:
authorIlion Beyst <ilion.beyst@gmail.com>2022-09-26 19:57:22 +0200
committerIlion Beyst <ilion.beyst@gmail.com>2022-09-26 19:57:22 +0200
commit2a37b96da2c713f706ad541f81c56dc4ef822f5f (patch)
tree55b4c8aaa98b279dfc1ac724f275446d173af36d /planetwars-matchrunner/src/pw_match.rs
parentb7bcbdd3a6b045692a1850d6b49128e312dffbe7 (diff)
downloadplanetwars.dev-2a37b96da2c713f706ad541f81c56dc4ef822f5f.tar.xz
planetwars.dev-2a37b96da2c713f706ad541f81c56dc4ef822f5f.zip
track player status and return player outcomes from match
Diffstat (limited to 'planetwars-matchrunner/src/pw_match.rs')
-rw-r--r--planetwars-matchrunner/src/pw_match.rs54
1 files changed, 43 insertions, 11 deletions
diff --git a/planetwars-matchrunner/src/pw_match.rs b/planetwars-matchrunner/src/pw_match.rs
index 62a07e5..01da9b4 100644
--- a/planetwars-matchrunner/src/pw_match.rs
+++ b/planetwars-matchrunner/src/pw_match.rs
@@ -9,6 +9,7 @@ use tokio::time::Duration;
use serde_json;
+use std::collections::HashMap;
use std::convert::TryInto;
pub use planetwars_rules::config::{Config, Map};
@@ -17,30 +18,43 @@ use planetwars_rules::protocol as proto;
use planetwars_rules::serializer as pw_serializer;
use planetwars_rules::{PlanetWars, PwConfig};
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MatchConfig {
- pub map_name: String,
- pub max_turns: usize,
-}
-
pub struct PwMatch {
pub match_ctx: MatchCtx,
pub match_state: PlanetWars,
+ pub player_status: HashMap<usize, PlayerStatus>,
+}
+
+pub struct PlayerStatus {
+ pub had_command_errors: bool,
+ pub terminated: bool,
}
impl PwMatch {
pub fn create(match_ctx: MatchCtx, config: PwConfig) -> Self {
// TODO: this is kind of hacked together at the moment
let match_state = PlanetWars::create(config, match_ctx.players().len());
+ let player_status = match_ctx
+ .players()
+ .into_iter()
+ .map(|player_id| {
+ (
+ player_id as usize,
+ PlayerStatus {
+ had_command_errors: false,
+ terminated: false,
+ },
+ )
+ })
+ .collect();
PwMatch {
match_state,
match_ctx,
+ player_status,
}
}
- pub async fn run(mut self) -> PlanetWars {
+ pub async fn run(&mut self) {
// log initial state
self.log_game_state();
@@ -49,14 +63,12 @@ impl PwMatch {
for (player_id, turn) in player_messages {
let player_action = self.execute_action(player_id, turn);
+ self.update_player_status(player_id, &player_action);
self.log_player_action(player_id, player_action);
}
self.match_state.step();
self.log_game_state();
}
-
- self.match_ctx.shutdown().await;
- self.match_state
}
async fn prompt_players(&mut self) -> Vec<(usize, RequestResult<Vec<u8>>)> {
@@ -145,6 +157,26 @@ impl PwMatch {
}
}
}
+
+ fn update_player_status(&mut self, player_id: usize, player_action: &PlayerAction) {
+ let player_status = self.player_status.get_mut(&player_id).unwrap();
+ match player_action {
+ PlayerAction::Commands(dispatches) => {
+ if dispatches.iter().any(|d| d.error.is_some()) {
+ player_status.had_command_errors = true;
+ }
+ }
+ PlayerAction::ParseError { .. } => {
+ player_status.had_command_errors = true;
+ }
+ PlayerAction::Timeout => {
+ player_status.had_command_errors = true;
+ }
+ PlayerAction::Terminated => {
+ player_status.terminated = true;
+ }
+ }
+ }
}
#[derive(Debug, Clone, Serialize, Deserialize)]