Update comms.rs

.gitignore

@@ -1,4 +1,5 @@
 /target
 /src/dma/cs2dumper/offsets_mod.rs
 /src/dma/cs2dumper/client_mod.rs
-/src/dma/cs2dumper/engine2_mod.rs
+/src/dma/cs2dumper/engine2_mod.rs
+dump.sh

README.md

@@ -13,7 +13,7 @@ Before you begin, install the necessary memflow plugins using memflowup from the
 The needed Plugins are `memflow-qemu` and `memflow-win32` 
 
 Clone the repo on your vm host:  
-`git clone https://github.com/superyu1337/radarflow2.git`
+`git clone https://git.deadzone.lol/Wizzard/radarflow2-kvm.git`
 
 Run radarflow:   
 `cargo run --release`
@@ -38,7 +38,7 @@ Check the dlopen documentation for all possible import paths.
 ```
 
 Clone the repo on your attacking pc:  
-`git clone https://github.com/superyu1337/radarflow2.git`
+`git clone https://git.deadzone.lol/Wizzard/radarflow2-kvm.git`
 
 Run radarflow:   
 `cargo run --release -- --connector pcileech`

src/cli.rs

@@ -6,7 +6,7 @@ use memflow::plugins::Inventory;
 use crate::dma::Connector;
 const PORT_RANGE: std::ops::RangeInclusive<usize> = 8000..=65535;
 
-#[derive(Parser)]
+#[derive(Parser, Clone)]
 #[command(author, version = version(), about, long_about = None)]
 pub struct Cli {
     /// Specifies the connector type for DMA

src/comms.rs

@@ -16,12 +16,18 @@ pub struct PlayerData {
     has_awp: bool,
 
     #[serde(rename = "isScoped")]
-    is_scoped: bool
+    is_scoped: bool,
+
+    #[serde(rename = "playerName")]
+    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) -> PlayerData {
-        PlayerData { pos, yaw, player_type, has_bomb, has_awp, is_scoped }
+    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 }
     }
 }
 
