From f14c154c114f2600d2597cfee7227c376df2403d Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Wed, 3 Apr 2024 19:33:46 +0000 Subject: [PATCH] Change the select size map system (#106) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://git.tipragot.fr/fish-cannard/border-wars/pulls/106 Reviewed-by: Raphaël Co-authored-by: CoCo_Sol Co-committed-by: CoCo_Sol --- crates/border-wars/src/scenes/lobby.rs | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/crates/border-wars/src/scenes/lobby.rs b/crates/border-wars/src/scenes/lobby.rs index d3762cc..8b79bde 100644 --- a/crates/border-wars/src/scenes/lobby.rs +++ b/crates/border-wars/src/scenes/lobby.rs @@ -69,17 +69,17 @@ fn lobby_ui( return; } - ui.add(egui::Slider::new(&mut (*map_size), 1..=5).text("map size")); + ui.add(egui::Slider::new(&mut (*map_size), 1..=3).text("map size")); if !ui.button("Run the game").clicked() { return; } let seed = rand::thread_rng().gen::(); - let index = *map_size as usize; + let index = *map_size as u16; let nomber_of_players = all_players_query.iter().count() as u32; - let radius = get_map_sizes(nomber_of_players)[index] as u16 * 2; + let radius = nomber_of_players as u16 * 2 * (index + 1); // Start the game. for player in all_players_query.iter() { @@ -90,19 +90,3 @@ fn lobby_ui( } }); } - -/// Get the map sizes form a given number of players. -fn get_map_sizes(number_of_players: u32) -> Vec { - let mut result = Vec::with_capacity(6); - - let mut current = 0; - while result.len() < 6 { - current += 1; - - if (current * 6) % number_of_players == 0 { - result.push(current); - } - } - - result -}