WIP

DigitalExtinction · Aug 16, 2023 · 968b292 · 968b292
1 parent b0bfd01
commit 968b292
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/crates/menu/src/multiplayer/joined.rs b/crates/menu/src/multiplayer/joined.rs
@@ -1,15 +1,8 @@
 use bevy::prelude::*;
-use de_core::{
-    assets::asset_path,
-    gconfig::{GameConfig, LocalPlayers},
-    player::Player,
-    state::AppState,
-};
+use de_core::state::AppState;
 use de_gui::ToastEvent;
 use de_lobby_client::GetGameRequest;
-use de_map::hash::MapHash;
-use de_messages::Readiness;
-use de_multiplayer::{GameReadinessEvent, ShutdownMultiplayerEvent};
+use de_multiplayer::{PeerJoinedEvent, PeerLeftEvent, ShutdownMultiplayerEvent};
 
 use super::{
     current::GameNameRes,
@@ -21,10 +14,16 @@ pub(crate) struct JoinedGamePlugin;
 
 impl Plugin for JoinedGamePlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(OnExit(MultiplayerState::GameJoined), cleanup)
+        app.add_systems(OnEnter(MultiplayerState::GameJoined), refresh)
+            .add_systems(OnExit(MultiplayerState::GameJoined), cleanup)
             .add_systems(
                 Update,
-                (refresh, handle_get_response).run_if(in_state(MultiplayerState::GameJoined)),
+                (
+                    refresh
+                        .run_if(on_event::<PeerJoinedEvent>().or_else(on_event::<PeerLeftEvent>())),
+                    handle_get_response,
+                )
+                    .run_if(in_state(MultiplayerState::GameJoined)),
             );
     }
 }
@@ -36,14 +35,12 @@ fn cleanup(state: Res<State<AppState>>, mut shutdown: EventWriter<ShutdownMultip
 }
 
 fn refresh(game_name: Res<GameNameRes>, mut sender: Sender<GetGameRequest>) {
-    // TODO when player joins or first time
+    info!("Refreshing game info...");
     sender.send(GetGameRequest::new(game_name.name_owned()));
 }
 
 fn handle_get_response(
-    mut commands: Commands,
     mut multi_state: ResMut<NextState<MultiplayerState>>,
-    mut app_state: ResMut<NextState<AppState>>,
     mut receiver: Receiver<GetGameRequest>,
     mut toasts: EventWriter<ToastEvent>,
 ) {

diff --git a/crates/multiplayer/src/game.rs b/crates/multiplayer/src/game.rs
@@ -56,6 +56,24 @@ impl GameJoinedEvent {
     }
 }
 
+#[derive(Event)]
+pub struct PeerJoinedEvent(u8);
+
+impl PeerJoinedEvent {
+    pub fn id(&self) -> u8 {
+        self.0
+    }
+}
+
+#[derive(Event)]
+pub struct PeerLeftEvent(u8);
+
+impl PeerLeftEvent {
+    pub fn id(&self) -> u8 {
+        self.0
+    }
+}
+
 fn open_or_join(
     conf: Res<NetGameConfRes>,
     mut main_server: EventWriter<ToMainServerEvent>,
@@ -118,6 +136,8 @@ fn process_from_game(
     mut fatals: EventWriter<FatalErrorEvent>,
     state: Res<State<NetState>>,
     mut joined_events: EventWriter<GameJoinedEvent>,
+    mut peer_joined_events: EventWriter<PeerJoinedEvent>,
+    mut peer_left_events: EventWriter<PeerLeftEvent>,
     mut next_state: ResMut<NextState<NetState>>,
 ) {
     for event in inputs.iter() {
@@ -169,9 +189,11 @@ fn process_from_game(
             }
             FromGame::PeerJoined(id) => {
                 info!("Peer {id} joined.");
+                peer_joined_events.send(PeerJoinedEvent(*id));
             }
             FromGame::PeerLeft(id) => {
                 info!("Peer {id} left.");
+                peer_left_events.send(PeerLeftEvent(*id));
             }
             FromGame::GameReadiness(readiness) => {
                 info!("Game readiness changed to: {readiness:?}");

diff --git a/crates/multiplayer/src/lib.rs b/crates/multiplayer/src/lib.rs
@@ -15,7 +15,7 @@ use stats::StatsPlugin;
 
 pub use crate::{
     config::{ConnectionType, NetGameConf},
-    game::{GameJoinedEvent, GameOpenedEvent},
+    game::{GameJoinedEvent, GameOpenedEvent, PeerJoinedEvent, PeerLeftEvent},
     lifecycle::{MultiplayerShuttingDownEvent, ShutdownMultiplayerEvent, StartMultiplayerEvent},
     netstate::NetState,
 };