Make CSS and SSS reach a match

src/menus/match_config.rs

@@ -1,37 +1,86 @@
 use bevy::prelude::*;
 use thiserror::Error;
 
-use crate::fighter::FighterId;
+use crate::{
+    fighter::FighterId,
+    match_loading::{MatchPlayer, PendingMatch},
+    stage::manifest::StageId,
+};
 
 pub struct MenuMatchPlayerSlot {
     pub slot: usize,
-    pub fighter: Option<FighterId>
+    pub fighter: Option<FighterId>,
 }
 
 #[derive(Resource, Default)]
 pub struct MenuMatchConfig {
-    pub players: Vec<MenuMatchPlayerSlot>
+    pub stage: Option<StageId>,
+    pub players: Vec<MenuMatchPlayerSlot>,
 }
 
 #[derive(Error, Debug, Reflect)]
 pub enum MenuMatchConfigErrors {
     #[error("Fighter slot {0} was invalid!")]
-    PlayerSlotInvalid(usize)
+    PlayerSlotInvalid(usize),
+    #[error("Invalid configuration: Slot {0} doesn't have a fighter selected")]
+    FighterNotSelectedForSlot(usize),
+    #[error("Invalid configuration: No stage selected")]
+    StageNotSelected,
 }
 
 impl MenuMatchConfig {
-    pub fn set_player_fighter(&mut self, player_slot: usize, fighter_id: Option<FighterId>) -> Result<(), MenuMatchConfigErrors> {
-        let slot = self.players.get_mut(player_slot).ok_or(MenuMatchConfigErrors::PlayerSlotInvalid(player_slot))?;
+    pub fn set_player_fighter(
+        &mut self,
+        player_slot: usize,
+        fighter_id: Option<FighterId>,
+    ) -> Result<(), MenuMatchConfigErrors> {
+        let slot = self
+            .players
+            .get_mut(player_slot)
+            .ok_or(MenuMatchConfigErrors::PlayerSlotInvalid(player_slot))?;
         slot.fighter = fighter_id;
         Ok(())
     }
-    pub fn get_player_fighter(&self, player_slot: usize) -> Result<Option<FighterId>, MenuMatchConfigErrors> {
-        let slot = self.players.get(player_slot).ok_or(MenuMatchConfigErrors::PlayerSlotInvalid(player_slot))?;
+    pub fn get_player_fighter(
+        &self,
+        player_slot: usize,
+    ) -> Result<Option<FighterId>, MenuMatchConfigErrors> {
+        let slot = self
+            .players
+            .get(player_slot)
+            .ok_or(MenuMatchConfigErrors::PlayerSlotInvalid(player_slot))?;
         Ok(slot.fighter)
     }
 
     pub fn all_players_ready(&self) -> bool {
-        let has_unselected_fighter = self.players.iter().any(|player_slot| player_slot.fighter.is_none());
+        let has_unselected_fighter = self
+            .players
+            .iter()
+            .any(|player_slot| player_slot.fighter.is_none());
         !has_unselected_fighter
     }
-}
+
+    pub fn to_pending_match(&self) -> Result<PendingMatch, MenuMatchConfigErrors> {
+        let mut match_players = vec![];
+
+        let stage = self.stage.ok_or(MenuMatchConfigErrors::StageNotSelected)?;
+
+        for player in self.players.iter() {
+            let fighter_id =
+                player
+                    .fighter
+                    .ok_or(MenuMatchConfigErrors::FighterNotSelectedForSlot(
+                        player.slot,
+                    ))?;
+            match_players.push(MatchPlayer {
+                fighter: fighter_id,
+                handle: player.slot,
+            });
+        }
+
+        Ok(PendingMatch {
+            players: match_players,
+            stage,
+        })
+    }
+}