fix: Set random seed in online from matchmaker

fishfolk · Oct 7, 2024 · 2eb969a · 2eb969a
1 parent 1f9c0f4
commit 2eb969a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/src/core/random.rs b/src/core/random.rs
@@ -22,9 +22,11 @@ pub fn plugin(session: &mut Session) {
 #[type_data(SchemaLuaEcsRefMetatable(lua_metatable))]
 pub struct GlobalRng(AtomicRng);
 
+pub const DEFAULT_RANDOM_SEED: u32 = 7;
+
 impl Default for GlobalRng {
     fn default() -> Self {
-        Self(AtomicRng::with_seed(7))
+        Self(AtomicRng::with_seed(DEFAULT_RANDOM_SEED as u64))
     }
 }
 

diff --git a/src/ui/main_menu/map_select.rs b/src/ui/main_menu/map_select.rs
@@ -3,6 +3,9 @@ use crate::prelude::*;
 
 use crate::ui::map_select::{map_select_menu, MapSelectAction};
 
+#[cfg(not(target_arch = "wasm32"))]
+use crate::ui::network_game::NetworkGameState;
+
 use super::player_select::PlayerSelectState;
 use super::MenuPage;
 
@@ -52,14 +55,19 @@ pub fn widget(
 
             #[cfg(not(target_arch = "wasm32"))]
             let session_runner: Box<dyn SessionRunner> = match network_socket {
-                Some(socket) => Box::new(GgrsSessionRunner::<NetworkInputConfig>::new(
-                    FPS,
-                    GgrsSessionRunnerInfo::new(
-                        socket.ggrs_socket(),
-                        Some(meta.network.max_prediction_window),
-                        Some(meta.network.local_input_delay),
-                    ),
-                )),
+                Some(socket) => {
+                    let random_seed = ui.ctx().get_state::<NetworkGameState>().random_seed();
+
+                    Box::new(GgrsSessionRunner::<NetworkInputConfig>::new(
+                        Some(FPS),
+                        GgrsSessionRunnerInfo::new(
+                            socket.ggrs_socket(),
+                            Some(meta.network.max_prediction_window),
+                            Some(meta.network.local_input_delay),
+                            random_seed,
+                        ),
+                    ))
+                }
                 None => Box::<JumpyDefaultMatchRunner>::default(),
             };
             #[cfg(target_arch = "wasm32")]

diff --git a/src/ui/network_game.rs b/src/ui/network_game.rs
@@ -85,6 +85,7 @@ pub struct NetworkGameState {
     joined_players: usize,
     lan_servers: Vec<lan::ServerInfo>,
     ping_update_timer: Timer,
+    random_seed: u64,
 }
 
 impl Default for NetworkGameState {
@@ -97,10 +98,17 @@ impl Default for NetworkGameState {
             lan_servers: default(),
             joined_players: default(),
             ping_update_timer: Timer::new(Duration::from_secs(1), TimerMode::Repeating),
+            random_seed: DEFAULT_RANDOM_SEED as u64,
         }
     }
 }
 
+impl NetworkGameState {
+    pub fn random_seed(&self) -> u64 {
+        self.random_seed
+    }
+}
+
 pub fn network_game_menu(
     world: &World,
     // commands: &mut Commands,
@@ -247,6 +255,7 @@ pub fn network_game_menu(
                         status,
                         ping_update_timer,
                         joined_players,
+                        random_seed
                     } = &mut state;
 
                     ui.separator();
@@ -504,11 +513,11 @@ pub fn network_game_menu(
                                                                 // Player idx is on socket - don't need it here atm
                                                                 player_idx: _,
                                                                 player_count: _,
-                                                                // random seed currently unused - currently GlobalRng has a fixed seed
-                                                                random_seed,
+                                                                random_seed: new_random_seed,
                                             } => {
                                                 world.resources.insert(socket);
                                                 *status = NetworkGameStatus::default();
+                                                *random_seed = new_random_seed;
                                                 ui.ctx().set_state(MenuPage::PlayerSelect);
                                                 info!("Matchmaking complete, going to player select.");
                                             },