Implement most of the occasional packets sent in elimination, expand interface for custom game logic #30

rc_multiplayer/src/events/flipper_start.rs

@@ -0,0 +1,30 @@
+pub struct RectifierStart {
+    msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
+}
+
+pub(super) fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::Dataless<RectifierStart> {
+    crate::handlers::Dataless::new(RectifierStart::new(init_ctx))
+}
+
+impl RectifierStart {
+    fn new(init_ctx: &crate::InitConfig) -> Self {
+        Self {
+            msg_router: init_ctx.matches_chann.clone(),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl crate::handlers::DatalessEventCodeHandler for RectifierStart {
+    const CODE: rlnl::event_code::NetworkEvent = rlnl::event_code::NetworkEvent::AlignmentRectifierStarted;
+
+    async fn handle(&self, _peer: &std::sync::Arc<literustlib_server::Connection<crate::PacketData>>, user: &crate::UserData, _sender: &std::sync::Arc<literustlib_server::DataSender<crate::PacketData>>) {
+        if let Some(user_info) = user.user().await {
+            super::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::FlippingStarted {
+                user_id: user_info.user_id(),
+            }).await);
+        } else {
+            log::error!("Failed to handle sync loading request for unknown user");
+        }
+    }
+}

rc_multiplayer/src/events/mod.rs

@@ -8,6 +8,8 @@ mod loading_done;
 mod spot_player;
 mod kill_player;
 mod client_unregister;
+mod flipper_start;
+mod self_destruct_elimination;
 
 pub async fn handler(init_ctx: &crate::InitConfig) -> crate::handler::LnlEventHandler {
     crate::handler::LnlEventHandler::new(init_ctx.users.clone(), crate::vehicle_motion::handler(init_ctx))
@@ -25,12 +27,14 @@ pub async fn handler(init_ctx: &crate::InitConfig) -> crate::handler::LnlEventHa
             {literustlib::packet::Property::Unreliable as u8},
             rlnl::events::ingame::PlayerIdAndInputData,
         >::handler(init_ctx))
-        .add(crate::handlers::DatalessBroadcaster::<
+        .add(flipper_start::handler(init_ctx))
+        /*.add(crate::handlers::Broadcaster::<
             true,
             {rlnl::event_code::NetworkEvent::AlignmentRectifierStarted as i16},
             {rlnl::event_code::NetworkEvent::AlignmentRectifierStarted as i16},
             {literustlib::packet::Property::Unreliable as u8},
-        >::handler(init_ctx))
+            rlnl::events::ingame::PlayerId,
+        >::handler(init_ctx))*/
         .add(crate::handlers::Broadcaster::<
             true,
             {rlnl::event_code::NetworkEvent::FireWeaponEffect as i16},
@@ -106,28 +110,28 @@ pub async fn handler(init_ctx: &crate::InitConfig) -> crate::handler::LnlEventHa
         >::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
             true,
-            {rlnl::event_code::NetworkEvent::ActivateTeleportEffect as i16},
+            {rlnl::event_code::NetworkEvent::BroadcastActivateTeleportEffect as i16},
             {rlnl::event_code::NetworkEvent::ActivateTeleportEffect as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
-            rlnl::events::ingame::PlayerId,
+            rlnl::events::ingame::TeleportActivateEffect,
         >::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
             true,
-            {rlnl::event_code::NetworkEvent::SpawnEmpLocator as i16},
+            {rlnl::event_code::NetworkEvent::BroadcastSpawnEmpLocator as i16},
             {rlnl::event_code::NetworkEvent::SpawnEmpLocator as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
             rlnl::events::ingame::SpawnEmpLocator,
         >::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
             true,
-            {rlnl::event_code::NetworkEvent::SpawnEmpMachineEffect as i16},
+            {rlnl::event_code::NetworkEvent::BroadcastSpawnEmpMachineEffect as i16},
             {rlnl::event_code::NetworkEvent::SpawnEmpMachineEffect as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
             rlnl::events::ingame::NetworkStunnedMachineEffect,
         >::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
             true,
-            {rlnl::event_code::NetworkEvent::SpawnShield as i16},
+            {rlnl::event_code::NetworkEvent::ShieldSpawned as i16},
             {rlnl::event_code::NetworkEvent::SpawnShield as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
             rlnl::events::ingame::ShieldModuleEvent,
@@ -147,6 +151,28 @@ pub async fn handler(init_ctx: &crate::InitConfig) -> crate::handler::LnlEventHa
             rlnl::events::ingame::CosmeticAction,
         >::handler(init_ctx))
         .add(client_unregister::handler(init_ctx))
+        .add(crate::handlers::Broadcaster::<
+            true,
+            {rlnl::event_code::NetworkEvent::BroadcastInvisible as i16},
+            {rlnl::event_code::NetworkEvent::MakeInvisible as i16},
+            {literustlib::packet::Property::ReliableOrdered as u8},
+            rlnl::events::ingame::PlayerId,
+        >::handler(init_ctx))
+        .add(crate::handlers::Broadcaster::<
+            true,
+            {rlnl::event_code::NetworkEvent::BroadcastVisible as i16},
+            {rlnl::event_code::NetworkEvent::MakeVisible as i16},
+            {literustlib::packet::Property::ReliableOrdered as u8},
+            rlnl::events::ingame::PlayerId,
+        >::handler(init_ctx))
+        .add(crate::handlers::Broadcaster::<
+            true,
+            {rlnl::event_code::NetworkEvent::UpdateVotingAfterBattle as i16},
+            {rlnl::event_code::NetworkEvent::UpdateVotingAfterBattle as i16},
+            {literustlib::packet::Property::ReliableOrdered as u8},
+            rlnl::events::ingame::UpdateVotingAfterBattle,
+        >::handler(init_ctx))
+        .add(self_destruct_elimination::handler(init_ctx))
 }
 
 #[inline]
@@ -180,7 +206,10 @@ mod _broadcast_impls {
     impl Broadcastable for rlnl::events::ingame::ShieldModuleEvent {}
     impl Broadcastable for rlnl::events::ingame::Taunt {}
     impl Broadcastable for rlnl::events::ingame::CosmeticAction {}
+    impl Broadcastable for rlnl::events::ingame::UpdateVotingAfterBattle {}
+    impl Broadcastable for rlnl::events::ingame::TeleportActivateEffect {}
 
     impl Broadcastable for rlnl::events::sync::UpdateGameModeSettings {}
     impl Broadcastable for rlnl::events::GameTime {}
+    impl Broadcastable for rlnl::events::ingame::TeamBaseState {}
 }

rc_multiplayer/src/events/self_destruct_elimination.rs

@@ -0,0 +1,31 @@
+pub struct SelfDestructElim {
+    msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
+}
+
+pub(super) fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::Dataless<SelfDestructElim> {
+    crate::handlers::Dataless::new(SelfDestructElim::new(init_ctx))
+}
+
+impl SelfDestructElim {
+    fn new(init_ctx: &crate::InitConfig) -> Self {
+        Self {
+            msg_router: init_ctx.matches_chann.clone(),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl crate::handlers::DatalessEventCodeHandler for SelfDestructElim {
+    const CODE: rlnl::event_code::NetworkEvent = rlnl::event_code::NetworkEvent::SelfDestructClassicMode;
+
+    async fn handle(&self, _peer: &std::sync::Arc<literustlib_server::Connection<crate::PacketData>>, user: &crate::UserData, _sender: &std::sync::Arc<literustlib_server::DataSender<crate::PacketData>>) {
+        if let Some(user_info) = user.user().await {
+            super::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::SelfDestruct {
+                user_id: user_info.user_id(),
+                is_classic: true,
+            }).await);
+        } else {
+            log::error!("Failed to handle sync loading request for unknown user");
+        }
+    }
+}