@@ -45,6 +51,20 @@ pub enum EntityData {
     Bomb(BombData)
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CheatOptions {
+    #[serde(rename = "revealMoney")]
+    pub reveal_money: bool,
+}
+
+impl Default for CheatOptions {
+    fn default() -> Self {
+        Self {
+            reveal_money: false,
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RadarData {
     freq: usize,
@@ -77,13 +97,30 @@ pub struct RadarData {
     #[serde(rename(serialize = "entityData"))]
     player_data: Vec<EntityData>,
 
-    //#[serde(rename(serialize = "localYaw"))]
-    //local_yaw: f32,
+    #[serde(rename = "options")]
+    options: CheatOptions,
+
+    #[serde(skip)]
+    pub money_reveal_enabled: bool,
 }
 
 impl RadarData {
     pub fn new(ingame: bool, map_name: String, player_data: Vec<EntityData>, freq: usize, bomb_planted: bool, bomb_cannot_defuse: bool, bomb_defuse_timeleft: f32, bomb_exploded: bool, bomb_being_defused: bool, bomb_defuse_length: f32, bomb_defuse_end: f32) -> RadarData {
-        RadarData { ingame, map_name, player_data, freq, bomb_planted, bomb_can_defuse: bomb_cannot_defuse, bomb_defuse_timeleft, bomb_exploded, bomb_being_defused, bomb_defuse_length, bomb_defuse_end }
+        RadarData {
+            ingame,
+            map_name,
+            player_data,
+            freq,
+            bomb_planted,
+            bomb_can_defuse: bomb_cannot_defuse,
+            bomb_defuse_timeleft,
+            bomb_exploded,
+            bomb_being_defused,
+            bomb_defuse_length,
+            bomb_defuse_end,
+            options: CheatOptions::default(),
+            money_reveal_enabled: false
+        }
     }
 
     /// Returns empty RadarData, it's also the same data that gets sent to clients when not ingame
@@ -99,7 +136,9 @@ impl RadarData {
             bomb_exploded: false,
             bomb_being_defused: false,
             bomb_defuse_length: 0.0,
-            bomb_defuse_end: 0.0
+            bomb_defuse_end: 0.0,
+            options: CheatOptions::default(),
+            money_reveal_enabled: false
         }
     }
 }

src/dma/context/mod.rs

@@ -97,6 +97,7 @@ impl DmaCtx {
         let mut team = 0i32;
         let mut clipping_weapon = 0u64;
         let mut is_scoped = 0u8;
+        let mut player_name_ptr = 0u64;
 
         {
             let mut batcher = MemoryViewBatcher::new(&mut self.process);
@@ -106,18 +107,33 @@ impl DmaCtx {
             batcher.read_into(controller + cs2dumper::client::C_BaseEntity::m_iTeamNum, &mut team);
             batcher.read_into(pawn + cs2dumper::client::C_CSPlayerPawnBase::m_pClippingWeapon, &mut clipping_weapon);
             batcher.read_into(pawn + cs2dumper::client::C_CSPlayerPawn::m_bIsScoped, &mut is_scoped);
+            batcher.read_into(controller + cs2dumper::client::CCSPlayerController::m_sSanitizedPlayerName, &mut player_name_ptr);
         }
-    
+
+        let player_name = if player_name_ptr != 0 {
+            let mut name_buffer = [0u8; 32];
+            self.process.read_raw_into(player_name_ptr.into(), &mut name_buffer)?;
+
+            let name_len = name_buffer.iter().position(|&c| c == 0).unwrap_or(name_buffer.len());
+            String::from_utf8_lossy(&name_buffer[..name_len]).to_string()
+        } else {
+            match team {
+                2 => format!("T Player"),
+                3 => format!("CT Player"),
+                _ => format!("Unknown Player"),
+            }
+        };
+
         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 {
@@ -126,7 +142,9 @@ impl DmaCtx {
             team,
             health,
             has_awp,
-            is_scoped: is_scoped != 0
+            is_scoped: is_scoped != 0,
+            player_name,
+            weapon_id,
         })
     }
 
@@ -178,7 +196,8 @@ impl DmaCtx {
         let mut data_vec: Vec<(Address, u64, Vec<(u64, i32)>)> = data_vec
             .into_iter()
             .map(|(pawn, _, wep_count, wep_base)| {
-                let weps = (0..wep_count).into_iter().map(|idx| (0u64, idx)).collect();
+                let safe_count = if wep_count < 0 || wep_count > 32 { 0 } else { wep_count };
+                let weps = (0..safe_count).into_iter().map(|idx| (0u64, idx)).collect();
                 (pawn, wep_base, weps)
             })
             .collect();
@@ -188,7 +207,7 @@ impl DmaCtx {
         data_vec.iter_mut().for_each(|(_, wep_base, wep_data_vec)| {
             wep_data_vec.iter_mut().for_each(|(_, idx)| {
                 let b: Address = (*wep_base).into();
-                batcher.read_into(b + * idx * 0x4, idx);
+                batcher.read_into(b + u64::saturating_mul(*idx as u64, 0x4), idx);
             });
         });
         drop(batcher);
@@ -252,4 +271,6 @@ pub struct BatchedPlayerData {
     pub health: u32,
     pub has_awp: bool,
     pub is_scoped: bool,
+    pub player_name: String,
+    pub weapon_id: i16,
 }

src/dma/mod.rs

@@ -4,17 +4,28 @@ use memflow::{mem::MemoryView, os::Process, types::Address};
 
 use crate::{enums::PlayerType, comms::{EntityData, PlayerData, RadarData, ArcRwlockRadarData, BombData}};
 
+use crate::money_reveal::MoneyReveal;
+
 use self::{context::DmaCtx, threaddata::CsData};
 
-mod context;
-mod threaddata;
+pub mod context;
+pub mod threaddata;
 mod cs2dumper;
 
 pub use context::Connector;
 
 pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_device: String, skip_version: bool) -> anyhow::Result<()> {
     let mut ctx = DmaCtx::setup(connector, pcileech_device, skip_version)?;
-    let mut data = CsData { recheck_bomb_holder: true, ..Default::default() };
+    let mut data = CsData {
+        recheck_bomb_holder: true,
+        money_reveal_enabled: false,
+        ..Default::default()
+    };
+
+    let mut money_reveal = MoneyReveal::new();
+    if let Err(e) = money_reveal.init(&mut ctx.process, &ctx.client_module) {
+        log::warn!("Failed to initialize money reveal: {}", e);
+    }
     
     // For read timing
     let mut last_bomb_dropped = false;
@@ -47,6 +58,17 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
 
         data.update_common(&mut ctx);
 
+        {
+            let radar = radar_data.read().await;
+            if radar.money_reveal_enabled != data.money_reveal_enabled {
+                data.money_reveal_enabled = radar.money_reveal_enabled;
+
+                if let Err(e) = money_reveal.toggle(&mut ctx.process) {
+                    log::warn!("Failed to toggle money reveal: {}", e);
+                }
+            }
+        }
+
         // Bomb update
         if (data.bomb_dropped && !last_bomb_dropped) || (data.bomb_planted && !last_bomb_planted) {
             data.update_bomb(&mut ctx);
@@ -76,10 +98,18 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                 .into_iter()
                 .map(|(_, pawn)| pawn)
                 .collect();
-
-            pawns.push(data.local_pawn.into());
         
+            pawns.push(data.local_pawn.into());
+
+            let prev_holder = data.bomb_holder;
+
             data.bomb_holder = ctx.get_c4_holder(pawns, data.entity_list.into(), &data);
+
+            if data.bomb_holder.is_some() && prev_holder.is_none() {
+                log::debug!("Bomb picked up by player");
+                data.bomb_dropped = false;
+            }
+
             data.recheck_bomb_holder = false;
         }
 
@@ -138,18 +168,25 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
 
             // Bomb
             if data.bomb_dropped || data.bomb_planted {
-                let node = ctx.process.read_addr64(
+                if let Ok(node) = ctx.process.read_addr64(
                     data.bomb + cs2dumper::client::C_BaseEntity::m_pGameSceneNode as u64
-                ).unwrap();
-                let pos = ctx.process.read(node + cs2dumper::client::CGameSceneNode::m_vecAbsOrigin).unwrap();
-    
-                entity_data.push(EntityData::Bomb(BombData::new(pos, data.bomb_planted)));
+                ) {
+                    if let Ok(pos) = ctx.process.read(node + cs2dumper::client::CGameSceneNode::m_vecAbsOrigin) {
+                        entity_data.push(EntityData::Bomb(BombData::new(pos, data.bomb_planted)));
+                    }
+                }
             }
 
             // Local player
-            let local_data = ctx.batched_player_read(
+            let local_data = match ctx.batched_player_read(
                 data.local.into(), data.local_pawn.into()
-            ).unwrap();
+            ) {
+                Ok(data) => data,
+                Err(e) => {
+                    log::warn!("Failed to read local player data: {}", e);
+                    continue;
+                }
+            };
 
             if local_data.health > 0 {
                 let has_bomb = match data.bomb_holder {
@@ -160,12 +197,14 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                 entity_data.push(
                     EntityData::Player(
                         PlayerData::new(
-                            local_data.pos, 
+                            local_data.pos,
                             local_data.yaw,
                             PlayerType::Local,
                             has_bomb,
                             local_data.has_awp,
-                            local_data.is_scoped
+                            local_data.is_scoped,
+                            local_data.player_name,
+                            local_data.weapon_id
                         )
                     )
                 );
@@ -173,39 +212,47 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
 
             // Other players
             for (controller, pawn) in &data.players {
-                let player_data = ctx.batched_player_read(*controller, *pawn).unwrap();
+                match ctx.batched_player_read(*controller, *pawn) {
+                    Ok(player_data) => {
+                        if player_data.health < 1 {
+                            continue;
+                        }
 
-                if player_data.health < 1 {
-                    continue;
-                }
+                        let has_bomb = match data.bomb_holder {
+                            Some(bh) => *pawn == bh,
+                            None => false,
+                        };
 
-                let has_bomb = match data.bomb_holder {
-                    Some(bh) => *pawn == bh,
-                    None => false,
-                };
+                        let player_type = {
+                            if local_data.team != player_data.team {
+                                PlayerType::Enemy
+                            } else if local_data.team == player_data.team {
+                                PlayerType::Team
+                            } else {
+                                PlayerType::Unknown
+                            }
+                        };
 
-                let player_type = {
-                    if local_data.team != player_data.team {
-                        PlayerType::Enemy
-                    } else if local_data.team == player_data.team {
-                        PlayerType::Team
-                    } else {
-                        PlayerType::Unknown
+                        entity_data.push(
+                            EntityData::Player(
+                                PlayerData::new(
+                                    player_data.pos,
+                                    player_data.yaw,
+                                    player_type,
+                                    has_bomb,
+                                    player_data.has_awp,
+                                    player_data.is_scoped,
+                                    player_data.player_name,
+                                    player_data.weapon_id
+                                )
+                            )
+                        );
+                    },
+                    Err(e) => {
+                        log::warn!("Failed to read player data: {}", e);
+                        continue;
                     }
-                };
-
-                entity_data.push(
-                    EntityData::Player(
-                        PlayerData::new(
-                            player_data.pos, 
-                            player_data.yaw,
-                            player_type,
-                            has_bomb,
-                            player_data.has_awp,
-                            player_data.is_scoped
-                        )
-                    )
-                );
+                }
             }
 
             let mut radar = radar_data.write().await;
@@ -222,9 +269,12 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                 data.bomb_defuse_length,
                 bomb_defuse_end
             );
+
+            radar.money_reveal_enabled = data.money_reveal_enabled;
         } else {
             let mut radar = radar_data.write().await;
             *radar = RadarData::empty(freq);
+            radar.money_reveal_enabled = data.money_reveal_enabled;
         }
 
         last_tick_count = data.tick_count;
@@ -239,5 +289,10 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
         thread::sleep(Duration::from_millis(1));
     }
 
+    let cleanup_result = money_reveal.ensure_disabled(&mut ctx.process);
+    if let Err(e) = cleanup_result {
+        log::warn!("Failed to cleanup money reveal: {}", e);
+    }
+
     Ok(())
 }

src/dma/threaddata/mod.rs

@@ -38,6 +38,7 @@ pub struct CsData {
     pub bomb_defuse_length: f32,
     pub bomb_exploded: bool,
     pub bomb_defused: bool,
+    pub money_reveal_enabled: bool,
 }
 
 
@@ -104,10 +105,12 @@ impl CsData {
                 }
             }
         } else if self.bomb_planted {
-            let bomb = ctx.get_plantedc4()
-                .expect("Failed to get planted bomb");
-
-            self.bomb = bomb;
+            match ctx.get_plantedc4() {
+                Ok(bomb) => self.bomb = bomb,
+                Err(e) => {
+                    log::warn!("Failed to get planted bomb: {}", e);
+                }
+            }
         }
     }
 
@@ -169,7 +172,7 @@ impl CsData {
         {
             // Globals
             let tick_count_addr = (self.globals + 0x40).into();
-            let map_addr = (self.globals + 0x1B8).into();
+            let map_addr = (self.globals + 384).into();
 
             // Gamerules
             let bomb_dropped_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_bBombDropped as u64).into();

src/main.rs

@@ -13,6 +13,9 @@ mod comms;
 mod dma;
 mod websocket;
 
+mod pattern;
+mod money_reveal;
+
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let cli: Cli = Cli::parse();
@@ -29,6 +32,7 @@ async fn main() -> anyhow::Result<()> {
     );
 
     let radar_clone = radar_data.clone();
+
     let dma_handle = tokio::spawn(async move {
         if let Err(err) = dma::run(radar_clone, cli.connector, cli.pcileech_device, cli.skip_version).await {
             log::error!("Error in dma thread: [{}]", err.to_string());
@@ -37,20 +41,23 @@ async fn main() -> anyhow::Result<()> {
         }
     });
 
+    let web_path = cli.web_path.clone();
+    let port = cli.port;
+
     let _websocket_handle = tokio::spawn(async move {
         if let Ok(my_local_ip) = local_ip_address::local_ip() {
-            let address = format!("http://{}:{}", my_local_ip, cli.port);
+            let address = format!("http://{}:{}", my_local_ip, port);
             println!("Launched webserver at {}", address);
         } else {
-            let address = format!("http://0.0.0.0:{}", cli.port);
+            let address = format!("http://0.0.0.0:{}", port);
             println!("launched webserver at {}", address);
         }
 
-        if let Err(err) = websocket::run(cli.web_path, cli.port, radar_data).await {
+        if let Err(err) = websocket::run(web_path, port, radar_data).await {
             log::error!("Error in ws server: [{}]", err.to_string());
         }
     });
 
     dma_handle.await?;
     Ok(())
-}
+}

src/money_reveal.rs

@@ -0,0 +1,96 @@
+use memflow::{mem::MemoryView, types::Address, os::ModuleInfo};
+use crate::pattern::pattern_scan;
+
+const BUF_SIZE: usize = 3;
+
+pub struct MoneyReveal {
+    pub is_enabled: bool,
+    pub address: Option<Address>,
+    original_bytes: Option<[u8; BUF_SIZE]>,
+}
+
+impl MoneyReveal {
+    pub fn new() -> Self {
+        Self {
+            is_enabled: false,
+            address: None,
+            original_bytes: None,
+        }
+    }
+
+    pub fn init(&mut self, mem: &mut impl MemoryView, client_module: &ModuleInfo) -> anyhow::Result<()> {
+        self.address = self.find_function(mem, client_module)?;
+        log::info!("Money reveal function found at: {:?}", self.address);
+        Ok(())
+    }
+
+    pub fn toggle(&mut self, mem: &mut impl MemoryView) -> anyhow::Result<bool> {
+        if let Some(addr) = self.address {
+            if self.is_enabled {
+                if let Some(original) = self.original_bytes {
+                    self.restore(mem, addr, original)?;
+                    self.original_bytes = None;
+                    self.is_enabled = false;
+                }
+            } else {
+                let original = self.patch(mem, addr)?;
+                self.original_bytes = Some(original);
+                self.is_enabled = true;
+            }
+            Ok(self.is_enabled)
+        } else {
+            Err(anyhow::anyhow!("Money reveal not initialized"))
+        }
+    }
+
+    pub fn ensure_disabled(&mut self, mem: &mut impl MemoryView) -> anyhow::Result<()> {
+        if self.is_enabled {
+            if let Some(addr) = self.address {
+                if let Some(original) = self.original_bytes {
+                    self.restore(mem, addr, original)?;
+                    self.is_enabled = false;
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn find_function(&self, mem: &mut impl MemoryView, module: &ModuleInfo) -> anyhow::Result<Option<Address>> {
+        let is_hltv = pattern_scan(
+            mem,
+            module,
+            "48 83 EC 28 48 8B 0D ?? ?? ?? ?? 48 8B 01 FF 90 ?? ?? ?? ?? 84 C0 75 0D"
+        )?;
+
+        if is_hltv.is_none() {
+            Ok(pattern_scan(
+                mem,
+                module,
+                "B0 01 C3 28 48 8B 0D ?? ?? ?? ?? 48 8B 01 FF 90 ?? ?? ?? ?? 84 C0 75 0D"
+            )?)
+        } else {
+            Ok(is_hltv)
+        }
+    }
+
+    fn patch(&self, mem: &mut impl MemoryView, location: Address) -> anyhow::Result<[u8; BUF_SIZE]> {
+        let mut original_buf = [0u8; BUF_SIZE];
+        mem.read_into(location, &mut original_buf)?;
+
+        let new_buf: [u8; BUF_SIZE] = [
+            0xB0, 0x01,     // MOV AL,1
+            0xC3            // RET
+        ];
+
+        log::debug!("Patching memory for money reveal");
+        mem.write(location, &new_buf)?;
+
+        Ok(original_buf)
+    }
+
+    fn restore(&self, mem: &mut impl MemoryView, location: Address, original: [u8; BUF_SIZE]) -> anyhow::Result<()> {
+        log::debug!("Restoring memory for money reveal");
+        mem.write(location, &original)?;
+        Ok(())
+    }
+}

src/pattern.rs

@@ -0,0 +1,51 @@
+use std::io::Read;
+use log::warn;
+use memflow::{os::ModuleInfo, mem::MemoryView, types::Address};
+
+fn pattern_to_bytes(pattern: String) -> Vec<Option<u8>> {
+    pattern.split(' ')
+        .fold(Vec::new(), |mut accum, str| {
+            if str == "??" {
+                accum.push(None);
+            } else {
+                let byte = u8::from_str_radix(str, 16).unwrap();
+                accum.push(Some(byte));
+            }
+
+            accum
+        })
+}
+
+pub fn pattern_scan(mem: &mut impl MemoryView, module: &ModuleInfo, sig: &str) -> anyhow::Result<Option<Address>> {
+    let pattern_bytes = pattern_to_bytes(sig.to_owned());
+    let mut cursor = mem.cursor();
+
+    log::debug!("Searching \"{}\" for pattern: \"{}\"", module.name, sig);
+
+    for i in 0..module.size {
+        let mut found = true;
+        cursor.set_address(module.base + i);
+
+        let mut buf = vec![0u8; pattern_bytes.len()];
+
+        if let Err(_) = cursor.read(&mut buf) {
+            warn!("Encountered read error while scanning for pattern");
+            continue;
+        }
+
+        for (idx, byte) in buf.iter().enumerate() {
+            if let Some(pat_byte) = pattern_bytes[idx] {
+                if *byte != pat_byte {
+                    found = false;
+                    break;
+                }
+            }
+        }
+
+        if found {
+            return Ok(Some(module.base + i));
+        }
+    }
+
+    Ok(None)
+}

src/websocket.rs

@@ -25,29 +25,43 @@ async fn ws_handler(ws: WebSocketUpgrade, State(state): State<AppState>) -> Resp
 async fn handle_socket(mut socket: WebSocket, state: AppState) {
     while let Some(msg) = socket.recv().await {
         if let Ok(msg) = msg {
-            if msg == Message::Text("requestInfo".to_string()) {
-                let str = {
-                    let data = state.data_lock.read().await;
+            if let Ok(text) = msg.to_text() {
+                if text == "requestInfo" {
+                    let str = {
+                        let data = state.data_lock.read().await;
 
-                    match serde_json::to_string(&*data) {
-                        Ok(json) => json,
-                        Err(e) => {
-                            log::error!("Could not serialize data into json: {}", e.to_string());
-                            log::error!("Sending \"error\" instead");
-                            "error".to_string()
-                        },
+                        match serde_json::to_string(&*data) {
+                            Ok(json) => json,
+                            Err(e) => {
+                                log::error!("Could not serialize data into json: {}", e.to_string());
+                                log::error!("Sending \"error\" instead");
+                                "error".to_string()
+                            },
+                        }
+                    };
+
+                    if socket.send(Message::Text(str)).await.is_err() {
+                        return;
                     }
-                };
+                } else if text == "toggleMoneyReveal" {
+                    let new_value = {
+                        let mut data = state.data_lock.write().await;
+                        data.money_reveal_enabled = !data.money_reveal_enabled;
+                        data.money_reveal_enabled
+                    };
 
-                //println!("{str}");
+                    let response = serde_json::json!({
+                        "action": "toggleMoneyReveal",
+                        "status": "success",
+                        "enabled": new_value
+                    });
 
-                if socket.send(Message::Text(str)).await.is_err() {
-                    // client disconnected
-                    return;
+                    if socket.send(Message::Text(response.to_string())).await.is_err() {
+                        return;
+                    }
                 }
             }
         } else {
-            // client disconnected
             return;
         }
     }

webradar/assets/json/de_train.json

@@ -0,0 +1,7 @@
+{
+  "pos_x": -2308.0,
+  "pos_y": 2078.0,
+  "scale": 4.082077,
+  "rotate": 0,
+  "zoom": 0.0
+}

webradar/index.html

@@ -18,6 +18,18 @@
                     <input type="checkbox" onclick="toggleStats()" id="statsCheck" name="stats"/>
                     <label for="statsCheck">Stats</label>
                 </div>
+                <div>
+                    <input type="checkbox" onclick="toggleNames()" id="namesCheck" name="names"/>
+                    <label for="namesCheck">Player Names</label>
+                </div>
+                <div>
+                    <input type="checkbox" onclick="toggleGuns()" id="gunsCheck" name="guns"/>
+                    <label for="gunsCheck">Weapons</label>
+                </div>
+                <div>
+                    <input type="checkbox" onclick="toggleMoneyReveal()" id="moneyReveal" name="money"/>
+                    <label for="moneyReveal">Money Reveal (DANGEROUS!)</label>
+                </div>
             </div>
         </div>
         <canvas id="canvas"></canvas>

webradar/script.js

@@ -6,8 +6,11 @@ const bombColor = "#eda338"
 const textColor = "#d1d1d1"
 
 // Settings
-shouldZoom = true
-drawStats = false
+shouldZoom = false
+
+drawStats = true
+drawNames = true
+drawGuns = true
 
 // Common
 canvas = null
@@ -28,6 +31,53 @@ zoomSet = false
 safetyBound = 50
 boundingRect = null
 
+// Weapon IDs
+const weaponIdMap = {
+    1: "DEAGLE",
+    2: "DUALIES",
+    3: "FIVE-SEVEN",
+    4: "GLOCK",
+    7: "AK-47",
+    8: "AUG",
+    9: "AWP",
+    10: "FAMAS",
+    11: "G3SG1",
+    13: "GALIL",
+    14: "M249",
+    16: "M4A4",
+    17: "MAC-10",
+    19: "P90",
+    23: "MP5",
+    24: "UMP",
+    25: "XM1014",
+    26: "BIZON",
+    27: "MAG-7",
+    28: "NEGEV",
+    29: "SAWED-OFF",
+    30: "TEC-9",
+    31: "ZEUS",
+    32: "P2000",
+    33: "MP7",
+    34: "MP9",
+    35: "NOVA",
+    36: "P250",
+    38: "SCAR-20",
+    39: "SG 553",
+    40: "SCOUT",
+    60: "M4A1-S",
+    61: "USP-S",
+    63: "CZ75",
+    64: "REVOLVER",
+    43: "FLASH",
+    44: "HE",
+    45: "SMOKE",
+    46: "MOLOTOV",
+    47: "DECOY",
+    48: "INCENDIARY",
+    49: "C4",
+    0: "KNIFE"
+};
+
 // networking
 websocket = null
 if (location.protocol == 'https:') {
@@ -39,7 +89,7 @@ if (location.protocol == 'https:') {
 
 // Util functions
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-const degreesToRadians = (degrees) => degrees * (Math.PI/180);
+const degreesToRadians = (degrees) => degrees * (Math.PI / 180);
 function makeBoundingRect(x1, y1, x2, y2, aspectRatio) {
     const topLeftX = x1;
     const topLeftY = y1;
@@ -92,7 +142,7 @@ function boundingCoordinates(coordinates, boundingRect) {
     const newX = (coordinates.x - boundingRect.x) / xScale;
     const newY = (coordinates.y - boundingRect.y) / yScale;
 
-    return {x: newX, y: newY};
+    return { x: newX, y: newY };
 }
 
 function boundingScale(value, boundingRect) {
@@ -107,7 +157,113 @@ function mapCoordinates(coordinates) {
     offset_x /= map.scale;
     offset_y /= -map.scale;
 
-    return {x: offset_x, y: offset_y}
+    return { x: offset_x, y: offset_y }
+}
+
+function drawPlayerBomb(pos, playerType) {
+    if (!map) return;
+
+    if (zoomSet) {
+        pos = boundingCoordinates(mapCoordinates(pos), boundingRect);
+        textSize = boundingScale(10, boundingRect);
+    } else {
+        pos = mapCoordinates(pos);
+        textSize = 10;
+    }
+
+    const textY = pos.y + (drawNames ? (drawGuns ? 50 : 35) : (drawGuns ? 35 : 20));
+
+    ctx.fillStyle = bombColor;
+
+    ctx.font = `${textSize}px Arial`;
+    ctx.textAlign = "center";
+    ctx.textBaseline = "top";
+
+    ctx.lineWidth = 2;
+    ctx.strokeStyle = "black";
+    ctx.strokeText("[C4]", pos.x, textY);
+    ctx.fillText("[C4]", pos.x, textY);
+}
+
+function drawPlayerName(pos, playerName, playerType, hasAwp, hasBomb, isScoped) {
+    if (!map) return;
+
+    if (zoomSet) {
+        pos = boundingCoordinates(mapCoordinates(pos), boundingRect);
+        textSize = boundingScale(12, boundingRect);
+    } else {
+        pos = mapCoordinates(pos);
+        textSize = 12;
+    }
+
+    const textY = pos.y + 20;
+
+    let displayName = playerName;
+    if (playerType === "Local") {
+        displayName = "YOU";
+        ctx.fillStyle = localColor;
+    } else if (playerType === "Team") {
+        ctx.fillStyle = teamColor;
+    } else if (playerType === "Enemy") {
+        ctx.fillStyle = enemyColor;
+    }
+
+    if (isScoped) {
+        displayName += " [SCOPED]";
+    }
+
+    ctx.font = `${textSize}px Arial`;
+    ctx.textAlign = "center";
+    ctx.textBaseline = "top";
+
+    ctx.lineWidth = 2;
+    ctx.strokeStyle = "black";
+    ctx.strokeText(displayName, pos.x, textY);
+
+    ctx.fillText(displayName, pos.x, textY);
+}
+
+function getWeaponName(weaponId) {
+    if (weaponIdMap[weaponId]) {
+        return weaponIdMap[weaponId];
+    }
+
+    if (weaponId >= 500) {
+        return "KNIFE";
+    }
+
+    return "WEAPON";
+}
+
+function drawPlayerWeapon(pos, playerType, weaponId) {
+    if (!map) return;
+
+    if (zoomSet) {
+        pos = boundingCoordinates(mapCoordinates(pos), boundingRect);
+        textSize = boundingScale(10, boundingRect);
+    } else {
+        pos = mapCoordinates(pos);
+        textSize = 10;
+    }
+
+    const textY = pos.y + (drawNames ? 35 : 20);
+
+    let weaponName = getWeaponName(weaponId);
+
+    if (weaponId === 9) {
+        ctx.fillStyle = "orange";
+    } else {
+        ctx.fillStyle = textColor;
+    }
+
+    ctx.font = `${textSize}px Arial`;
+    ctx.textAlign = "center";
+    ctx.textBaseline = "top";
+
+    ctx.lineWidth = 2;
+    ctx.strokeStyle = "black";
+    ctx.strokeText(`[${weaponName}]`, pos.x, textY);
+    ctx.fillText(`[${weaponName}]`, pos.x, textY);
 }
 
 function render() {
@@ -132,15 +288,14 @@ function render() {
                     } else {
                         mapCords = mapCoordinates(data.Player.pos)
                     }
-    
+
                     minX = Math.min(minX, mapCords.x);
                     minY = Math.min(minY, mapCords.y);
                     maxX = Math.max(maxX, mapCords.x);
                     maxY = Math.max(maxY, mapCords.y);
                 });
 
-
-                boundingRect = makeBoundingRect(minX-safetyBound, minY-safetyBound, maxX+safetyBound, maxY+safetyBound, image.width/image.height)
+                boundingRect = makeBoundingRect(minX - safetyBound, minY - safetyBound, maxX + safetyBound, maxY + safetyBound, image.width / image.height)
 
                 zoomSet = true
             } else if (zoomSet) {
@@ -168,14 +323,40 @@ function render() {
 
                         drawEntity(
                             data.Player.pos,
-                            fillStyle, 
+                            fillStyle,
                             data.Player.isDormant,
                             data.Player.hasBomb,
                             data.Player.yaw,
                             data.Player.hasAwp,
                             data.Player.playerType,
                             data.Player.isScoped
-                        )
+                        );
+
+                        if (drawNames && !data.Player.isDormant) {
+                            drawPlayerName(
+                                data.Player.pos,
+                                data.Player.playerName,
+                                data.Player.playerType,
+                                data.Player.hasAwp,
+                                data.Player.hasBomb,
+                                data.Player.isScoped
+                            );
+                        }
+
+                        if (drawGuns && !data.Player.isDormant) {
+                            drawPlayerWeapon(
+                                data.Player.pos,
+                                data.Player.playerType,
+                                data.Player.weaponId
+                            );
+                        }
+
+                        if (data.Player.hasBomb && !data.Player.isDormant) {
+                            drawPlayerBomb(
+                                data.Player.pos,
+                                data.Player.playerType
+                            );
+                        }
                     }
                 });
             }
@@ -183,13 +364,13 @@ function render() {
             if (radarData != null) {
                 if (radarData.bombPlanted && !radarData.bombExploded && radarData.bombDefuseTimeleft >= 0) {
 
-                    let maxWidth = 1024-128-128;
+                    let maxWidth = 1024 - 128 - 128;
                     let timeleft = radarData.bombDefuseTimeleft;
-    
+
                     // Base bar
                     ctx.fillStyle = "black"
                     ctx.fillRect(128, 16, maxWidth, 16)
-                    
+
                     // Bomb timer
                     if (radarData.bombBeingDefused) {
                         if (radarData.bombCanDefuse) {
@@ -201,14 +382,14 @@ function render() {
                         ctx.fillStyle = bombColor
                     }
 
-                    ctx.fillRect(130, 18, (maxWidth-2) * (timeleft / 40), 12)
+                    ctx.fillRect(130, 18, (maxWidth - 2) * (timeleft / 40), 12)
 
                     ctx.font = "24px Arial";
                     ctx.textAlign = "center"
                     ctx.textBaseline = "middle"
                     ctx.fillStyle = textColor
-                    ctx.fillText(`${timeleft.toFixed(1)}s`, 1024/2, 28+24); 
-                    
+                    ctx.fillText(`${timeleft.toFixed(1)}s`, 1024 / 2, 28 + 24);
+
                     // Defuse time lines
                     ctx.strokeStyle = "black"
                     ctx.lineWidth = 2
@@ -221,8 +402,8 @@ function render() {
 
                     // Normal defuse
                     ctx.beginPath()
-                    ctx.moveTo(130 + (maxWidth-2) * (10 / 40), 16)
-                    ctx.lineTo(130 + (maxWidth-2) * (10 / 40), 32)
+                    ctx.moveTo(130 + (maxWidth - 2) * (10 / 40), 16)
+                    ctx.lineTo(130 + (maxWidth - 2) * (10 / 40), 32)
                     ctx.stroke()
 
                     // Defuse stamp line
@@ -230,8 +411,8 @@ function render() {
                         console.log(radarData.bombDefuseEnd)
                         ctx.strokeStyle = "green"
                         ctx.beginPath()
-                        ctx.moveTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 16)
-                        ctx.lineTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 32)
+                        ctx.moveTo(130 + (maxWidth - 2) * (radarData.bombDefuseEnd / 40), 16)
+                        ctx.lineTo(130 + (maxWidth - 2) * (radarData.bombDefuseEnd / 40), 32)
                         ctx.stroke()
                     }
                 }
@@ -243,12 +424,12 @@ function render() {
                 ctx.textAlign = "center"
                 ctx.textBaseline = "middle"
                 ctx.fillStyle = textColor
-                ctx.fillText("Not on a server", 1024/2, 1024/2); 
+                ctx.fillText("Not on a server", 1024 / 2, 1024 / 2);
             } else {
                 ctx.font = "100px Arial";
                 ctx.textAlign = "center"
                 ctx.fillStyle = textColor
-                ctx.fillText("Disconnected", 1024/2, 1024/2); 
+                ctx.fillText("Disconnected", 1024 / 2, 1024 / 2);
             }
         }
 
@@ -290,26 +471,39 @@ function drawBomb(pos, planted) {
 
     if (zoomSet) {
         pos = boundingCoordinates(mapCoordinates(pos), boundingRect)
-        size = boundingScale(5, boundingRect);
+        size = boundingScale(8, boundingRect);
     } else {
         pos = mapCoordinates(pos)
-        size = 5
+        size = 8
     }
 
     ctx.beginPath();
     ctx.arc(pos.x, pos.y, size, 0, 2 * Math.PI);
     ctx.fillStyle = bombColor;
     ctx.fill();
+
+    ctx.lineWidth = 2;
+    ctx.strokeStyle = "black";
+    ctx.stroke();
+
+    ctx.font = size * 1.2 + "px Arial";
+    ctx.textAlign = "center";
+    ctx.textBaseline = "middle";
+    ctx.fillStyle = "white";
+    ctx.fillText("C4", pos.x, pos.y);
+
     ctx.closePath();
 
     if (planted && ((new Date().getTime() / 1000) % 1) > 0.5) {
         ctx.strokeStyle = enemyColor
-        ctx.lineWidth = 1;
-        ctx.stroke()
+        ctx.lineWidth = 3;
+        ctx.beginPath();
+        ctx.arc(pos.x, pos.y, size + 4, 0, 2 * Math.PI);
+        ctx.stroke();
     }
 }
 
-function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, isScoped) {
+function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, isScoped, playerName) {
     if (map == null)
         return
 
@@ -331,7 +525,7 @@ function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, i
         ctx.font = "20px Arial";
         ctx.textAlign = "center"
         ctx.fillStyle = fillStyle
-        ctx.fillText("?", pos.x, pos.y); 
+        ctx.fillText("?", pos.x, pos.y);
     } else {
 
         if (hasAwp) {
@@ -362,14 +556,6 @@ function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, i
             ctx.fill();
         }
 
-        if (hasBomb) {
-            ctx.beginPath();
-            ctx.arc(pos.x, pos.y, circleRadius / 2, 0, 2 * Math.PI);
-            ctx.fillStyle = bombColor;
-            ctx.fill();
-        }
-
-
         ctx.closePath();
 
         // Calculate arrowhead points
@@ -385,9 +571,9 @@ function drawEntity(pos, fillStyle, dormant, hasBomb, yaw, hasAwp, playerType, i
         const arrowCornerY2 = pos.y - distance * Math.sin((yaw + arrowWidth) * (Math.PI / 180))
 
 
-        const cicleYaw = 90-yaw
-        const startAngle = degreesToRadians(cicleYaw-arrowWidth)-Math.PI/2
-        const endAngle = degreesToRadians(cicleYaw+arrowWidth)-Math.PI/2
+        const cicleYaw = 90 - yaw
+        const startAngle = degreesToRadians(cicleYaw - arrowWidth) - Math.PI / 2
+        const endAngle = degreesToRadians(cicleYaw + arrowWidth) - Math.PI / 2
 
         // Draw arrow
 
@@ -461,36 +647,44 @@ function connect() {
             console.log("[radarflow] Connection established")
             websocket.send("requestInfo");
         };
-        
+
         socket.onmessage = (event) => {
             if (event.data == "error") {
                 console.log("[radarflow] Server had an unknown error")
             } else {
-                let data = JSON.parse(event.data);
-                radarData = data; 
-                freq = data.freq;
+                try {
+                    let data = JSON.parse(event.data);
+                    radarData = data;
+                    freq = data.freq;
 
-                if (data.ingame == false) {
-                    mapName = null
-                    entityData = null
-
-                    if (loaded)
-                        unloadMap()
-                } else {
-                    if (!loaded) {
-                        mapName = data.mapName
-                        entityData = data.entityData
-                        loadMap(mapName)
-                    } else {
-                        entityData = data.entityData
+                    if (data.money_reveal_enabled !== undefined) {
+                        document.getElementById("moneyReveal").checked = data.money_reveal_enabled;
                     }
-                }
 
-                update = true
-                requestAnimationFrame(render);
+                    if (data.ingame == false) {
+                        mapName = null
+                        entityData = null
+
+                        if (loaded)
+                            unloadMap()
+                    } else {
+                        if (!loaded) {
+                            mapName = data.mapName
+                            entityData = data.entityData
+                            loadMap(mapName)
+                        } else {
+                            entityData = data.entityData
+                        }
+                    }
+
+                    update = true
+                    requestAnimationFrame(render);
+                } catch (e) {
+                    console.error("[radarflow] Error parsing server message:", e, event.data);
+                }
             }
         };
-        
+
         socket.onclose = (event) => {
             if (event.wasClean) {
                 console.log("[radarflow] connection closed");
@@ -502,11 +696,11 @@ function connect() {
             websocket = null
             unloadMap()
 
-            setTimeout(function() {
+            setTimeout(function () {
                 connect();
             }, 1000);
         };
-    
+
         socket.onerror = (error) => {
             console.log(`[radarflow] websocket error: ${error}`);
         };
@@ -520,8 +714,11 @@ function connect() {
 }
 
 addEventListener("DOMContentLoaded", (e) => {
-    document.getElementById("zoomCheck").checked = true;
-
+    document.getElementById("zoomCheck").checked = false;
+    document.getElementById("statsCheck").checked = true;
+    document.getElementById("namesCheck").checked = true;
+    document.getElementById("gunsCheck").checked = true;
+    document.getElementById("moneyReveal").checked = false;
 
     canvas = document.getElementById('canvas');
     canvas.width = 1024;
@@ -539,4 +736,18 @@ function toggleZoom() {
 
 function toggleStats() {
     drawStats = !drawStats
+}
+
+function toggleNames() {
+    drawNames = !drawNames
+}
+
+function toggleGuns() {
+    drawGuns = !drawGuns
+}
+
+function toggleMoneyReveal() {
+    if (websocket && websocket.readyState === WebSocket.OPEN) {
+        websocket.send("toggleMoneyReveal");
+    }
 }

webradar/styles.css

@@ -6,6 +6,9 @@ body {
     align-items: center;
     height: 100vh;
     background-color: #000000; /* Change the background color as needed */
+    background-image: url('assets/image/background.png');
+    background-repeat: repeat;
+    background-size: 128px 128px;
 }
 
 #canvasContainer {
@@ -23,12 +26,27 @@ canvas {
 }
 
 #settingsHolder {
-    visibility: hidden;
-    position: absolute;
-    top: inherit;
-    left: inherit;
-    width: inherit;
-    height: 20%;
+    visibility: visible;
+    position: fixed;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+    width: auto;
+    height: auto;
+    z-index: 100;
+}
+
+#settingsHolder .settings {
+    display: flex;
+    flex-direction: column;
+    font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    color: white;
+    visibility: visible;
+    opacity: 0.8;
+    padding: 10px;
+    background-color: rgba(25, 25, 25, 0.7);
+    border-radius: 5px;
+    transition: opacity 0.3s ease;
 }
 
 #settingsHolder:hover .settings {