Add full destruction (no respawn) #30

rc_multiplayer/src/events/kill_player.rs

@@ -0,0 +1,31 @@
+pub struct KillEnemy {
+    msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
+}
+
+pub(super) fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::SimpleRlnl<rlnl::events::ingame::Kill, KillEnemy> {
+    crate::handlers::SimpleRlnl::new(KillEnemy::new(init_ctx))
+}
+
+impl KillEnemy {
+    fn new(init_ctx: &crate::InitConfig) -> Self {
+        Self {
+            msg_router: init_ctx.matches_chann.clone(),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl crate::handlers::RlnlEventCodeHandler for KillEnemy {
+    type In = rlnl::events::ingame::Kill;
+    const CODE: rlnl::event_code::NetworkEvent = rlnl::event_code::NetworkEvent::MachineDestroyed;
+
+    async fn handle(&self, data: Self::In, _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::DestroyVehicle {
+                user_id: user_info.user_id(),
+                remote_player: data.killee_player_id,
+                killer_player: data.killer_player_id,
+            }).await);
+        }
+    }
+}

rc_multiplayer/src/events/mod.rs

@@ -5,6 +5,8 @@ mod weapon_select;
 mod activate_sync;
 mod loading_done;
 //mod player_input;
+mod spot_player;
+mod kill_player;
 
 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))
@@ -42,34 +44,51 @@ pub async fn handler(init_ctx: &crate::InitConfig) -> crate::handler::LnlEventHa
             {literustlib::packet::Property::Unreliable as u8},
             rlnl::events::ingame::FireMiss,
         >::handler(init_ctx))
-        .add(crate::handlers::Broadcaster::<
+        /*.add(crate::handlers::Broadcaster::<
             true,
             {rlnl::event_code::NetworkEvent::EnemySpotted as i16},
             {rlnl::event_code::NetworkEvent::EnemySpotted as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
             rlnl::events::ingame::SpottingIds,
-        >::handler(init_ctx))
+        >::handler(init_ctx))*/
+        .add(spot_player::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
-            true,
+            false,
             {rlnl::event_code::NetworkEvent::DamageCube as i16},
             {rlnl::event_code::NetworkEvent::DestroyCubesFull as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
             rlnl::events::ingame::DestroyCubesFull,
         >::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
-            true,
+            false,
             {rlnl::event_code::NetworkEvent::DamageCubeNoEffect as i16},
             {rlnl::event_code::NetworkEvent::DestroyCubeNoEffect as i16},
             {literustlib::packet::Property::ReliableOrdered as u8},
             rlnl::events::ingame::DestroyCubeNoEffect,
         >::handler(init_ctx))
         .add(crate::handlers::Broadcaster::<
-            true,
+            false,
             {rlnl::event_code::NetworkEvent::DamageCubeEffectOnly as i16},
             {rlnl::event_code::NetworkEvent::DestroyCubeEffectOnly as i16},
             {literustlib::packet::Property::Unreliable as u8},
             rlnl::events::ingame::DestroyCubeEffectOnly,
         >::handler(init_ctx))
+        .add(crate::handlers::Stub::<
+            {rlnl::event_code::NetworkEvent::DestroyCubesBonusRequest as i16},
+            rlnl::events::ingame::DestroyedHealedCubesBonus,
+        >::handler(init_ctx))
+        .add(crate::handlers::Broadcaster::<
+            false,
+            {rlnl::event_code::NetworkEvent::HealSelf as i16},
+            {rlnl::event_code::NetworkEvent::HealSelfResponse as i16},
+            {literustlib::packet::Property::ReliableOrdered as u8},
+            rlnl::events::HealedCubes,
+        >::handler(init_ctx))
+        .add(crate::handlers::Stub::<
+            {rlnl::event_code::NetworkEvent::KillBonusRequest as i16},
+            rlnl::events::ingame::Kill, // FIXME this is not a player ID -- it's actually sending 2 bytes not 1
+        >::handler(init_ctx))
+        .add(kill_player::handler(init_ctx))
 }
 
 #[inline]

rc_multiplayer/src/events/spot_player.rs

@@ -0,0 +1,30 @@
+pub struct SpotEnemy {
+    msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
+}
+
+pub(super) fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::SimpleRlnl<rlnl::events::ingame::SpottingIds, SpotEnemy> {
+    crate::handlers::SimpleRlnl::new(SpotEnemy::new(init_ctx))
+}
+
+impl SpotEnemy {
+    fn new(init_ctx: &crate::InitConfig) -> Self {
+        Self {
+            msg_router: init_ctx.matches_chann.clone(),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl crate::handlers::RlnlEventCodeHandler for SpotEnemy {
+    type In = rlnl::events::ingame::SpottingIds;
+    const CODE: rlnl::event_code::NetworkEvent = rlnl::event_code::NetworkEvent::EnemySpotted;
+
+    async fn handle(&self, data: Self::In, _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::SpotVehicle {
+                user_id: user_info.user_id(),
+                remote_player: data.player_id,
+            }).await);
+        }
+    }
+}