Show weapons

src/comms.rs

@@ -19,12 +19,15 @@ pub struct PlayerData {
     is_scoped: bool,
 
     #[serde(rename = "playerName")]
-    player_name: String
+    player_name: String,
+
+    #[serde(rename = "weaponId")]
+    weapon_id: i16,
 }
 
 impl PlayerData {
-    pub fn new(pos: Vec3, yaw: f32, player_type: PlayerType, has_bomb: bool, has_awp: bool, is_scoped: bool, player_name: String) -> PlayerData {
-        PlayerData { pos, yaw, player_type, has_bomb, has_awp, is_scoped, player_name }
+    pub fn new(pos: Vec3, yaw: f32, player_type: PlayerType, has_bomb: bool, has_awp: bool, is_scoped: bool, player_name: String, weapon_id: i16) -> PlayerData {
+        PlayerData { pos, yaw, player_type, has_bomb, has_awp, is_scoped, player_name, weapon_id }
     }
 }
 

src/dma/context/mod.rs

@@ -126,14 +126,14 @@ impl DmaCtx {
 
         let team = TeamID::from_i32(team);
 
-        let has_awp = {
+        let (has_awp, weapon_id) = {
             let clipping_weapon: Address = clipping_weapon.into();
             let items_def_idx_addr = clipping_weapon + cs2dumper::client::C_EconEntity::m_AttributeManager 
                 + cs2dumper::client::C_AttributeContainer::m_Item + cs2dumper::client::C_EconItemView::m_iItemDefinitionIndex;
     
             let items_def_idx: i16 = self.process.read(items_def_idx_addr)?;
 
-            items_def_idx == 9
+            (items_def_idx == 9, items_def_idx)
         };
 
         Ok(BatchedPlayerData {
@@ -144,6 +144,7 @@ impl DmaCtx {
             has_awp,
             is_scoped: is_scoped != 0,
             player_name,
+            weapon_id,
         })
     }
 
@@ -270,4 +271,5 @@ pub struct BatchedPlayerData {
     pub has_awp: bool,
     pub is_scoped: bool,
     pub player_name: String,
+    pub weapon_id: i16,
 }

src/dma/mod.rs

@@ -166,7 +166,8 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                             has_bomb,
                             local_data.has_awp,
                             local_data.is_scoped,
-                            local_data.player_name
+                            local_data.player_name,
+                            local_data.weapon_id
                         )
                     )
                 );
@@ -204,7 +205,8 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                             has_bomb,
                             player_data.has_awp,
                             player_data.is_scoped,
-                            player_data.player_name
+                            player_data.player_name,
+                            player_data.weapon_id
                         )
                     )
                 );